From 069833a8f81a56b84fe59287a5515cba5a00e947 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 10 Jul 2024 10:34:33 +0200 Subject: [PATCH] Update DT 97-100 MSQ paths --- .../Heritage Found/5153_Stressed Testing.json | 1 + .../5156_Phyt for Survival.json | 43 +---- .../Heritage Found/5159_He Who Remembers.json | 27 +++ .../5160_Auntie Knows Best.json | 1 + .../C-Yak T'el/4897_The Leap to Yak T'el.json | 3 +- .../4927_The Land of Levin.json | 20 ++- .../4928_A Royal Welcome.json | 13 +- .../4929_A Day in the Life.json | 31 ++++ .../4930_On the Cloud.json | 10 ++ .../4931_Gone and Forgotten.json | 12 ++ .../4934_The Queen's Tour.json | 7 +- .../4935_Her People, Her Family.json | 6 +- .../4939_Drowned Vestiges.json | 48 +++--- .../4940_Memories of a Knight.json | 10 ++ .../4941_At a Crossroads.json | 5 +- .../4942_The Protector and the Destroyer.json | 2 +- .../4943_A Comforting Hand.json | 21 +-- .../4945_The Resilient Son.json | 1 + .../4947_In Pursuit of Sphene.json | 5 +- .../4948_Through the Gate of Gold.json | 21 ++- .../4950_In Serenity and Sorrow.json | 18 ++ .../4951_The Land of Dreams.json | 1 + .../4952_A Knight of Alexandria.json | 24 ++- .../4954_The Taste of Family.json | 42 ++--- .../MagicalRanged/4845_Floundering Fame.json | 157 ++++++++++++++++++ .../Controller/Steps/BaseFactory/WaitAtEnd.cs | 2 +- Questionable/Questionable.csproj | 2 +- 27 files changed, 413 insertions(+), 120 deletions(-) create mode 100644 QuestPaths/Dawntrail/RoleQuests/MagicalRanged/4845_Floundering Fame.json diff --git a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5153_Stressed Testing.json b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5153_Stressed Testing.json index d0ba4d01b..d1e4cc4ae 100644 --- a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5153_Stressed Testing.json +++ b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5153_Stressed Testing.json @@ -26,6 +26,7 @@ "Y": 82.089386, "Z": -355.71875 }, + "StopDistance": 0.25, "TerritoryId": 1191, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", diff --git a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5156_Phyt for Survival.json b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5156_Phyt for Survival.json index ef479aa2f..73bae9b34 100644 --- a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5156_Phyt for Survival.json +++ b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5156_Phyt for Survival.json @@ -47,44 +47,6 @@ { "Sequence": 2, "Steps": [ - { - "Position": { - "X": -592.5055, - "Y": 35.94439, - "Z": -324.25006 - }, - "TerritoryId": 1191, - "InteractionType": "WalkTo", - "Mount": false, - "Sprint": false, - "Comment": "Needs manual babysitting to kill enemies" - }, - { - "DataId": 17678, - "Position": { - "X": -619.23193, - "Y": 11.514403, - "Z": -436.67496 - }, - "TerritoryId": 1191, - "InteractionType": "WaitForNpcAtPosition", - "NpcWaitDistance": 4, - "Mount": false, - "Sprint": false - }, - { - "DataId": 17678, - "Position": { - "X": -618.6356, - "Y": 5.743476, - "Z": -457.91925 - }, - "TerritoryId": 1191, - "InteractionType": "WaitForNpcAtPosition", - "NpcWaitDistance": 4, - "Mount": false, - "Sprint": false - }, { "DataId": 1049501, "Position": { @@ -93,9 +55,8 @@ "Z": -489.28055 }, "TerritoryId": 1191, - "InteractionType": "Interact", - "Mount": false, - "Sprint": false + "InteractionType": "Instruction", + "Comment": "Needs manual babysitting, NPC will stop any time they are hit (even if you de-aggro the enemy)" } ] }, diff --git a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5159_He Who Remembers.json b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5159_He Who Remembers.json index c7176a0fc..07d7c881e 100644 --- a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5159_He Who Remembers.json +++ b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5159_He Who Remembers.json @@ -20,6 +20,24 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -415.87146, + "Y": -13.798597, + "Z": 656.2935 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -442.4273, + "Y": -14.000011, + "Z": 696.89746 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo" + }, { "Position": { "X": -457.70477, @@ -42,6 +60,15 @@ "AetherCurrentId": 2818473, "Comment": "While counterintuitive, this is the closest aether current/msq quest" }, + { + "Position": { + "X": -264.81693, + "Y": -2.2232819, + "Z": 665.8315 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo" + }, { "DataId": 1050668, "Position": { diff --git a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5160_Auntie Knows Best.json b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5160_Auntie Knows Best.json index a23f3adbb..bd8070fcc 100644 --- a/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5160_Auntie Knows Best.json +++ b/QuestPaths/Dawntrail/AetherCurrents/Heritage Found/5160_Auntie Knows Best.json @@ -26,6 +26,7 @@ "Y": 92.47675, "Z": -298.49872 }, + "StopDistance": 0.25, "TerritoryId": 1191, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", diff --git a/QuestPaths/Dawntrail/MSQ/C-Yak T'el/4897_The Leap to Yak T'el.json b/QuestPaths/Dawntrail/MSQ/C-Yak T'el/4897_The Leap to Yak T'el.json index 3df2c76be..1eba0f069 100644 --- a/QuestPaths/Dawntrail/MSQ/C-Yak T'el/4897_The Leap to Yak T'el.json +++ b/QuestPaths/Dawntrail/MSQ/C-Yak T'el/4897_The Leap to Yak T'el.json @@ -88,8 +88,7 @@ }, "TerritoryId": 1189, "InteractionType": "AttuneAetherCurrent", - "AetherCurrentId": 2818434, - "Comment": "TODO verify" + "AetherCurrentId": 2818434 }, { "DataId": 1047515, diff --git a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4927_The Land of Levin.json b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4927_The Land of Levin.json index e05b33b7a..e531b0fbd 100644 --- a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4927_The Land of Levin.json +++ b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4927_The Land of Levin.json @@ -59,7 +59,7 @@ "Y": 145.86096, "Z": 207.56836 }, - "StopDistance": 5, + "StopDistance": 8, "TerritoryId": 1191, "InteractionType": "AttuneAetheryte" }, @@ -110,6 +110,23 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818464 }, + { + "Position": { + "X": 483.82584, + "Y": 145.82513, + "Z": 186.19025 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] + }, { "DataId": 2013819, "Position": { @@ -117,6 +134,7 @@ "Y": 147.50891, "Z": 184.22205 }, + "StopDistance": 4.5, "TerritoryId": 1191, "InteractionType": "Interact", "CompletionQuestVariablesFlags": [ diff --git a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4928_A Royal Welcome.json b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4928_A Royal Welcome.json index 381f9027d..ed6617274 100644 --- a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4928_A Royal Welcome.json +++ b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4928_A Royal Welcome.json @@ -36,6 +36,16 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": -56.819763, + "Y": 28.072628, + "Z": -399.17023 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "Comment": "Outskirts Navmesh workaround" + }, { "DataId": 1047397, "Position": { @@ -60,8 +70,7 @@ }, "StopDistance": 10, "TerritoryId": 1191, - "InteractionType": "AttuneAetheryte", - "Comment": "TODO Verify" + "InteractionType": "AttuneAetheryte" }, { "DataId": 1047403, diff --git a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json index 75b7fa15a..492930182 100644 --- a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json +++ b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json @@ -1,6 +1,7 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "Comment": "TODO Maybe switch the order for sequence 2", "QuestSequence": [ { "Sequence": 0, @@ -20,6 +21,16 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -105.24525, + "Y": 29.019762, + "Z": -348.05893 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "Comment": "Farm Navmesh workaround" + }, { "DataId": 1047405, "Position": { @@ -35,6 +46,16 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": -105.24525, + "Y": 29.019762, + "Z": -348.05893 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "Comment": "Farm Navmesh workaround" + }, { "DataId": 1047408, "Position": { @@ -158,6 +179,16 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": -105.24525, + "Y": 29.019762, + "Z": -348.05893 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "Comment": "Farm Navmesh workaround" + }, { "DataId": 1047406, "Position": { diff --git a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4930_On the Cloud.json b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4930_On the Cloud.json index 151d0835f..e8f912f8f 100644 --- a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4930_On the Cloud.json +++ b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4930_On the Cloud.json @@ -140,6 +140,16 @@ { "Sequence": 6, "Steps": [ + { + "Position": { + "X": 230.06555, + "Y": 67.24928, + "Z": -473.94547 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "Comment": "TODO Verify this avoids combat" + }, { "DataId": 1047428, "Position": { diff --git a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4931_Gone and Forgotten.json b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4931_Gone and Forgotten.json index f3c9519c6..98cf6309d 100644 --- a/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4931_Gone and Forgotten.json +++ b/QuestPaths/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4931_Gone and Forgotten.json @@ -21,6 +21,18 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 2013853, + "Position": { + "X": 0.6560669, + "Y": 0.99176025, + "Z": 17.532532 + }, + "StopDistance": 4.5, + "TerritoryId": 1171, + "InteractionType": "Interact", + "TargetTerritoryId": 1191 + }, { "DataId": 1047444, "Position": { diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4934_The Queen's Tour.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4934_The Queen's Tour.json index f25ed8f84..59abad93c 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4934_The Queen's Tour.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4934_The Queen's Tour.json @@ -29,8 +29,7 @@ "Z": -51.529785 }, "TerritoryId": 1186, - "InteractionType": "WaitForManualProgress", - "Comment": "Pick anything (PointMenu)", + "InteractionType": "Interact", "DialogueChoices": [ { "Type": "YesNo", @@ -42,6 +41,9 @@ "Prompt": "TEXT_KINGME103_04934_Q1_000_000", "Answer": "TEXT_KINGME103_04934_A1_000_003" } + ], + "PointMenuChoices": [ + 2 ] } ] @@ -158,6 +160,7 @@ "Y": 13.999998, "Z": 275.8678 }, + "StopDistance": 5, "TerritoryId": 1186, "InteractionType": "CompleteQuest" } diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json index 27072cae2..f218060ea 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json @@ -12,6 +12,7 @@ "Y": 13.999998, "Z": 275.8678 }, + "StopDistance": 5, "TerritoryId": 1186, "InteractionType": "AcceptQuest" } @@ -84,7 +85,7 @@ ] }, { - "Sequence": 4, + "Sequence": 255, "Steps": [ { "DataId": 1048075, @@ -95,7 +96,8 @@ }, "TerritoryId": 1186, "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Solution Nine" + "AetheryteShortcut": "Solution Nine", + "Comment": "TODO Check if there is a missing sequence #4 now, or if this works correctly" } ] } diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4939_Drowned Vestiges.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4939_Drowned Vestiges.json index 45f86e4e6..1d0fc93bc 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4939_Drowned Vestiges.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4939_Drowned Vestiges.json @@ -162,27 +162,6 @@ "TerritoryId": 1191, "InteractionType": "WalkTo" }, - { - "Position": { - "X": -499.3873, - "Y": 0.67980266, - "Z": 276.4448 - }, - "TerritoryId": 1191, - "InteractionType": "WaitForNpcAtPosition", - "NpcWaitDistance": 5, - "StopDistance": 100, - "Comment": "TODO Verify this" - }, - { - "Position": { - "X": -494.25827, - "Y": 0.9486048, - "Z": 270.9015 - }, - "TerritoryId": 1191, - "InteractionType": "WalkTo" - }, { "DataId": 1047493, "Position": { @@ -217,6 +196,7 @@ "Y": 7.829801, "Z": 315.32764 }, + "StopDistance": 5, "TerritoryId": 1191, "InteractionType": "Interact" } @@ -234,8 +214,7 @@ }, "StopDistance": 10, "TerritoryId": 1191, - "InteractionType": "AttuneAetheryte", - "Comment": "TODO Verify if this is the best spot" + "InteractionType": "AttuneAetheryte" }, { "DataId": 2013972, @@ -248,6 +227,26 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818472 }, + { + "Position": { + "X": -44.293804, + "Y": 59.430523, + "Z": 343.74417 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Mount": true + }, + { + "Position": { + "X": -238.53459, + "Y": 24.70902, + "Z": 438.2853 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo" + }, { "DataId": 2013842, "Position": { @@ -260,8 +259,7 @@ "EnemySpawnType": "AfterInteraction", "KillEnemyDataIds": [ 17703 - ], - "AetheryteShortcut": "Heritage Found - Electrope Strike" + ] } ] }, diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4940_Memories of a Knight.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4940_Memories of a Knight.json index f49ef4c7e..df8e8b337 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4940_Memories of a Knight.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4940_Memories of a Knight.json @@ -68,6 +68,16 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818467 }, + { + "Position": { + "X": -594.9605, + "Y": 0.31490707, + "Z": 239.41946 + }, + "TerritoryId": 1191, + "InteractionType": "WalkTo", + "Mount": true + }, { "DataId": 2013845, "Position": { diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4941_At a Crossroads.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4941_At a Crossroads.json index 690d41807..31b320ba8 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4941_At a Crossroads.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4941_At a Crossroads.json @@ -61,7 +61,8 @@ "Z": -671.77844 }, "TerritoryId": 1191, - "InteractionType": "Interact" + "InteractionType": "Interact", + "AetheryteShortcut": "Heritage Found - The Outskirts" } ] }, @@ -75,7 +76,7 @@ "Y": 31.838512, "Z": -672.5719 }, - "StopDistance": 5, + "StopDistance": 7, "TerritoryId": 1191, "InteractionType": "CompleteQuest" } diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json index 4ff52cf18..3d0aa5a35 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json @@ -15,7 +15,7 @@ "Y": 31.838512, "Z": -672.5719 }, - "StopDistance": 5, + "StopDistance": 7, "TerritoryId": 1191, "InteractionType": "AcceptQuest" } diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4943_A Comforting Hand.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4943_A Comforting Hand.json index d7b6f8e2a..eec7e91c8 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4943_A Comforting Hand.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4943_A Comforting Hand.json @@ -12,6 +12,7 @@ "Y": 70.0001, "Z": 8.316162 }, + "StopDistance": 5, "TerritoryId": 1186, "InteractionType": "AcceptQuest" } @@ -21,11 +22,11 @@ "Sequence": 1, "Steps": [ { - "DataId": 1048128, + "DataId": 1048126, "Position": { - "X": 339.22327, - "Y": 52.212578, - "Z": 186.57202 + "X": 371.4198, + "Y": 50.75, + "Z": 185.19873 }, "TerritoryId": 1186, "InteractionType": "Interact", @@ -35,7 +36,7 @@ null, null, null, - 32 + 128 ] }, { @@ -57,11 +58,11 @@ ] }, { - "DataId": 1048126, + "DataId": 1048128, "Position": { - "X": 371.4198, - "Y": 50.75, - "Z": 185.19873 + "X": 339.22327, + "Y": 52.212578, + "Z": 186.57202 }, "TerritoryId": 1186, "InteractionType": "Interact", @@ -71,7 +72,7 @@ null, null, null, - 128 + 32 ] } ] diff --git a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json index 8abe5c211..0ead69e5c 100644 --- a/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json +++ b/QuestPaths/Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json @@ -96,6 +96,7 @@ "Y": 0, "Z": 107.2251 }, + "StopDistance": 5, "TerritoryId": 1220, "InteractionType": "Interact" } diff --git a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4947_In Pursuit of Sphene.json b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4947_In Pursuit of Sphene.json index 1198e422b..6b1d7c143 100644 --- a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4947_In Pursuit of Sphene.json +++ b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4947_In Pursuit of Sphene.json @@ -27,7 +27,7 @@ "Y": 120.75, "Z": -332.87555 }, - "StopDistance": 5, + "StopDistance": 7, "TerritoryId": 1185, "InteractionType": "Interact" } @@ -49,7 +49,8 @@ "AethernetShortcut": [ "[Tuliyollal] Aetheryte Plaza", "[Tuliyollal] Bayside Bevy Marketplace" - ] + ], + "Comment": "Stops at the place where you can buy Lv99 gear" } ] } diff --git a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json index 1b76a7176..b882b1803 100644 --- a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json +++ b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json @@ -44,6 +44,19 @@ "FlyingUnlocked" ] }, + { + "Position": { + "X": -573.30396, + "Y": -153.01865, + "Z": 529.2467 + }, + "TerritoryId": 1189, + "InteractionType": "WalkTo", + "Fly": true, + "SkipIf": [ + "FlyingLocked" + ] + }, { "DataId": 1047813, "Position": { @@ -52,7 +65,8 @@ "Z": 875.15063 }, "TerritoryId": 1189, - "InteractionType": "Interact" + "InteractionType": "Interact", + "Fly": true } ] }, @@ -81,6 +95,7 @@ "Y": 0.20000042, "Z": -51.499268 }, + "StopDistance": 7, "TerritoryId": 1222, "InteractionType": "Interact" } @@ -111,10 +126,10 @@ "Y": 105.00008, "Z": 848.7831 }, + "StopDistance": 7, "DisableNavmesh": true, "TerritoryId": 1192, - "InteractionType": "Interact", - "Comment": "TODO Check the distance" + "InteractionType": "Interact" } ] }, diff --git a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4950_In Serenity and Sorrow.json b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4950_In Serenity and Sorrow.json index c039d2f11..814090e3f 100644 --- a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4950_In Serenity and Sorrow.json +++ b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4950_In Serenity and Sorrow.json @@ -100,6 +100,24 @@ { "Sequence": 6, "Steps": [ + { + "Position": { + "X": -528.32446, + "Y": 6.402005, + "Z": 525.08594 + }, + "TerritoryId": 1192, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -479.25574, + "Y": 6.4020014, + "Z": 586.5792 + }, + "TerritoryId": 1192, + "InteractionType": "WalkTo" + }, { "DataId": 2013976, "Position": { diff --git a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json index 756b5d219..c772e098b 100644 --- a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json +++ b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json @@ -127,6 +127,7 @@ "Y": -0.106494784, "Z": 551.68506 }, + "StopDistance": 0.25, "TerritoryId": 1192, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", diff --git a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4952_A Knight of Alexandria.json b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4952_A Knight of Alexandria.json index 279823ce4..6307df314 100644 --- a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4952_A Knight of Alexandria.json +++ b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4952_A Knight of Alexandria.json @@ -120,7 +120,24 @@ null, null, null, - 16 + 128 + ] + }, + { + "Position": { + "X": 367.99225, + "Y": 58.0012, + "Z": 409.66818 + }, + "TerritoryId": 1192, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -16 ] }, { @@ -138,7 +155,7 @@ null, null, null, - 128 + 16 ] } ] @@ -170,8 +187,7 @@ }, "TerritoryId": 1192, "InteractionType": "AttuneAetherCurrent", - "AetherCurrentId": 2818485, - "Comment": "TODO Maybe move this to a sidequest" + "AetherCurrentId": 2818485 }, { "DataId": 2013778, diff --git a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4954_The Taste of Family.json b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4954_The Taste of Family.json index 11ae81093..96e9737a7 100644 --- a/QuestPaths/Dawntrail/MSQ/F-Living Memory/4954_The Taste of Family.json +++ b/QuestPaths/Dawntrail/MSQ/F-Living Memory/4954_The Taste of Family.json @@ -52,11 +52,11 @@ "Sequence": 3, "Steps": [ { - "DataId": 1047942, + "DataId": 1047944, "Position": { - "X": 634.14966, - "Y": 24.999489, - "Z": -292.77484 + "X": 665.5221, + "Y": 24.999493, + "Z": -266.55988 }, "TerritoryId": 1192, "InteractionType": "Interact", @@ -66,9 +66,20 @@ null, null, null, - 128 + 32 ] }, + { + "DataId": 214, + "Position": { + "X": 657.98413, + "Y": 28.976807, + "Z": -284.01617 + }, + "StopDistance": 10, + "TerritoryId": 1192, + "InteractionType": "AttuneAetheryte" + }, { "DataId": 1047943, "Position": { @@ -88,22 +99,11 @@ ] }, { - "DataId": 214, + "DataId": 1047942, "Position": { - "X": 657.98413, - "Y": 28.976807, - "Z": -284.01617 - }, - "StopDistance": 10, - "TerritoryId": 1192, - "InteractionType": "AttuneAetheryte" - }, - { - "DataId": 1047944, - "Position": { - "X": 665.5221, - "Y": 24.999493, - "Z": -266.55988 + "X": 634.14966, + "Y": 24.999489, + "Z": -292.77484 }, "TerritoryId": 1192, "InteractionType": "Interact", @@ -113,7 +113,7 @@ null, null, null, - 32 + 128 ] } ] diff --git a/QuestPaths/Dawntrail/RoleQuests/MagicalRanged/4845_Floundering Fame.json b/QuestPaths/Dawntrail/RoleQuests/MagicalRanged/4845_Floundering Fame.json new file mode 100644 index 000000000..121237bc9 --- /dev/null +++ b/QuestPaths/Dawntrail/RoleQuests/MagicalRanged/4845_Floundering Fame.json @@ -0,0 +1,157 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1048331, + "Position": { + "X": 214.03821, + "Y": 5.2600574, + "Z": 628.3817 + }, + "TerritoryId": 957, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGBA531_04845_Q2_000_200", + "Answer": "TEXT_KINGBA531_04845_A1_000_200" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1048357, + "Position": { + "X": -183.21509, + "Y": 36, + "Z": 53.116577 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AetheryteShortcut": "Radz-at-Han", + "AethernetShortcut": [ + "[Radz-at-Han] Aetheryte Plaza", + "[Radz-at-Han] Ruveydah Fibers" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1048359, + "Position": { + "X": -175.0058, + "Y": 36.051327, + "Z": 104.20386 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1048360, + "Position": { + "X": -237.41516, + "Y": 35.999996, + "Z": 102.067505 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1048362, + "Position": { + "X": -10.544006, + "Y": 2.999996, + "Z": -204.91345 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Radz-at-Han] Ruveydah Fibers", + "[Radz-at-Han] Mehryde's Meyhane" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1048361, + "Position": { + "X": 9.262146, + "Y": 0.92, + "Z": -103.31885 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1048363, + "Position": { + "X": 369.40564, + "Y": 3.9809039, + "Z": -219.40955 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "AetheryteShortcut": "Thavnair - Palaka's Stand" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2013713, + "Position": { + "X": 362.35596, + "Y": 3.616333, + "Z": -241.77924 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs b/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs index 4af6d5889..4c74c5922 100644 --- a/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs +++ b/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs @@ -174,7 +174,7 @@ internal static class WaitAtEnd } public override string ToString() => - $"WaitCF({string.Join(", ", Flags.Select(x => x?.ToString(CultureInfo.InvariantCulture) ?? "-"))})"; + $"Wait(QW: {string.Join(", ", Flags.Select(x => x?.ToString(CultureInfo.InvariantCulture) ?? "-"))})"; } internal sealed class WaitObjectAtPosition(GameFunctions gameFunctions) : ITask diff --git a/Questionable/Questionable.csproj b/Questionable/Questionable.csproj index d5001725e..d8f32ddbd 100644 --- a/Questionable/Questionable.csproj +++ b/Questionable/Questionable.csproj @@ -1,6 +1,6 @@  - 1.2 + 1.3 dist $(SolutionDir)=X:\