1
0
forked from liza/Questionable

Add missing teleport prompts, add remaining EW story prompts; fix mare aether current being referenced twice

This commit is contained in:
Liza 2024-06-08 19:28:15 +02:00
parent 89e43ce9e2
commit c611ba03da
Signed by: liza
GPG Key ID: 7199F8D727D55F67
48 changed files with 302 additions and 92 deletions

@ -31,37 +31,6 @@
"InteractionType": "AttuneAetherCurrent",
"AetherCurrentId": 2818362
},
{
"Position": {
"X": 62.71022,
"Y": -46.99965,
"Z": -433.81802
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
},
{
"Position": {
"X": 47.394165,
"Y": -133.50012,
"Z": -397.90225
},
"TerritoryId": 959,
"InteractionType": "WalkTo",
"DisableNavmesh": true
},
{
"DataId": 2012019,
"Position": {
"X": 21.7081,
"Y": -133.5001,
"Z": -385.7313
},
"TerritoryId": 959,
"InteractionType": "AttuneAetherCurrent",
"AetherCurrentId": 2818368,
"DisableNavmesh": true
},
{
"DataId": 1038908,
"Position": {
@ -139,9 +108,7 @@
"Z": -620.05035
},
"TerritoryId": 959,
"InteractionType": "Interact",
"DialogueChoices": [
]
"InteractionType": "Interact"
}
]
},

@ -34,22 +34,6 @@
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2012185,
"Position": {
"X": -5.416992,
"Y": -49.05786,
"Z": -269.24548
},
"TerritoryId": 959,
"InteractionType": "SinglePlayerDuty",
"Comment": "Follow Urianger (TODO is this sequence used?)"
}
]
},
{
"Sequence": 3,
"Steps": [

@ -52,7 +52,6 @@
},
{
"Sequence": 3,
"Comment": "TODO Check flags",
"Steps": [
{
"DataId": 1037628,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
1014
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
1012
],
"QuestSequence": [
{
"Sequence": 0,

@ -28,6 +28,7 @@
"Y": -350,
"Z": -84.82495
},
"StopDistance": 5,
"TerritoryId": 1056,
"InteractionType": "Interact"
}
@ -60,7 +61,14 @@
"Z": -148.57715
},
"TerritoryId": 963,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMH105_04530_Q2_000_000",
"Answer": "TEXT_AKTKMH105_04530_A2_000_001"
}
]
}
]
}

@ -55,7 +55,15 @@
},
"TerritoryId": 957,
"InteractionType": "WalkTo",
"Fly": true
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1037631,
@ -74,6 +82,13 @@
null,
null,
128
],
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMH106_04531_Q1_000_000",
"Answer": "TEXT_AKTKMH106_04531_A1_000_002"
}
]
},
{
@ -84,7 +99,15 @@
"Z": 561.27246
},
"TerritoryId": 957,
"InteractionType": "Interact"
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},

@ -126,7 +126,23 @@
},
"TerritoryId": 957,
"InteractionType": "Interact",
"Mount": false
"Mount": false,
"SkipIf": [
"FlyingLocked"
]
},
{
"DataId": 2012847,
"Position": {
"X": 242.08435,
"Y": 0.3508911,
"Z": 119.43237
},
"TerritoryId": 957,
"InteractionType": "Interact",
"SkipIf": [
"FlyingUnlocked"
]
}
]
},

@ -29,7 +29,14 @@
},
"TerritoryId": 957,
"InteractionType": "Interact",
"Fly": true
"Fly": true,
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMH109_04534_Q2_000_120",
"Yes": true
}
]
}
]
},

@ -60,7 +60,14 @@
"Z": 106.06543
},
"TerritoryId": 957,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMH110_04535_Q2_000_000",
"Answer": "TEXT_AKTKMH110_04535_A2_000_001"
}
]
}
]
},

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
1070
],
"QuestSequence": [
{
"Sequence": 0,
@ -45,7 +48,8 @@
},
"StopDistance": 5,
"TerritoryId": 957,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1056
}
]
},

@ -127,7 +127,8 @@
"Z": 14.389221
},
"TerritoryId": 1089,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1089
},
{
"DataId": 2013113,
@ -137,7 +138,8 @@
"Z": 133.95886
},
"TerritoryId": 1089,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1089
},
{
"Position": {

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
1091
],
"QuestSequence": [
{
"Sequence": 0,
@ -59,7 +62,8 @@
"Z": 90.01325
},
"TerritoryId": 1089,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1089
},
{
"DataId": 1043808,

@ -29,7 +29,8 @@
"Z": -232.4083
},
"TerritoryId": 1089,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1089
},
{
"DataId": 1043792,
@ -103,7 +104,8 @@
"Z": 14.389221
},
"TerritoryId": 1089,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1089
},
{
"DataId": 1043814,
@ -128,7 +130,8 @@
"Z": -232.41016
},
"TerritoryId": 1089,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1089
},
{
"DataId": 1043816,
@ -138,7 +141,14 @@
"Z": -110.12439
},
"TerritoryId": 1089,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMI104_04595_SYSTEM_000_322",
"Yes": true
}
]
}
]
},

@ -114,7 +114,14 @@
"Z": -22.62915
},
"TerritoryId": 1077,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMI105_04596_Q1_000_000",
"Answer": "TEXT_AKTKMI105_04596_A1_000_002"
}
]
}
]
},
@ -159,7 +166,14 @@
"Z": 60.501953
},
"TerritoryId": 1077,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMI105_04596_Q2_000_000",
"Answer": "TEXT_AKTKMI105_04596_A2_000_001"
}
]
}
]
},

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
1071
],
"QuestSequence": [
{
"Sequence": 0,
@ -14,7 +17,14 @@
},
"StopDistance": 7,
"TerritoryId": 1077,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMI106_04597_Q1_000_000",
"Answer": "TEXT_AKTKMI106_04597_A1_000_002"
}
]
}
]
},
@ -29,7 +39,14 @@
"Z": -74.87604
},
"TerritoryId": 1077,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMI106_04597_SYSTEM_000_120",
"Yes": true
}
]
}
]
},

@ -44,7 +44,14 @@
"Z": 51.499146
},
"TerritoryId": 1077,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMI107_04598_SYSTEM_000_221",
"Yes": true
}
]
}
]
},
@ -59,7 +66,14 @@
"Z": -81.28485
},
"TerritoryId": 963,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMI107_04598_SYSTEM_000_401",
"Yes": true
}
]
}
]
}

@ -14,7 +14,14 @@
},
"StopDistance": 7,
"TerritoryId": 1078,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMI108_04599_Q1_000_000",
"Answer": "TEXT_AKTKMI108_04599_A1_000_002"
}
]
}
]
},
@ -30,7 +37,8 @@
},
"StopDistance": 4,
"TerritoryId": 1078,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 963
},
{
"DataId": 1037381,
@ -45,6 +53,13 @@
"AethernetShortcut": [
"[Radz-at-Han] Meghaduta",
"[Radz-at-Han] Mehryde's Meyhane"
],
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMI108_04599_Q3_000_000",
"Answer": "TEXT_AKTKMI108_04599_A3_000_002"
}
]
}
]
@ -64,6 +79,13 @@
"AethernetShortcut": [
"[Radz-at-Han] Mehryde's Meyhane",
"[Radz-at-Han] Meghaduta"
],
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMI108_04599_SYSTEM_000_211",
"Yes": true
}
]
}
]

@ -32,6 +32,13 @@
"AethernetShortcut": [
"[Radz-at-Han] Ruveydah Fibers",
"[Radz-at-Han] Meghaduta"
],
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMI109_04600_SYSTEM_000_020",
"Yes": true
}
]
}
]

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
1120
],
"QuestSequence": [
{
"Sequence": 0,
@ -44,6 +47,7 @@
"Y": -36.65,
"Z": -246.44855
},
"StopDistance": 5,
"TerritoryId": 958,
"InteractionType": "Interact"
}

@ -15,6 +15,7 @@
"Y": -36.65,
"Z": -242.90839
},
"StopDistance": 5,
"TerritoryId": 958,
"InteractionType": "Interact"
}

@ -29,7 +29,8 @@
"Z": 371.96924
},
"TerritoryId": 1119,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1119
},
{
"DataId": 1044274,
@ -69,7 +70,8 @@
"Z": -433.95135
},
"TerritoryId": 1119,
"InteractionType": "Interact"
"InteractionType": "Interact",
"TargetTerritoryId": 1119
},
{
"DataId": 2013233,

@ -49,7 +49,14 @@
"Z": 460.34937
},
"TerritoryId": 957,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMJ107_04676_Q1_000_000",
"Answer": "TEXT_AKTKMJ107_04676_A1_000_002"
}
]
}
]
},

@ -16,7 +16,14 @@
"Z": -569.8787
},
"TerritoryId": 957,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMJ108_04677_Q1_000_000",
"Answer": "TEXT_AKTKMJ108_04677_A1_000_001"
}
]
}
]
},
@ -48,7 +55,14 @@
},
"TerritoryId": 957,
"InteractionType": "Interact",
"Fly": true
"Fly": true,
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMJ108_04677_Q2_000_063",
"Yes": true
}
]
}
]
},

@ -34,6 +34,13 @@
"AethernetShortcut": [
"[Radz-at-Han] Aetheryte Plaza",
"[Radz-at-Han] Meghaduta"
],
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMJ109_04678_SYSTEM_000_021",
"Yes": true
}
]
}
]

@ -48,7 +48,19 @@
},
"StopDistance": 5,
"TerritoryId": 963,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMK101_04735_Q1_000_000",
"Answer": "TEXT_AKTKMK101_04735_A1_000_003"
},
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMK101_04735_Q1_000_065",
"Yes": true
}
]
}
]
},
@ -97,6 +109,13 @@
"AethernetShortcut": [
"[Radz-at-Han] Mehryde's Meyhane",
"[Radz-at-Han] Meghaduta"
],
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_AKTKMK101_04735_Q2_000_182",
"Yes": true
}
]
}
]

@ -34,7 +34,8 @@
"KillEnemyDataIds": [
16332
],
"Fly": true
"Fly": true,
"Comment": "TODO Verify that navmesh can still get you here if flying is locked, and doesn't get stuck on rubble"
}
]
},

@ -64,6 +64,7 @@
"TerritoryId": 959,
"InteractionType": "Interact",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"TargetTerritoryId": 959,
"SkipIf": [
"FlyingUnlocked"
]
@ -194,8 +195,7 @@
16
]
}
],
"Comment": "TODO Check Flags (32)"
]
},
{
"Sequence": 255,

@ -12,6 +12,7 @@
"Y": -49.589592,
"Z": -618.46344
},
"StopDistance": 7,
"TerritoryId": 959,
"InteractionType": "Interact"
}

@ -31,6 +31,7 @@
"TerritoryId": 959,
"InteractionType": "Interact",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"TargetTerritoryId": 959,
"SkipIf": [
"FlyingUnlocked"
]

@ -144,6 +144,7 @@
"Y": 82.05,
"Z": -5.661133
},
"StopDistance": 7,
"TerritoryId": 820,
"InteractionType": "Interact"
}

@ -12,6 +12,7 @@
"Y": 82.05,
"Z": -5.661133
},
"StopDistance": 7,
"TerritoryId": 820,
"InteractionType": "Interact"
}

@ -32,7 +32,8 @@
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] The Dossal Gate"
]
],
"TargetTerritoryId": 844
},
{
"DataId": 1033888,

@ -14,7 +14,14 @@
},
"StopDistance": 5,
"TerritoryId": 962,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_AKTKMM103_04753_Q1_000_000",
"Answer": "TEXT_AKTKMM103_04753_A1_000_001"
}
]
}
]
},

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
884
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
893
],
"QuestSequence": [
{
"Sequence": 0,

@ -2,6 +2,9 @@
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"Comment": "TODO Missing quest end",
"TerritoryBlacklist": [
898
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
932
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
916
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
922
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
933
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
954
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
938
],
"QuestSequence": [
{
"Sequence": 0,

@ -1,6 +1,9 @@
{
"$schema": "https://carvel.li/questionable/quest-1.0",
"Author": "liza",
"TerritoryBlacklist": [
977
],
"QuestSequence": [
{
"Sequence": 0,

@ -11,6 +11,7 @@ using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.Game.Control;
using Questionable.External;
using Questionable.Model;
using Questionable.Model.V1;
@ -159,6 +160,7 @@ internal sealed class MovementController : IDisposable
{
ResetPathfinding();
if (InputManager.IsAutoRunning())
_gameFunctions.ExecuteCommand("/automove off");
Destination = new DestinationData(dataId, to, stopDistance ?? (DefaultStopDistance - 0.2f), fly, sprint);
@ -207,6 +209,9 @@ internal sealed class MovementController : IDisposable
{
_navmeshIpc.Stop();
ResetPathfinding();
if (InputManager.IsAutoRunning())
_gameFunctions.ExecuteCommand("/automove off");
}
public void Dispose()

@ -29,7 +29,6 @@ internal sealed class QuestController
private readonly ICondition _condition;
private readonly IChatGui _chatGui;
private readonly IFramework _framework;
private readonly IGameGui _gameGui;
private readonly AetheryteData _aetheryteData;
private readonly LifestreamIpc _lifestreamIpc;
private readonly TerritoryData _territoryData;
@ -37,8 +36,7 @@ internal sealed class QuestController
public QuestController(DalamudPluginInterface pluginInterface, IDataManager dataManager, IClientState clientState,
GameFunctions gameFunctions, MovementController movementController, IPluginLog pluginLog, ICondition condition,
IChatGui chatGui, IFramework framework, IGameGui gameGui, AetheryteData aetheryteData,
LifestreamIpc lifestreamIpc)
IChatGui chatGui, IFramework framework, AetheryteData aetheryteData, LifestreamIpc lifestreamIpc)
{
_pluginInterface = pluginInterface;
_dataManager = dataManager;
@ -49,7 +47,6 @@ internal sealed class QuestController
_condition = condition;
_chatGui = chatGui;
_framework = framework;
_gameGui = gameGui;
_aetheryteData = aetheryteData;
_lifestreamIpc = lifestreamIpc;
_territoryData = new TerritoryData(dataManager);
@ -358,7 +355,7 @@ internal sealed class QuestController
if (!step.SkipIf.Contains(ESkipCondition.Never))
{
_pluginLog.Information("Checking skip conditions");
_pluginLog.Information($"Checking skip conditions; {string.Join(",", step.SkipIf)}");
if (step.SkipIf.Contains(ESkipCondition.FlyingUnlocked) &&
_gameFunctions.IsFlyingUnlocked(step.TerritoryId))

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<Version>0.4</Version>
<Version>0.5</Version>
<LangVersion>12</LangVersion>
<Nullable>enable</Nullable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

@ -56,7 +56,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin
_movementController =
new MovementController(navmeshIpc, clientState, _gameFunctions, condition, pluginLog);
_questController = new QuestController(pluginInterface, dataManager, _clientState, _gameFunctions,
_movementController, pluginLog, condition, chatGui, framework, gameGui, aetheryteData, lifestreamIpc);
_movementController, pluginLog, condition, chatGui, framework, aetheryteData, lifestreamIpc);
_gameUiController =
new GameUiController(addonLifecycle, dataManager, _gameFunctions, _questController, gameGui, pluginLog);