From dd7152024a1491e2e47248ce2644951569615d4e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 2 Aug 2024 09:55:55 +0200 Subject: [PATCH] Misc skip adjustments --- .../3861_Microbrewing.json | 1 + .../738_Sylphish Concerns.json | 21 ++++++ .../747_Shadow of Darkness.json | 14 +++- .../761_Tea for Three.json | 43 ++++++++++++ .../778_Wilred Wants You.json | 2 + .../Studium Deliveries/4473_The Faculty.json | 36 ++++++++++ .../MIN, BTN/4153_Cultured Pursuits.json | 67 +++++++++++++++++++ .../MIN, BTN/4154_Cooking Up a Culture.json | 37 ++++++++++ .../4966_Wrought in Wachumeqimeqi.json | 36 ++++++++++ .../MIN, BTN/4989_Hands for Hire.json | 36 ++++++++++ .../MIN, BTN/4990_Test of Talents.json | 36 ++++++++++ QuestPaths/QuestPaths.csproj | 4 ++ QuestPaths/Reusable Paths.md | 15 +++++ Questionable.Model/V1/SkipStepConditions.cs | 2 +- 14 files changed, 347 insertions(+), 3 deletions(-) create mode 100644 QuestPaths/6.x - Endwalker/Studium Deliveries/4473_The Faculty.json create mode 100644 QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4153_Cultured Pursuits.json create mode 100644 QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4154_Cooking Up a Culture.json create mode 100644 QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/4966_Wrought in Wachumeqimeqi.json create mode 100644 QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4989_Hands for Hire.json create mode 100644 QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4990_Test of Talents.json diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3861_Microbrewing.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3861_Microbrewing.json index c71fd8b1..1178aff5 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3861_Microbrewing.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3861_Microbrewing.json @@ -29,6 +29,7 @@ "TerritoryId": 139, "InteractionType": "WalkTo", "DisableNavmesh": true, + "Mount": true, "Comment": "Avoids swimming" }, { diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json index a7e83e81..86d44f5d 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json @@ -96,6 +96,27 @@ 8 ] }, + { + "Position": { + "X": -103.87269, + "Y": 5.116502, + "Z": -73.9041 + }, + "TerritoryId": 153, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } + }, { "Position": { "X": -90.467575, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/747_Shadow of Darkness.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/747_Shadow of Darkness.json index 6f3f239d..b5cbedd0 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/747_Shadow of Darkness.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/747_Shadow of Darkness.json @@ -20,6 +20,17 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -119.1183, + "Y": 3.7999938, + "Z": -104.33473 + }, + "TerritoryId": 130, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Ul'dah", + "$": "Ul'dah Aetheryte to Immortal Flames" + }, { "DataId": 1004576, "Position": { @@ -28,8 +39,7 @@ "Z": -114.67157 }, "TerritoryId": 130, - "InteractionType": "Interact", - "AetheryteShortcut": "Ul'dah" + "InteractionType": "Interact" } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json index 215cbf4e..eba78647 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json @@ -26,6 +26,49 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -179.69392, + "Y": 18.008331, + "Z": -279.60886 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, + { + "Position": { + "X": -184.29613, + "Y": 3.5985415, + "Z": -246.7013 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, { "DataId": 1006702, "Position": { diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json index 51abeee8..6d840e0f 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json @@ -12,6 +12,7 @@ "Y": 26.138475, "Z": -355.0622 }, + "StopDistance": 7, "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", @@ -53,6 +54,7 @@ "Y": 19.02249, "Z": -557.8546 }, + "StopDistance": 7, "TerritoryId": 146, "InteractionType": "Interact" } diff --git a/QuestPaths/6.x - Endwalker/Studium Deliveries/4473_The Faculty.json b/QuestPaths/6.x - Endwalker/Studium Deliveries/4473_The Faculty.json new file mode 100644 index 00000000..e960c9f3 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Studium Deliveries/4473_The Faculty.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038500, + "Position": { + "X": -357.83936, + "Y": 21.84602, + "Z": -91.32526 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038500, + "Position": { + "X": -357.83936, + "Y": 21.84602, + "Z": -91.32526 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4153_Cultured Pursuits.json b/QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4153_Cultured Pursuits.json new file mode 100644 index 00000000..9e198c81 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4153_Cultured Pursuits.json @@ -0,0 +1,67 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038504, + "Position": { + "X": -357.62573, + "Y": 21.64856, + "Z": -95.99457 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038505, + "Position": { + "X": -376.45538, + "Y": 18.999998, + "Z": 37.00305 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038503, + "Position": { + "X": -367.0863, + "Y": 21.84602, + "Z": -101.701416 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038501, + "Position": { + "X": -367.3305, + "Y": 21.846018, + "Z": -102.983154 + }, + "StopDistance": 7, + "TerritoryId": 962, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4154_Cooking Up a Culture.json b/QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4154_Cooking Up a Culture.json new file mode 100644 index 00000000..ea7b708c --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Studium Deliveries/MIN, BTN/4154_Cooking Up a Culture.json @@ -0,0 +1,37 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "Disabled": true, + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038501, + "Position": { + "X": -367.3305, + "Y": 21.846018, + "Z": -102.983154 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038501, + "Position": { + "X": -367.3305, + "Y": 21.846018, + "Z": -102.983154 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/4966_Wrought in Wachumeqimeqi.json b/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/4966_Wrought in Wachumeqimeqi.json new file mode 100644 index 00000000..0120cf2a --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/4966_Wrought in Wachumeqimeqi.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1047095, + "Position": { + "X": 139.5437, + "Y": -13.99, + "Z": 10.60498 + }, + "TerritoryId": 1185, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1047095, + "Position": { + "X": 139.5437, + "Y": -13.99, + "Z": 10.60498 + }, + "TerritoryId": 1185, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4989_Hands for Hire.json b/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4989_Hands for Hire.json new file mode 100644 index 00000000..36eb6d7b --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4989_Hands for Hire.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1047151, + "Position": { + "X": 130.2052, + "Y": -14, + "Z": 16.952698 + }, + "TerritoryId": 1185, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1047164, + "Position": { + "X": 217.21204, + "Y": -14, + "Z": -8.316223 + }, + "TerritoryId": 1185, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4990_Test of Talents.json b/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4990_Test of Talents.json new file mode 100644 index 00000000..5693f6bf --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Custom Deliveries/Wachumeqimeqi/MIN, BTN/4990_Test of Talents.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1047132, + "Position": { + "X": 217.36475, + "Y": -14.000001, + "Z": -5.6916504 + }, + "TerritoryId": 1185, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1047132, + "Position": { + "X": 217.36475, + "Y": -14.000001, + "Z": -5.6916504 + }, + "TerritoryId": 1185, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/QuestPaths.csproj b/QuestPaths/QuestPaths.csproj index bb2b3663..e914b62d 100644 --- a/QuestPaths/QuestPaths.csproj +++ b/QuestPaths/QuestPaths.csproj @@ -39,4 +39,8 @@ + + + + diff --git a/QuestPaths/Reusable Paths.md b/QuestPaths/Reusable Paths.md index 719a95f5..7bbfa2f5 100644 --- a/QuestPaths/Reusable Paths.md +++ b/QuestPaths/Reusable Paths.md @@ -5,6 +5,21 @@ outside). This vastly improves the pathfinding performance, and avoids attempting to fly e.g. under the map or into the building that can sometimes be found as valid paths. +## Ul'dah + +```json + { + "Position": { + "X": -119.1183, + "Y": 3.7999938, + "Z": -104.33473 + }, + "TerritoryId": 130, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Ul'dah", + "$": "Ul'dah Aetheryte to Immortal Flames" + } +``` ## Mor Dhona ```json diff --git a/Questionable.Model/V1/SkipStepConditions.cs b/Questionable.Model/V1/SkipStepConditions.cs index 5f15ca98..be8df96b 100644 --- a/Questionable.Model/V1/SkipStepConditions.cs +++ b/Questionable.Model/V1/SkipStepConditions.cs @@ -21,7 +21,7 @@ public sealed class SkipStepConditions { if (Never) return false; - return (CompletionQuestVariablesFlags.Count > 6 && CompletionQuestVariablesFlags.Any(x => x != null)) || + return (CompletionQuestVariablesFlags.Count > 0 && CompletionQuestVariablesFlags.Any(x => x != null)) || Flying != null || Chocobo != null || NotTargetable ||