From d8494b347b0ab8c6aaca0bd20be413f515a867c4 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 7 Jun 2024 23:21:58 +0200 Subject: [PATCH] Mini-YA II --- .../Garlemald/4498_In Pursuit of Power.json | 24 ++++++++++ .../Thavnair/4489_Steppe Child.json | 10 +++- .../4401_A Harey Situation.json | 48 +++++++++++++++++-- .../4407_Heart of the Matter.json | 5 +- .../MSQ/F-Labyrinthos2/4443_Wise Guides.json | 5 +- .../4449_Her Children One and All.json | 11 +++++ .../G-UltimaThule/4450_A Bold Decision.json | 35 +++++++++++++- .../G-UltimaThule/4451_Friends Gathered.json | 7 +++ .../G-UltimaThule/4452_Unto the Heavens.json | 12 ++++- .../4453_A Strange New World.json | 24 ++++++++++ .../G-UltimaThule/4459_Victory x Lost.json | 39 +++++++++++++-- .../Endwalker/MSQ/G-UltimaThule/4460_x.json | 9 +++- .../MSQ/G-UltimaThule/4462_Forge Ahead.json | 9 +++- .../G-UltimaThule/4463_Youre Not Alone.json | 14 ++++++ .../MSQ/G-UltimaThule/4464_Endwalker.json | 13 ++++- .../MSQ/H-6.1/4527_Bountiful Ruins.json | 35 +++++++++++++- .../MSQ/H-6.1/4528_Friends for the Road.json | 1 + Questionable/Controller/QuestController.cs | 2 +- Questionable/Questionable.csproj | 2 +- 19 files changed, 276 insertions(+), 29 deletions(-) diff --git a/QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json b/QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json index 71567a97..629a0c69 100644 --- a/QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json +++ b/QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json @@ -59,6 +59,14 @@ }, "TerritoryId": 958, "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ], "$.0": "[1]", "$.1": "QuestVariables if done first: 16 1 0 0 0 128" }, @@ -71,6 +79,14 @@ }, "TerritoryId": 958, "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ], "$.0": "[2]", "$.1": "QuestVariables if done first: 16 16 0 0 0 32", "$.2": "QuestVariables if done after [1]: 32 17 0 0 0 160" @@ -84,6 +100,14 @@ }, "TerritoryId": 958, "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ], "$.0": "[3]", "$.1": "QuestVariables if done first: 17 0 0 0 0 64" } diff --git a/QuestPaths/Endwalker/AetherCurrents/Thavnair/4489_Steppe Child.json b/QuestPaths/Endwalker/AetherCurrents/Thavnair/4489_Steppe Child.json index 87571b01..258210c2 100644 --- a/QuestPaths/Endwalker/AetherCurrents/Thavnair/4489_Steppe Child.json +++ b/QuestPaths/Endwalker/AetherCurrents/Thavnair/4489_Steppe Child.json @@ -13,7 +13,15 @@ "Z": 727.7484 }, "TerritoryId": 957, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_AKTKZA201_04489_Q1_000_004", + "Answer": "TEXT_AKTKZA201_04489_A1_000_002" + } + ], + "Comment": "TODO I don't think dialogue choices as part of accepting a quest are handled yet" } ] }, diff --git a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4401_A Harey Situation.json b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4401_A Harey Situation.json index edaf5084..fec7609d 100644 --- a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4401_A Harey Situation.json +++ b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4401_A Harey Situation.json @@ -1,7 +1,6 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", - "Comment": "TODO add aether current (2818368) here since it can't be reached later with mount speed 0", "QuestSequence": [ { "Sequence": 0, @@ -23,15 +22,56 @@ "Steps": [ { "Position": { - "X": 1.131261, - "Y": -114.92335, - "Z": -418.2727 + "X": 11.922524, + "Y": -105.8306, + "Z": -397.17743 }, "TerritoryId": 959, "InteractionType": "WalkTo", "Mount": true, "DisableNavmesh": true }, + { + "Position": { + "X": 30.28816, + "Y": -133.50012, + "Z": -394.98798 + }, + "StopDistance": 5, + "TerritoryId": 959, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "DataId": 2012019, + "Position": { + "X": 21.7081, + "Y": -133.5001, + "Z": -385.7313 + }, + "TerritoryId": 959, + "InteractionType": "AttuneAetherCurrent", + "AetherCurrentId": 2818368 + }, + { + "DataId": 2012019, + "Position": { + "X": 23.67959, + "Y": -133.50012, + "Z": -399.96643 + }, + "StopDistance": 0.5, + "TerritoryId": 959, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": 22.27572, + "Y": -137, + "Z": -416.6249 + }, + "StopDistance": 5 + } + }, { "DataId": 1038897, "Position": { diff --git a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4407_Heart of the Matter.json b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4407_Heart of the Matter.json index a417052b..68f939f2 100644 --- a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4407_Heart of the Matter.json +++ b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4407_Heart of the Matter.json @@ -31,10 +31,7 @@ "TerritoryId": 959, "InteractionType": "Interact", "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", - "TargetTerritoryId": 959, - "SkipIf": [ - "Never" - ] + "TargetTerritoryId": 959 }, { "Position": { diff --git a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json index 05ca4eb2..be9b1f19 100644 --- a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json +++ b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json @@ -111,10 +111,7 @@ }, "TerritoryId": 956, "InteractionType": "Interact", - "TargetTerritoryId": 956, - "SkipIf": [ - "Never" - ] + "TargetTerritoryId": 956 }, { "DataId": 1040397, diff --git a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json index 977c3128..8b8f0e25 100644 --- a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json +++ b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json @@ -1,6 +1,10 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "TerritoryBlacklist": [ + 978, + 995 + ], "QuestSequence": [ { "Sequence": 0, @@ -83,6 +87,13 @@ "AethernetShortcut": [ "[Old Sharlayan] The Rostra", "[Old Sharlayan] The Baldesion Annex" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMF111_04449_Q4_000_344", + "Yes": true + } ] } ] diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4450_A Bold Decision.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4450_A Bold Decision.json index d8f649c2..053be914 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4450_A Bold Decision.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4450_A Bold Decision.json @@ -82,8 +82,39 @@ "Z": -62.485718 }, "TerritoryId": 962, - "InteractionType": "WaitForManualProgress", - "Comment": "Talk (2, 2, 2, N/A, 2)" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMG101_04450_Q2_000_221", + "Yes": true + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMG101_04450_Q3_000_240", + "Answer": "TEXT_AKTKMG101_04450_A3_000_241" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMG101_04450_Q4_000_256", + "Answer": "TEXT_AKTKMG101_04450_A4_000_258" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMG101_04450_Q5_000_276", + "Answer": "TEXT_AKTKMG101_04450_A5_000_278" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMG101_04450_Q6_000_298", + "Answer": "TEXT_AKTKMG101_04450_A6_000_300" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMG101_04450_Q7_000_305", + "Answer": "TEXT_AKTKMG101_04450_A7_000_307" + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4451_Friends Gathered.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4451_Friends Gathered.json index 2318361a..5d7d5ad4 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4451_Friends Gathered.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4451_Friends Gathered.json @@ -121,6 +121,13 @@ "AethernetShortcut": [ "[Old Sharlayan] The Leveilleur Estate", "[Old Sharlayan] The Baldesion Annex" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMG102_04451_Q1_000_143", + "Yes": true + } ] } ] diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json index 68e7201a..dfe0571c 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json @@ -33,7 +33,8 @@ "AetheryteShortcut": "Labyrinthos - Aporia", "SkipIf": [ "FlyingUnlocked" - ] + ], + "TargetTerritoryId": 956 }, { "DataId": 1039827, @@ -59,7 +60,14 @@ "Z": 311.9402 }, "TerritoryId": 956, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMG103_04452_Q1_000_183", + "Yes": true + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4453_A Strange New World.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4453_A Strange New World.json index bfadff4d..bed1e8d5 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4453_A Strange New World.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4453_A Strange New World.json @@ -45,6 +45,14 @@ }, "TerritoryId": 960, "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ], "$.0": "[1]", "$.1": "QuestVariables if done first: 16 1 0 0 0 128" }, @@ -57,6 +65,14 @@ }, "TerritoryId": 960, "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ], "$.0": "[2]", "$.1": "QuestVariables if done after [1]: 33 1 0 0 0 192" }, @@ -69,6 +85,14 @@ }, "TerritoryId": 960, "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ], "$.0": "[3]", "$.2": "QuestVariables if done first: 16 16 0 0 0 32" } diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json index 99b7938b..7f563d33 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json @@ -55,7 +55,14 @@ "Z": -319.50867 }, "TerritoryId": 960, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMG110_04459_Q1_000_041", + "Yes": true + } + ] }, { "DataId": 2012286, @@ -176,7 +183,15 @@ "Z": 329.76257 }, "TerritoryId": 960, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1038041, @@ -186,7 +201,15 @@ "Z": 345.44885 }, "TerritoryId": 960, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1038045, @@ -196,7 +219,15 @@ "Z": 347.64624 }, "TerritoryId": 960, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4460_x.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4460_x.json index 58b80718..b320abf4 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4460_x.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4460_x.json @@ -170,7 +170,14 @@ "Z": 241.77905 }, "TerritoryId": 960, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMG111_04460_Q1_000_135", + "Yes": true + } + ] }, { "DataId": 1041157, diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4462_Forge Ahead.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4462_Forge Ahead.json index 1681f9f1..6228801f 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4462_Forge Ahead.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4462_Forge Ahead.json @@ -44,7 +44,14 @@ "Z": 365.43823 }, "TerritoryId": 960, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMG113_04462_Q1_000_040", + "Yes": true + } + ] }, { "DataId": 1041165, diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4463_Youre Not Alone.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4463_Youre Not Alone.json index e30ef3b5..f831cdec 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4463_Youre Not Alone.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4463_Youre Not Alone.json @@ -37,6 +37,13 @@ null, 128 ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_AKTKMG114_04463_Q1_000_031", + "Answer": "TEXT_AKTKMG114_04463_A1_000_033" + } + ], "$.0": "[1]", "$.1": "QuestVariables if done first: 16 0 0 16 0 128" }, @@ -137,6 +144,13 @@ null, 64 ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_AKTKMG114_04463_Q2_000_061", + "Answer": "TEXT_AKTKMG114_04463_A2_000_063" + } + ], "$.0": "[6]", "$.1": "QuestVariables if done first: 16 0 1 0 0 64" } diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json index 9ce295c1..ec74cea0 100644 --- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json +++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json @@ -2,7 +2,9 @@ "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", "TerritoryBlacklist": [ - 973 + 973, + 997, + 1013 ], "QuestSequence": [ { @@ -234,7 +236,14 @@ "Z": -7.1870728 }, "TerritoryId": 351, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMG115_04464_Q13_000_391", + "Yes": true + } + ] } ] } diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4527_Bountiful Ruins.json b/QuestPaths/Endwalker/MSQ/H-6.1/4527_Bountiful Ruins.json index cc0b7cc5..4ea14ed2 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4527_Bountiful Ruins.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4527_Bountiful Ruins.json @@ -48,8 +48,39 @@ "Z": -225.42157 }, "TerritoryId": 963, - "InteractionType": "WaitForManualProgress", - "Comment": "Talk (1, 1, 1, 2)" + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKMH102_04527_Q9_100_111", + "Yes": true + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMH102_04527_Q1_000_000", + "Answer": "TEXT_AKTKMH102_04527_A1_000_001" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMH102_04527_Q2_000_000", + "Answer": "TEXT_AKTKMH102_04527_A2_000_001" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMH102_04527_Q3_000_000", + "Answer": "TEXT_AKTKMH102_04527_A3_000_001" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMH102_04527_Q4_000_000", + "Answer": "TEXT_AKTKMH102_04527_A4_000_001" + }, + { + "Type": "List", + "Prompt": "TEXT_AKTKMH102_04527_Q5_000_000", + "Answer": "TEXT_AKTKMH102_04527_A5_000_002" + } + ] } ] }, diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4528_Friends for the Road.json b/QuestPaths/Endwalker/MSQ/H-6.1/4528_Friends for the Road.json index 1d8d4e32..a75cdbb5 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4528_Friends for the Road.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4528_Friends for the Road.json @@ -79,6 +79,7 @@ "TerritoryId": 956, "InteractionType": "Interact", "AetheryteShortcut": "Labyrinthos - Aporia", + "TargetTerritoryId": 956, "SkipIf": [ "FlyingUnlocked" ] diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index 07d45f42..378dbd7c 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -444,7 +444,7 @@ internal sealed class QuestController $"Aethernet shortcut not unlocked (from: {step.AethernetShortcut.From}, to: {step.AethernetShortcut.To}), walking manually"); } - if (step.TargetTerritoryId == _clientState.TerritoryType && !step.SkipIf.Contains(ESkipCondition.Never)) + if (step.TargetTerritoryId.HasValue && step.TerritoryId != step.TargetTerritoryId && step.TargetTerritoryId == _clientState.TerritoryType) { // we assume whatever e.g. interaction, walkto etc. we have will trigger the zone transition _pluginLog.Information("Zone transition, skipping rest of step"); diff --git a/Questionable/Questionable.csproj b/Questionable/Questionable.csproj index 1bc72708..2188bd53 100644 --- a/Questionable/Questionable.csproj +++ b/Questionable/Questionable.csproj @@ -1,7 +1,7 @@  net8.0-windows - 0.3 + 0.4 12 enable true