From 9696b5470a4c13af1dd495c3db093996448e055e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Mon, 22 Jul 2024 16:16:39 +0200 Subject: [PATCH] Add hunt unlock quests (ARR, HW, SB, ShB) as a quest chain --- .../1563_Let the Hunt Begin (Twin Adder).json | 37 +++++++++++ .../1564_Let the Hunt Begin (Maelstrom).json | 37 +++++++++++ ..._Let the Hunt Begin (Immortal Flames).json | 37 +++++++++++ .../Hunts/2119_Let the Clan Hunt Begin.json | 61 ++++++++++++++++++ .../Hunts/2120_Better Bill Hunting.json | 54 ++++++++++++++++ .../Unlocks/Hunts/2121_Top Marks.json | 62 ++++++++++++++++++ .../Hunts/2122_Elite and Dangerous.json | 42 +++++++++++++ .../2936_One-star Veteran Clan Hunt.json | 42 +++++++++++++ .../2937_Two-star Veteran Clan Hunt.json | 42 +++++++++++++ .../2938_Three-star Veteran Clan Hunt.json | 42 +++++++++++++ .../Hunts/2939_Elite Veteran Clan Hunt.json | 42 +++++++++++++ .../Dailies/3698_Porxine Perfection.json | 14 ++++- .../Pixies/Dailies/3699_The Big Sleep.json | 61 +++++++++++++++++- .../Dailies/3700_Best of Boat Worlds.json | 3 +- .../Dailies/3704_Pebble without a Cause.json | 46 +++++++++++--- .../3705_There's Always a Stupider Fish.json | 31 ++++++--- .../Unlocks/Hunts/3597_Nuts to You.json | 63 +++++++++++++++++++ .../Hunts/3598_Two Nuts Too Nutty.json | 43 +++++++++++++ .../3599_How Do You Like Three Nuts.json | 43 +++++++++++++ .../Unlocks/Hunts/3600_Too Many Nutters.json | 43 +++++++++++++ .../Dailies/4557_Gulal Generosity.json | 12 ++++ .../Arkasodara/Dailies/4569_Tusk Trouble.json | 3 +- ...4177_That Specimen Came from the Moon.json | 2 + .../Hunts/4178_A Hunt for the Ages.json | 2 + .../Unlocks/Hunts/4179_Perfect Specimens.json | 2 + QuestPaths/QuestPaths.csproj | 2 +- .../QuestComponents/ActiveQuestComponent.cs | 2 +- Questionable/Windows/QuestSelectionWindow.cs | 3 +- 28 files changed, 847 insertions(+), 26 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1563_Let the Hunt Begin (Twin Adder).json create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1564_Let the Hunt Begin (Maelstrom).json create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1565_Let the Hunt Begin (Immortal Flames).json create mode 100644 QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json create mode 100644 QuestPaths/3.x - Heavensward/Unlocks/Hunts/2120_Better Bill Hunting.json create mode 100644 QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json create mode 100644 QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json create mode 100644 QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json create mode 100644 QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json create mode 100644 QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json create mode 100644 QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json create mode 100644 QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3597_Nuts to You.json create mode 100644 QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json create mode 100644 QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json create mode 100644 QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1563_Let the Hunt Begin (Twin Adder).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1563_Let the Hunt Begin (Twin Adder).json new file mode 100644 index 00000000..380367a4 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1563_Let the Hunt Begin (Twin Adder).json @@ -0,0 +1,37 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1009294, + "Position": { + "X": -63.767517, + "Y": -1.7171676, + "Z": 11.673096 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1009152, + "Position": { + "X": -74.47931, + "Y": -0.50372624, + "Z": 3.250122 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "NextQuestId": 2119 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1564_Let the Hunt Begin (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1564_Let the Hunt Begin (Maelstrom).json new file mode 100644 index 00000000..41ed6f5d --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1564_Let the Hunt Begin (Maelstrom).json @@ -0,0 +1,37 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1003550, + "Position": { + "X": 76.85962, + "Y": 39.99632, + "Z": 78.99597 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1009552, + "Position": { + "X": 96.025024, + "Y": 40.247147, + "Z": 60.68506 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "NextQuestId": 2119 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1565_Let the Hunt Begin (Immortal Flames).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1565_Let the Hunt Begin (Immortal Flames).json new file mode 100644 index 00000000..c8079428 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Hunts/1565_Let the Hunt Begin (Immortal Flames).json @@ -0,0 +1,37 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001634, + "Position": { + "X": -130.93768, + "Y": 4.0999947, + "Z": -91.02008 + }, + "TerritoryId": 130, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001379, + "Position": { + "X": -153.55157, + "Y": 4.10972, + "Z": -94.04144 + }, + "TerritoryId": 130, + "InteractionType": "CompleteQuest", + "NextQuestId": 2119 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json new file mode 100644 index 00000000..a8fed7d3 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json @@ -0,0 +1,61 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1012256, + "Position": { + "X": 86.96118, + "Y": 24, + "Z": 30.350098 + }, + "TerritoryId": 418, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ishgard", + "AethernetShortcut": [ + "[Ishgard] Aetheryte Plaza", + "[Ishgard] The Forgotten Knight" + ], + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1012225, + "Position": { + "X": 90.10449, + "Y": 15.094684, + "Z": 30.044922 + }, + "StopDistance": 5, + "TerritoryId": 418, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2005909, + "Position": { + "X": 73.899414, + "Y": 24.307495, + "Z": 22.049255 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "NextQuestId": 2120 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2120_Better Bill Hunting.json b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2120_Better Bill Hunting.json new file mode 100644 index 00000000..a3b74e2b --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2120_Better Bill Hunting.json @@ -0,0 +1,54 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1012226, + "Position": { + "X": 71.732666, + "Y": 23.979126, + "Z": 20.85907 + }, + "StopDistance": 7, + "TerritoryId": 418, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1012225, + "Position": { + "X": 90.10449, + "Y": 15.094684, + "Z": 30.044922 + }, + "StopDistance": 5, + "TerritoryId": 418, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2005909, + "Position": { + "X": 73.899414, + "Y": 24.307495, + "Z": 22.049255 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "NextQuestId": 2121 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json new file mode 100644 index 00000000..ec5d7d9d --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json @@ -0,0 +1,62 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1013721, + "Position": { + "X": 17.380005, + "Y": 205.38686, + "Z": 37.491333 + }, + "TerritoryId": 478, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Idyllshire", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1012225, + "Position": { + "X": 90.10449, + "Y": 15.094684, + "Z": 30.044922 + }, + "StopDistance": 5, + "TerritoryId": 418, + "InteractionType": "Interact", + "AetheryteShortcut": "Ishgard", + "AethernetShortcut": [ + "[Ishgard] Aetheryte Plaza", + "[Ishgard] The Forgotten Knight" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2005909, + "Position": { + "X": 73.899414, + "Y": 24.307495, + "Z": 22.049255 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "NextQuestId": 2122 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json new file mode 100644 index 00000000..18665f36 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1012225, + "Position": { + "X": 90.10449, + "Y": 15.094684, + "Z": 30.044922 + }, + "StopDistance": 5, + "TerritoryId": 418, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ishgard", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2005909, + "Position": { + "X": 73.899414, + "Y": 24.307495, + "Z": 22.049255 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "NextQuestId": 2936 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json new file mode 100644 index 00000000..8780b0be --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1019007, + "Position": { + "X": -42.526978, + "Y": -2.9, + "Z": -47.959167 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1019009, + "Position": { + "X": -29.160034, + "Y": 0.09999966, + "Z": -46.189087 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 2937 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json new file mode 100644 index 00000000..1e49ce93 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1019007, + "Position": { + "X": -42.526978, + "Y": -2.9, + "Z": -47.959167 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1019009, + "Position": { + "X": -29.160034, + "Y": 0.09999966, + "Z": -46.189087 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 2938 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json new file mode 100644 index 00000000..3c4959dc --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1019007, + "Position": { + "X": -42.526978, + "Y": -2.9, + "Z": -47.959167 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1019009, + "Position": { + "X": -29.160034, + "Y": 0.09999966, + "Z": -46.189087 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 2939 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json new file mode 100644 index 00000000..138b123d --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1019007, + "Position": { + "X": -42.526978, + "Y": -2.9, + "Z": -47.959167 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1019009, + "Position": { + "X": -29.160034, + "Y": 0.09999966, + "Z": -46.189087 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 3597 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3698_Porxine Perfection.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3698_Porxine Perfection.json index 76b562bf..d8ed1ca1 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3698_Porxine Perfection.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3698_Porxine Perfection.json @@ -128,10 +128,22 @@ "Y": 71.43217, "Z": 575.1278 }, + "StopDistance": 3, "TerritoryId": 816, - "InteractionType": "CompleteQuest", + "InteractionType": "WalkTo", "AetheryteShortcut": "Il Mheg - Lydha Lran", "Fly": true + }, + { + "DataId": 1031809, + "Position": { + "X": -454.3069, + "Y": 71.43217, + "Z": 575.1278 + }, + "TerritoryId": 816, + "InteractionType": "CompleteQuest", + "Mount": false } ] } diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3699_The Big Sleep.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3699_The Big Sleep.json index b068dc26..c5d4f640 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3699_The Big Sleep.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3699_The Big Sleep.json @@ -1,7 +1,6 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -21,7 +20,64 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 1032183, + "Position": { + "X": -105.60773, + "Y": 110.29838, + "Z": -196.97876 + }, + "StopDistance": 1, + "TerritoryId": 816, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [16], + null, + null, + null + ] + }, + { + "DataId": 1032185, + "Position": { + "X": -185.29034, + "Y": 154.79187, + "Z": -262.89777 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [32], + null, + null, + null + ] + }, + { + "DataId": 1032184, + "Position": { + "X": -226.27612, + "Y": 114.61068, + "Z": -305.6535 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [48], + null, + null, + null + ] + } ] }, { @@ -36,6 +92,7 @@ }, "TerritoryId": 816, "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Il Mheg - Lydha Lran", "Fly": true } ] diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3700_Best of Boat Worlds.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3700_Best of Boat Worlds.json index 4ee0b527..5de73e30 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3700_Best of Boat Worlds.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3700_Best of Boat Worlds.json @@ -32,7 +32,8 @@ "EnemySpawnType": "AfterInteraction", "KillEnemyDataIds": [ 11448 - ] + ], + "Fly": true } ] }, diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3704_Pebble without a Cause.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3704_Pebble without a Cause.json index 2a3aad74..22c42530 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3704_Pebble without a Cause.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3704_Pebble without a Cause.json @@ -31,8 +31,14 @@ "TerritoryId": 816, "InteractionType": "Interact", "Fly": true, - "$": "Only if QW: 0 0 3 0 0 0", - "SkipIf": ["NotTargetable"] + "RequiredQuestVariables": [ + null, + null, + [3], + null, + null, + null + ] }, { "DataId": 2010902, @@ -43,8 +49,34 @@ }, "TerritoryId": 816, "InteractionType": "Interact", - "$": "Only if QW: 0 0 1 0 0 0", - "SkipIf": ["NotTargetable"] + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [1], + null, + null, + null + ] + }, + { + "DataId": 2010903, + "Position": { + "X": -395.46808, + "Y": -0.07635498, + "Z": -0.16790771 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [2], + null, + null, + null + ] } ] }, @@ -53,9 +85,9 @@ "Steps": [ { "Position": { - "X": -398.9776, - "Y": 0.82966614, - "Z": 8.668919 + "X": -427.47775, + "Y": 5.0289116, + "Z": 18.171812 }, "TerritoryId": 816, "InteractionType": "WalkTo", diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3705_There's Always a Stupider Fish.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3705_There's Always a Stupider Fish.json index 1ca9189d..afbc174c 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3705_There's Always a Stupider Fish.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3705_There's Always a Stupider Fish.json @@ -1,7 +1,6 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -41,9 +40,13 @@ "TerritoryId": 816, "InteractionType": "Interact", "DisableNavmesh": true, - "$": "QW: 0 2 0 0 0 0", - "SkipIf": [ - "NotTargetable" + "RequiredQuestVariables": [ + null, + [2], + null, + null, + null, + null ] }, { @@ -55,9 +58,13 @@ }, "TerritoryId": 816, "InteractionType": "Interact", - "$": "QW: 0 3 0 0 0 0", - "SkipIf": [ - "NotTargetable" + "RequiredQuestVariables": [ + null, + [3], + null, + null, + null, + null ] }, { @@ -70,9 +77,13 @@ "TerritoryId": 816, "InteractionType": "Interact", "DisableNavmesh": true, - "$": "QW: 0 1 0 0 0 0", - "SkipIf": [ - "NotTargetable" + "RequiredQuestVariables": [ + null, + [1], + null, + null, + null, + null ] } ] diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3597_Nuts to You.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3597_Nuts to You.json new file mode 100644 index 00000000..06bd23c7 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3597_Nuts to You.json @@ -0,0 +1,63 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1031348, + "Position": { + "X": 47.13501, + "Y": 1.4901161E-08, + "Z": 191.5769 + }, + "TerritoryId": 819, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Crystarium", + "AethernetShortcut": [ + "[Crystarium] Aetheryte Plaza", + "[Crystarium] The Pendants" + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1027990, + "Position": { + "X": -85.31323, + "Y": -2.7974376E-11, + "Z": -93.247925 + }, + "StopDistance": 5, + "TerritoryId": 819, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Crystarium] The Pendants", + "[Crystarium] Temenos Rookery" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1027988, + "Position": { + "X": -88.578674, + "Y": 0.07107824, + "Z": -83.66528 + }, + "StopDistance": 7, + "TerritoryId": 819, + "InteractionType": "CompleteQuest", + "NextQuestId": 3598 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json new file mode 100644 index 00000000..034067d8 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json @@ -0,0 +1,43 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1027990, + "Position": { + "X": -85.31323, + "Y": -2.7974376E-11, + "Z": -93.247925 + }, + "StopDistance": 5, + "TerritoryId": 819, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Crystarium", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1027988, + "Position": { + "X": -88.578674, + "Y": 0.07107824, + "Z": -83.66528 + }, + "StopDistance": 7, + "TerritoryId": 819, + "InteractionType": "CompleteQuest", + "NextQuestId": 3599 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json new file mode 100644 index 00000000..d27adca5 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json @@ -0,0 +1,43 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1027990, + "Position": { + "X": -85.31323, + "Y": -2.7974376E-11, + "Z": -93.247925 + }, + "StopDistance": 5, + "TerritoryId": 819, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Crystarium", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1027988, + "Position": { + "X": -88.578674, + "Y": 0.07107824, + "Z": -83.66528 + }, + "StopDistance": 7, + "TerritoryId": 819, + "InteractionType": "CompleteQuest", + "NextQuestId": 3600 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json new file mode 100644 index 00000000..f81bd5e9 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json @@ -0,0 +1,43 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1027990, + "Position": { + "X": -85.31323, + "Y": -2.7974376E-11, + "Z": -93.247925 + }, + "StopDistance": 5, + "TerritoryId": 819, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Crystarium", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1027988, + "Position": { + "X": -88.578674, + "Y": 0.07107824, + "Z": -83.66528 + }, + "StopDistance": 7, + "TerritoryId": 819, + "InteractionType": "CompleteQuest", + "NextQuestId": 4176 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4557_Gulal Generosity.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4557_Gulal Generosity.json index f2476fc2..f63c28bd 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4557_Gulal Generosity.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4557_Gulal Generosity.json @@ -157,6 +157,18 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 404.065, + "Y": 13.027411, + "Z": -306.9749 + }, + "StopDistance": 10000, + "TerritoryId": 957, + "InteractionType": "WalkTo", + "Mount": false, + "Comment": "Unmount from Quest Mount" + }, { "DataId": 1042301, "Position": { diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4569_Tusk Trouble.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4569_Tusk Trouble.json index acafd9fa..42ed9d13 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4569_Tusk Trouble.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4569_Tusk Trouble.json @@ -30,7 +30,8 @@ "TerritoryId": 957, "InteractionType": "UseItem", "ItemId": 2003403, - "AetheryteShortcut": "Thavnair - Palaka's Stand" + "AetheryteShortcut": "Thavnair - Palaka's Stand", + "Fly": true } ] }, diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json index 05ef5bf0..eb76923d 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json @@ -12,6 +12,7 @@ "Y": -15.646991, "Z": 99.68713 }, + "StopDistance": 5, "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", @@ -31,6 +32,7 @@ "Y": -15.646992, "Z": 102.4032 }, + "StopDistance": 7, "TerritoryId": 962, "InteractionType": "CompleteQuest", "NextQuestId": 4178 diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json index f518bf0f..f9f80619 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json @@ -12,6 +12,7 @@ "Y": -15.646991, "Z": 99.68713 }, + "StopDistance": 5, "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", @@ -31,6 +32,7 @@ "Y": -15.646992, "Z": 102.4032 }, + "StopDistance": 7, "TerritoryId": 962, "InteractionType": "CompleteQuest", "NextQuestId": 4179 diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json index 8f89f853..7535f66b 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json @@ -12,6 +12,7 @@ "Y": -15.646991, "Z": 99.68713 }, + "StopDistance": 5, "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", @@ -31,6 +32,7 @@ "Y": -15.646992, "Z": 102.4032 }, + "StopDistance": 7, "TerritoryId": 962, "InteractionType": "CompleteQuest", "NextQuestId": 5009 diff --git a/QuestPaths/QuestPaths.csproj b/QuestPaths/QuestPaths.csproj index 0be93b07..241b9c69 100644 --- a/QuestPaths/QuestPaths.csproj +++ b/QuestPaths/QuestPaths.csproj @@ -23,6 +23,7 @@ Questionable.QuestPaths.QuestSchema + @@ -38,7 +39,6 @@ - diff --git a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs index 7821bbc1..25b9d38c 100644 --- a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs +++ b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs @@ -117,7 +117,7 @@ internal sealed class ActiveQuestComponent { ImGui.SameLine(); ImGui.PushFont(UiBuilder.IconFont); - ImGui.TextColored(ImGuiColors.DalamudYellow, FontAwesomeIcon.CodeBranch.ToIconString()); + ImGui.TextColored(ImGuiColors.DalamudYellow, FontAwesomeIcon.Pause.ToIconString()); ImGui.PopFont(); } } diff --git a/Questionable/Windows/QuestSelectionWindow.cs b/Questionable/Windows/QuestSelectionWindow.cs index 7594fc4a..20948973 100644 --- a/Questionable/Windows/QuestSelectionWindow.cs +++ b/Questionable/Windows/QuestSelectionWindow.cs @@ -188,8 +188,7 @@ internal sealed class QuestSelectionWindow : LWindow ImGui.TextUnformatted("NoQuestPath"); } - if (quest.PreviousQuests.Count > 0) - DrawQuestUnlocks(quest, 0); + DrawQuestUnlocks(quest, 0); } } }