From c611ba03daf2ca66a537b94fc9f8587a421301fe Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 8 Jun 2024 19:28:15 +0200 Subject: [PATCH] Add missing teleport prompts, add remaining EW story prompts; fix mare aether current being referenced twice --- .../4402_A Taste of the Moon.json | 35 +------------------ .../4405_Back to Old Tricks.json | 16 --------- .../D-Thavnair2/4416_Simple Pleasures.json | 1 - .../MSQ/E-Elpis/4432_Worthy of His Back.json | 3 ++ .../4439_As the Heavens Burn.json | 3 ++ .../MSQ/H-6.1/4530_A Brothers Grief.json | 10 +++++- .../MSQ/H-6.1/4531_Sharing the Wealth.json | 27 ++++++++++++-- .../MSQ/H-6.1/4533_Restricted Reading.json | 18 +++++++++- .../Endwalker/MSQ/H-6.1/4534_Void Theory.json | 9 ++++- .../MSQ/H-6.1/4535_A Satraps Duty.json | 9 ++++- .../MSQ/I-6.2/4592_In Search of Azdaja.json | 6 +++- .../MSQ/I-6.2/4593_Shadowed Remnants.json | 6 ++-- .../I-6.2/4594_Where Everything Begins.json | 6 +++- .../MSQ/I-6.2/4595_Groping in the Dark.json | 18 +++++++--- .../MSQ/I-6.2/4596_Nowhere to Run.json | 18 ++++++++-- .../MSQ/I-6.2/4597_The Wind Rises.json | 21 +++++++++-- .../MSQ/I-6.2/4598_Return from the Void.json | 18 ++++++++-- .../4599_A World with Light and Life.json | 26 ++++++++++++-- .../MSQ/I-6.2/4600_Buried Memory.json | 7 ++++ .../MSQ/J-6.3/4673_An Unforeseen Bargain.json | 4 +++ .../MSQ/J-6.3/4674_King of the Mountain.json | 1 + .../MSQ/J-6.3/4675_A Dragons Resolve.json | 6 ++-- .../MSQ/J-6.3/4676_Paths Barred.json | 9 ++++- .../MSQ/J-6.3/4677_Desires Untold.json | 18 ++++++++-- .../J-6.3/4678_Gods Revel Lands Tremble.json | 7 ++++ .../MSQ/K-6.4/4735_Currying Flavor.json | 21 ++++++++++- .../MSQ/K-6.4/4739_Bonds of Trust.json | 3 +- .../MSQ/K-6.4/4740_Lunar Rendezvous.json | 4 +-- .../K-6.4/4741_The Red Side of the Moon.json | 1 + .../MSQ/K-6.4/4743_The Dark Throne.json | 1 + .../MSQ/L-6.5/4745_Appealing the Masses.json | 1 + .../MSQ/L-6.5/4746_In Defiance of Fate.json | 1 + .../MSQ/L-6.5/4747_Back to Action.json | 3 +- .../MSQ/M-6.55/4753_The Coming Dawn.json | 9 ++++- .../MSQ/G-5.1/3674_A Grand Adventure.json | 3 ++ ...3682_Vows of Virtue, Deeds of Cruelty.json | 3 ++ .../MSQ/H-5.2/3769_Beneath the Surface.json | 3 ++ .../MSQ/I-5.3/3775_Faded Memories.json | 3 ++ .../MSQ/I-5.3/3777_The Converging Light.json | 3 ++ .../MSQ/I-5.3/3778_Hope's Confluence.json | 3 ++ .../J-5.4/4011_Like Master, Like Pupil.json | 3 ++ .../J-5.4/4015_The Great Ship Vylbrand.json | 3 ++ .../MSQ/K-5.5/4062_The Flames of War.json | 3 ++ .../MSQ/L-5.55/4066_Death Unto Dawn.json | 3 ++ Questionable/Controller/MovementController.cs | 7 +++- Questionable/Controller/QuestController.cs | 7 ++-- Questionable/Questionable.csproj | 2 +- Questionable/QuestionablePlugin.cs | 2 +- 48 files changed, 302 insertions(+), 92 deletions(-) diff --git a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json index ed304e3a8..b77ddfba7 100644 --- a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json +++ b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json @@ -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" } ] }, diff --git a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json index a75f5f0e8..4e91502c7 100644 --- a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json +++ b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json @@ -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": [ diff --git a/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json b/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json index 2b93258da..e923edd20 100644 --- a/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json +++ b/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json @@ -52,7 +52,6 @@ }, { "Sequence": 3, - "Comment": "TODO Check flags", "Steps": [ { "DataId": 1037628, diff --git a/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json b/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json index 8dff4e72a..50facbd7f 100644 --- a/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json +++ b/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 1014 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json index f0dcc64fa..f7cec2000 100644 --- a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json +++ b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 1012 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json b/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json index 65b557ac4..45803ce07 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json @@ -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" + } + ] } ] } diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json b/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json index e7efd53a2..66b8685cb 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json @@ -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 + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json b/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json index da7d334f1..f4355ad69 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json @@ -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" + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json b/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json index b42471b8d..c215c70e5 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json @@ -29,7 +29,14 @@ }, "TerritoryId": 957, "InteractionType": "Interact", - "Fly": true + "Fly": true, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMH109_04534_Q2_000_120", + "Yes": true + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json b/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json index 88d18b130..6d356e186 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json @@ -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" + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json b/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json index 61f0623ca..51b2de681 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json @@ -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 } ] }, diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json b/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json index 80552cbdf..af9e9d7c5 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json @@ -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": { diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json b/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json index fd2435b95..ee0289bb7 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json @@ -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, diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json b/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json index f60e2a87b..0d12f93af 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json @@ -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 + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json b/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json index d9c09fc8d..51627a8f8 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json @@ -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" + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json b/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json index 4410c0f00..493393497 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json @@ -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 + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json b/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json index 90d21c5e0..e77fe0180 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json @@ -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 + } + ] } ] } diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json b/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json index 68e8801b4..ab3d48d22 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json @@ -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 + } ] } ] diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json b/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json index 3b0bf4534..c061510dd 100644 --- a/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json +++ b/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json @@ -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 + } ] } ] diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json b/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json index ab0479823..06fc6e1f4 100644 --- a/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json +++ b/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json @@ -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" } diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json b/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json index dee5098f4..315aa1b92 100644 --- a/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json +++ b/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json @@ -15,6 +15,7 @@ "Y": -36.65, "Z": -242.90839 }, + "StopDistance": 5, "TerritoryId": 958, "InteractionType": "Interact" } diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json b/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json index 97ce37795..cbe77febd 100644 --- a/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json +++ b/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json @@ -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, diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json b/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json index a730dfa45..d1e686360 100644 --- a/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json +++ b/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json @@ -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" + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json b/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json index ce4256b1d..9fc75d52f 100644 --- a/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json +++ b/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json @@ -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 + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json b/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json index 2af3b071e..0629b9cf7 100644 --- a/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json +++ b/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json @@ -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 + } ] } ] diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json b/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json index 2c9dc1689..194b51fb6 100644 --- a/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json +++ b/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json @@ -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 + } ] } ] diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json b/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json index c6d94c9bd..b7b4a500a 100644 --- a/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json +++ b/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json @@ -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" } ] }, diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json b/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json index 347b99f38..2ac6347c6 100644 --- a/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json +++ b/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json @@ -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, diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json b/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json index d1d08aa6c..ef00913d3 100644 --- a/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json +++ b/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json @@ -12,6 +12,7 @@ "Y": -49.589592, "Z": -618.46344 }, + "StopDistance": 7, "TerritoryId": 959, "InteractionType": "Interact" } diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json b/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json index ae8943788..eed27d89e 100644 --- a/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json +++ b/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json @@ -31,6 +31,7 @@ "TerritoryId": 959, "InteractionType": "Interact", "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "TargetTerritoryId": 959, "SkipIf": [ "FlyingUnlocked" ] diff --git a/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json b/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json index d45f6f2f8..ad01c0dff 100644 --- a/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json +++ b/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json @@ -144,6 +144,7 @@ "Y": 82.05, "Z": -5.661133 }, + "StopDistance": 7, "TerritoryId": 820, "InteractionType": "Interact" } diff --git a/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json b/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json index 2d0f4d99c..eddfd321c 100644 --- a/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json +++ b/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json @@ -12,6 +12,7 @@ "Y": 82.05, "Z": -5.661133 }, + "StopDistance": 7, "TerritoryId": 820, "InteractionType": "Interact" } diff --git a/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json b/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json index 39df81daa..092c429eb 100644 --- a/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json +++ b/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json @@ -32,7 +32,8 @@ "AethernetShortcut": [ "[Crystarium] Aetheryte Plaza", "[Crystarium] The Dossal Gate" - ] + ], + "TargetTerritoryId": 844 }, { "DataId": 1033888, diff --git a/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json b/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json index 5d1dec8b8..dd348edfb 100644 --- a/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json +++ b/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json @@ -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" + } + ] } ] }, diff --git a/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json b/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json index ab3cba3e2..54015211f 100644 --- a/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json +++ b/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 884 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json b/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json index d2c46e224..a6a376446 100644 --- a/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json +++ b/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 893 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json b/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json index 0f4dc39ba..a2aa8d224 100644 --- a/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json +++ b/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json @@ -2,6 +2,9 @@ "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", "Comment": "TODO Missing quest end", + "TerritoryBlacklist": [ + 898 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json b/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json index f9aa5e012..b8dec55b4 100644 --- a/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json +++ b/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 932 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json b/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json index 1e3ca3356..158b93b3e 100644 --- a/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json +++ b/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 916 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json b/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json index 2b8055a38..4cc3791bf 100644 --- a/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json +++ b/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 922 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json b/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json index cd78e3707..73e231d76 100644 --- a/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json +++ b/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 933 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json b/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json index 733407621..f03429017 100644 --- a/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json +++ b/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 954 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json b/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json index 266b87321..3ed6784fd 100644 --- a/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json +++ b/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 938 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json b/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json index 62c256897..3244074e3 100644 --- a/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json +++ b/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 977 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/Questionable/Controller/MovementController.cs b/Questionable/Controller/MovementController.cs index 839ac4531..0c58119df 100644 --- a/Questionable/Controller/MovementController.cs +++ b/Questionable/Controller/MovementController.cs @@ -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,7 +160,8 @@ internal sealed class MovementController : IDisposable { ResetPathfinding(); - _gameFunctions.ExecuteCommand("/automove off"); + 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() diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index 378dbd7c3..9c9778586 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -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)) diff --git a/Questionable/Questionable.csproj b/Questionable/Questionable.csproj index 2188bd533..e6bf8f846 100644 --- a/Questionable/Questionable.csproj +++ b/Questionable/Questionable.csproj @@ -1,7 +1,7 @@  net8.0-windows - 0.4 + 0.5 12 enable true diff --git a/Questionable/QuestionablePlugin.cs b/Questionable/QuestionablePlugin.cs index 56eeea992..8ed248e55 100644 --- a/Questionable/QuestionablePlugin.cs +++ b/Questionable/QuestionablePlugin.cs @@ -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);