From 35537564f1179b37bc5f3c3afaed91bcfb4d96d0 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 15:53:26 +0000 Subject: [PATCH 01/73] Making it easier to travel to east shroud without aetheryte --- .../Class Quests/WHM/91_Trial by Wind.json | 298 ++++++++++-------- 1 file changed, 158 insertions(+), 140 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json index 4415c7f54..cdcebb9f4 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json @@ -1,140 +1,158 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000692, - "Position": { - "X": -258.8083, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "AetheryteShortcut": "Gridania", - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Conjurers' Guild" - ], - "InteractionType": "AcceptQuest", - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 133 - ] - } - } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "DataId": 1000767, - "Position": { - "X": -483.42108, - "Y": 10.130882, - "Z": 209.46057 - }, - "TerritoryId": 152, - "InteractionType": "Interact", - "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true - } - } - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "DataId": 2000885, - "Position": { - "X": -510.6655, - "Y": 5.8422394, - "Z": 35.87895 - }, - "TerritoryId": 152, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 295 - ] - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "DataId": 1000767, - "Position": { - "X": -483.42108, - "Y": 10.130882, - "Z": 209.46057 - }, - "TerritoryId": 152, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 4, - "Steps": [ - { - "DataId": 2000887, - "Position": { - "X": -510.76526, - "Y": 6.1798096, - "Z": 35.568726 - }, - "TerritoryId": 152, - "InteractionType": "SinglePlayerDuty" - } - ] - }, - { - "Sequence": 5, - "Steps": [ - { - "DataId": 1000767, - "Position": { - "X": -483.42108, - "Y": 10.130882, - "Z": 209.46057 - }, - "TerritoryId": 152, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "DataId": 1000692, - "Position": { - "X": -258.8083, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Gridania", - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Conjurers' Guild" - ], - "NextQuestId": 92 - } - ] - } - ] -} +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000692, + "Position": { + "X": -258.8083, + "Y": -5.7735243, + "Z": -27.267883 + }, + "TerritoryId": 133, + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Conjurers' Guild" + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 133 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1001263, + "Position": { + "X": 181.41443, + "Y": -2.3519497, + "Z": -240.40594 + }, + "TerritoryId": 133, + "InteractionType": "Interact", + "TargetTerritoryId": 152, + "AethernetShortcut": [ + "[Gridania] Conjurers' Guild", + "[Gridania] Lancers' Guild" + ], + "SkipConditions": { + "StepIf": {"AetheryteUnlocked": "East Shroud - Hawthorne Hut"} + } + }, + { + "DataId": 1000767, + "Position": { + "X": -483.42108, + "Y": 10.130882, + "Z": 209.46057 + }, + "TerritoryId": 152, + "InteractionType": "Interact", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2000885, + "Position": { + "X": -510.6655, + "Y": 5.8422394, + "Z": 35.87895 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 295 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1000767, + "Position": { + "X": -483.42108, + "Y": 10.130882, + "Z": 209.46057 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2000887, + "Position": { + "X": -510.76526, + "Y": 6.1798096, + "Z": 35.568726 + }, + "TerritoryId": 152, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1000767, + "Position": { + "X": -483.42108, + "Y": 10.130882, + "Z": 209.46057 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000692, + "Position": { + "X": -258.8083, + "Y": -5.7735243, + "Z": -27.267883 + }, + "TerritoryId": 133, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Conjurers' Guild" + ], + "NextQuestId": 92 + } + ] + } + ] +} \ No newline at end of file From b49c2e898d941a74c94cd5f72d18199492746c5b Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 15:58:12 +0000 Subject: [PATCH 02/73] GLA/PLD Quests validated and updated prompts There is one quest where a prompt is immediately after the single duty instance. I couldn't validate that one because there was no way to go back to it after it happened. Quest 264_On Holy Ground --- .../PLD/261_Ul'dah's Most Wanted.json | 158 ++++++++++++++++ .../PLD/262_That Old Familiar Feeling.json | 132 +++++++++++++ .../PLD/263_The Face of Thal.json | 174 ++++++++++++++++++ .../Class Quests/PLD/264_On Holy Ground.json | 143 ++++++++++++++ .../Class Quests/PLD/265_The Rematch.json | 169 +++++++++++++++++ 5 files changed, 776 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json new file mode 100644 index 000000000..1c0293f70 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json @@ -0,0 +1,158 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "AcceptQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1002296, +"Position": { + "X": -139.42175, + "Y": 4.019726, + "Z": 205.0354 +}, +"TerritoryId": 141, +"InteractionType": "Combat", +"EnemySpawnType": "AfterInteraction", +"AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ], + "KillEnemyDataIds": [1245] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1002296, +"Position": { + "X": -139.42175, + "Y": 4.019726, + "Z": 205.0354 +}, +"TerritoryId": 141, +"InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "Interact", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2001426, +"Position": { + "X": 27.206787, + "Y": 12.985352, + "Z": 51.83484 +}, +"TerritoryId": 141, +"InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ] + } + ] + }, + + { "Sequence": 5, + "Steps": [ + { + "DataId": 1003945, +"Position": { + "X": 24.917969, + "Y": 13, + "Z": 50.156372 +}, +"TerritoryId": 141, +"InteractionType": "Interact" + } + ]}, + + { "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "CompleteQuest", +"AetheryteShortcut": "Ul'dah", +"DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CLSGLA100_00261_Q1_000_160", + "Answer": "TEXT_CLSGLA100_00261_A1_000_161" + } + ], +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "NextQuestId": 262 + } + ]} + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json new file mode 100644 index 000000000..6a32e9756 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json @@ -0,0 +1,132 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "AcceptQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1004224, +"Position": { + "X": -220.93542, + "Y": -38.407475, + "Z": 63.91992 +}, +"TerritoryId": 145, +"InteractionType": "Combat", +"AetheryteShortcut": "Eastern Thanalan - Camp Drybone", +"EnemySpawnType":"AfterInteraction", +"KillEnemyDataIds":[1244] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1004224, +"Position": { + "X": -220.93542, + "Y": -38.407475, + "Z": 63.91992 +}, +"TerritoryId": 145, +"InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "Interact", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1004091, +"Position": { + "X": 24.12439, + "Y": 7.1999984, + "Z": -102.76953 +}, +"TerritoryId": 130, +"InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Adventurers' Guild" + ] + } + ] + }, + { "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "CompleteQuest", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "NextQuestId": 263 + } + ]} + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json new file mode 100644 index 000000000..46473b39e --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json @@ -0,0 +1,174 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "AcceptQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1004140, +"Position": { + "X": -72.34308, + "Y": -12.372956, + "Z": -69.13867 +}, +"TerritoryId": 141, +"InteractionType": "Interact", +"AetheryteShortcut": "Central Thanalan - Black Brush Station" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1001462, +"Position": { + "X": -93.33948, + "Y": -11.367981, + "Z": -41.397766 +}, +"TerritoryId": 141, +"InteractionType": "Interact" + }, + { + "DataId": 1001438, +"Position": { + "X": -30.838562, + "Y": -1.0332576, + "Z": -145.67792 +}, +"TerritoryId": 141, +"InteractionType": "Interact" + }, + {"DataId": 2001434, +"Position": { + "X": -115.77026, + "Y": 0.015197754, + "Z": -149.24854 +}, +"TerritoryId": 141, +"InteractionType": "Interact" +} + ] + }, + { + "Sequence": 3, + "Steps": [ + {"DataId": 1004140, +"Position": { + "X": -72.34308, + "Y": -12.372956, + "Z": -69.13867 +}, +"TerritoryId": 141, +"InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1001285, +"Position": { + "X": -68.77246, + "Y": 4.0411124, + "Z": -126.51257 +}, +"TerritoryId": 130, +"InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah" + } + ] + }, + { "Sequence": 5, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "Interact", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CLSGLA200_00263_Q1_000_124", + "Answer": "TEXT_CLSGLA200_00263_A1_000_125" + } + ] + } + ]}, + { "Sequence": 6, + "Steps": [ + { + "DataId": 1004092, +"Position": { + "X": -241.16882, + "Y": 32.47634, + "Z": 398.9165 +}, +"TerritoryId": 140, +"InteractionType": "SinglePlayerDuty", +"AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Gate of the Sultana (Western Thanalan)" + ] + } + ]}, + { "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "CompleteQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "NextQuestId": 264 + } + ]} + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json new file mode 100644 index 000000000..8756d67b7 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json @@ -0,0 +1,143 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "AcceptQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1004225, +"Position": { + "X": 62.974, + "Y": 54.60642, + "Z": 284.90112 +}, +"TerritoryId": 140, +"InteractionType": "Combat", +"EnemySpawnType": "AfterInteraction", +"KillEnemyDataIds": [1243], +"AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Gate of the Sultana (Western Thanalan)" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1004225, +"Position": { + "X": 62.974, + "Y": 54.60642, + "Z": 284.90112 +}, +"TerritoryId": 140, +"InteractionType": "Interact" + } + ] + }, + { "Sequence": 3, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "Interact", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ] + } + ]}, + { "Sequence": 4, + "Steps": [ + { + "DataId": 1002277, +"Position": { + "X": -97.550964, + "Y": 7.05, + "Z": 23.605652 +}, +"TerritoryId": 131, +"InteractionType": "Interact" + } + ]} + , + { "Sequence": 5, + "Steps": [ + { + "DataId": 1004141, +"Position": { + "X": -520.5005, + "Y": -21.460285, + "Z": 123.46069 +}, +"TerritoryId": 145, +"InteractionType": "SinglePlayerDuty", +"AetheryteShortcut": "Eastern Thanalan - Camp Drybone", +"DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CLSGLA250_00264_Q1_000_170", + "Answer": "TEXT_CLSGLA250_00264_A1_000_180" + } + ] + } + ]} + , + { "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "CompleteQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "NextQuestId": 265 + } + ]} + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json new file mode 100644 index 000000000..e644803ca --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json @@ -0,0 +1,169 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "AcceptQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1001285, +"Position": { + "X": -68.77246, + "Y": 4.0411124, + "Z": -126.51257 +}, +"TerritoryId": 130, +"InteractionType": "Interact", +"AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Aetheryte Plaza" + ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CLSGLA300_00265_Q1_000_40", + "Answer": "TEXT_CLSGLA300_00265_A1_000_50" + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 235.23369, + "Y": 2.747214, + "Z": 673.64215 +}, +"TerritoryId": 141, +"InteractionType": "WalkTo", +"AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gate of Thal (Central Thanalan)"] + }, +{ +"TerritoryId": 146, +"Aetheryte": "Southern Thanalan - Little Ala Mhigo", +"InteractionType": "AttuneAetheryte" +}, +{"Position": { + "X": 140.30618, + "Y": 4.2185926, + "Z": -585.2695 +}, +"TerritoryId": 146, +"InteractionType": "WalkTo"}, + { + "DataId": 2001455, +"Position": { + "X": 28.091797, + "Y": 6.9733276, + "Z": -611.2917 +}, +"TerritoryId": 146, +"InteractionType": "Interact" + }, + { + "DataId": 2001435, +"Position": { + "X": 101.823364, + "Y": 7.248047, + "Z": -534.56934 +}, +"TerritoryId": 146, +"InteractionType": "Interact" + }, + { +"Position": { + "X": 164.75665, + "Y": 3.3963587, + "Z": -585.49005 +}, +"TerritoryId": 146, +"InteractionType": "WalkTo" + + } + ] + }, + { "Sequence": 3, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "Interact", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ] + } + ]}, + { "Sequence": 4, + "Steps": [ + { + "DataId": 1004142, +"Position": { + "X": -19.97406, + "Y": -30.999985, + "Z": -33.951355 +}, +"TerritoryId": 145, +"InteractionType": "SinglePlayerDuty", +"AetheryteShortcut": "Eastern Thanalan - Camp Drybone" + } + ]} + , + { "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, +"InteractionType": "CompleteQuest", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "NextQuestId": 1055 + } + ]} + ] +} From 7865ee6fe8d1bccef2a2334001c77bcf49c16180 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 15:58:26 +0000 Subject: [PATCH 03/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/PLD" --- .../PLD/1055_Paladin's Pledge.json | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json new file mode 100644 index 000000000..ee440d593 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json @@ -0,0 +1,117 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002277, +"Position": { + "X": -97.550964, + "Y": 7.05, + "Z": 23.605652 +}, +"TerritoryId": 131, +"InteractionType": "AcceptQuest", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1006747, +"Position": { + "X": -20.828613, + "Y": 29.999964, + "Z": -2.4262085 +}, +"TerritoryId": 131, +"InteractionType": "Interact", +"AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] The Chamber of Rule" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2002344, +"Position": { + "X": -97.39838, + "Y": 14.846985, + "Z": -188.2201 +}, +"TerritoryId": 146, +"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", +"InteractionType": "Combat", +"EnemySpawnType": "AfterInteraction", +"KillEnemyDataIds": [18,19] + } + ] + }, + { "Sequence": 3, + "Steps": [ + { + "DataId": 2002345, +"Position": { + "X": -97.39838, + "Y": 16.433899, + "Z": -188.2201 +}, +"TerritoryId": 146, +"InteractionType": "UseItem", +"ItemId": 2000821 + } + ]}, + { "Sequence": 4, + "Steps": [ + { + "DataId": 1006747, +"Position": { + "X": -20.828613, + "Y": 29.999964, + "Z": -2.4262085 +}, +"TerritoryId": 131, +"InteractionType": "Interact", +"AetheryteShortcut": "Ul'dah", +"AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] The Chamber of Rule" + ] + } + ]} + , + { "Sequence": 255, + "Steps": [ + { + "DataId": 1006747, +"Position": { + "X": -20.828613, + "Y": 29.999964, + "Z": -2.4262085 +}, +"TerritoryId": 131, +"InteractionType": "CompleteQuest", + "NextQuestId": 1056 + } + ]} + ] +} From 2765247f928849cd7bc87993d2449c1b784ffc12 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:00:01 +0000 Subject: [PATCH 04/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/BLM" --- .../183_So You Want to Be a Thaumaturge.json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json new file mode 100644 index 000000000..f4678d54c --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002279, +"Position": { + "X": -196.8872, + "Y": 18.459997, + "Z": 59.952637 +}, +"TerritoryId": 130, +"InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Thaumaturges' Guild"], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 130 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSTHM001_00183_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file From c5ea5563ffe719305e0ecdc0f629b9bf2761ec01 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:00:29 +0000 Subject: [PATCH 05/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/CRP" --- .../184_So You Want to Be a Carpenter.json | 65 +++++++++++-------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json index 3226ac80e..a157b4677 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json @@ -1,28 +1,37 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000148, - "Position": { - "X": -20.279297, - "Y": -3.25, - "Z": 45.97534 - }, - "TerritoryId": 132, - "InteractionType": "AcceptQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSWDK999_00184_Q1_000_1", - "Yes": true - } - ] - } - ] - } - ] -} +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000148, +"Position": { + "X": -20.279297, + "Y": -3.25, + "Z": 45.97534 +}, +"TerritoryId": 132, + "AetheryteShortcut": "Gridania", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSWDK999_00184_Q1_000_1", + "Yes": true + } + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + } + ] + } + \ No newline at end of file From 6fde4de9dc85f8cf98ea051c0ce4c958e16c5def Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:01:42 +0000 Subject: [PATCH 06/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/DRG" --- .../DRG/180_So You Want to Be a Lancer.json | 73 ++++++++----------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json index eaa4aec07..f2cb05de2 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json @@ -1,41 +1,32 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000251, - "Position": { - "X": 147.08167, - "Y": 15.5, - "Z": -267.99426 - }, - "TerritoryId": 133, - "InteractionType": "AcceptQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSLNC999_00180_Q1_000_1", - "Yes": true - } - ], - "AetheryteShortcut": "Gridania", - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Lancers' Guild" - ], - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 133 - ] - } - } - } - ] - } - ] -} +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000251, + "Position": { + "X": 147.08167, + "Y": 15.5, + "Z": -267.99426 + }, + "TerritoryId": 133, + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Lancers' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSLNC999_00180_Q1_000_1", + "Yes": true + } + ], + "InteractionType": "Interact" + } + ] + } + ] + } + \ No newline at end of file From 79751474de0b797054fb5b85e29545afae6f45b3 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:02:31 +0000 Subject: [PATCH 07/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/FSH" --- .../FSH/1107_Way of the Fisher.json | 57 ++++++++++++++ .../FSH/1108_My First Fishing Rod.json | 76 +++++++++++++++++++ .../FSH/1134_So You Want to Be a Fisher.json | 67 ++++++++++++++++ .../FSH/3843_All the Fish in the Sea.json | 40 ++++++++++ 4 files changed, 240 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json new file mode 100644 index 000000000..d28fa0e01 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json @@ -0,0 +1,57 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000859, +"Position": { + "X": -166.76587, + "Y": 4.5496645, + "Z": 150.04187 +}, +"TerritoryId": 129, +"InteractionType": "Interact", +"AetheryteShortcut": "Limsa Lominsa", +"AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Fishermens' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000857, +"Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 +}, +"TerritoryId": 129, +"DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSFSH011_01107_Q1_000_001", + "Yes": true + } + ], +"InteractionType": "CompleteQuest", +"NextQuestId": 1108 + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json new file mode 100644 index 000000000..67bd92543 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json @@ -0,0 +1,76 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "TerritoryId": 129, + "InteractionType": "EquipItem", + "ItemId": 2571, + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } + }, + { + "TerritoryId": 129, + "InteractionType": "EquipRecommended" + }, + + { + "DataId": 1000857, +"Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { +"Position": { + "X": -42.679565, + "Y": 39.999966, + "Z": 119.920654 +}, +"TerritoryId": 128, +"InteractionType": "WaitForManualProgress", + "AethernetShortcut": [ + "[Limsa Lominsa] Fishermens' Guild", + "[Limsa Lominsa] The Aftcastle" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000857, +"Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 +}, +"TerritoryId": 129, +"InteractionType": "CompleteQuest", +"AethernetShortcut": [ + "[Limsa Lominsa] The Aftcastle", + "[Limsa Lominsa] Fishermens' Guild" + ], + "NextQuestId": 3843 + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json new file mode 100644 index 000000000..037f2dad8 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json @@ -0,0 +1,67 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000859, +"Position": { + "X": -166.76587, + "Y": 4.5496645, + "Z": 150.04187 +}, +"TerritoryId": 129, +"AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Fishermens' Guild" + ], +"DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSFSH001_01134_Q1_000_1", + "Yes": true, + "$": "Need to find real prompt in godbert" + } + ], +"InteractionType": "Interact" + }, + { + "DataId": 1000859, +"Position": { + "X": -166.76587, + "Y": 4.5496645, + "Z": 150.04187 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000857, +"Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 +}, +"TerritoryId": 129, +"DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSGLA020_00253_Q1_000_1", + "Yes": true, + "$": "Need to find real prompt in godbert" + } + ], +"InteractionType": "CompleteQuest", +"NextQuestId": 1108 + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json new file mode 100644 index 000000000..985f50b6b --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json @@ -0,0 +1,40 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000858, +"Position": { + "X": -168.47485, + "Y": 4.5500045, + "Z": 163.65295 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005424, +"Position": { + "X": -412.80237, + "Y": 4, + "Z": 75.05908 +}, +"TerritoryId": 129, +"InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Limsa Lominsa] Fishermens' Guild", + "[Limsa Lominsa] Arcanists' Guild" + ] + } + ] + } + ] +} \ No newline at end of file From 45137b231cd37fdd63dea091dd1db8bf71b72266 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:02:55 +0000 Subject: [PATCH 08/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/MNK" --- .../MNK/178_So You Want to Be a Pugilist.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json new file mode 100644 index 000000000..5a950afb8 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1001286, +"Position": { + "X": -88.9754, + "Y": 2.55, + "Z": -51.163513 +}, +"TerritoryId": 130, +"InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 130 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSPGL001_00178_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file From 9413b2ccdb0a96fcd5e134b6ed03b3a3722e4ad7 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:03:24 +0000 Subject: [PATCH 09/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/MNK" --- .../MNK/532_Way of the Pugilist.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json new file mode 100644 index 000000000..fd3e9fcbd --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1001286, +"Position": { + "X": -88.9754, + "Y": 2.55, + "Z": -51.163513 +}, +"TerritoryId": 130, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1003817, +"Position": { + "X": -74.57086, + "Y": 1.9999951, + "Z": -42.404846 +}, +"TerritoryId": 130, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSPGL011_00532_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 553 + } + ] + } + ] + } + \ No newline at end of file From 80f9b02b3729f76cb7b02a95e2e009cbafd43b78 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:05:00 +0000 Subject: [PATCH 10/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/WAR" --- .../WAR/179_So You Want to Be a Marauder.json | 40 ++++++++++++++++++ .../WAR/310_Way of the Marauder.json | 42 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json new file mode 100644 index 000000000..b989176bc --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json @@ -0,0 +1,40 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000926, +"Position": { + "X": -10.055725, + "Y": 44.999794, + "Z": -245.80762 +}, +"TerritoryId": 128, +"InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129, 128 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSEXC001_00179_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json new file mode 100644 index 000000000..16829c6db --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000926, +"Position": { + "X": -10.055725, + "Y": 44.999794, + "Z": -245.80762 +}, +"TerritoryId": 128, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000927, +"Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 +}, +"TerritoryId": 128, +"InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSEXC011_00310_Q2_000_1", + "Yes": true + } + ], + "NextQuestId": 312 + } + ] + } + ] + } + \ No newline at end of file From ea483d1cd538209f65a26ab5a4d1bb443dc85363 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:05:53 +0000 Subject: [PATCH 11/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/ACN" --- .../451_So You Want to Be an Arcanist.json | 42 +++++++++++++++++++ .../ACN/452_Way of the Arcanist.json | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/452_Way of the Arcanist.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json new file mode 100644 index 000000000..020ff0d5a --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000895, +"Position": { + "X": -335.74432, + "Y": 12.899764, + "Z": 1.3884888 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Arcanists' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSACN001_00451_Q1_000_000", + "Yes": true + } + ], + "NextQuestId": 452 + } + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/452_Way of the Arcanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/452_Way of the Arcanist.json new file mode 100644 index 000000000..dad2a9282 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/452_Way of the Arcanist.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000895, +"Position": { + "X": -335.74432, + "Y": 12.899764, + "Z": 1.3884888 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000909, +"Position": { + "X": -326.37524, + "Y": 12.899658, + "Z": 9.994568 +}, +"TerritoryId": 129, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSACN011_00452_Q1_000_000", + "Yes": true + } + ], + "NextQuestId": 454 + } + ] + } + ] + } + \ No newline at end of file From 0635f4e6398ec8fb3e3ab1caaafbc4b2bb35defd Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:07:33 +0000 Subject: [PATCH 12/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/ARC" --- .../ARC/131_Way of the Archer.json | 42 +++++++++++++++++++ .../ARC/181_So You Want to Be an Archer.json | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/131_Way of the Archer.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/181_So You Want to Be an Archer.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/131_Way of the Archer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/131_Way of the Archer.json new file mode 100644 index 000000000..08c556d1b --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/131_Way of the Archer.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000197, +"Position": { + "X": 201.31226, + "Y": -3.1634123E-15, + "Z": 43.900146 +}, +"TerritoryId": 132, + "InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000200, +"Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 +}, +"TerritoryId": 132, +"InteractionType": "CompleteQuest", + + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARC998_00131_Q1_000_1", + "Yes": true + } + ] + } + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/181_So You Want to Be an Archer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/181_So You Want to Be an Archer.json new file mode 100644 index 000000000..b4a8b5fe1 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/181_So You Want to Be an Archer.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000197, +"Position": { + "X": 201.31226, + "Y": -3.1634123E-15, + "Z": 43.900146 +}, +"TerritoryId": 132, +"AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARC999_00181_Q1_000_1", + "Yes": true, + "$": "No Godbert prompt" + } + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + } + ] + } + \ No newline at end of file From 1f4089ce49080f6a097c82a53c9654d103609336 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:08:17 +0000 Subject: [PATCH 13/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/BSM" --- .../185_So You Want to Be a Blacksmith.json | 42 +++++++++++++ .../BSM/291_Way of the Blacksmith.json | 62 +++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json new file mode 100644 index 000000000..ff547934c --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000995, +"Position": { + "X": -52.018066, + "Y": 42.799637, + "Z": 192.2179 +}, +"TerritoryId": 128, +"InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] The Aftcastle" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSBSM001_00185_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 291 + } + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json new file mode 100644 index 000000000..d175b90d8 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json @@ -0,0 +1,62 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000995, +"Position": { + "X": -52.018066, + "Y": 42.799637, + "Z": 192.2179 +}, +"TerritoryId": 128, +"InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] The Aftcastle" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSBSM001_00185_Q1_000_1", + "Yes": true + } + ]} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000997, +"Position": { + "X": -31.265808, + "Y": 44.49997, + "Z": 185.53442 +}, +"TerritoryId": 128, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSBSM011_00291_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 292 + } + ] + } + ] + } + \ No newline at end of file From 387ef9f69b48251b5c4287c1302217b6c19eda42 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:08:49 +0000 Subject: [PATCH 14/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/ARM" --- .../ARM/186_So You Want to Be an Armorer.json | 40 ++++++++++++++++++ .../ARM/273_Way of the Armorer.json | 42 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json new file mode 100644 index 000000000..f365f339c --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json @@ -0,0 +1,40 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000998, +"Position": { + "X": -51.651794, + "Y": 42.79979, + "Z": 190.41736 +}, +"TerritoryId": 128, +"InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] The Aftcastle" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARM001_00186_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json new file mode 100644 index 000000000..91ca9538f --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000998, + "Position": { + "X": -51.651794, + "Y": 42.79979, + "Z": 190.41736 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1001000, + "Position": { + "X": -32.028687, + "Y": 41.499985, + "Z": 208.39233 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARM011_00273_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 273 + } + ] + } + ] + } + \ No newline at end of file From 905074513ab2c4a3a7b597a871fe1e8e79dab04a Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:09:36 +0000 Subject: [PATCH 15/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/GSM" --- .../187_So You Want to Be a Goldsmith.json | 38 +++++++++++++++++ .../GSM/608_Way of the Goldsmith.json | 41 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json new file mode 100644 index 000000000..0151fc858 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002280, +"Position": { + "X": -35.385742, + "Y": 13.599962, + "Z": 97.24573 +}, +"TerritoryId": 131, +"InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Goldsmiths' Guild"], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSGLD001_00187_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json new file mode 100644 index 000000000..eab3d2282 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json @@ -0,0 +1,41 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002280, +"Position": { + "X": -35.385742, + "Y": 13.599962, + "Z": 97.24573 +}, +"TerritoryId": 131, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1004093, +"Position": { + "X": -25.162231, + "Y": 12.200003, + "Z": 110.795654 +}, +"TerritoryId": 131, +"InteractionType": "CompleteQuest", +"DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSGLD011_00608_A1_000_1", + "Yes": true + } + ], +"NextQuestId": 608 +} + ] + } + ] +} From 0da8c8acb5c5a0af6eca4e019ca82a1aa7263e8f Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:10:11 +0000 Subject: [PATCH 16/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/CUL" --- .../191_So You Want to Be a Culinarian.json | 40 ++++++++++++++++++ .../CUL/271_Way of the Culinarian.json | 42 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json new file mode 100644 index 000000000..762b5f79a --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json @@ -0,0 +1,40 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000946, +"Position": { + "X": -61.142883, + "Y": 42.299698, + "Z": -164.0498 +}, +"TerritoryId": 128, +"InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Culinarians' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSCUL001_00191_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json new file mode 100644 index 000000000..cbc91453d --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000946, +"Position": { + "X": -61.142883, + "Y": 42.299698, + "Z": -164.0498 +}, +"TerritoryId": 128, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000947, +"Position": { + "X": -54.64258, + "Y": 44, + "Z": -151.23218 +}, +"TerritoryId": 128, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSCUL011_00271_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 271 + } + ] + } + ] + } + \ No newline at end of file From bd3f01390baa138c04e5b6eb07a0353ac34fa44b Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:10:55 +0000 Subject: [PATCH 17/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/ALC" --- .../190_So You Want to Be an Alchemist.json | 38 +++++++++++++++++ .../ALC/575_Way of the Alchemist.json | 42 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json new file mode 100644 index 000000000..4b16c6d03 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002281, +"Position": { + "X": -115.739685, + "Y": 41.600117, + "Z": 118.88306 +}, +"TerritoryId": 131, +"InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Alchemists' Guild"], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSALC001_00190_Q1_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json new file mode 100644 index 000000000..35f1bc7df --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002281, +"Position": { + "X": -115.739685, + "Y": 41.600117, + "Z": 118.88306 +}, +"TerritoryId": 131, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1002299, +"Position": { + "X": -98.8938, + "Y": 40.200146, + "Z": 120.83618 +}, +"TerritoryId": 131, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSALC011_00575_Q1_1", + "Yes": true + } + ], + "NextQuestId": 575 + } + ] + } + ] + } + \ No newline at end of file From 110eece2d741804d109d63a5831691e24a2b3f11 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:11:36 +0000 Subject: [PATCH 18/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/BTN" --- .../BTN/193_So You Want to Be a Botanist.json | 39 +++++++++++++++++ .../BTN/3_Way of the Botanist.json | 42 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json new file mode 100644 index 000000000..048b8ad3d --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json @@ -0,0 +1,39 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000294, +"Position": { + "X": -238.05603, + "Y": 8, + "Z": -142.93127 +}, +"TerritoryId": 133, +"AetheryteShortcut": "Gridania", +"AethernetShortcut": ["[Gridania] Aetheryte Plaza", "[Gridania] Botanists' Guild"], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSHRV999_00193_Q1_000_1", + "Yes": true + } + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132,133 + ] + } + } + +} + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json new file mode 100644 index 000000000..02440c89b --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000294, +"Position": { + "X": -238.05603, + "Y": 8, + "Z": -142.93127 +}, +"TerritoryId": 133, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000815, +"Position": { + "X": -233.9361, + "Y": 6.668152, + "Z": -171.03839 +}, +"TerritoryId": 133, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSHRV001_00003_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 3 + } + ] + } + ] + } + \ No newline at end of file From 7b0faf9a37ae8d4051c1dfb172d90c1ee7b97554 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:11:59 +0000 Subject: [PATCH 19/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/BLM" --- .../BLM/344_Way of the Thaumaturge.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json new file mode 100644 index 000000000..9dc1536a5 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002279, +"Position": { + "X": -196.8872, + "Y": 18.459997, + "Z": 59.952637 +}, +"TerritoryId": 130, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1001709, +"Position": { + "X": -240.4975, + "Y": 18.7, + "Z": 85.58777 +}, +"TerritoryId": 130, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSTHM011_00344_Q1_001_1", + "Yes": true + } + ], + "NextQuestId": 553 + } + ] + } + ] + } + \ No newline at end of file From ea0c30198deeb5227c15671491ca87383f8c88a5 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:12:45 +0000 Subject: [PATCH 20/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/ROG" --- .../ROG/101_So You Want to Be a Rogue.json | 41 +++++++++++++++ .../ROG/102_Way of the Rogue.json | 50 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/101_So You Want to Be a Rogue.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/102_Way of the Rogue.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/101_So You Want to Be a Rogue.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/101_So You Want to Be a Rogue.json new file mode 100644 index 000000000..fc8bdb081 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/101_So You Want to Be a Rogue.json @@ -0,0 +1,41 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 255, + "Steps": [ + { "DataId": 1009944, +"Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza","[Limsa Lominsa] Fishermens' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSROG001_00101_Q1_000_040", + "Yes": true + } + ], + "NextQuestID": 102 + } + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/102_Way of the Rogue.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/102_Way of the Rogue.json new file mode 100644 index 000000000..5c6f9486e --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/102_Way of the Rogue.json @@ -0,0 +1,50 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1009944, +"Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1009944, +"Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 +}, +"TerritoryId": 129, +"InteractionType": "Interact" +}, + { "DataId": 1009943, +"Position": { + "X": -153.36847, + "Y": -129.4397, + "Z": 265.88843 +}, +"TerritoryId": 129, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSROG011_00102_Q1_000_030", + "Yes": true + } + ] + } + ] + } + ] + } + \ No newline at end of file From 99ab970747ecdb73b97f6044dc4e374fb9678f41 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:13:18 +0000 Subject: [PATCH 21/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/LTW" --- .../LTW/105_Way of the Leatherworker.json | 42 +++++++++++++++++++ ...188_So You Want to Be a Leatherworker.json | 40 ++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json new file mode 100644 index 000000000..8c8f840af --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000352, +"Position": { + "X": 65.69006, + "Y": 8, + "Z": -147.41742 +}, +"TerritoryId": 133, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000691, +"Position": { + "X": 71.97681, + "Y": 8, + "Z": -166.52173 +}, +"TerritoryId": 133, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSTAN000_00105_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 105 + } + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json new file mode 100644 index 000000000..1114efb19 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json @@ -0,0 +1,40 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000352, +"Position": { + "X": 65.69006, + "Y": 8, + "Z": -147.41742 +}, +"TerritoryId": 133, +"InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Leatherworkers' Guild & Shaded Bower" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 133 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSTAN999_00188_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file From 6967cfc8f77d31bd2ba4abf42c979ff6ef82abf1 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:13:52 +0000 Subject: [PATCH 22/73] Upload files to "QuestPaths/2.x - A Realm Reborn/Class Quests/WVR" --- .../WVR/189_So You Want to Be a Weaver.json | 38 +++++++++++++++++ .../WVR/534_Way of the Weaver.json | 42 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json new file mode 100644 index 000000000..9428fff94 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002283, +"Position": { + "X": 134.90503, + "Y": 7.5919275, + "Z": 98.039185 +}, +"TerritoryId": 131, +"InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild"], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSWVR001_00189_Q1_000_1", + "Yes": true + } + ]} + ] + } + ] + } + \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json new file mode 100644 index 000000000..6196aadd7 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1002283, +"Position": { + "X": 134.90503, + "Y": 7.5919275, + "Z": 98.039185 +}, +"TerritoryId": 131, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1003818, +"Position": { + "X": 157.36621, + "Y": 7.7920074, + "Z": 98.924194 +}, +"TerritoryId": 131, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSWVR011_00534_SYSTEM_Q0", + "Yes": true + } + ], + "NextQuestId": 534 + } + ] + } + ] + } + \ No newline at end of file From ac81c8279b875be4f672aab89ac809247df0a323 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:17:36 +0000 Subject: [PATCH 23/73] Added Combat point Added one extra combat point when entering camp so that you don't get overwhelmed by 6 enemies at once by the time you get to the center of the camp. --- .../Ul'dah/3853_Heir Today, Gone Tomorrow.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/3853_Heir Today, Gone Tomorrow.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/3853_Heir Today, Gone Tomorrow.json index 98b017e1f..fd3d1dcd5 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/3853_Heir Today, Gone Tomorrow.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/3853_Heir Today, Gone Tomorrow.json @@ -17,9 +17,25 @@ } ] }, + + + { "Sequence": 1, "Steps": [ + + { +"DataId": 353, +"Position": { + "X": 112.41321, + "Y": 28.93967, + "Z": -37.277832 +}, +"TerritoryId": 141, +"InteractionType": "Combat", +"EnemySpawnType": "OverworldEnemies", +"KillEnemyDataIds": [352,353] +}, { "Position": { "X": 125.61467, From fbc29b2f39845d6d6b0c051596ae09c0b45f148a Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Wed, 21 Aug 2024 16:18:26 +0000 Subject: [PATCH 24/73] added a missing interaction point after combat --- .../Gridania/387_Salvaging the Scene.json | 136 ++++++++++-------- 1 file changed, 73 insertions(+), 63 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json index fec290a5f..e796eaa85 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json @@ -1,66 +1,76 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000503, - "Position": { - "X": 178.33215, - "Y": -32.015224, - "Z": 333.30273 + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000503, + "Position": { + "X": 178.33215, + "Y": -32.015224, + "Z": 333.30273 + }, + "TerritoryId": 148, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2001018, + "Position": { + "X": 155.47412, + "Y": -23.66681, + "Z": 490.74524 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 26 + ] }, - "TerritoryId": 148, - "InteractionType": "AcceptQuest" - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "DataId": 2001018, - "Position": { - "X": 155.47412, - "Y": -23.66681, - "Z": 490.74524 + { + "DataId": 2001016, + "Position": { + "X": 152.60547, + "Y": -23.758362, + "Z": 494.71265 + }, + "TerritoryId": 148, + "InteractionType": "Interact" }, - "TerritoryId": 148, - "InteractionType": "Combat", - "EnemySpawnType": "AutoOnEnterArea", - "KillEnemyDataIds": [ - 26 - ] - }, - { - "DataId": 2001016, - "Position": { - "X": 152.60547, - "Y": -23.758362, - "Z": 494.71265 - }, - "TerritoryId": 148, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "DataId": 1000470, - "Position": { - "X": -59.006653, - "Y": -0.010835781, - "Z": 26.41333 - }, - "TerritoryId": 148, - "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" - } - ] - } - ] -} + { + "DataId": 2001018, + "Position": { + "X": 155.47412, + "Y": -23.66681, + "Z": 490.74524 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000470, + "Position": { + "X": -59.006653, + "Y": -0.010835781, + "Z": 26.41333 + }, + "TerritoryId": 148, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" + } + ] + } + ] + } \ No newline at end of file From 8aaabacc2d96016eb21781c26fb2e0b3616d5dbf Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 21 Aug 2024 20:33:40 +0200 Subject: [PATCH 25/73] Attempt to fix diving movement issue --- Directory.Build.targets | 2 +- .../Arkasodara/Dailies/4573_Gathering Moss.json | 11 +---------- Questionable/Controller/MovementController.cs | 3 ++- Questionable/Controller/Steps/Shared/MoveTo.cs | 9 --------- Questionable/Functions/GameFunctions.cs | 17 ++++++++++------- 5 files changed, 14 insertions(+), 28 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 7aba154f4..db4a3c208 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.12 + 2.13 diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json index 380b35fe8..06b876996 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json @@ -42,16 +42,6 @@ } } }, - { - "Position": { - "X": 103.41005, - "Y": -23.878786, - "Z": 187.79831 - }, - "TerritoryId": 957, - "InteractionType": "WalkTo", - "DisableNavmesh": true - }, { "DataId": 2012907, "Position": { @@ -61,6 +51,7 @@ }, "TerritoryId": 957, "InteractionType": "Interact", + "DisableNavmesh": true, "CompletionQuestVariablesFlags": [ null, null, diff --git a/Questionable/Controller/MovementController.cs b/Questionable/Controller/MovementController.cs index 2f40a3bea..6809c9f1e 100644 --- a/Questionable/Controller/MovementController.cs +++ b/Questionable/Controller/MovementController.cs @@ -151,8 +151,9 @@ internal sealed class MovementController : IDisposable if (IsPathRunning && Destination != null) { - if (_gameFunctions.IsLoadingScreenVisible()) + if (_gameFunctions.IsLoadingScreenVisible(false)) { + _logger.LogInformation("Stopping movement, loading screen visible"); Stop(); return; } diff --git a/Questionable/Controller/Steps/Shared/MoveTo.cs b/Questionable/Controller/Steps/Shared/MoveTo.cs index 1ba43fdbc..a24fb2f09 100644 --- a/Questionable/Controller/Steps/Shared/MoveTo.cs +++ b/Questionable/Controller/Steps/Shared/MoveTo.cs @@ -115,15 +115,6 @@ internal static class MoveTo actualDistance = float.MaxValue; } - // In particular, MoveBuilder is used so early that it'll have the position when you're starting gathering, - // not when you're finished. - if (questId is SatisfactionSupplyNpcId) - { - logger.LogDebug("SatisfactionSupply: Changing distance to max, previous distance: {Distance}", - actualDistance); - actualDistance = float.MaxValue; - } - if (step.Mount == true) yield return mountFactory.Mount(step.TerritoryId, Mount.EMountIf.Always); else if (step.Mount == false) diff --git a/Questionable/Functions/GameFunctions.cs b/Questionable/Functions/GameFunctions.cs index 32b35ce7b..fda0c60d9 100644 --- a/Questionable/Functions/GameFunctions.cs +++ b/Questionable/Functions/GameFunctions.cs @@ -398,7 +398,7 @@ internal sealed unsafe class GameFunctions if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null) return true; - if (IsLoadingScreenVisible()) + if (IsLoadingScreenVisible(true)) return true; if (_condition[ConditionFlag.Crafting]) @@ -437,16 +437,19 @@ internal sealed unsafe class GameFunctions flags.Contains(ConditionFlag.OccupiedInQuestEvent); } - public bool IsLoadingScreenVisible() + public bool IsLoadingScreenVisible(bool all) { - if (_gameGui.TryGetAddonByName("FadeMiddle", out AtkUnitBase* fade) && fade->IsVisible) + if (_gameGui.TryGetAddonByName("FadeMiddle", out AtkUnitBase* fade) && LAddon.IsAddonReady(fade) && fade->IsVisible) return true; - if (_gameGui.TryGetAddonByName("FadeBack", out fade) && fade->IsVisible) - return true; + if (all) + { + if (_gameGui.TryGetAddonByName("FadeBack", out fade) && LAddon.IsAddonReady(fade) && fade->IsVisible) + return true; - if (_gameGui.TryGetAddonByName("NowLoading", out fade) && fade->IsVisible) - return true; + if (_gameGui.TryGetAddonByName("NowLoading", out fade) && LAddon.IsAddonReady(fade) && fade->IsVisible) + return true; + } return false; } From f4ff18e9f4c86e45b628392e04ede071bf645350 Mon Sep 17 00:00:00 2001 From: JerryWester Date: Wed, 21 Aug 2024 14:27:30 -0600 Subject: [PATCH 26/73] SB MSQ Part 3 --- .../MSQ/B-4.1/2962_Arenvald's Adventure.json | 70 ++++++ .../MSQ/B-4.1/2963_The Darkness Below.json | 99 ++++++++ .../MSQ/B-4.1/2964_The Mad King's Trove.json | 108 +++++++++ .../MSQ/B-4.1/2965_The Butcher's Blood.json | 73 ++++++ .../MSQ/B-4.1/2966_Echoes of an Echo.json | 159 +++++++++++++ .../MSQ/B-4.1/2967_A Sultana's Strings.json | 145 ++++++++++++ .../MSQ/B-4.1/2968_A Sultana's Duty.json | 116 ++++++++++ .../MSQ/B-4.1/2969_A Sultana's Resolve.json | 104 +++++++++ .../MSQ/B-4.1/2970_Securing the Saltery.json | 132 +++++++++++ .../MSQ/B-4.1/2971_A Blissful Arrival.json | 69 ++++++ .../MSQ/B-4.1/2972_Return of the Bull.json | 143 ++++++++++++ .../MSQ/C-4.2/3022_Tidings from the East.json | 67 ++++++ .../C-4.2/3023_The Sword in the Store.json | 65 ++++++ .../MSQ/C-4.2/3024_Hope on the Waves.json | 106 +++++++++ .../C-4.2/3025_Elation and Trepidation.json | 145 ++++++++++++ .../MSQ/C-4.2/3026_Storm on the Horizon.json | 213 ++++++++++++++++++ .../MSQ/C-4.2/3027_His Forgotten Home.json | 91 ++++++++ .../MSQ/C-4.2/3028_A Guilty Conscience.json | 70 ++++++ .../MSQ/C-4.2/3029_Rise of a New Sun.json | 96 ++++++++ .../MSQ/D-4.3/3070_Gosetsu and Tsuyu.json | 82 +++++++ .../D-4.3/3071_Gone Like the Morning Dew.json | 118 ++++++++++ .../MSQ/D-4.3/3072_Fruits of Her Labor.json | 73 ++++++ .../3073_Conscripts and Contingencies.json | 136 +++++++++++ .../MSQ/D-4.3/3074_The Primary Agreement.json | 120 ++++++++++ .../MSQ/D-4.3/3075_Under the Moonlight.json | 73 ++++++ .../MSQ/D-4.3/3076_Emissary of the Dawn.json | 51 +++++ 26 files changed, 2724 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2962_Arenvald's Adventure.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3022_Tidings from the East.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/D-4.3/3072_Fruits of Her Labor.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/D-4.3/3073_Conscripts and Contingencies.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2962_Arenvald's Adventure.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2962_Arenvald's Adventure.json new file mode 100644 index 000000000..c255319c6 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2962_Arenvald's Adventure.json @@ -0,0 +1,70 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1019468, + "Position": { + "X": 170.58057, + "Y": 13.02367, + "Z": -91.96619 + }, + "TerritoryId": 635, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024136, + "Position": { + "X": -29.34314, + "Y": -0.1424195, + "Z": -124.52893 + }, + "TerritoryId": 635, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": -63.63005, + "Y": -0.0012056828, + "Z": -101.09714 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo" + }, + { + "DataId": 2009050, + "Position": { + "X": 49.66809, + "Y": -0.015319824, + "Z": 58.182617 + }, + "TerritoryId": 635, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Rhalgr's Reach] Western Rhalgr's Reach", + "[Rhalgr's Reach] Aetheryte Plaza" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json new file mode 100644 index 000000000..9921542b7 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json @@ -0,0 +1,99 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024137, + "Position": { + "X": 47.77588, + "Y": 0, + "Z": 58.64038 + }, + "TerritoryId": 635, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024130, + "Position": { + "X": 614.61804, + "Y": 80.000015, + "Z": 624.567 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + }, + { + "DataId": 1024131, + "Position": { + "X": 585.3512, + "Y": 70, + "Z": 564.0801 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192", + "Fly": true + }, + { + "DataId": 1024132, + "Position": { + "X": 683.71094, + "Y": 70, + "Z": 540.5508 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024133, + "Position": { + "X": 745.20483, + "Y": 69.99999, + "Z": 489.76868 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024103, + "Position": { + "X": 532.494, + "Y": 70, + "Z": 576.1653 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json new file mode 100644 index 000000000..8facd9488 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json @@ -0,0 +1,108 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024104, + "Position": { + "X": 530.81555, + "Y": 70, + "Z": 576.0128 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024134, + "Position": { + "X": 207.84314, + "Y": -0.3, + "Z": 338.55188 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 196.67705, + "Y": -0.6, + "Z": 318.12054 + }, + "TerritoryId": 621, + "InteractionType": "Dive", + "StopDistance": 0.25 + }, + { + "DataId": 2009052, + "Position": { + "X": 144.97595, + "Y": -270.98505, + "Z": -12.283508 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2009054, + "Position": { + "X": 258.19788, + "Y": -274.06738, + "Z": -12.588745 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "TerritoryId": 621, + "InteractionType": "Duty", + "ContentFinderConditionId": 279 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024104, + "Position": { + "X": 530.81555, + "Y": 70, + "Z": 576.0128 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json new file mode 100644 index 000000000..b09978d32 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json @@ -0,0 +1,73 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024103, + "Position": { + "X": 532.494, + "Y": 70, + "Z": 576.1653 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024105, + "Position": { + "X": 739.22327, + "Y": 70, + "Z": 537.6515 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024107, + "Position": { + "X": 788.3878, + "Y": 69.999916, + "Z": 637.3845 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024112, + "Position": { + "X": 796.933, + "Y": 69.9999, + "Z": 634.76 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json new file mode 100644 index 000000000..0fad695cf --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json @@ -0,0 +1,159 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024125, + "Position": { + "X": 775.6007, + "Y": 69.99993, + "Z": 639.4292 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024113, + "Position": { + "X": 754.26855, + "Y": 70, + "Z": 424.70435 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024114, + "Position": { + "X": 5.2338257, + "Y": 0.054396715, + "Z": -3.3417358 + }, + "TerritoryId": 738, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": -2.9216702, + "Y": -2.0000002, + "Z": -34.863174 + }, + "TerritoryId": 738, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -2.9769177, + "Y": -1.3092512, + "Z": -36.29651 + } + }, + "StopDistance": 0.25 + }, + { + "Position": { + "X": -2.9769177, + "Y": -1.3092512, + "Z": -36.29651 + }, + "TerritoryId": 738, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -2.8188858, + "Y": 0.16235979, + "Z": -38.626305 + } + }, + "StopDistance": 0.25 + }, + { + "DataId": 2009058, + "Position": { + "X": -2.8188858, + "Y": 0.16235979, + "Z": -38.626305 + }, + "TerritoryId": 738, + "InteractionType": "Interact", + "StopDistance": 4, + "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128" + }, + { + "Position": { + "X": -0.01923807, + "Y": -2.0000002, + "Z": -35.31207 + }, + "TerritoryId": 738, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "DataId": 1024118, + "Position": { + "X": 24.612793, + "Y": -0.3670061, + "Z": 5.0201416 + }, + "TerritoryId": 738, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024114, + "Position": { + "X": 5.2338257, + "Y": 0.054396715, + "Z": -3.3417358 + }, + "TerritoryId": 738, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024119, + "Position": { + "X": 758.6632, + "Y": 70, + "Z": 446.31104 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json new file mode 100644 index 000000000..c044ad4c0 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json @@ -0,0 +1,145 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024120, + "Position": { + "X": 757.68665, + "Y": 70, + "Z": 444.3275 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1001821, + "Position": { + "X": -24.124573, + "Y": 38.000004, + "Z": 85.31323 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] The Chamber of Rule" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024122, + "Position": { + "X": 57.968994, + "Y": 4, + "Z": -121.53815 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] The Chamber of Rule", + "[Ul'dah] Adventurers' Guild" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024123, + "Position": { + "X": -132.9519, + "Y": 4.590753, + "Z": 238.7273 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "Fly": true, + "AethernetShortcut": [ + "[Ul'dah] Adventurers' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDB106_02967_Q1_000_000", + "Answer": "TEXT_STMBDB106_02967_A1_000_002" + } + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024124, + "Position": { + "X": 254.35254, + "Y": -6.26633, + "Z": -152.36133 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Central Thanalan - Black Brush Station" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024102, + "Position": { + "X": -105.7298, + "Y": 6.9839897, + "Z": -4.135254 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024102, + "Position": { + "X": -105.7298, + "Y": 6.9839897, + "Z": -4.135254 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json new file mode 100644 index 000000000..db940a8b3 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json @@ -0,0 +1,116 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024102, + "Position": { + "X": -105.7298, + "Y": 6.9839897, + "Z": -4.135254 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024040, + "Position": { + "X": -201.06812, + "Y": 18, + "Z": 78.62964 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Thaumaturges' Guild" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024041, + "Position": { + "X": -22.781738, + "Y": 83.19999, + "Z": -7.5532227 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Thaumaturges' Guild", + "[Ul'dah] Airship Landing" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1004433, + "Position": { + "X": -23.605713, + "Y": 83.19999, + "Z": -2.3041382 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "TargetTerritoryId": 144 + }, + { + "DataId": 1024042, + "Position": { + "X": -51.682373, + "Y": 0.04428002, + "Z": 53.94055 + }, + "TerritoryId": 144, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 12.5078335, + "Y": 4.1552944, + "Z": 45.718685 + }, + "TerritoryId": 144, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": 12.60962, + "Y": 4.2181597, + "Z": 49.651253 + } + } + }, + { + "DataId": 1024043, + "Position": { + "X": -12.77179, + "Y": 20.999727, + "Z": 47.837036 + }, + "TerritoryId": 144, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json new file mode 100644 index 000000000..5fdd5f68c --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json @@ -0,0 +1,104 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024043, + "Position": { + "X": -12.77179, + "Y": 20.999727, + "Z": 47.837036 + }, + "TerritoryId": 144, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gold Saucer", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1019070, + "Position": { + "X": 151.20166, + "Y": 14.7757225, + "Z": 95.78088 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "TargetTerritoryId": 639, + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] The Ruby Bazaar" + ] + }, + { + "DataId": 1020622, + "Position": { + "X": 0.045776367, + "Y": 0, + "Z": -2.3041382 + }, + "TerritoryId": 639, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024044, + "Position": { + "X": -110.36853, + "Y": 4, + "Z": -114.00018 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024045, + "Position": { + "X": -2.822998, + "Y": -2.0000012, + "Z": -17.166443 + }, + "TerritoryId": 212, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024045, + "Position": { + "X": -2.822998, + "Y": -2.0000012, + "Z": -17.166443 + }, + "TerritoryId": 212, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json new file mode 100644 index 000000000..10759bdc1 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json @@ -0,0 +1,132 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024045, + "Position": { + "X": -2.822998, + "Y": -2.0000012, + "Z": -17.166443 + }, + "TerritoryId": 212, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024046, + "Position": { + "X": 592.70605, + "Y": 80.00001, + "Z": 618.6465 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1023036, + "Position": { + "X": -285.23688, + "Y": 11.183244, + "Z": 188.83032 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024052, + "Position": { + "X": -238.54431, + "Y": 0.9244179, + "Z": 196.55139 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Comment": "Aim at jaw" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024340, + "Position": { + "X": -208.20941, + "Y": -0.3, + "Z": 207.6294 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024053, + "Position": { + "X": 8.590759, + "Y": 5.3881354, + "Z": 282.7954 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true, + "Comment": "Aim at nearest eye" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1024341, + "Position": { + "X": -3.5248413, + "Y": 3.1742485, + "Z": 249.34766 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023036, + "Position": { + "X": -285.23688, + "Y": 11.183244, + "Z": 188.83032 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json new file mode 100644 index 000000000..5a1e96029 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024051, + "Position": { + "X": -285.29797, + "Y": 11.183233, + "Z": 187.02979 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2009047, + "Position": { + "X": 526.8176, + "Y": 69.962524, + "Z": 577.3861 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024055, + "Position": { + "X": 525.0781, + "Y": 70, + "Z": 574.6699 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024057, + "Position": { + "X": 340.23022, + "Y": 74.00002, + "Z": 70.66455 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json new file mode 100644 index 000000000..ec0914e70 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json @@ -0,0 +1,143 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024063, + "Position": { + "X": 339.62, + "Y": 74.00002, + "Z": 75.48633 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDB111_02972_Q1_000_000", + "Answer": "TEXT_STMBDB111_02972_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2009048, + "Position": { + "X": 593.56055, + "Y": 79.972534, + "Z": 621.9425 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024065, + "Position": { + "X": 749.9961, + "Y": 70.139626, + "Z": 522.88086 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024066, + "Position": { + "X": 245.07507, + "Y": 122, + "Z": -349.0807 + }, + "TerritoryId": 737, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 4 + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024206, + "Position": { + "X": 251.69751, + "Y": 122, + "Z": -345.5406 + }, + "TerritoryId": 737, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1024068, + "Position": { + "X": 741.1764, + "Y": 70, + "Z": 525.5055 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1024068, + "Position": { + "X": 741.1764, + "Y": 70, + "Z": 525.5055 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1019468, + "Position": { + "X": 170.58057, + "Y": 13.02367, + "Z": -91.96619 + }, + "TerritoryId": 635, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "AethernetShortcut": [ + "[Rhalgr's Reach] Aetheryte Plaza", + "[Rhalgr's Reach] Northeastern Rhalgr's Reach" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3022_Tidings from the East.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3022_Tidings from the East.json new file mode 100644 index 000000000..393743144 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3022_Tidings from the East.json @@ -0,0 +1,67 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1019468, + "Position": { + "X": 170.58057, + "Y": 13.02367, + "Z": -91.96619 + }, + "TerritoryId": 635, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1020463, + "Position": { + "X": 151.20166, + "Y": 14.7757225, + "Z": 95.750244 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "TargetTerritoryId": 639, + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] The Ruby Bazaar" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024726, + "Position": { + "X": -11.367981, + "Y": 10.503965, + "Z": -212.75659 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Kugane] The Ruby Bazaar", + "[Kugane] Rakuza District" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json new file mode 100644 index 000000000..5e64545dc --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json @@ -0,0 +1,65 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024727, + "Position": { + "X": -12.375122, + "Y": 10.503965, + "Z": -213.76367 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024731, + "Position": { + "X": 89.92139, + "Y": 3.9999497, + "Z": 52.262085 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Rakuza District", + "[Kugane] Kogane Dori Markets" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1019061, + "Position": { + "X": -0.045776367, + "Y": -7.9738514E-11, + "Z": -80.857605 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Kugane] Kogane Dori Markets", + "[Kugane] Aetheryte Plaza" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json new file mode 100644 index 000000000..7d6c5d52b --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json @@ -0,0 +1,106 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024738, + "Position": { + "X": 1.3884888, + "Y": -7.717861E-11, + "Z": -78.14148 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024743, + "Position": { + "X": -123.1861, + "Y": -6.9999976, + "Z": -58.854065 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024822, + "Position": { + "X": 885.0995, + "Y": 1.1792068, + "Z": 861.38696 + }, + "TerritoryId": 613, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 3 + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024826, + "Position": { + "X": 458.94556, + "Y": 30.580631, + "Z": 748.74475 + }, + "TerritoryId": 613, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024830, + "Position": { + "X": 577.26404, + "Y": 0.93538165, + "Z": 852.7809 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024836, + "Position": { + "X": -788.2658, + "Y": 11.709066, + "Z": -283.0091 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json new file mode 100644 index 000000000..9faacdcfd --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json @@ -0,0 +1,145 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024837, + "Position": { + "X": -791.04297, + "Y": 12.349811, + "Z": -283.8026 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -831.06116, + "Y": 20.168653, + "Z": -266.25217 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "TargetTerritoryId": 614, + "Mount": true + }, + { + "DataId": 1024842, + "Position": { + "X": 789.6085, + "Y": 99.21144, + "Z": -288.5329 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1019285, + "Position": { + "X": 195.63586, + "Y": 5.16971, + "Z": -437.2473 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + }, + { + "DataId": 1019286, + "Position": { + "X": 233.60034, + "Y": 5.2518563, + "Z": -425.3758 + }, + "TerritoryId": 614, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024846, + "Position": { + "X": 309.46814, + "Y": 17.755785, + "Z": -445.97546 + }, + "TerritoryId": 614, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024847, + "Position": { + "X": 59.067627, + "Y": 37.21815, + "Z": -529.1676 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024849, + "Position": { + "X": 57.328125, + "Y": 36.90612, + "Z": -524.71204 + }, + "TerritoryId": 614, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 228.99776, + "Y": 5.218606, + "Z": -407.7175 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1020524, + "Position": { + "X": 173.20508, + "Y": 5.1910434, + "Z": -433.24945 + }, + "TerritoryId": 614, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json new file mode 100644 index 000000000..5abb5ca4f --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json @@ -0,0 +1,213 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1020524, + "Position": { + "X": 173.20508, + "Y": 5.1910434, + "Z": -433.24945 + }, + "TerritoryId": 614, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Yanxia - House of the Fierce", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024955, + "Position": { + "X": 350.14868, + "Y": 26.448109, + "Z": 609.1859 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Yanxia - Namai" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024957, + "Position": { + "X": 365.9265, + "Y": 1.7862457, + "Z": 738.9486 + }, + "TerritoryId": 614, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024966, + "Position": { + "X": -472.3125, + "Y": 1.2300053, + "Z": 537.77356 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024794, + "Position": { + "X": -493.98032, + "Y": 1.3011811, + "Z": 542.90063 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "TargetTerritoryId": 759 + }, + { + "DataId": 162, + "Position": { + "X": 96.269165, + "Y": -3.4332886, + "Z": 81.01013 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "Comment": "Aethernet Attunement: [Doman Enclave] Ferry Docks" + }, + { + "DataId": 130, + "Position": { + "X": -61.57019, + "Y": 0.77819824, + "Z": 90.684326 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "Comment": "Aethernet Attunement: [Doman Enclave] The Southern Enclave" + }, + { + "DataId": 129, + "Position": { + "X": 8.987488, + "Y": 0.8086548, + "Z": -105.85187 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "Comment": "Aethernet Attunement: [Doman Enclave] The Northern Enclave" + }, + { + "TerritoryId": 759, + "InteractionType": "AttuneAetheryte", + "Aetheryte": "Doman Enclave" + }, + { + "DataId": 1024970, + "Position": { + "X": 40.238037, + "Y": 0, + "Z": 5.874695 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDC105_03026_Q1_000_000", + "Answer": "TEXT_STMBDC105_03026_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDC105_03026_EVENTAREA_WARP_000_000", + "Yes": true + } + ], + "TargetTerritoryId": 744 + } + ] + }, + { + "Sequence": 6 + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1025049, + "Position": { + "X": -0.015319824, + "Y": 0.19999999, + "Z": -4.837158 + }, + "TerritoryId": 744, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2009289, + "Position": { + "X": 0.02468622, + "Y": 0.9079783, + "Z": 18.30971 + }, + "TerritoryId": 744, + "InteractionType": "Interact", + "TargetTerritoryId": 759 + }, + { + "DataId": 1024971, + "Position": { + "X": 6.0272217, + "Y": 0, + "Z": 18.631226 + }, + "TerritoryId": 759, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json new file mode 100644 index 000000000..5e94b93a0 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json @@ -0,0 +1,91 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024971, + "Position": { + "X": 6.0272217, + "Y": 0, + "Z": 18.631226 + }, + "TerritoryId": 759, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Doman Enclave", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024980, + "Position": { + "X": -276.26465, + "Y": 53.240116, + "Z": -368.8869 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "AetheryteShortcut": "Yanxia - House of the Fierce", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024983, + "Position": { + "X": -260.60883, + "Y": 53.217503, + "Z": -645.594 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024986, + "Position": { + "X": -348.9281, + "Y": 1.230035, + "Z": -344.13672 + }, + "TerritoryId": 614, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024989, + "Position": { + "X": 464.10315, + "Y": 17.720512, + "Z": 301.59448 + }, + "TerritoryId": 614, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json new file mode 100644 index 000000000..b99143fcf --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json @@ -0,0 +1,70 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024989, + "Position": { + "X": 464.10315, + "Y": 17.720512, + "Z": 301.59448 + }, + "TerritoryId": 614, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1025026, + "Position": { + "X": 3.7078857, + "Y": 0, + "Z": 17.471558 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "AetheryteShortcut": "Doman Enclave" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDC107_03028_EVENTAREA_WARP_000_056", + "Yes": true + } + ], + "TargetTerritoryId": 744 + }, + { + "DataId": 1024999, + "Position": { + "X": 0.19836426, + "Y": 0.021091364, + "Z": -3.0975952 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json new file mode 100644 index 000000000..6f89975ed --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json @@ -0,0 +1,96 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025008, + "Position": { + "X": -0.19836426, + "Y": 0.021091364, + "Z": -2.7619019 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2009289, + "Position": { + "X": 0.02468622, + "Y": 0.9079783, + "Z": 18.30971 + }, + "TerritoryId": 744, + "InteractionType": "Interact", + "TargetTerritoryId": 759 + }, + { + "DataId": 1025012, + "Position": { + "X": 1.5715942, + "Y": 0, + "Z": 18.631226 + }, + "TerritoryId": 759, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2 + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1025019, + "Position": { + "X": 366.53687, + "Y": 1.286227, + "Z": 746.2118 + }, + "TerritoryId": 614, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1019070, + "Position": { + "X": 151.20166, + "Y": 14.7757225, + "Z": 95.78088 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "TargetTerritoryId": 639, + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] The Ruby Bazaar" + ] + }, + { + "DataId": 1020622, + "Position": { + "X": 0.045776367, + "Y": 0, + "Z": -2.3041382 + }, + "TerritoryId": 639, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json new file mode 100644 index 000000000..cdc7c89b2 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json @@ -0,0 +1,82 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025023, + "Position": { + "X": -1.7853394, + "Y": 0.024148807, + "Z": -0.015319824 + }, + "TerritoryId": 639, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "AetheryteShortcut": "Doman Enclave", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDD101_03070_EVENTAREA_WARP_100_027", + "Yes": true + } + ], + "TargetTerritoryId": 744 + }, + { + "DataId": 1025552, + "Position": { + "X": 0.045776367, + "Y": 0.021091362, + "Z": -2.9145508 + }, + "TerritoryId": 744, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2009289, + "Position": { + "X": 0.02468622, + "Y": 0.9079783, + "Z": 18.30971 + }, + "TerritoryId": 744, + "InteractionType": "Interact", + "TargetTerritoryId": 759 + }, + { + "DataId": 1025555, + "Position": { + "X": 148.05823, + "Y": -4.178815, + "Z": 60.135742 + }, + "TerritoryId": 759, + "InteractionType": "CompleteQuest", + "Comment": "AethernetShortcut: [Doman Enclave] Aetheryte Plaza -> [Doman Enclave] Ferry Docks" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json new file mode 100644 index 000000000..68ab9388d --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json @@ -0,0 +1,118 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025557, + "Position": { + "X": 146.37976, + "Y": -4.178755, + "Z": 60.135742 + }, + "TerritoryId": 759, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Doman Enclave", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1019297, + "Position": { + "X": -275.9289, + "Y": 17.31996, + "Z": 512.9625 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true, + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + }, + { + "DataId": 1019303, + "Position": { + "X": -308.94946, + "Y": 17.73554, + "Z": 512.47424 + }, + "TerritoryId": 614, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009474, + "Position": { + "X": 67.185425, + "Y": 17.440979, + "Z": 349.3247 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2009527, + "Position": { + "X": 457.26697, + "Y": 31.265625, + "Z": 234.79053 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2009528, + "Position": { + "X": 545.3727, + "Y": 84.70276, + "Z": 126.32947 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2009475, + "Position": { + "X": 546.9595, + "Y": 72.129395, + "Z": 39.78015 + }, + "TerritoryId": 614, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3072_Fruits of Her Labor.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3072_Fruits of Her Labor.json new file mode 100644 index 000000000..66ed7718b --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3072_Fruits of Her Labor.json @@ -0,0 +1,73 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025095, + "Position": { + "X": 466.23938, + "Y": 70.27501, + "Z": -58.701477 + }, + "TerritoryId": 614, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Yanxia - Namai", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1025104, + "Position": { + "X": 408.71277, + "Y": 14.6418705, + "Z": 622.8275 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024999, + "Position": { + "X": 0.19836426, + "Y": 0.021091364, + "Z": -3.0975952 + }, + "TerritoryId": 744, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024999, + "Position": { + "X": 0.19836426, + "Y": 0.021091364, + "Z": -3.0975952 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3073_Conscripts and Contingencies.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3073_Conscripts and Contingencies.json new file mode 100644 index 000000000..5d268929d --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3073_Conscripts and Contingencies.json @@ -0,0 +1,136 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024999, + "Position": { + "X": 0.19836426, + "Y": 0.021091364, + "Z": -3.0975952 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021505, + "Position": { + "X": 79.42322, + "Y": 33.00897, + "Z": -669.9474 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "AetheryteShortcut": "Ruby Sea - Onokoro", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 116.05634, + "Y": 3.799895, + "Z": -868.98865 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 2009420, + "Position": { + "X": 106.30957, + "Y": 0.47296143, + "Z": -874.38776 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "DisableNavmesh": true + }, + { + "Position": { + "X": 63.579952, + "Y": -1.1090306, + "Z": -869.52625 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 2009469, + "Position": { + "X": 78.20239, + "Y": 0.47296143, + "Z": -870.66455 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Mount": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1025106, + "Position": { + "X": 97.00159, + "Y": 5.1987257, + "Z": -877.0428 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "AetheryteShortcut": "Doman Enclave", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDD104_03073_EVENTAREA_WARP_100_004", + "Yes": true + } + ], + "TargetTerritoryId": 744 + }, + { + "DataId": 1024999, + "Position": { + "X": 0.19836426, + "Y": 0.021091364, + "Z": -3.0975952 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json new file mode 100644 index 000000000..c5ac52f01 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024999, + "Position": { + "X": 0.19836426, + "Y": 0.021091364, + "Z": -3.0975952 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1025523, + "Position": { + "X": 239.12415, + "Y": 0.9334852, + "Z": 754.1161 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Yanxia - Namai" + } + ] + }, + { + "Sequence": 2 + }, + { + "Sequence": 3, + "Steps": [ + { + "TerritoryId": 786, + "InteractionType": "Duty", + "ContentFinderConditionId": 537 + } + ] + }, + { + "Sequence": 4 + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1025528, + "Position": { + "X": 4.3182373, + "Y": -8.000055, + "Z": 44.327393 + }, + "TerritoryId": 786, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6 + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1025538, + "Position": { + "X": 4.7455444, + "Y": 0, + "Z": 16.067688 + }, + "TerritoryId": 759, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDD105_03074_EVENTAREA_WARP_100_004", + "Yes": true + } + ], + "TargetTerritoryId": 744 + }, + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json new file mode 100644 index 000000000..fd75aab2e --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json @@ -0,0 +1,73 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025009, + "Position": { + "X": 1.3274536, + "Y": 0.021091362, + "Z": 0.59503174 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1019468, + "Position": { + "X": 170.58057, + "Y": 13.02367, + "Z": -91.96619 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "AetheryteShortcut": "Rhalgr's Reach", + "AethernetShortcut": [ + "[Rhalgr's Reach] Aetheryte Plaza", + "[Rhalgr's Reach] Northeastern Rhalgr's Reach" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1025546, + "Position": { + "X": 70.87805, + "Y": 26.199663, + "Z": -609.43005 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Lochs - Porta Praetoria" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1025549, + "Position": { + "X": 1.4800415, + "Y": -1.1041565E-05, + "Z": -11.734253 + }, + "TerritoryId": 351, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json new file mode 100644 index 000000000..05c5cf91b --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json @@ -0,0 +1,51 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025549, + "Position": { + "X": 1.4800415, + "Y": -1.1041565E-05, + "Z": -11.734253 + }, + "TerritoryId": 351, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2009467, + "Position": { + "X": -5.189492, + "Y": 0.4746897, + "Z": 0.3689831 + }, + "TerritoryId": 351, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1025549, + "Position": { + "X": 1.4800415, + "Y": -1.1041565E-05, + "Z": -11.734253 + }, + "TerritoryId": 351, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file From 142bf2331d03e1fc67c51ee8c6847dcc5a1c15be Mon Sep 17 00:00:00 2001 From: Jerry Wester Date: Wed, 21 Aug 2024 19:00:51 -0600 Subject: [PATCH 27/73] SB MSQ Part 4 --- .../MSQ/E-4.4/3143_Sisterly Act.json | 102 ++++++++++ .../MSQ/E-4.4/3144_Feel the Burn.json | 63 +++++++ .../MSQ/E-4.4/3145_Shadows in the Empire.json | 127 +++++++++++++ .../MSQ/E-4.4/3146_A Power in Slumber.json | 76 ++++++++ .../MSQ/E-4.4/3147_The Will of the Moon.json | 110 +++++++++++ .../MSQ/E-4.4/3148_The Call.json | 140 ++++++++++++++ .../MSQ/E-4.4/3149_Prelude in Violet.json | 104 +++++++++++ .../MSQ/F-4.5/3179_Soul Searching.json | 63 +++++++ .../MSQ/F-4.5/3180_A Defector's Tidings.json | 93 +++++++++ .../MSQ/F-4.5/3181_Seiryu's Wall.json | 60 ++++++ .../F-4.5/3182_Parley on the Front Lines.json | 176 ++++++++++++++++++ .../MSQ/F-4.5/3183_The Face of War.json | 22 ++- 12 files changed, 1134 insertions(+), 2 deletions(-) create mode 100644 QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/F-4.5/3181_Seiryu's Wall.json create mode 100644 QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json new file mode 100644 index 000000000..9d50c5886 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json @@ -0,0 +1,102 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025549, + "Position": { + "X": 1.4800415, + "Y": -1.1041565E-05, + "Z": -11.734253 + }, + "TerritoryId": 351, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026253, + "Position": { + "X": 650.87354, + "Y": 70, + "Z": 546.89856 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026256, + "Position": { + "X": 648.1575, + "Y": 70, + "Z": 548.24133 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026257, + "Position": { + "X": -7.950012, + "Y": -3.2583127E-12, + "Z": -16.31195 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "AetheryteShortcut": "Doman Enclave" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDE101_03143_EVENTAREA_WARP_100_004", + "Yes": true + } + ], + "TargetTerritoryId": 744 + }, + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json new file mode 100644 index 000000000..bfce7d3dc --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json @@ -0,0 +1,63 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026261, + "Position": { + "X": 337.78882, + "Y": 54.860683, + "Z": -531.2734 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Yanxia - House of the Fierce" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 614, + "InteractionType": "Duty", + "ContentFinderConditionId": 585 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026268, + "Position": { + "X": 117.7843, + "Y": -4.178714, + "Z": 87.296875 + }, + "TerritoryId": 759, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json new file mode 100644 index 000000000..cc2bd52fc --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json @@ -0,0 +1,127 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026268, + "Position": { + "X": 117.7843, + "Y": -4.178714, + "Z": 87.296875 + }, + "TerritoryId": 759, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Doman Enclave", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDE103_03145_EVENTAREA_WARP_100_004", + "Yes": true + } + ], + "TargetTerritoryId": 744, + "Comment": "AethernetShortcut: [Doman Enclave] Ferry Docks -> [Doman Enclave] Aetheryte Plaza" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2009289, + "Position": { + "X": 0.02468622, + "Y": 0.9079783, + "Z": 18.30971 + }, + "TerritoryId": 744, + "InteractionType": "Interact", + "TargetTerritoryId": 759 + }, + { + "DataId": 1026276, + "Position": { + "X": 119.035645, + "Y": -4.1787133, + "Z": 65.384766 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "Comment": "AethernetShortcut: [Doman Enclave] Aetheryte Plaza -> [Doman Enclave] Ferry Docks" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDE103_03145_EVENTAREA_WARP_100_004", + "Yes": true + } + ], + "TargetTerritoryId": 744, + "Comment": "AethernetShortcut: [Doman Enclave] Ferry Docks -> [Doman Enclave] Aetheryte Plaza" + }, + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json new file mode 100644 index 000000000..e55780fde --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json @@ -0,0 +1,76 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDE104_03146_Q1_000_000", + "Answer": "TEXT_STMBDE104_03146_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026280, + "Position": { + "X": 561.4862, + "Y": -19.50564, + "Z": 409.17065 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Azim Steppe - Reunion" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026281, + "Position": { + "X": 561.7302, + "Y": -19.30375, + "Z": 271.99194 + }, + "TerritoryId": 622, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1020539, + "Position": { + "X": 498.2832, + "Y": 40.836098, + "Z": -508.20172 + }, + "TerritoryId": 622, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json new file mode 100644 index 000000000..5c521f8b4 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json @@ -0,0 +1,110 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026284, + "Position": { + "X": 498.2832, + "Y": 40.86853, + "Z": -503.37988 + }, + "TerritoryId": 622, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1025874, + "Position": { + "X": 351.12524, + "Y": 118.66239, + "Z": -692.53076 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 493.77588, + "Y": 40.425697, + "Z": -475.4643 + }, + "TerritoryId": 622, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1020539, + "Position": { + "X": 498.2832, + "Y": 40.836098, + "Z": -508.20172 + }, + "TerritoryId": 622, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1020280, + "Position": { + "X": -448.1422, + "Y": 2.2771428, + "Z": 632.1354 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "AetheryteShortcut": "Azim Steppe - Dawn Throne", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2009591, + "Position": { + "X": -210.34564, + "Y": 2.6397705, + "Z": 519.27966 + }, + "TerritoryId": 622, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1020539, + "Position": { + "X": 498.2832, + "Y": 40.836098, + "Z": -508.20172 + }, + "TerritoryId": 622, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json new file mode 100644 index 000000000..feb70ed2a --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json @@ -0,0 +1,140 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026284, + "Position": { + "X": 498.2832, + "Y": 40.86853, + "Z": -503.37988 + }, + "TerritoryId": 622, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1025874, + "Position": { + "X": 351.12524, + "Y": 118.66239, + "Z": -692.53076 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026239, + "Position": { + "X": 348.53125, + "Y": 118.662384, + "Z": -691.92035 + }, + "TerritoryId": 622, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "AetheryteShortcut": "Doman Enclave", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDE106_03148_EVENTAREA_WARP_100_004", + "Yes": true + } + ], + "TargetTerritoryId": 744 + }, + { + "DataId": 1026469, + "Position": { + "X": -1.8463745, + "Y": 0.02109136, + "Z": -1.4191895 + }, + "TerritoryId": 744, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1026241, + "Position": { + "X": 747.00525, + "Y": 69.99995, + "Z": 526.36 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024065, + "Position": { + "X": 749.9961, + "Y": 70.139626, + "Z": 522.88086 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDE106_03148_Q1_000_000", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026242, + "Position": { + "X": 773.3424, + "Y": 80, + "Z": 437.70496 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json new file mode 100644 index 000000000..15f45d46e --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json @@ -0,0 +1,104 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026242, + "Position": { + "X": 773.3424, + "Y": 80, + "Z": 437.70496 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026247, + "Position": { + "X": -9.201294, + "Y": 0, + "Z": -5.44751 + }, + "TerritoryId": 351, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026249, + "Position": { + "X": 66.20886, + "Y": 40, + "Z": 69.93213 + }, + "TerritoryId": 128, + "InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] The Aftcastle" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026249, + "Position": { + "X": 66.20886, + "Y": 40, + "Z": 69.93213 + }, + "TerritoryId": 128, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "TerritoryId": 156, + "DataId": 2002881, + "Position": { + "X": 21.133728, + "Y": 22.323914, + "Z": -631.281 + }, + "InteractionType": "Interact", + "TargetTerritoryId": 351, + "AetheryteShortcut": "Mor Dhona" + }, + { + "DataId": 1025549, + "Position": { + "X": 1.4800415, + "Y": -1.1041565E-05, + "Z": -11.734253 + }, + "TerritoryId": 351, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json new file mode 100644 index 000000000..d9590ccec --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json @@ -0,0 +1,63 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025549, + "Position": { + "X": 1.4800415, + "Y": -1.1041565E-05, + "Z": -11.734253 + }, + "TerritoryId": 351, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 71.86769, + "Y": 204.99998, + "Z": 145.98666 + }, + "TerritoryId": 478, + "InteractionType": "WalkTo", + "TargetTerritoryId": 399, + "AetheryteShortcut": "Idyllshire" + }, + { + "DataId": 1026781, + "Position": { + "X": -478.41614, + "Y": 137.42972, + "Z": 696.9557 + }, + "TerritoryId": 399, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026781, + "Position": { + "X": -478.41614, + "Y": 137.42972, + "Z": 696.9557 + }, + "TerritoryId": 399, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json new file mode 100644 index 000000000..c28613305 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json @@ -0,0 +1,93 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026781, + "Position": { + "X": -478.41614, + "Y": 137.42972, + "Z": 696.9557 + }, + "TerritoryId": 399, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024065, + "Position": { + "X": 749.9961, + "Y": 70.139626, + "Z": 522.88086 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDF102_03180_Q1_000_021", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026783, + "Position": { + "X": 747.12744, + "Y": 69.99995, + "Z": 521.599 + }, + "TerritoryId": 621, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024974, + "Position": { + "X": -10.330383, + "Y": 0.19997318, + "Z": 12.893799 + }, + "TerritoryId": 759, + "InteractionType": "Interact", + "AetheryteShortcut": "Doman Enclave", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDF102_03180_EVENTAREA_WARP_000_043", + "Yes": true + } + ], + "TargetTerritoryId": 744 + }, + { + "DataId": 1026784, + "Position": { + "X": -0.015319824, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3181_Seiryu's Wall.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3181_Seiryu's Wall.json new file mode 100644 index 000000000..3557398da --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3181_Seiryu's Wall.json @@ -0,0 +1,60 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026784, + "Position": { + "X": -0.015319824, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026261, + "Position": { + "X": 337.78882, + "Y": 54.860683, + "Z": -531.2734 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "AetheryteShortcut": "Yanxia - House of the Fierce", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDF103_03181_Q1_000_031", + "Yes": true + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json new file mode 100644 index 000000000..addb3a727 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json @@ -0,0 +1,176 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025597, + "Position": { + "X": 0.19836426, + "Y": 0.021091362, + "Z": -3.0060425 + }, + "TerritoryId": 744, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026804, + "Position": { + "X": -524.55945, + "Y": 8.698304, + "Z": -15.487976 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "AetheryteShortcut": "Lochs - Porta Praetoria", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDF104_03182_Q1_000_021", + "Yes": true + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 2 + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026805, + "Position": { + "X": -477.77527, + "Y": 107.62999, + "Z": 102.433716 + }, + "TerritoryId": 829, + "InteractionType": "Interact", + "StopDistance": 7, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDF104_03182_Q1_000_031", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1026815, + "Position": { + "X": -0.7172241, + "Y": 0.014375329, + "Z": 3.2807007 + }, + "TerritoryId": 829, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1026821, + "Position": { + "X": 4.2266846, + "Y": -3.7252903E-09, + "Z": 5.1116943 + }, + "TerritoryId": 829, + "InteractionType": "Interact", + "StopDistance": 4, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDF104_03182_Q3_000_000", + "Answer": "TEXT_STMBDF104_03182_A3_000_001" + } + ], + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 64" + }, + { + "DataId": 1026817, + "Position": { + "X": -3.7080078, + "Y": -1.1059713E-09, + "Z": 5.2643433 + }, + "TerritoryId": 829, + "InteractionType": "Interact", + "StopDistance": 5, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDF104_03182_Q2_000_000", + "Answer": "TEXT_STMBDF104_03182_A2_000_001" + } + ], + "$": "QW: 1 0 0 0 0 64 -> QW: 2 0 0 0 0 96" + }, + { + "DataId": 1026818, + "Position": { + "X": -1.9990234, + "Y": -1.8626451E-09, + "Z": 12.344482 + }, + "TerritoryId": 829, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDF104_03182_Q1_000_000", + "Answer": "TEXT_STMBDF104_03182_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1026815, + "Position": { + "X": -0.7172241, + "Y": 0.014375329, + "Z": 3.2807007 + }, + "TerritoryId": 829, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026823, + "Position": { + "X": -468.925, + "Y": 107.62999, + "Z": 130.9071 + }, + "TerritoryId": 829, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json index 93a6ab154..378349697 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json @@ -1,7 +1,25 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", + "Author": [ + "liza", + "JerryWester" + ], "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026823, + "Position": { + "X": -468.925, + "Y": 107.62999, + "Z": 130.9071 + }, + "TerritoryId": 829, + "InteractionType": "AcceptQuest" + } + ] + }, { "Sequence": 1, "Steps": [ @@ -71,4 +89,4 @@ ] } ] -} +} \ No newline at end of file From ee2980bef9edb8f5afff764941589717d174a7c1 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 10:37:28 +0200 Subject: [PATCH 28/73] Add some QW to early gridania msq --- .../Gridania/376_You Shall Not Trespass.json | 19 +- .../Gridania/3855_A Soldier's Breakfast.json | 23 ++- .../Gridania/387_Salvaging the Scene.json | 162 ++++++++++-------- 3 files changed, 124 insertions(+), 80 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json index c8f8f3ef3..e8d23edde 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json @@ -61,10 +61,21 @@ "TerritoryId": 148, "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", - "KillEnemyDataIds": [ - 771 - ], - "Comment": "Kill Qiqirn manually" + "ComplexCombatData": [ + { + "DataId": 771, + "CompletionQuestVariablesFlags": [ + { + "Low": 4 + }, + null, + null, + null, + null, + null + ] + } + ] } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json index 51cad9c30..64af3a348 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json @@ -19,7 +19,6 @@ }, { "Sequence": 1, - "Comment": "TODO Figure out quest flags if picking up egg first OR doing the combat first", "Steps": [ { "DataId": 2000010, @@ -29,7 +28,15 @@ "Z": -49.729187 }, "TerritoryId": 148, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "Position": { @@ -43,7 +50,17 @@ "KillEnemyDataIds": [ 142 ], - "Comment": "Depending on how many enemies you fought on the way to the egg, this step could be optional" + "Comment": "Depending on how many enemies you fought on the way to the egg, this step could be optional", + "CompletionQuestVariablesFlags": [ + null, + { + "High": 3 + }, + null, + null, + null, + null + ] } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json index e796eaa85..10579e195 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json @@ -1,76 +1,92 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000503, - "Position": { - "X": 178.33215, - "Y": -32.015224, - "Z": 333.30273 - }, - "TerritoryId": 148, - "InteractionType": "AcceptQuest" - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "DataId": 2001018, - "Position": { - "X": 155.47412, - "Y": -23.66681, - "Z": 490.74524 - }, - "TerritoryId": 148, - "InteractionType": "Combat", - "EnemySpawnType": "AutoOnEnterArea", - "KillEnemyDataIds": [ - 26 - ] + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000503, + "Position": { + "X": 178.33215, + "Y": -32.015224, + "Z": 333.30273 }, - { - "DataId": 2001016, - "Position": { - "X": 152.60547, - "Y": -23.758362, - "Z": 494.71265 - }, - "TerritoryId": 148, - "InteractionType": "Interact" + "TerritoryId": 148, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2001018, + "Position": { + "X": 155.47412, + "Y": -23.66681, + "Z": 490.74524 }, - { - "DataId": 2001018, - "Position": { - "X": 155.47412, - "Y": -23.66681, - "Z": 490.74524 - }, - "TerritoryId": 148, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "DataId": 1000470, - "Position": { - "X": -59.006653, - "Y": -0.010835781, - "Z": 26.41333 - }, - "TerritoryId": 148, - "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" - } - ] - } - ] - } \ No newline at end of file + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 26 + ] + }, + { + "DataId": 2001016, + "Position": { + "X": 152.60547, + "Y": -23.758362, + "Z": 494.71265 + }, + "TerritoryId": 148, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2001018, + "Position": { + "X": 155.47412, + "Y": -23.66681, + "Z": 490.74524 + }, + "TerritoryId": 148, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000470, + "Position": { + "X": -59.006653, + "Y": -0.010835781, + "Z": 26.41333 + }, + "TerritoryId": 148, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" + } + ] + } + ] +} From 6ea9f282f306b611dbbce5ab4285c06f441a7a6b Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 12:14:12 +0200 Subject: [PATCH 29/73] Fixes for early limsa quests --- .../RoslynElements/QuestStepExtensions.cs | 2 ++ .../MSQ-1/Limsa/402_Thanks a Million.json | 3 +- .../MSQ-1/Limsa/465_Washed Up.json | 1 + QuestPaths/quest-v1.json | 5 +++ Questionable.Model/Questing/QuestStep.cs | 1 + .../Controller/Steps/Interactions/Interact.cs | 35 ++++++++++++++----- 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/QuestPathGenerator/RoslynElements/QuestStepExtensions.cs b/QuestPathGenerator/RoslynElements/QuestStepExtensions.cs index 0e4e9dd0c..11cdc2142 100644 --- a/QuestPathGenerator/RoslynElements/QuestStepExtensions.cs +++ b/QuestPathGenerator/RoslynElements/QuestStepExtensions.cs @@ -44,6 +44,8 @@ internal static class QuestStepExtensions Assignment(nameof(QuestStep.DelaySecondsAtStart), step.DelaySecondsAtStart, emptyStep.DelaySecondsAtStart) .AsSyntaxNodeOrToken(), + Assignment(nameof(QuestStep.PickUpItemId), step.PickUpItemId, emptyStep.PickUpItemId) + .AsSyntaxNodeOrToken(), Assignment(nameof(QuestStep.Disabled), step.Disabled, emptyStep.Disabled) .AsSyntaxNodeOrToken(), Assignment(nameof(QuestStep.DisableNavmesh), step.DisableNavmesh, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/402_Thanks a Million.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/402_Thanks a Million.json index 2f02ad56e..88a45ef38 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/402_Thanks a Million.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/402_Thanks a Million.json @@ -29,7 +29,8 @@ }, "TerritoryId": 134, "InteractionType": "Interact", - "Comment": "Technically triggers combat, but can be ignored" + "Comment": "Technically triggers combat, but can be ignored", + "PickUpItemId": 2000342 } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/465_Washed Up.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/465_Washed Up.json index 8a9700f89..2619b49f8 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/465_Washed Up.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/465_Washed Up.json @@ -59,6 +59,7 @@ "StopDistance": 5, "TerritoryId": 134, "InteractionType": "Interact", + "DelaySecondsAtStart": 3, "DialogueChoices": [ { "Type": "List", diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 06f9a711c..c717679f2 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -440,6 +440,11 @@ } }, "then": { + "properties": { + "PickUpItemId": { + "type": "number" + } + }, "required": [ "DataId" ] diff --git a/Questionable.Model/Questing/QuestStep.cs b/Questionable.Model/Questing/QuestStep.cs index bb2f71402..a09386bc1 100644 --- a/Questionable.Model/Questing/QuestStep.cs +++ b/Questionable.Model/Questing/QuestStep.cs @@ -27,6 +27,7 @@ public sealed class QuestStep public float? NpcWaitDistance { get; set; } public ushort? TargetTerritoryId { get; set; } public float? DelaySecondsAtStart { get; set; } + public uint? PickUpItemId { get; set; } public bool Disabled { get; set; } public bool DisableNavmesh { get; set; } diff --git a/Questionable/Controller/Steps/Interactions/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs index 49b9e419f..0482d88b0 100644 --- a/Questionable/Controller/Steps/Interactions/Interact.cs +++ b/Questionable/Controller/Steps/Interactions/Interact.cs @@ -4,6 +4,7 @@ using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Objects.Enums; using Dalamud.Game.ClientState.Objects.Types; using Dalamud.Plugin.Services; +using FFXIVClientStructs.FFXIV.Client.Game; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Questionable.Controller.Steps.Shared; @@ -15,7 +16,8 @@ namespace Questionable.Controller.Steps.Interactions; internal static class Interact { - internal sealed class Factory(GameFunctions gameFunctions, ICondition condition, ILoggerFactory loggerFactory) : ITaskFactory + internal sealed class Factory(GameFunctions gameFunctions, ICondition condition, ILoggerFactory loggerFactory) + : ITaskFactory { public IEnumerable CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step) { @@ -39,13 +41,14 @@ internal static class Interact yield return new WaitAtEnd.WaitDelay(); yield return Interact(step.DataId.Value, quest, step.InteractionType, - step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId); + step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId, step.PickUpItemId); } - internal ITask Interact(uint dataId, Quest? quest, EInteractionType interactionType, bool skipMarkerCheck = false) + internal ITask Interact(uint dataId, Quest? quest, EInteractionType interactionType, + bool skipMarkerCheck = false, uint? pickUpItemId = null) { - return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, gameFunctions, condition, - loggerFactory.CreateLogger()); + return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, pickUpItemId, gameFunctions, + condition, loggerFactory.CreateLogger()); } } @@ -54,6 +57,7 @@ internal static class Interact Quest? quest, EInteractionType interactionType, bool skipMarkerCheck, + uint? pickUpItemId, GameFunctions gameFunctions, ICondition condition, ILogger logger) @@ -64,6 +68,7 @@ internal static class Interact private DateTime _continueAt = DateTime.MinValue; public Quest? Quest => quest; + public EInteractionType InteractionType { get => interactionType; @@ -119,11 +124,23 @@ internal static class Interact _needsUnmount = false; } - if (_interactionState == EInteractionState.InteractionConfirmed) - return ETaskResult.TaskComplete; + if (pickUpItemId != null) + { + unsafe + { + InventoryManager* inventoryManager = InventoryManager.Instance(); + if (inventoryManager->GetInventoryItemCount(pickUpItemId.Value) > 0) + return ETaskResult.TaskComplete; + } + } + else + { + if (_interactionState == EInteractionState.InteractionConfirmed) + return ETaskResult.TaskComplete; - if (interactionType == EInteractionType.InternalGather && condition[ConditionFlag.Gathering]) - return ETaskResult.TaskComplete; + if (interactionType == EInteractionType.InternalGather && condition[ConditionFlag.Gathering]) + return ETaskResult.TaskComplete; + } IGameObject? gameObject = gameFunctions.FindObjectByDataId(dataId); if (gameObject == null || !gameObject.IsTargetable || !HasAnyMarker(gameObject)) From 99cd1dd023a8509d5f8488bdbd5bfdf73f395ddb Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 12:50:45 +0200 Subject: [PATCH 30/73] Update teleport logic for priority quests/lower estimated gil cost --- Questionable/Functions/QuestFunctions.cs | 34 +++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/Questionable/Functions/QuestFunctions.cs b/Questionable/Functions/QuestFunctions.cs index c26acc8d9..13eee5e4f 100644 --- a/Questionable/Functions/QuestFunctions.cs +++ b/Questionable/Functions/QuestFunctions.cs @@ -12,11 +12,11 @@ using FFXIVClientStructs.FFXIV.Component.GUI; using LLib.GameData; using LLib.GameUI; using Lumina.Excel.GeneratedSheets; +using Microsoft.Extensions.Logging; using Questionable.Controller; using Questionable.Controller.Steps.Interactions; using Questionable.Data; using Questionable.Model; -using Questionable.Model.Common; using Questionable.Model.Questing; using GrandCompany = FFXIVClientStructs.FFXIV.Client.UI.Agent.GrandCompany; using Quest = Questionable.Model.Quest; @@ -32,6 +32,7 @@ internal sealed unsafe class QuestFunctions private readonly IDataManager _dataManager; private readonly IClientState _clientState; private readonly IGameGui _gameGui; + private readonly ILogger _logger; public QuestFunctions( QuestRegistry questRegistry, @@ -40,7 +41,8 @@ internal sealed unsafe class QuestFunctions Configuration configuration, IDataManager dataManager, IClientState clientState, - IGameGui gameGui) + IGameGui gameGui, + ILogger logger) { _questRegistry = questRegistry; _questData = questData; @@ -49,6 +51,7 @@ internal sealed unsafe class QuestFunctions _dataManager = dataManager; _clientState = clientState; _gameGui = gameGui; + _logger = logger; } public (ElementId? CurrentQuest, byte Sequence) GetCurrentQuest() @@ -251,8 +254,7 @@ internal sealed unsafe class QuestFunctions // // Of course, they can still be accepted manually. InventoryManager* inventoryManager = InventoryManager.Instance(); - if (inventoryManager->GetItemCountInContainer(1, InventoryType.Currency) < 2000) - return null; + int gil = inventoryManager->GetItemCountInContainer(1, InventoryType.Currency); return GetPriorityQuestsThatCanBeAccepted() .Where(x => @@ -278,11 +280,20 @@ internal sealed unsafe class QuestFunctions if (!_questRegistry.TryGetQuest(x, out Quest? quest)) return false; + if (gil < EstimateTeleportCosts(quest)) + return false; + return quest.AllSteps().All(y => { if (y.Step.AetheryteShortcut is { } aetheryteShortcut && - _aetheryteFunctions.IsAetheryteUnlocked(aetheryteShortcut)) - return false; + !_aetheryteFunctions.IsAetheryteUnlocked(aetheryteShortcut)) + { + if (y.Step.SkipConditions?.AetheryteShortcutIf?.AetheryteLocked == aetheryteShortcut) + { + // _logger.LogTrace("Checking priority quest {QuestId}: aetheryte locked, but is listed as skippable", quest.Id); + } + else return false; + } if (y.Step.AethernetShortcut is { } aethernetShortcut && (!_aetheryteFunctions.IsAetheryteUnlocked(aethernetShortcut.From) || @@ -294,6 +305,17 @@ internal sealed unsafe class QuestFunctions }); } + private static int EstimateTeleportCosts(Quest quest) + { + /* + if (quest.Info.Expansion == EExpansionVersion.ARealmReborn) + return 300 * quest.AllSteps().Count(x => x.Step.AetheryteShortcut != null); + else + return 1000 * quest.AllSteps().Count(x => x.Step.AetheryteShortcut != null); + */ + return 0; + } + private List GetPriorityQuestsThatCanBeAccepted() { List priorityQuests = From e13007469e984bdfced8a59f5480614e49fb387e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 13:05:40 +0200 Subject: [PATCH 31/73] Add early MRD quests --- ...uty (Will Take You from the Mountain).json | 2 +- .../WAR/311_Way of the Marauder.json | 193 +++++++++++ .../WAR/313_Axe in the Stone.json | 311 ++++++++++++++++++ .../WAR/314_Wake of Destruction.json | 140 ++++++++ .../Class Quests/WAR/316_Brutal Strength.json | 217 ++++++++++++ .../WAR/317_The Mountain That Strides.json | 2 +- .../WAR/318_Bleeder of the Pack.json | 2 +- .../WAR/319_Bringing Down the Mountain.json | 2 +- QuestPaths/quest-v1.json | 1 + .../Questing/Converter/ActionConverter.cs | 1 + Questionable.Model/Questing/EAction.cs | 1 + 11 files changed, 868 insertions(+), 4 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1049_Pride and Duty (Will Take You from the Mountain).json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1049_Pride and Duty (Will Take You from the Mountain).json index bb55e9b10..7b2c28b3c 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1049_Pride and Duty (Will Take You from the Mountain).json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1049_Pride and Duty (Will Take You from the Mountain).json @@ -23,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] }, "AethernetShortcutIf": { diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json new file mode 100644 index 000000000..48c7d0507 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json @@ -0,0 +1,193 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000926, + "Position": { + "X": -10.055725, + "Y": 44.999794, + "Z": -245.80762 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSEXC020_00311_Q2_000_1", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 31.662792, + "Y": 44.020653, + "Z": 146.94322 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 347, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + } + ], + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + }, + { + "Position": { + "X": 74.15681, + "Y": 45.953808, + "Z": 169.73499 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 49, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + null, + { + "Low": 3 + }, + null, + null, + null, + null + ] + } + ], + "CompletionQuestVariablesFlags": [ + null, + { + "Low": 3 + }, + null, + null, + null, + null + ] + }, + { + "Position": { + "X": 74.15681, + "Y": 45.953808, + "Z": 169.73499 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 338, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + null, + { + "High": 3 + }, + null, + null, + null, + null + ] + } + ], + "CompletionQuestVariablesFlags": [ + null, + { + "High": 3 + }, + null, + null, + null, + null + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json new file mode 100644 index 000000000..42bd94349 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json @@ -0,0 +1,311 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1002680, + "Position": { + "X": 1.4800415, + "Y": 30.47563, + "Z": -242.20648 + }, + "TerritoryId": 128, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1002108, + "Position": { + "X": -57.236633, + "Y": 43.829678, + "Z": 45.334473 + }, + "TerritoryId": 134, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2001481, + "Position": { + "X": -52.140076, + "Y": 46.158447, + "Z": 15.823547 + }, + "TerritoryId": 134, + "InteractionType": "Action", + "Action": "Heavy Swing", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2001482, + "Position": { + "X": -73.80792, + "Y": 43.259277, + "Z": 4.623413 + }, + "TerritoryId": 134, + "InteractionType": "Action", + "Action": "Heavy Swing", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2001480, + "Position": { + "X": -68.467285, + "Y": 43.503418, + "Z": 20.248657 + }, + "TerritoryId": 134, + "InteractionType": "Action", + "Action": "Heavy Swing", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1002108, + "Position": { + "X": -57.236633, + "Y": 43.829678, + "Z": 45.334473 + }, + "TerritoryId": 134, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2001483, + "Position": { + "X": -12.314087, + "Y": 46.402588, + "Z": 31.47937 + }, + "TerritoryId": 134, + "InteractionType": "Action", + "Action": "Heavy Swing", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2001485, + "Position": { + "X": 1.663208, + "Y": 48.2948, + "Z": 9.597839 + }, + "TerritoryId": 134, + "InteractionType": "Action", + "Action": "Heavy Swing", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2001484, + "Position": { + "X": -14.572449, + "Y": 47.40979, + "Z": 12.344482 + }, + "TerritoryId": 134, + "InteractionType": "Action", + "Action": "Heavy Swing", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1002108, + "Position": { + "X": -57.236633, + "Y": 43.829678, + "Z": 45.334473 + }, + "TerritoryId": 134, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1002679, + "Position": { + "X": -5.2339478, + "Y": 31.475597, + "Z": -256.97723 + }, + "TerritoryId": 128, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 9, + "Steps": [ + { + "DataId": 2000284, + "Position": { + "X": 130.84607, + "Y": 35.99597, + "Z": 28.519043 + }, + "TerritoryId": 135, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Tempest Gate (Lower La Noscea)" + ] + } + ] + }, + { + "Sequence": 10, + "Steps": [ + { + "Position": { + "X": 157.25027, + "Y": 33.93623, + "Z": 91.90441 + }, + "StopDistance": 0.5, + "TerritoryId": 135, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json new file mode 100644 index 000000000..420eef6f9 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json @@ -0,0 +1,140 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 391.3196, + "Y": 73.47712, + "Z": -313.9601 + }, + "TerritoryId": 135, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 135, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + } + ], + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Tempest Gate (Lower La Noscea)" + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2000286, + "Position": { + "X": -88.60913, + "Y": 43.564453, + "Z": -303.05945 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 2 + ], + "AetheryteShortcut": "Middle La Noscea - Summerford Farms", + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "AetheryteLocked": "Middle La Noscea - Summerford Farms" + } + }, + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json new file mode 100644 index 000000000..b12278d86 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json @@ -0,0 +1,217 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000868, + "Position": { + "X": -192.00433, + "Y": 0.9999907, + "Z": 211.68835 + }, + "StopDistance": 7, + "TerritoryId": 129, + "InteractionType": "Interact", + "TargetTerritoryId": 138, + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Fishermens' Guild" + ] + }, + { + "DataId": 1002110, + "Position": { + "X": 319.84436, + "Y": -31.898647, + "Z": 273.51794 + }, + "TerritoryId": 138, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 138, + "InteractionType": "AttuneAetheryte", + "Aetheryte": "Western La Noscea - Aleport" + }, + { + "Position": { + "X": 139.18224, + "Y": -20.931536, + "Z": 139.35034 + }, + "TerritoryId": 138, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "DataId": 2000288, + "Position": { + "X": 99.22937, + "Y": -14.2977295, + "Z": 141.86316 + }, + "TerritoryId": 138, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 28 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": -182.58467, + "Y": 39.786213, + "Z": -46.777275 + }, + "StopDistance": 0.5, + "TerritoryId": 134, + "InteractionType": "Jump", + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ], + "JumpDestination": { + "Position": { + "X": -192.3236, + "Y": 41.73779, + "Z": -49.477997 + } + }, + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "DataId": 1002111, + "Position": { + "X": -206.80554, + "Y": 41.757885, + "Z": -39.627747 + }, + "TerritoryId": 134, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2001486, + "Position": { + "X": -225.33002, + "Y": 42.191162, + "Z": -35.202576 + }, + "TerritoryId": 134, + "InteractionType": "Action", + "Action": "Heavy Swing" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1002111, + "Position": { + "X": -206.80554, + "Y": 41.757885, + "Z": -39.627747 + }, + "TerritoryId": 134, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json index 0e86a9b98..476d6ddf7 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json @@ -23,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] }, "AethernetShortcutIf": { diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/318_Bleeder of the Pack.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/318_Bleeder of the Pack.json index 27eafbcdf..698e1ee7b 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/318_Bleeder of the Pack.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/318_Bleeder of the Pack.json @@ -23,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] }, "AethernetShortcutIf": { diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/319_Bringing Down the Mountain.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/319_Bringing Down the Mountain.json index 143a5e5d4..61bffe34f 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/319_Bringing Down the Mountain.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/319_Bringing Down the Mountain.json @@ -23,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] }, "AethernetShortcutIf": { diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index c717679f2..85cb5d591 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -837,6 +837,7 @@ "type": "string", "description": "The action to use", "enum": [ + "Heavy Swing", "Cure", "Esuna", "Physick", diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index bef560820..581986328 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -7,6 +7,7 @@ public sealed class ActionConverter() : EnumConverter(Values) { private static readonly Dictionary Values = new() { + { EAction.HeavySwing, "Heavy Swing" }, { EAction.Cure, "Cure" }, { EAction.Esuna, "Esuna" }, { EAction.Physick, "Physick" }, diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index a2a8b71f2..412999a6f 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -6,6 +6,7 @@ namespace Questionable.Model.Questing; [JsonConverter(typeof(ActionConverter))] public enum EAction { + HeavySwing = 31, Cure = 120, Esuna = 7568, Physick = 190, From e7fa50db2016a2328841dce2ca2bf31c9a8cb473 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Thu, 22 Aug 2024 13:42:59 +0000 Subject: [PATCH 32/73] Update QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json --- .../{ARC => BRD}/131_Way of the Archer.json | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) rename QuestPaths/2.x - A Realm Reborn/Class Quests/{ARC => BRD}/131_Way of the Archer.json (95%) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/131_Way of the Archer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json similarity index 95% rename from QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/131_Way of the Archer.json rename to QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json index 08c556d1b..691469631 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/131_Way of the Archer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json @@ -1,42 +1,42 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000197, -"Position": { - "X": 201.31226, - "Y": -3.1634123E-15, - "Z": 43.900146 -}, -"TerritoryId": 132, - "InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000200, -"Position": { - "X": 209.55212, - "Y": 0.9999819, - "Z": 35.01941 -}, -"TerritoryId": 132, -"InteractionType": "CompleteQuest", - - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSARC998_00131_Q1_000_1", - "Yes": true - } - ] - } - ] - } - ] - } +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000197, +"Position": { + "X": 201.31226, + "Y": -3.1634123E-15, + "Z": 43.900146 +}, +"TerritoryId": 132, + "InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000200, +"Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 +}, +"TerritoryId": 132, +"InteractionType": "CompleteQuest", + + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARC998_00131_Q1_000_1", + "Yes": true + } + ] + } + ] + } + ] + } \ No newline at end of file From 53d34888715d05119b8bdffcd2a6224af6f45dbc Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Thu, 22 Aug 2024 13:43:21 +0000 Subject: [PATCH 33/73] Update QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json --- .../181_So You Want to Be an Archer.json | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) rename QuestPaths/2.x - A Realm Reborn/Class Quests/{ARC => BRD}/181_So You Want to Be an Archer.json (96%) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/181_So You Want to Be an Archer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json similarity index 96% rename from QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/181_So You Want to Be an Archer.json rename to QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json index b4a8b5fe1..7ea66e41d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARC/181_So You Want to Be an Archer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json @@ -1,42 +1,42 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000197, -"Position": { - "X": 201.31226, - "Y": -3.1634123E-15, - "Z": 43.900146 -}, -"TerritoryId": 132, -"AetheryteShortcut": "Gridania", - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Archers' Guild" - ], - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSARC999_00181_Q1_000_1", - "Yes": true, - "$": "No Godbert prompt" - } - ], - "InteractionType": "AcceptQuest", - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] - } - } - } - ] - } - ] - } +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000197, +"Position": { + "X": 201.31226, + "Y": -3.1634123E-15, + "Z": 43.900146 +}, +"TerritoryId": 132, +"AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARC999_00181_Q1_000_1", + "Yes": true, + "$": "No Godbert prompt" + } + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + } + ] + } \ No newline at end of file From 0029711b9f89a8fcabd6624b539ae21d0c08cf26 Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Thu, 22 Aug 2024 13:44:03 +0000 Subject: [PATCH 34/73] Update QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json --- .../101_So You Want to Be a Rogue.json | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) rename QuestPaths/2.x - A Realm Reborn/Class Quests/{ROG => NIN}/101_So You Want to Be a Rogue.json (96%) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/101_So You Want to Be a Rogue.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json similarity index 96% rename from QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/101_So You Want to Be a Rogue.json rename to QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json index fc8bdb081..6d6923c9e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/101_So You Want to Be a Rogue.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json @@ -1,41 +1,41 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 255, - "Steps": [ - { "DataId": 1009944, -"Position": { - "X": -152.66656, - "Y": 2.8562405, - "Z": 243.18298 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest", - "AetheryteShortcut": "Limsa Lominsa", - "AethernetShortcut": [ - "[Limsa Lominsa] Aetheryte Plaza","[Limsa Lominsa] Fishermens' Guild" - ], - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 129 - ] - } - }, - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSROG001_00101_Q1_000_040", - "Yes": true - } - ], - "NextQuestID": 102 - } - ] - } - ] - } +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 255, + "Steps": [ + { "DataId": 1009944, +"Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza","[Limsa Lominsa] Fishermens' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSROG001_00101_Q1_000_040", + "Yes": true + } + ], + "NextQuestID": 102 + } + ] + } + ] + } \ No newline at end of file From abbc82cfbdc5d124fee6252ecc0e5390a641f60c Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Thu, 22 Aug 2024 13:44:34 +0000 Subject: [PATCH 35/73] Update QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json --- .../{ROG => NIN}/102_Way of the Rogue.json | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) rename QuestPaths/2.x - A Realm Reborn/Class Quests/{ROG => NIN}/102_Way of the Rogue.json (95%) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/102_Way of the Rogue.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json similarity index 95% rename from QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/102_Way of the Rogue.json rename to QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json index 5c6f9486e..5006b09f2 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ROG/102_Way of the Rogue.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json @@ -1,50 +1,50 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1009944, -"Position": { - "X": -152.66656, - "Y": 2.8562405, - "Z": 243.18298 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1009944, -"Position": { - "X": -152.66656, - "Y": 2.8562405, - "Z": 243.18298 -}, -"TerritoryId": 129, -"InteractionType": "Interact" -}, - { "DataId": 1009943, -"Position": { - "X": -153.36847, - "Y": -129.4397, - "Z": 265.88843 -}, -"TerritoryId": 129, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSROG011_00102_Q1_000_030", - "Yes": true - } - ] - } - ] - } - ] - } +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1009944, +"Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1009944, +"Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 +}, +"TerritoryId": 129, +"InteractionType": "Interact" +}, + { "DataId": 1009943, +"Position": { + "X": -153.36847, + "Y": -129.4397, + "Z": 265.88843 +}, +"TerritoryId": 129, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSROG011_00102_Q1_000_030", + "Yes": true + } + ] + } + ] + } + ] + } \ No newline at end of file From 59302bb92b900d2747171962c8cc7517fc738574 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 18:26:04 +0200 Subject: [PATCH 36/73] Add early MRD quests --- .../Class Quests/WAR/312_My First Axe.json | 171 ++++++++++++++++++ .../WAR/313_Axe in the Stone.json | 13 +- .../WAR/314_Wake of Destruction.json | 2 +- .../WAR/315_Wake of Destruction.json | 140 ++++++++++++++ 4 files changed, 324 insertions(+), 2 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json new file mode 100644 index 000000000..4969ace6f --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json @@ -0,0 +1,171 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 31.662792, + "Y": 44.020653, + "Z": 146.94322 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 347, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + } + ], + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + }, + { + "Position": { + "X": 74.15681, + "Y": 45.953808, + "Z": 169.73499 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 49, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + null, + { + "Low": 3 + }, + null, + null, + null, + null + ] + } + ], + "CompletionQuestVariablesFlags": [ + null, + { + "Low": 3 + }, + null, + null, + null, + null + ] + }, + { + "Position": { + "X": 74.15681, + "Y": 45.953808, + "Z": 169.73499 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 338, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + null, + { + "High": 3 + }, + null, + null, + null, + null + ] + } + ], + "CompletionQuestVariablesFlags": [ + null, + { + "High": 3 + }, + null, + null, + null, + null + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json index 42bd94349..a1adfdeb5 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json @@ -283,7 +283,18 @@ }, "StopDistance": 0.5, "TerritoryId": 135, - "InteractionType": "SinglePlayerDuty" + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 157.25027, + "Y": 33.93623, + "Z": 91.90441 + }, + "StopDistance": 0.5, + "TerritoryId": 135, + "InteractionType": "SinglePlayerDuty", + "Mount": false } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json index 420eef6f9..dbb6dcd4b 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json @@ -98,7 +98,7 @@ }, "TerritoryId": 134, "InteractionType": "Combat", - "EnemySpawnType": "AutoOnEnterArea", + "EnemySpawnType": "AfterInteraction", "KillEnemyDataIds": [ 2 ], diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json new file mode 100644 index 000000000..c6c66f93e --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json @@ -0,0 +1,140 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 391.3196, + "Y": 73.47712, + "Z": -313.9601 + }, + "TerritoryId": 135, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 135, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + } + ], + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Tempest Gate (Lower La Noscea)" + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2000287, + "Position": { + "X": -88.60913, + "Y": 43.564453, + "Z": -303.05945 + }, + "TerritoryId": 134, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 2 + ], + "AetheryteShortcut": "Middle La Noscea - Summerford Farms", + "AethernetShortcut": [ + "[Limsa Lominsa] Marauders' Guild", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "AetheryteLocked": "Middle La Noscea - Summerford Farms" + } + }, + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + } + ] + } + ] +} From 6b24a08da58af816ddfd00b63bcac04440129c82 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 18:39:50 +0200 Subject: [PATCH 37/73] Include author name in quest tooltip --- .../Windows/QuestComponents/QuestTooltipComponent.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Questionable/Windows/QuestComponents/QuestTooltipComponent.cs b/Questionable/Windows/QuestComponents/QuestTooltipComponent.cs index 1f8a19a0f..d181d45a8 100644 --- a/Questionable/Windows/QuestComponents/QuestTooltipComponent.cs +++ b/Questionable/Windows/QuestComponents/QuestTooltipComponent.cs @@ -62,7 +62,14 @@ internal sealed class QuestTooltipComponent ImGui.TextUnformatted("Instant"); } - if (!_questRegistry.IsKnownQuest(quest.QuestId)) + if (_questRegistry.TryGetQuest(quest.QuestId, out Quest? knownQuest)) + { + if (knownQuest.Root.Author.Count == 1) + ImGui.Text($"Author: {knownQuest.Root.Author[0]}"); + else + ImGui.Text($"Authors: {string.Join(", ", knownQuest.Root.Author)}"); + } + else { ImGui.SameLine(); ImGui.TextUnformatted("NoQuestPath"); From 7705e34918d4e48dec707c571c0d532e2a3f5dea Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 18:40:19 +0200 Subject: [PATCH 38/73] Include quest id + add context menu for quests in journal window --- .../QuestJournalComponent.cs | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/Questionable/Windows/JournalComponents/QuestJournalComponent.cs b/Questionable/Windows/JournalComponents/QuestJournalComponent.cs index e6688cdee..9aa04a7e6 100644 --- a/Questionable/Windows/JournalComponents/QuestJournalComponent.cs +++ b/Questionable/Windows/JournalComponents/QuestJournalComponent.cs @@ -12,6 +12,7 @@ using Questionable.Controller; using Questionable.Data; using Questionable.Functions; using Questionable.Model; +using Questionable.Model.Questing; using Questionable.Windows.QuestComponents; namespace Questionable.Windows.JournalComponents; @@ -28,6 +29,7 @@ internal sealed class QuestJournalComponent private readonly UiUtils _uiUtils; private readonly QuestTooltipComponent _questTooltipComponent; private readonly IDalamudPluginInterface _pluginInterface; + private readonly QuestController _questController; private readonly ICommandManager _commandManager; private List _filteredSections = []; @@ -35,7 +37,7 @@ internal sealed class QuestJournalComponent public QuestJournalComponent(JournalData journalData, QuestRegistry questRegistry, QuestFunctions questFunctions, UiUtils uiUtils, QuestTooltipComponent questTooltipComponent, IDalamudPluginInterface pluginInterface, - ICommandManager commandManager) + QuestController questController, ICommandManager commandManager) { _journalData = journalData; _questRegistry = questRegistry; @@ -43,6 +45,7 @@ internal sealed class QuestJournalComponent _uiUtils = uiUtils; _questTooltipComponent = questTooltipComponent; _pluginInterface = pluginInterface; + _questController = questController; _commandManager = commandManager; } @@ -171,19 +174,30 @@ internal sealed class QuestJournalComponent ImGui.TableNextRow(); ImGui.TableNextColumn(); - ImGui.TreeNodeEx(questInfo.Name, + ImGui.TreeNodeEx($"{questInfo.Name} ({questInfo.QuestId})", ImGuiTreeNodeFlags.Leaf | ImGuiTreeNodeFlags.NoTreePushOnOpen | ImGuiTreeNodeFlags.SpanFullWidth); - if (questInfo is QuestInfo && ImGui.IsItemClicked() && - _commandManager.Commands.TryGetValue("/questinfo", out var commandInfo)) - { - _commandManager.DispatchCommand("/questinfo", questInfo.QuestId.ToString() ?? string.Empty, commandInfo); - } - if (ImGui.IsItemHovered()) _questTooltipComponent.Draw(questInfo); + if (ImGui.BeginPopupContextItem($"##QuestPopup{questInfo.QuestId}", ImGuiPopupFlags.MouseButtonRight)) + { + if (ImGui.MenuItem("Start as next quest", _questFunctions.IsReadyToAcceptQuest(questInfo.QuestId))) + { + _questController.SetNextQuest(quest); + _questController.Start("SeasonalEventSelection"); + } + + bool openInQuestMap = _commandManager.Commands.TryGetValue("/questinfo", out var commandInfo); + if (ImGui.MenuItem("View in Quest Map", questInfo.QuestId is QuestId && openInQuestMap)) + { + _commandManager.DispatchCommand("/questinfo", questInfo.QuestId.ToString() ?? string.Empty, commandInfo!); + } + + ImGui.EndPopup(); + } + ImGui.TableNextColumn(); float spacing; // ReSharper disable once UnusedVariable From 772300f44b1a853c1403b086ee5d191269cd1f8d Mon Sep 17 00:00:00 2001 From: cacahuetes Date: Thu, 22 Aug 2024 18:19:14 +0000 Subject: [PATCH 39/73] Update QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json --- .../Class Quests/WHM/48_Trial by Earth.json | 269 +++++++++--------- 1 file changed, 130 insertions(+), 139 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json index 1cc917cf9..58ff4f0db 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json @@ -1,139 +1,130 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000692, - "Position": { - "X": -258.8083, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "AetheryteShortcut": "Gridania", - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Conjurers' Guild" - ], - "InteractionType": "AcceptQuest", - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 133 - ] - } - } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": 220.82336, - "Y": -28.335487, - "Z": 336.9016 - }, - "AethernetShortcut": [ - "[Gridania] Conjurers' Guild", - "[Gridania] Yellow Serpent Gate (North Shroud)" - ], - "TerritoryId": 154, - "InteractionType": "WalkTo", - "Fly": true, - "SkipConditions": { - "StepIf": { - "Flying": "Locked" - } - } - }, - { - "DataId": 1000764, - "Position": { - "X": 218.89062, - "Y": -28.252495, - "Z": 338.39917 - }, - "TerritoryId": 154, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "DataId": 2000883, - "Position": { - "X": 325.1848, - "Y": -5.217115, - "Z": 390.488 - }, - "TerritoryId": 154, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 294 - ], - "Fly": true - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": 220.82336, - "Y": -28.335487, - "Z": 336.9016 - }, - "TerritoryId": 154, - "InteractionType": "WalkTo", - "Fly": true, - "SkipConditions": { - "StepIf": { - "Flying": "Locked" - } - } - }, - { - "DataId": 1000764, - "Position": { - "X": 218.89062, - "Y": -28.252495, - "Z": 338.39917 - }, - "TerritoryId": 154, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "DataId": 1000692, - "Position": { - "X": -258.8083, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Gridania", - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Conjurers' Guild" - ], - "NextQuestId": 91 - } - ] - } - ] -} +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000692, + "Position": { + "X": -258.8083, + "Y": -5.7735243, + "Z": -27.267883 + }, + "TerritoryId": 133, + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Conjurers' Guild" + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [133] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 220.82336, + "Y": -28.335487, + "Z": 336.9016 + }, + "AethernetShortcut": [ + "[Gridania] Conjurers' Guild", + "[Gridania] Yellow Serpent Gate (North Shroud)" + ], + "TerritoryId": 154, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1000764, + "Position": { + "X": 218.89062, + "Y": -28.252495, + "Z": 338.39917 + }, + "TerritoryId": 154, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2000883, + "Position": { + "X": 325.1848, + "Y": -5.217115, + "Z": 390.488 + }, + "TerritoryId": 154, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [294], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": 220.82336, + "Y": -28.335487, + "Z": 336.9016 + }, + "TerritoryId": 154, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } + }, + { + "DataId": 1000764, + "Position": { + "X": 218.89062, + "Y": -28.252495, + "Z": 338.39917 + }, + "TerritoryId": 154, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000692, + "Position": { + "X": -258.8083, + "Y": -5.7735243, + "Z": -27.267883 + }, + "TerritoryId": 133, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Conjurers' Guild" + ], + "NextQuestId": 91 + } + ] + } + ] +} From 258bdb451f091feb6326408c5039b381022d0d69 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 20:21:49 +0200 Subject: [PATCH 40/73] Daily quest updates --- Directory.Build.targets | 2 +- .../Ananta/Dailies/3062_Up Sheet Creek.json | 43 ++++- .../Dailies/3063_Let There Be Lard.json | 170 +++++++++++++++++- .../Ananta/Dailies/3063_Let There Be Lard.md | 9 + .../Dailies/3922_Close to Clearmeltdown.json | 61 ++++++- .../Dwarves/Dailies/3923_Demolition Demo.json | 50 +++++- .../Dailies/3924_A Crude Awakening.json | 33 +++- .../3826_Legends of the Ronkan Temple.json | 25 ++- .../Dailies/3827_Her Splendid Materials.json | 17 +- .../Qitari/Dailies/3828_Splendid Eats.json | 14 +- .../Dailies/4572_An Explosive Brew.json | 48 ++++- .../Dailies/4707_Lunar Beats for Hopping.json | 85 ++++++++- .../Dailies/4708_Most Like It Sparkly.json | 38 +++- .../Dailies/4709_Spatial Cleanse.json | 82 ++++++++- .../Dailies/4627_Corporeal Comforts.json | 42 ++++- .../Dailies/4628_Remote Debugging.json | 74 +++++++- .../Dailies/4629_A Light in the Dark.json | 41 ++++- QuestPaths/quest-v1.json | 4 +- .../Questing/Converter/ActionConverter.cs | 2 + Questionable.Model/Questing/EAction.cs | 6 +- 20 files changed, 802 insertions(+), 44 deletions(-) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md diff --git a/Directory.Build.targets b/Directory.Build.targets index db4a3c208..5dacb6b5c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.13 + 2.14 diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json index 2ff0c2603..6f9d1cbf9 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -22,7 +21,47 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2009353, + "Position": { + "X": 269.1233, + "Y": 39.78015, + "Z": -202.01422 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009353, + "Position": { + "X": 269.1233, + "Y": 39.78015, + "Z": -202.01422 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2009353, + "Position": { + "X": 269.1233, + "Y": 39.78015, + "Z": -202.01422 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json index 2ff0c2603..e6c949ab7 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -22,7 +21,174 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2009357, + "Position": { + "X": -173.3883, + "Y": 58.1521, + "Z": -449.48505 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 2 + }, + { + "Low": 4 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2009356, + "Position": { + "X": -210.2846, + "Y": 59.250732, + "Z": -512.0775 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 3 + }, + { + "Low": 4 + }, + { + "Low": 6 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2009355, + "Position": { + "X": -210.98651, + "Y": 59.28125, + "Z": -668.6351 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 3 + }, + { + "Low": 5 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + }, + { + "DataId": 2009358, + "Position": { + "X": -171.03839, + "Y": 59.098145, + "Z": -750.3014 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 2 + }, + { + "Low": 5 + }, + { + "Low": 6 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md new file mode 100644 index 000000000..51ac26848 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md @@ -0,0 +1,9 @@ +``` +0 0 0 x 0 0 | 2009355 2009356 2009357 2009358 + 1 x x | unconfirmed + 2 x x + 3 x x + 4 x x | after 2009356: 2 4 → 17 20 + 5 x x + 6 x x +``` diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json index d73c93ee2..9856ed699 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,8 +29,64 @@ { "Sequence": 1, "Steps": [ - - + { + "DataId": 1033706, + "Position": { + "X": -384.9088, + "Y": 105.85561, + "Z": -645.9602 + }, + "StopDistance": 2, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1033705, + "Position": { + "X": -380.3922, + "Y": 103.089836, + "Z": -669.8253 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1033707, + "Position": { + "X": -361.83722, + "Y": 103.57124, + "Z": -703.2731 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json index d73c93ee2..235f3e9d7 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,8 +29,50 @@ { "Sequence": 1, "Steps": [ - - + { + "DataId": 1033715, + "Position": { + "X": -614.4961, + "Y": 65.60227, + "Z": -405.56958 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1034065, + "Position": { + "X": -294.75854, + "Y": 99.225815, + "Z": -724.0253 + }, + "TerritoryId": 813, + "InteractionType": "Action", + "Action": "Cannonfire", + "Fly": true, + "Land": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1034065, + "Position": { + "X": -294.75854, + "Y": 99.225815, + "Z": -724.0253 + }, + "TerritoryId": 813, + "InteractionType": "Action", + "Action": "Cannonfire" + } ] }, { @@ -55,7 +96,8 @@ "Z": -425.25372 }, "TerritoryId": 813, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "Mount": false } ] } diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json index d73c93ee2..6831c8ea0 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,8 +29,38 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1033767, + "Position": { + "X": -608.6061, + "Y": 65.60222, + "Z": -431.81506 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } - + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 813, + "InteractionType": "Craft", + "ItemId": 31177, + "ItemCount": 1 + }, + { + "DataId": 1034070, + "Position": { + "X": -796.47516, + "Y": 69.28625, + "Z": 117.29602 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json index 5b359ba61..6c9ed2042 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,6 +17,23 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2010997, + "Position": { + "X": -399.52698, + "Y": 10.635498, + "Z": 241.50452 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "AetheryteShortcut": "Rak'tika - Slitherbough", + "Fly": true + } + ] + }, { "Sequence": 255, "Steps": [ @@ -30,12 +46,7 @@ "TerritoryId": 817, "InteractionType": "WalkTo", "AetheryteShortcut": "Rak'tika - Fanow", - "Fly": true, - "RequiredGatheredItems": [ - - - - ] + "Fly": true }, { "DataId": 1032643, diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json index 5b359ba61..0ae024dc0 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -32,9 +31,16 @@ "AetheryteShortcut": "Rak'tika - Fanow", "Fly": true, "RequiredGatheredItems": [ - - - + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 29533, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29559, + "ItemCount": 3 + } ] }, { @@ -46,7 +52,8 @@ }, "StopDistance": 7, "TerritoryId": 817, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "Fly": true } ] } diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json index 5b359ba61..ce85c188a 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -32,9 +31,16 @@ "AetheryteShortcut": "Rak'tika - Fanow", "Fly": true, "RequiredGatheredItems": [ - - - + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 29534, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29560, + "ItemCount": 3 + } ] }, { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json index 42a2b0f7c..bf0d1001d 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -21,7 +20,52 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2012903, + "Position": { + "X": 37.03357, + "Y": 22.507019, + "Z": -8.133057 + }, + "TerritoryId": 957, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 14679 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2012904, + "Position": { + "X": 116.68567, + "Y": 22.262878, + "Z": -71.000244 + }, + "TerritoryId": 957, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 14679 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } ] }, { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json index f0656089e..185e61568 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json @@ -2,7 +2,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -31,6 +30,84 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044408, + "Position": { + "X": -164.08032, + "Y": -49.199722, + "Z": -250.75159 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2013262, + "Position": { + "X": 34.98889, + "Y": -47.56244, + "Z": -531.5481 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true, + "Land": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2013263, + "Position": { + "X": 49.79016, + "Y": -133.07397, + "Z": -558.9227 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true, + "Land": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2013261, + "Position": { + "X": -34.28705, + "Y": -129.2287, + "Z": -495.71985 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true, + "Land": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } ] }, { @@ -43,7 +120,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, @@ -53,7 +131,8 @@ "Z": -273.60956 }, "TerritoryId": 959, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "Mount": false } ] } diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json index d731dcbc4..13ed28195 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,6 +29,39 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044608, + "Position": { + "X": 227.19153, + "Y": 93.66165, + "Z": -35.385742 + }, + "StopDistance": 1, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38883, + "ItemCount": 3 + }, + { + "DataId": 1044608, + "Position": { + "X": 227.19153, + "Y": 93.66165, + "Z": -35.385742 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } ] }, { @@ -42,7 +74,9 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json index d731dcbc4..60d7d7909 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,6 +29,84 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 2013264, + "Position": { + "X": 47.01306, + "Y": -132.86035, + "Z": -504.08182 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2013266, + "Position": { + "X": 64.65234, + "Y": -132.61621, + "Z": -451.133 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": 17.153883, + "Y": -132.7894, + "Z": -444.4903 + }, + "TerritoryId": 959, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + } + }, + { + "DataId": 2013265, + "Position": { + "X": 15.060608, + "Y": -131.27338, + "Z": -444.0528 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } ] }, { @@ -42,7 +119,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json index 368803c3a..1c319fcac 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,50 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044071, + "Position": { + "X": 46.066895, + "Y": 268.99976, + "Z": -584.77155 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Abode of the Ea", + "Fly": true, + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38294, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38318, + "ItemCount": 3 + } + ] + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "AetheryteShortcut": "Ultima Thule - Base Omicron" + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json index 368803c3a..5410d8f0d 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,82 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044072, + "Position": { + "X": -541.9547, + "Y": 74.3691, + "Z": 208.39233 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Reah Tahra" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2013132, + "Position": { + "X": -327.04663, + "Y": 88.48706, + "Z": 293.04944 + }, + "TerritoryId": 960, + "InteractionType": "Action", + "Action": "Electric Flux", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2013131, + "Position": { + "X": -324.8493, + "Y": 88.05969, + "Z": 269.79468 + }, + "TerritoryId": 960, + "InteractionType": "Action", + "Action": "Electric Flux", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "AetheryteShortcut": "Ultima Thule - Base Omicron" + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json index 368803c3a..f1d2760b4 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,49 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044074, + "Position": { + "X": -585.90063, + "Y": 75.22713, + "Z": 256.67188 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Reah Tahra", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38295, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38319, + "ItemCount": 3 + } + ] + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "AetheryteShortcut": "Ultima Thule - Base Omicron" + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 85cb5d591..0a3be7325 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -845,10 +845,12 @@ "Buffet (Griffin)", "Fumigate", "Siphon Snout", + "Cannonfire", "Red Gulal", "Yellow Gulal", "Blue Gulal", - "Electric Flux" + "Electric Flux", + "Hop-step" ] } }, diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 581986328..5410e44b0 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -15,9 +15,11 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.Fumigate, "Fumigate" }, { EAction.SiphonSnout, "Siphon Snout" }, + { EAction.Cannonfire, "Cannonfire" }, { EAction.RedGulal, "Red Gulal" }, { EAction.YellowGulal, "Yellow Gulal" }, { EAction.BlueGulal, "Blue Gulal" }, { EAction.ElectrixFlux, "Electric Flux" }, + { EAction.HopStep, "Hop-step" }, }; } diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index 412999a6f..08f71d5ae 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -14,10 +14,12 @@ public enum EAction BuffetGriffin = 4583, Fumigate = 5872, SiphonSnout = 18187, + Cannonfire = 20121, RedGulal = 29382, YellowGulal = 29383, BlueGulal = 29384, ElectrixFlux = 29718, + HopStep = 31116, CollectMiner = 240, ScourMiner = 22182, @@ -46,9 +48,11 @@ public static class EActionExtensions or EAction.BuffetGriffin or EAction.Fumigate or EAction.SiphonSnout + or EAction.Cannonfire or EAction.RedGulal or EAction.YellowGulal or EAction.BlueGulal - or EAction.ElectrixFlux; + or EAction.ElectrixFlux + or EAction.HopStep; } } From 25e36fddc80080019b604ebf48fbb9f5b6eebd47 Mon Sep 17 00:00:00 2001 From: pot0to Date: Wed, 21 Aug 2024 14:18:33 -0700 Subject: [PATCH 41/73] adding new brd paths and 1 thm --- .../BLM/351_The Threat of Perplexity.json | 217 ++++++++++++++++++ .../BRD/1085_A Song of Bards and Bowmen.json | 133 +++++++++++ .../BRD/1086_The Archer's Anthem.json | 85 +++++++ .../BRD/1087_Bard's-eye View.json | 85 +++++++ .../BRD/1088_Doing It the Bard Way.json | 85 +++++++ .../BRD/1089_Pieces of the Past.json | 124 ++++++++++ .../BRD/1090_Requiem for the Fallen.json | 65 ++++++ .../BRD/1713_On the Road Again.json | 209 +++++++++++++++++ 8 files changed, 1003 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1713_On the Road Again.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json new file mode 100644 index 000000000..75d2bceba --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json @@ -0,0 +1,217 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001708, + "Position": { + "X": -250.3548, + "Y": 18, + "Z": 80.88806 + }, + "TerritoryId": 130, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Thaumaturges' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 130 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1001712, + "Position": { + "X": -241.50458, + "Y": 19.57727, + "Z": 84.64172 + }, + "TerritoryId": 130, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1002305, + "Position": { + "X": 14.419739, + "Y": 22.157166, + "Z": 72.3125 + }, + "TerritoryId": 140, + "Fly": true, + "InteractionType": "Interact", + "AetheryteShortcut": "Western Thanalan - Horizon", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 140 + ] + } + } + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1002324, + "Position": { + "X": 112.80994, + "Y": 17.536886, + "Z": 31.296265 + }, + "TerritoryId": 140, + "Fly": true, + "InteractionType": "Interact" + }, + { + "DataId": 1002322, + "Position": { + "X": 116.89929, + "Y": 17.536886, + "Z": 12.954895 + }, + "TerritoryId": 140, + "InteractionType": "Interact" + }, + { + "DataId": 1002323, + "Position": { + "X": 132.43298, + "Y": 21.104982, + "Z": 9.018005 + }, + "TerritoryId": 140, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1002305, + "Position": { + "X": 14.419739, + "Y": 22.157166, + "Z": 72.3125 + }, + "TerritoryId": 140, + "Fly": true, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2001472, + "Position": { + "X": 150.71338, + "Y": 18.783813, + "Z": -5.7526855 + }, + "TerritoryId": 140, + "Fly": true, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1002305, + "Position": { + "X": 14.419739, + "Y": 22.157166, + "Z": 72.3125 + }, + "TerritoryId": 140, + "Fly": true, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 2001474, + "Position": { + "X": 96.238525, + "Y": 16.952698, + "Z": 188.83032 + }, + "TerritoryId": 140, + "Fly": true, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1001712, + "Position": { + "X": -241.50458, + "Y": 19.57727, + "Z": 84.64172 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Thaumaturges' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 130 + ] + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001708, + "Position": { + "X": -250.3548, + "Y": 18, + "Z": 80.88806 + }, + "TerritoryId": 130, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json new file mode 100644 index 000000000..0e34595fa --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json @@ -0,0 +1,133 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1007834, + "Position": { + "X": 447.2876, + "Y": 2.147105, + "Z": 21.86615 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2002364, + "Position": { + "X": 457.9995, + "Y": 0.44250488, + "Z": -106.73688 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 440.87814, + "Y": 2.8651512, + "Z": 25.295788 + }, + "InteractionType": "", + "TerritoryId": 153, + "Fly": true + }, + { + "DataId": 1007834, + "Position": { + "X": 447.2876, + "Y": 2.147105, + "Z": 21.86615 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "Fly": false + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json new file mode 100644 index 000000000..dab7c28a1 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json @@ -0,0 +1,85 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2002366, + "Position": { + "X": -143.0534, + "Y": 68.192505, + "Z": 586.1448 + }, + "TerritoryId": 137, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 1945 + ], + "AetheryteShortcut": "Eastern La Noscea - Wineport", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 137 + ] + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json new file mode 100644 index 000000000..7332dbc98 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json @@ -0,0 +1,85 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2002365, + "Position": { + "X": 272.05298, + "Y": 18.875366, + "Z": -164.53809 + }, + "TerritoryId": 145, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 58 + ], + "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 145 + ] + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json new file mode 100644 index 000000000..e357eb15f --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json @@ -0,0 +1,85 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "Comment": "Need to enable some way of doing single player duty first?", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2002367, + "Position": { + "X": 104.32593, + "Y": -21.774658, + "Z": 171.00781 + }, + "TerritoryId": 154, + "InteractionType": "UseItem", + "ItemId": 2000952, + "EnemySpawnType": "AutoOnEnterArea", + "AetheryteShortcut": "North Shroud - Fallgourd Float", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 137 + ] + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + }, + "NextQuestId": 1089 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json new file mode 100644 index 000000000..a04de8734 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json @@ -0,0 +1,124 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_JOBBRD451_01089_Q1_000_000", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2002528, + "Position": { + "X": 512.291, + "Y": 10.482849, + "Z": 148.30237 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 2002530, + "Position": { + "X": 576.2263, + "Y": -24.002502, + "Z": -423.75836 + }, + "TerritoryId": 152, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "East Shroud - Hawthorne Hut" + }, + { + "Position": { + "X": -143.16391, + "Y": -25.75711, + "Z": 34.669674 + }, + "TerritoryId": 138, + "Fly": true, + "AetheryteShortcut": "Western La Noscea - Aleport" + }, + { + "DataId": 2002527, + "Position": { + "X": -168.29181, + "Y": -21.5, + "Z": 44.144287 + }, + "TerritoryId": 138, + "InteractionType": "Interact", + "Fly": false + }, + { + "DataId": 2002529, + "Position": { + "X": -324.7273, + "Y": 87.96814, + "Z": -133.50122 + }, + "TerritoryId": 147, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json new file mode 100644 index 000000000..d92324220 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json @@ -0,0 +1,65 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2002373, + "Position": { + "X": 72.098755, + "Y": 227.19153, + "Z": 380.84985 + }, + "TerritoryId": 155, + "InteractionType": "UseItem", + "ItemId": 2000953, + "EnemySpawnType": "AutoOnEnterArea", + "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1007891, + "Position": { + "X": 70.17627, + "Y": 226.72212, + "Z": 381.30762 + }, + "TerritoryId": 155, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1713_On the Road Again.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1713_On the Road Again.json new file mode 100644 index 000000000..03dfae4b4 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1713_On the Road Again.json @@ -0,0 +1,209 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "pot0to", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 153 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1014202, + "Position": { + "X": 190.14258, + "Y": -2.5202732, + "Z": 73.136475 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1000423, + "Position": { + "X": 232.04382, + "Y": 1.999974, + "Z": 45.578613 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_JOBBRD501_01713_Q1_000_000", + "Yes": true + } + ] + }, + { + "DataId": 1014203, + "Position": { + "X": 1.2359009, + "Y": 0.5000253, + "Z": -1.083435 + }, + "TerritoryId": 204, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1014203, + "Position": { + "X": 1.2359009, + "Y": 0.5000253, + "Z": -1.083435 + }, + "TerritoryId": 204, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1014207, + "Position": { + "X": 28.854736, + "Y": 6.655561, + "Z": 421.46936 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true, + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4684 + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1014207, + "Position": { + "X": 28.854736, + "Y": 6.655561, + "Z": 421.46936 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1014204, + "Position": { + "X": 24.673828, + "Y": 6.386869, + "Z": 414.9386 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1014205, + "Position": { + "X": 190.72253, + "Y": -2.5872245, + "Z": 74.75391 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1014208, + "Position": { + "X": -52.536804, + "Y": 8.059147, + "Z": 31.72351 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ishgard", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 418 + ] + } + } + } + ] + } + ] +} From d010dec9f6d1f9fc235a97997848232b527a9c75 Mon Sep 17 00:00:00 2001 From: pot0to Date: Wed, 21 Aug 2024 15:01:48 -0700 Subject: [PATCH 42/73] fixing interaction type --- .../Class Quests/BRD/1085_A Song of Bards and Bowmen.json | 2 +- .../Class Quests/BRD/1089_Pieces of the Past.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json index 0e34595fa..9fae75ae5 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json @@ -96,7 +96,7 @@ "Y": 2.8651512, "Z": 25.295788 }, - "InteractionType": "", + "InteractionType": "WalkTo", "TerritoryId": 153, "Fly": true }, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json index a04de8734..dbde6fc2d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json @@ -68,6 +68,7 @@ }, "TerritoryId": 138, "Fly": true, + "InteractionType": "WalkTo", "AetheryteShortcut": "Western La Noscea - Aleport" }, { From 6e7ade5ee74ac2044a3d5dd47de1e1f47e1ff7e2 Mon Sep 17 00:00:00 2001 From: pot0to Date: Thu, 22 Aug 2024 15:33:18 -0700 Subject: [PATCH 43/73] resolved merge conflicts --- QuestPaths/quest-v1.json | 1 + Questionable.Model/Questing/Converter/ActionConverter.cs | 1 + Questionable.Model/Questing/EAction.cs | 1 + 3 files changed, 3 insertions(+) diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 0a3be7325..ff535a8ff 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -838,6 +838,7 @@ "description": "The action to use", "enum": [ "Heavy Swing", + "Heavy Shot", "Cure", "Esuna", "Physick", diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 5410e44b0..42e6e3845 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -8,6 +8,7 @@ public sealed class ActionConverter() : EnumConverter(Values) private static readonly Dictionary Values = new() { { EAction.HeavySwing, "Heavy Swing" }, + { EAction.HeavyShot, "Heavy Shot" }, { EAction.Cure, "Cure" }, { EAction.Esuna, "Esuna" }, { EAction.Physick, "Physick" }, diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index 08f71d5ae..15e7f8429 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -7,6 +7,7 @@ namespace Questionable.Model.Questing; public enum EAction { HeavySwing = 31, + HeavyShot = 97, Cure = 120, Esuna = 7568, Physick = 190, From e21ae1c6cd8e9afa9632fa39b7166e393895f3ce Mon Sep 17 00:00:00 2001 From: pot0to Date: Thu, 22 Aug 2024 02:26:37 -0700 Subject: [PATCH 44/73] added quest path jsons --- .../BRD/134_Training with Leih.json | 344 ++++++++++++++++++ .../Class Quests/BRD/219_My First Bow.json | 179 +++++++++ .../BRD/46_A Matter of Perspective.json | 326 +++++++++++++++++ .../BRD/68_Violators Will Be Shot.json | 261 +++++++++++++ .../BRD/70_To Catch a Poacher.json | 162 +++++++++ .../Class Quests/BRD/71_Homecoming.json | 123 +++++++ .../BRD/76_The One That Got Away.json | 85 +++++ 7 files changed, 1480 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json new file mode 100644 index 000000000..a42df4428 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json @@ -0,0 +1,344 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000199, + "Position": { + "X": 211.13904, + "Y": 1.5032018E-05, + "Z": 28.580078 + }, + "TerritoryId": 132, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": -87.448326, + "Y": -3.8114734, + "Z": -77.68485 + }, + "TerritoryId": 148, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" + }, + { + "DataId": 2001177, + "Position": { + "X": -88.24298, + "Y": 3.768982, + "Z": -88.24298 + }, + "TerritoryId": 148, + "StopDistance": 15, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -113.806755, + "Y": -3.824695, + "Z": -61.20561 + }, + "TerritoryId": 148, + "InteractionType": "WalkTo" + }, + { + "DataId": 2001175, + "Position": { + "X": -115.58716, + "Y": -3.402832, + "Z": -51.07196 + }, + "TerritoryId": 148, + "StopDistance": 15, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -142.90863, + "Y": -1.355497, + "Z": -69.45994 + }, + "TerritoryId": 148, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000959, + "Position": { + "X": -143.32806, + "Y": -0.41204834, + "Z": -58.884644 + }, + "TerritoryId": 148, + "StopDistance": 15, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -154.95493, + "Y": 4.0352364, + "Z": -132.85217 + }, + "TerritoryId": 148, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000958, + "Position": { + "X": -166.97955, + "Y": 10.2387085, + "Z": -138.41461 + }, + "TerritoryId": 148, + "StopDistance": 15, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -114.08684, + "Y": 7.6589117, + "Z": -173.19547 + }, + "TerritoryId": 148, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000957, + "Position": { + "X": -120.68359, + "Y": 12.49707, + "Z": -182.39111 + }, + "TerritoryId": 148, + "StopDistance": 15, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -74.71171, + "Y": -4, + "Z": -190.44055 + }, + "TerritoryId": 148, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000956, + "Position": { + "X": -80.76605, + "Y": -2.3651733, + "Z": -196.49048 + }, + "TerritoryId": 148, + "StopDistance": 15, + "InteractionType": "Action", + "Action": "Heavy Shot" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1000199, + "Position": { + "X": 211.13904, + "Y": 1.5032018E-05, + "Z": 28.580078 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": -353.36465, + "Y": 4.1194496, + "Z": 288.19882 + }, + "TerritoryId": 152, + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 5, + "MinimumKillCount": 8, + "$": "Slay northern vultures." + }, + { + "DataId": 39, + "MinimumKillCount": 8, + "$": "Slay tree slugs." + } + ] + }, + { + "Position": { + "X": -424.11658, + "Y": 7.2559156, + "Z": 277.93048 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 5, + "MinimumKillCount": 8, + "$": "Slay northern vultures." + }, + { + "DataId": 39, + "MinimumKillCount": 8, + "$": "Slay tree slugs." + } + ] + }, + { + "Position": { + "X": -431.09494, + "Y": 2.9039853, + "Z": 239.26413 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 5, + "MinimumKillCount": 8, + "$": "Slay northern vultures." + }, + { + "DataId": 39, + "MinimumKillCount": 8, + "$": "Slay tree slugs." + } + ] + }, + { + "Position": { + "X": -380.5414, + "Y": 1.1250772, + "Z": 236.78247 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 5, + "MinimumKillCount": 8, + "$": "Slay northern vultures." + } + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 8 + }, + { + "High": 8 + }, + null, + null, + null, + null + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1000199, + "Position": { + "X": 211.13904, + "Y": 1.5032018E-05, + "Z": 28.580078 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARC997_00134_Q1_000_1", + "Yes": true + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json new file mode 100644 index 000000000..fdb606fc3 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json @@ -0,0 +1,179 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 117.47766, + "Y": 17.661993, + "Z": -247.24017 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 37, + "MinimumKillCount": 3, + "$": "Slay ground squirrels as an archer" + }, + { + "DataId": 49, + "MinimumKillCount": 3, + "$": "Slay little ladybugs as an archer" + } + ], + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Archers' Guild", + "[Gridania] Blue Badger Gate (Central Shroud)" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132, + 148 + ] + } + } + }, + { + "Position": { + "X": 72.74856, + "Y": 14.679733, + "Z": -257.5843 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 37, + "MinimumKillCount": 3, + "$": "Slay ground squirrels as an archer" + }, + { + "DataId": 49, + "MinimumKillCount": 3, + "$": "Slay little ladybugs as an archer" + } + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + 32, + null, + null, + null, + null + ] + }, + { + "Position": { + "X": 92.364235, + "Y": 3.463302, + "Z": -193.49184 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 47, + "MinimumKillCount": 3, + "$": "Slay forest funguars as an archer" + } + ] + }, + { + "Position": { + "X": 126.943115, + "Y": 2.910592, + "Z": -180.54787 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 47, + "MinimumKillCount": 3, + "$": "Slay forest funguars as an archer" + } + ], + "CompletionQuestVariablesFlags": [ + 16, + { + "Low": 3 + }, + null, + null, + null, + null + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json new file mode 100644 index 000000000..3201ff5c7 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json @@ -0,0 +1,326 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2000925, + "Position": { + "X": 187.18237, + "Y": -2.7314453, + "Z": 79.087524 + }, + "TerritoryId": 132, + "StopDistance": 15, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": 106.01592, + "Y": 0.14552212, + "Z": 57.230045 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000926, + "Position": { + "X": 113.42029, + "Y": 4.6539917, + "Z": 54.306763 + }, + "TerritoryId": 132, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": 40.66375, + "Y": 2.5499606, + "Z": 15.033528 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000931, + "Position": { + "X": 36.453735, + "Y": 7.248047, + "Z": 10.879639 + }, + "TerritoryId": 132, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -4.75964, + "Y": -3.0942674, + "Z": 21.23782 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000929, + "Position": { + "X": -5.7526855, + "Y": 2.0598755, + "Z": 30.655273 + }, + "TerritoryId": 132, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": 31.96446, + "Y": -1.5349445, + "Z": 60.44494 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000928, + "Position": { + "X": 33.24939, + "Y": 5.4473877, + "Z": 70.63391 + }, + "TerritoryId": 132, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": 65.39101, + "Y": -3.7351668, + "Z": 88.24835 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000930, + "Position": { + "X": 56.595703, + "Y": -3.7385254, + "Z": 96.97107 + }, + "TerritoryId": 132, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": 303.89548, + "Y": -21.916101, + "Z": 210.33368 + }, + "TerritoryId": 154, + "AethernetShortcut": [ + "[Gridania] Archers' Guild", + "[Gridania] Yellow Serpent Gate (North Shroud)" + ], + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 5, + "MinimumKillCount": 8, + "$": "Slay opo-opos." + } + ] + }, + { + "Position": { + "X": 316.9498, + "Y": -16.625727, + "Z": 190.52563 + }, + "TerritoryId": 154, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 5, + "MinimumKillCount": 8, + "$": "Slay opo-opos." + } + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 8 + }, + null, + null, + null, + null, + null + ] + }, + { + "Position": { + "X": 250.70682, + "Y": -11.9244995, + "Z": 40.554157 + }, + "TerritoryId": 154, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 32, + "MinimumKillCount": 8, + "$": "Slay microchus." + } + ] + }, + { + "Position": { + "X": 315.33475, + "Y": -8.230231, + "Z": -6.9168186 + }, + "TerritoryId": 154, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 32, + "MinimumKillCount": 8, + "$": "Slay microchus." + } + ] + }, + { + "Position": { + "X": 276.26797, + "Y": -6.927437, + "Z": -31.987146 + }, + "TerritoryId": 154, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 32, + "MinimumKillCount": 8, + "$": "Slay microchus." + } + ], + "CompletionQuestVariablesFlags": [ + null, + { + "High": 8 + }, + null, + null, + null, + null + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json new file mode 100644 index 000000000..de9bdb95e --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json @@ -0,0 +1,261 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000204, + "Position": { + "X": 226.33704, + "Y": 1.9999089, + "Z": 29.06836 + }, + "TerritoryId": 132, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": -326.03064, + "Y": 9.169003, + "Z": 323.19617 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo", + "AetheryteShortcut": "East Shroud - Hawthorne Hut" + }, + { + "DataId": 2000944, + "Position": { + "X": -330.12903, + "Y": 16.708557, + "Z": 329.67102 + }, + "TerritoryId": 152, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -321.1917, + "Y": 0.22361445, + "Z": 297.61597 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000943, + "Position": { + "X": -330.73932, + "Y": 9.262146, + "Z": 290.1808 + }, + "TerritoryId": 152, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -358.00266, + "Y": 6.9801626, + "Z": 306.18744 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000945, + "Position": { + "X": -364.55334, + "Y": 14.480774, + "Z": 307.60657 + }, + "TerritoryId": 152, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -378.32364, + "Y": 6.10847, + "Z": 269.35767 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000942, + "Position": { + "X": -378.53058, + "Y": 9.048584, + "Z": 262.68408 + }, + "TerritoryId": 152, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -301.42407, + "Y": 0.17268503, + "Z": 257.9185 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo" + }, + { + "DataId": 2001179, + "Position": { + "X": -297.29156, + "Y": 5.996765, + "Z": 250.96509 + }, + "TerritoryId": 152, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + }, + { + "Position": { + "X": -264.77237, + "Y": -3.2272563, + "Z": 240.00267 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo" + }, + { + "DataId": 2000946, + "Position": { + "X": -269.00134, + "Y": 4.2266846, + "Z": 230.45691 + }, + "TerritoryId": 152, + "StopDistance": 20, + "InteractionType": "Action", + "Action": "Heavy Shot" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1000204, + "Position": { + "X": 226.33704, + "Y": 1.9999089, + "Z": 29.06836 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 288.74252, + "Y": -11.241169, + "Z": 42.220448 + }, + "TerritoryId": 154, + "InteractionType": "WalkTo", + "AetheryteShortcut": "North Shroud - Fallgourd Float" + }, + { + "DataId": 2000962, + "Position": { + "X": 288.56335, + "Y": -11.306946, + "Z": 52.384155 + }, + "TerritoryId": 154, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1000204, + "Position": { + "X": 226.33704, + "Y": 1.9999089, + "Z": 29.06836 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json new file mode 100644 index 000000000..7658c4eff --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json @@ -0,0 +1,162 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000590, + "Position": { + "X": -165.9419, + "Y": 9.869227, + "Z": -81.34589 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "AetheryteShortcut": "South Shroud - Quarrymill" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2000949, + "Position": { + "X": -258.9914, + "Y": 10.330261, + "Z": -46.00598 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + }, + { + "DataId": 2000948, + "Position": { + "X": -270.00848, + "Y": 15.487854, + "Z": -91.17267 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + }, + { + "DataId": 2000947, + "Position": { + "X": -318.07434, + "Y": 18.936401, + "Z": -165.11792 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2001105, + "Position": { + "X": -173.02203, + "Y": 9.872559, + "Z": -78.690796 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CLSARC004_00070_Q1_000_1", + "Answer": "TEXT_CLSARC004_00070_A1_000_1" + }, + { + "Type": "List", + "Prompt": "TEXT_CLSARC004_00070_Q2_000_1", + "Answer": "TEXT_CLSARC004_00070_A2_000_3" + } + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2000136, + "Position": { + "X": -295.85718, + "Y": 23.575134, + "Z": -192.34003 + }, + "TerritoryId": 153, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1000590, + "Position": { + "X": -165.9419, + "Y": 9.869227, + "Z": -81.34589 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json new file mode 100644 index 000000000..326cd1744 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json @@ -0,0 +1,123 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000204, + "Position": { + "X": 226.33704, + "Y": 1.9999089, + "Z": 29.06836 + }, + "TerritoryId": 132, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1000199, + "Position": { + "X": 211.13904, + "Y": 1.5032133E-05, + "Z": 28.580078 + }, + "TerritoryId": 132, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2000951, + "Position": { + "X": -1.8158569, + "Y": 6.9122925, + "Z": -93.0343 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "AetheryteShortcut": "South Shroud - Quarrymill", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CLSARC005_00071_Q1_000_1", + "Answer": "TEXT_CLSARC005_00071_A1_000_1" + } + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1000534, + "Position": { + "X": 134.47766, + "Y": -7, + "Z": -69.993164 + }, + "TerritoryId": 148, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json new file mode 100644 index 000000000..a9566634e --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json @@ -0,0 +1,85 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 132 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000795, + "Position": { + "X": 278.61438, + "Y": 8.346143, + "Z": -38.223938 + }, + "TerritoryId": 153, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "South Shroud - Quarrymill" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2000709, + "Position": { + "X": -90.74542, + "Y": 0.015197754, + "Z": 61.08191 + }, + "TerritoryId": 153, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ] + } + ] + } + ] +} \ No newline at end of file From 77df87b23b4be2f08779532d7278b0ef45bb2477 Mon Sep 17 00:00:00 2001 From: pot0to Date: Thu, 22 Aug 2024 03:26:09 -0700 Subject: [PATCH 45/73] fixed author name --- .../Class Quests/BRD/219_My First Bow.json | 4 ++-- .../Class Quests/BRD/46_A Matter of Perspective.json | 4 ++-- .../Class Quests/BRD/68_Violators Will Be Shot.json | 4 ++-- .../Class Quests/BRD/70_To Catch a Poacher.json | 4 ++-- .../2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json | 4 ++-- .../Class Quests/BRD/76_The One That Got Away.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json index fdb606fc3..f2e24c67d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", + "Author": "pot0to", "QuestSequence": [ { "Sequence": 0, @@ -176,4 +176,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json index 3201ff5c7..f0a78f61d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", + "Author": "pot0to", "QuestSequence": [ { "Sequence": 0, @@ -323,4 +323,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json index de9bdb95e..88c35e717 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", + "Author": "pot0to", "QuestSequence": [ { "Sequence": 0, @@ -258,4 +258,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json index 7658c4eff..95fd13ef6 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", + "Author": "pot0to", "QuestSequence": [ { "Sequence": 0, @@ -159,4 +159,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json index 326cd1744..f8f3f2232 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", + "Author": "pot0to", "QuestSequence": [ { "Sequence": 0, @@ -120,4 +120,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json index a9566634e..90eca1760 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", + "Author": "pot0to", "QuestSequence": [ { "Sequence": 0, @@ -82,4 +82,4 @@ ] } ] -} \ No newline at end of file +} From 0796ab86724df84998d01baac4e4b501346dc587 Mon Sep 17 00:00:00 2001 From: alydev Date: Fri, 23 Aug 2024 06:58:56 +0000 Subject: [PATCH 46/73] Add 1560_Bird in Hand.json --- .../Central Shroud/1560_Bird in Hand.json | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json new file mode 100644 index 000000000..7e4abb73a --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json @@ -0,0 +1,181 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "alydev", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000471, + "Position": { + "X": -60.471558, + "Y": 0.19999865, + "Z": 6.301941 + }, + "TerritoryId": 148, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2004436, + "Position": { + "X": -58.06067, + "Y": 0.19836426, + "Z": 5.355835 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + }, + { + "DataId": 2004432, + "Position": { + "X": -64.62195, + "Y": -0.015319824, + "Z": -5.2339478 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + }, + { + "DataId": 2004433, + "Position": { + "X": -47.28778, + "Y": -0.015319824, + "Z": -4.0131226 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + }, + { + "DataId": 2004434, + "Position": { + "X": -51.773926, + "Y": 0.19836426, + "Z": 16.128723 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + }, + { + "DataId": 2004435, + "Position": { + "X": -63.309692, + "Y": 0.19836426, + "Z": 16.03717 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1000471, + "Position": { + "X": -60.471558, + "Y": 0.19999865, + "Z": 6.301941 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1000473, + "Position": { + "X": -44.14441, + "Y": 0.74388826, + "Z": -32.88324 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1000471, + "Position": { + "X": -60.471558, + "Y": 0.19999865, + "Z": 6.301941 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1000470, + "Position": { + "X": -59.006653, + "Y": -0.010835781, + "Z": 26.41333 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1009569, + "Position": { + "X": -56.10742, + "Y": -0.020424694, + "Z": 28.54956 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1000470, + "Position": { + "X": -59.006653, + "Y": -0.010835781, + "Z": 26.41333 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000471, + "Position": { + "X": -60.471558, + "Y": 0.19999865, + "Z": 6.301941 + }, + "TerritoryId": 148, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file From 325860ec2794dcec6671b3d94047a0f18991f262 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 09:53:24 +0200 Subject: [PATCH 47/73] Remove ShouldHandleUiInteractions from duty UI windows since that's never active --- Questionable/Controller/GameUi/HelpUiController.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Questionable/Controller/GameUi/HelpUiController.cs b/Questionable/Controller/GameUi/HelpUiController.cs index a7b23398d..0d869add3 100644 --- a/Questionable/Controller/GameUi/HelpUiController.cs +++ b/Questionable/Controller/GameUi/HelpUiController.cs @@ -24,13 +24,8 @@ internal sealed class HelpUiController : IDisposable _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "MultipleHelpWindow", MultipleHelpWindowPostSetup); } - private bool ShouldHandleUiInteractions => _questController.IsRunning; - private unsafe void UnendingCodexPostSetup(AddonEvent type, AddonArgs args) { - if (!ShouldHandleUiInteractions) - return; - if (_questController.StartedQuest?.Quest.Id.Value == 4526) { _logger.LogInformation("Closing Unending Codex"); @@ -41,9 +36,6 @@ internal sealed class HelpUiController : IDisposable private unsafe void ContentsTutorialPostSetup(AddonEvent type, AddonArgs args) { - if (!ShouldHandleUiInteractions) - return; - if (_questController.StartedQuest?.Quest.Id.Value == 245) { _logger.LogInformation("Closing ContentsTutorial"); @@ -57,9 +49,6 @@ internal sealed class HelpUiController : IDisposable /// private unsafe void MultipleHelpWindowPostSetup(AddonEvent type, AddonArgs args) { - if (!ShouldHandleUiInteractions) - return; - if (_questController.StartedQuest?.Quest.Id.Value == 245) { _logger.LogInformation("Closing MultipleHelpWindow"); From b1d5b6cf2cf64ed4467a576c92f15380f3393450 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 14:02:29 +0200 Subject: [PATCH 48/73] Add some NextQuestIds for MRD --- .../Class Quests/WAR/311_Way of the Marauder.json | 3 ++- .../Class Quests/WAR/312_My First Axe.json | 3 ++- .../Class Quests/WAR/313_Axe in the Stone.json | 3 ++- .../Class Quests/WAR/314_Wake of Destruction.json | 3 ++- .../Class Quests/WAR/315_Wake of Destruction.json | 3 ++- .../Class Quests/WAR/316_Brutal Strength.json | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json index 48c7d0507..450bc8561 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/311_Way of the Marauder.json @@ -185,7 +185,8 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Marauders' Guild" - ] + ], + "NextQuestId": 313 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json index 4969ace6f..45f30e162 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/312_My First Axe.json @@ -163,7 +163,8 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Marauders' Guild" - ] + ], + "NextQuestId": 313 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json index a1adfdeb5..c4c412624 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json @@ -314,7 +314,8 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Marauders' Guild" - ] + ], + "NextQuestId": 315 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json index dbb6dcd4b..a95f37e9b 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/314_Wake of Destruction.json @@ -132,7 +132,8 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Marauders' Guild" - ] + ], + "NextQuestId": 316 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json index c6c66f93e..e5ef67e16 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/315_Wake of Destruction.json @@ -132,7 +132,8 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Marauders' Guild" - ] + ], + "NextQuestId": 316 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json index b12278d86..ead596f44 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json @@ -209,7 +209,8 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Marauders' Guild" - ] + ], + "NextQuestId": 317 } ] } From 3a4cf56965dc57cdb4774457b53c8c5b707fa434 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 14:28:23 +0200 Subject: [PATCH 49/73] Add Immortal Flames to GC selection --- ...2_My Little Chocobo (Immortal Flames).json | 88 +++++++++++++++++++ Questionable/Functions/QuestFunctions.cs | 2 + Questionable/Windows/ConfigWindow.cs | 2 +- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/702_My Little Chocobo (Immortal Flames).json diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/702_My Little Chocobo (Immortal Flames).json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/702_My Little Chocobo (Immortal Flames).json new file mode 100644 index 000000000..200da05f0 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/702_My Little Chocobo (Immortal Flames).json @@ -0,0 +1,88 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "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": { + "X": -141.64954, + "Y": 4.1, + "Z": -114.67157 + }, + "TerritoryId": 130, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1002390, + "Position": { + "X": -143.45007, + "Y": 4.5499268, + "Z": -108.537415 + }, + "TerritoryId": 130, + "InteractionType": "Instruction", + "Comment": "Buy Flame Chocobo Issuance" + }, + { + "DataId": 1001978, + "Position": { + "X": 55.344482, + "Y": 4.124078, + "Z": -143.9079 + }, + "TerritoryId": 130, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1006003, + "Position": { + "X": 51.621216, + "Y": 4, + "Z": -142.22937 + }, + "TerritoryId": 130, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001978, + "Position": { + "X": 55.344482, + "Y": 4.124078, + "Z": -143.9079 + }, + "TerritoryId": 130, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/Questionable/Functions/QuestFunctions.cs b/Questionable/Functions/QuestFunctions.cs index 13eee5e4f..6c51b2e5e 100644 --- a/Questionable/Functions/QuestFunctions.cs +++ b/Questionable/Functions/QuestFunctions.cs @@ -80,6 +80,7 @@ internal sealed unsafe class QuestFunctions { GrandCompany.TwinAdder => (new QuestId(680), 0), GrandCompany.Maelstrom => (new QuestId(681), 0), + GrandCompany.ImmortalFlames => (new QuestId(682), 0), _ => default }; } @@ -89,6 +90,7 @@ internal sealed unsafe class QuestFunctions { GrandCompany.TwinAdder => 700, GrandCompany.Maelstrom => 701, + GrandCompany.ImmortalFlames => 702, _ => 0 }; diff --git a/Questionable/Windows/ConfigWindow.cs b/Questionable/Windows/ConfigWindow.cs index c2148aa1e..a419249cc 100644 --- a/Questionable/Windows/ConfigWindow.cs +++ b/Questionable/Windows/ConfigWindow.cs @@ -20,7 +20,7 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig private readonly string[] _mountNames; private readonly string[] _grandCompanyNames = - ["None (manually pick quest)", "Maelstrom", "Twin Adder" /*, "Immortal Flames"*/]; + ["None (manually pick quest)", "Maelstrom", "Twin Adder", "Immortal Flames"]; [SuppressMessage("Performance", "CA1861", Justification = "One time initialization")] public ConfigWindow(IDalamudPluginInterface pluginInterface, Configuration configuration, IDataManager dataManager) From 03b26500523f115b627eaa1b2458c900565cdef4 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 14:40:39 +0200 Subject: [PATCH 50/73] Update early ARR msq quests --- .../510_A Wild Rose By Any Other Name.json | 22 +++++++++++++++++-- .../MSQ-1/Shared/574_Dressed to Deceive.json | 4 ++++ .../MSQ-1/Shared/621_For the Children.json | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/510_A Wild Rose By Any Other Name.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/510_A Wild Rose By Any Other Name.json index 486e38a9b..c3ea23c73 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/510_A Wild Rose By Any Other Name.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/510_A Wild Rose By Any Other Name.json @@ -44,15 +44,33 @@ "Sequence": 255, "Steps": [ { + "Position": { + "X": -64.84354, + "Y": -3.6581912, + "Z": 186.08156 + }, "TerritoryId": 141, - "InteractionType": "AttuneAetheryte", - "Aetheryte": "Central Thanalan - Black Brush Station", + "InteractionType": "WalkTo", "AetheryteShortcut": "Ul'dah", "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gate of Nald (Central Thanalan)" ] }, + { + "Position": { + "X": -62.2836, + "Y": -3.6582258, + "Z": 144.35869 + }, + "TerritoryId": 141, + "InteractionType": "WalkTo" + }, + { + "TerritoryId": 141, + "InteractionType": "AttuneAetheryte", + "Aetheryte": "Central Thanalan - Black Brush Station" + }, { "Position": { "X": 454.0109, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/574_Dressed to Deceive.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/574_Dressed to Deceive.json index 75423c9d6..7580849a0 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/574_Dressed to Deceive.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/574_Dressed to Deceive.json @@ -190,6 +190,10 @@ "ItemId": 30362, "TargetTerritoryId": 140 }, + { + "TerritoryId": 140, + "InteractionType": "EquipRecommended" + }, { "Position": { "X": -492.96475, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/621_For the Children.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/621_For the Children.json index 2c176bc24..147d35b07 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/621_For the Children.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/621_For the Children.json @@ -41,6 +41,7 @@ "Y": -0.48849356, "Z": -278.41507 }, + "StopDistance": 0.5, "TerritoryId": 145, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", From 721c3d0a5c88d7d87b53e748b47ad2106564de3a Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 15:43:58 +0200 Subject: [PATCH 51/73] Add Gold Saucer aethernet shards --- .../Common/Converter/AetheryteConverter.cs | 2 +- Questionable.Model/Common/EAetheryteLocation.cs | 10 +++++++++- .../Questing/Converter/AethernetShardConverter.cs | 9 +++++++++ Questionable.Model/common-schema.json | 10 +++++++++- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Questionable.Model/Common/Converter/AetheryteConverter.cs b/Questionable.Model/Common/Converter/AetheryteConverter.cs index 0cecd3ea0..36853586a 100644 --- a/Questionable.Model/Common/Converter/AetheryteConverter.cs +++ b/Questionable.Model/Common/Converter/AetheryteConverter.cs @@ -35,8 +35,8 @@ public sealed class AetheryteConverter() : EnumConverter(Val { EAetheryteLocation.CoerthasCentralHighlandsCampDragonhead, "Coerthas Central Highlands - Camp Dragonhead" }, { EAetheryteLocation.MorDhona, "Mor Dhona" }, - { EAetheryteLocation.GoldSaucer, "Gold Saucer" }, { EAetheryteLocation.WolvesDenPier, "Wolves' Den Pier" }, + { EAetheryteLocation.GoldSaucer, "Gold Saucer" }, { EAetheryteLocation.Ishgard, "Ishgard" }, { EAetheryteLocation.Idyllshire, "Idyllshire" }, diff --git a/Questionable.Model/Common/EAetheryteLocation.cs b/Questionable.Model/Common/EAetheryteLocation.cs index a2dc3e2dc..7142cfe79 100644 --- a/Questionable.Model/Common/EAetheryteLocation.cs +++ b/Questionable.Model/Common/EAetheryteLocation.cs @@ -72,9 +72,17 @@ public enum EAetheryteLocation CoerthasCentralHighlandsCampDragonhead = 23, MorDhona = 24, - GoldSaucer = 62, WolvesDenPier = 55, + GoldSaucer = 62, + GoldSaucerEntranceCardSquares = 63, + GoldSaucerWonderSquareEast = 64, + GoldSaucerWonderSquareWest = 65, + GoldSaucerEventSquare = 66, + GoldSaucerCactpotBoard = 67, + GoldSaucerRoundSquare = 68, + GoldSaucerChocoboSquare = 69, + Ishgard = 70, IshgardForgottenKnight = 80, IshgardSkysteelManufactory = 81, diff --git a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs index 6b5e58349..6367c9d77 100644 --- a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs +++ b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs @@ -46,6 +46,15 @@ public sealed class AethernetShardConverter() : EnumConverter Date: Fri, 23 Aug 2024 16:57:14 +0200 Subject: [PATCH 52/73] Add Omega raid quests --- .../Raid Quests/2928_The Hunt for Omega.json | 106 +++++++++++ .../Raid Quests/2929_Into the Deltascape.json | 63 +++++++ .../2930_A Catastrophe Waiting.json | 64 +++++++ .../Raid Quests/2931_The Croak Queen.json | 65 +++++++ .../Raid Quests/2932_A Void at All Costs.json | 65 +++++++ .../Raid Quests/2933_The Anomaly.json | 105 +++++++++++ .../Raid Quests/3031_Return to the Rift.json | 55 ++++++ .../Raid Quests/3032_No Slowing Down.json | 65 +++++++ .../3033_An Unfinished Masterpiece.json | 80 +++++++++ .../Raid Quests/3034_Won't Let You Pass.json | 98 ++++++++++ .../Raid Quests/3035_Test World of Ruin.json | 80 +++++++++ ...154_In the Beginning, There Was Chaos.json | 90 ++++++++++ .../3155_And Like Fire Was His Mane.json | 49 +++++ .../3156_In the End, There Is Omega.json | 143 +++++++++++++++ .../3157_To Kweh under Distant Skies.json | 167 ++++++++++++++++++ 15 files changed, 1295 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/2928_The Hunt for Omega.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/2929_Into the Deltascape.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/2930_A Catastrophe Waiting.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/2931_The Croak Queen.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/2932_A Void at All Costs.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/2933_The Anomaly.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3031_Return to the Rift.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3032_No Slowing Down.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3033_An Unfinished Masterpiece.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3034_Won't Let You Pass.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3154_In the Beginning, There Was Chaos.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3155_And Like Fire Was His Mane.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3156_In the End, There Is Omega.json create mode 100644 QuestPaths/4.x - Stormblood/Raid Quests/3157_To Kweh under Distant Skies.json diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/2928_The Hunt for Omega.json b/QuestPaths/4.x - Stormblood/Raid Quests/2928_The Hunt for Omega.json new file mode 100644 index 000000000..f3390265d --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/2928_The Hunt for Omega.json @@ -0,0 +1,106 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1021926, + "Position": { + "X": 71.06128, + "Y": -0.10695544, + "Z": 59.372803 + }, + "TerritoryId": 635, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021930, + "Position": { + "X": 112.41321, + "Y": 0.65204173, + "Z": 56.290405 + }, + "TerritoryId": 635, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1021933, + "Position": { + "X": 466.20886, + "Y": 69.27097, + "Z": 525.7495 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "AetheryteShortcut": "Fringes - Peering Stones", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1021941, + "Position": { + "X": 467.00232, + "Y": 69.270096, + "Z": 521.14136 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1021937, + "Position": { + "X": 465.5984, + "Y": 69.25287, + "Z": 518.88293 + }, + "StopDistance": 7, + "TerritoryId": 612, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1021942, + "Position": { + "X": -208.57562, + "Y": -223.5, + "Z": -124.16266 + }, + "TerritoryId": 724, + "InteractionType": "CompleteQuest", + "NextQuestId": 2929 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/2929_Into the Deltascape.json b/QuestPaths/4.x - Stormblood/Raid Quests/2929_Into the Deltascape.json new file mode 100644 index 000000000..86aee81dd --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/2929_Into the Deltascape.json @@ -0,0 +1,63 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1021942, + "Position": { + "X": -208.57562, + "Y": -223.5, + "Z": -124.16266 + }, + "TerritoryId": 724, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021946, + "Position": { + "X": -211.01703, + "Y": -223.25, + "Z": -117.021484 + }, + "StopDistance": 6, + "TerritoryId": 724, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 724, + "InteractionType": "Duty", + "ContentFinderConditionId": 252 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1021942, + "Position": { + "X": -208.57562, + "Y": -223.5, + "Z": -124.16266 + }, + "TerritoryId": 724, + "InteractionType": "CompleteQuest", + "NextQuestId": 2930 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/2930_A Catastrophe Waiting.json b/QuestPaths/4.x - Stormblood/Raid Quests/2930_A Catastrophe Waiting.json new file mode 100644 index 000000000..2cf9ddfe0 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/2930_A Catastrophe Waiting.json @@ -0,0 +1,64 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1021942, + "Position": { + "X": -208.57562, + "Y": -223.5, + "Z": -124.16266 + }, + "TerritoryId": 724, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021946, + "Position": { + "X": -211.01703, + "Y": -223.25, + "Z": -117.021484 + }, + "StopDistance": 6, + "TerritoryId": 724, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 724, + "InteractionType": "Duty", + "ContentFinderConditionId": 253 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1021943, + "Position": { + "X": -207.20227, + "Y": -223.50002, + "Z": -124.95618 + }, + "StopDistance": 7, + "TerritoryId": 724, + "InteractionType": "CompleteQuest", + "NextQuestId": 2931 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/2931_The Croak Queen.json b/QuestPaths/4.x - Stormblood/Raid Quests/2931_The Croak Queen.json new file mode 100644 index 000000000..fc0551c33 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/2931_The Croak Queen.json @@ -0,0 +1,65 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1021942, + "Position": { + "X": -208.57562, + "Y": -223.5, + "Z": -124.16266 + }, + "StopDistance": 7, + "TerritoryId": 724, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021946, + "Position": { + "X": -211.01703, + "Y": -223.25, + "Z": -117.021484 + }, + "StopDistance": 6, + "TerritoryId": 724, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 724, + "InteractionType": "Duty", + "ContentFinderConditionId": 254 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1021942, + "Position": { + "X": -208.57562, + "Y": -223.5, + "Z": -124.16266 + }, + "StopDistance": 6, + "TerritoryId": 724, + "InteractionType": "CompleteQuest", + "NextQuestId": 2932 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/2932_A Void at All Costs.json b/QuestPaths/4.x - Stormblood/Raid Quests/2932_A Void at All Costs.json new file mode 100644 index 000000000..f1f7a00d8 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/2932_A Void at All Costs.json @@ -0,0 +1,65 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1021942, + "Position": { + "X": -208.57562, + "Y": -223.5, + "Z": -124.16266 + }, + "StopDistance": 7, + "TerritoryId": 724, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021946, + "Position": { + "X": -211.01703, + "Y": -223.25, + "Z": -117.021484 + }, + "StopDistance": 6, + "TerritoryId": 724, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 724, + "InteractionType": "Duty", + "ContentFinderConditionId": 255 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1021949, + "Position": { + "X": 462.6687, + "Y": 69.02547, + "Z": 515.06824 + }, + "StopDistance": 5, + "TerritoryId": 612, + "InteractionType": "CompleteQuest", + "NextQuestId": 2933 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/2933_The Anomaly.json b/QuestPaths/4.x - Stormblood/Raid Quests/2933_The Anomaly.json new file mode 100644 index 000000000..ee0be5a5d --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/2933_The Anomaly.json @@ -0,0 +1,105 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1021949, + "Position": { + "X": 462.6687, + "Y": 69.02547, + "Z": 515.06824 + }, + "StopDistance": 5, + "TerritoryId": 612, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1023687, + "Position": { + "X": 112.7489, + "Y": 0.65204155, + "Z": 60.227295 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "AetheryteShortcut": "Rhalgr's Reach" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1021952, + "Position": { + "X": 40.146484, + "Y": -19.000002, + "Z": 94.92627 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Airship Landing" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1021956, + "Position": { + "X": 4.257263, + "Y": 0.002998305, + "Z": -0.4730835 + }, + "TerritoryId": 636, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1021953, + "Position": { + "X": 41.550293, + "Y": -19.000004, + "Z": 95.26196 + }, + "TerritoryId": 132, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023687, + "Position": { + "X": 112.7489, + "Y": 0.65204155, + "Z": 60.227295 + }, + "TerritoryId": 635, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "NextQuestId": 3031 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3031_Return to the Rift.json b/QuestPaths/4.x - Stormblood/Raid Quests/3031_Return to the Rift.json new file mode 100644 index 000000000..5f7d792b5 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3031_Return to the Rift.json @@ -0,0 +1,55 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1023687, + "Position": { + "X": 112.7489, + "Y": 0.65204155, + "Z": 60.227295 + }, + "TerritoryId": 635, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021933, + "Position": { + "X": 466.20886, + "Y": 69.27097, + "Z": 525.7495 + }, + "TerritoryId": 612, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Fringes - Peering Stones", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024788, + "Position": { + "X": -86.07617, + "Y": -72.25, + "Z": 181.47546 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "CompleteQuest", + "NextQuestId": 3032 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3032_No Slowing Down.json b/QuestPaths/4.x - Stormblood/Raid Quests/3032_No Slowing Down.json new file mode 100644 index 000000000..0b798f4c2 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3032_No Slowing Down.json @@ -0,0 +1,65 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024788, + "Position": { + "X": -86.07617, + "Y": -72.25, + "Z": 181.47546 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024747, + "Position": { + "X": -88.304016, + "Y": -72.25, + "Z": 169.17664 + }, + "StopDistance": 6, + "TerritoryId": 756, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 756, + "InteractionType": "Duty", + "ContentFinderConditionId": 286 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024788, + "Position": { + "X": -86.07617, + "Y": -72.25, + "Z": 181.47546 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "CompleteQuest", + "NextQuestId": 3033 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3033_An Unfinished Masterpiece.json b/QuestPaths/4.x - Stormblood/Raid Quests/3033_An Unfinished Masterpiece.json new file mode 100644 index 000000000..4a1e669c5 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3033_An Unfinished Masterpiece.json @@ -0,0 +1,80 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024788, + "Position": { + "X": -86.07617, + "Y": -72.25, + "Z": 181.47546 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024790, + "Position": { + "X": -81.92572, + "Y": -72.25, + "Z": 172.7168 + }, + "StopDistance": 5, + "TerritoryId": 756, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 756, + "InteractionType": "Duty", + "ContentFinderConditionId": 287 + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024788, + "Position": { + "X": -86.07617, + "Y": -72.25, + "Z": 181.47546 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024749, + "Position": { + "X": 463.79797, + "Y": 69.36809, + "Z": 520.31726 + }, + "TerritoryId": 612, + "InteractionType": "CompleteQuest", + "NextQuestId": 3034 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3034_Won't Let You Pass.json b/QuestPaths/4.x - Stormblood/Raid Quests/3034_Won't Let You Pass.json new file mode 100644 index 000000000..0a610909b --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3034_Won't Let You Pass.json @@ -0,0 +1,98 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024750, + "Position": { + "X": 464.28625, + "Y": 69.317245, + "Z": 519.3103 + }, + "StopDistance": 5, + "TerritoryId": 612, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021947, + "Position": { + "X": 476.73767, + "Y": 69.83099, + "Z": 526.604 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDR204_03034_SYSTEM_000_026", + "Yes": true + } + ] + }, + { + "DataId": 1024853, + "Position": { + "X": -86.71704, + "Y": -72.25, + "Z": 179.58337 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024747, + "Position": { + "X": -88.304016, + "Y": -72.25, + "Z": 169.17664 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "TerritoryId": 756, + "InteractionType": "Duty", + "ContentFinderConditionId": 288 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024788, + "Position": { + "X": -86.07617, + "Y": -72.25, + "Z": 181.47546 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "CompleteQuest", + "NextQuestId": 3035 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json b/QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json new file mode 100644 index 000000000..13de679ba --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json @@ -0,0 +1,80 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024853, + "Position": { + "X": -86.71704, + "Y": -72.25, + "Z": 179.58337 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024747, + "Position": { + "X": -88.304016, + "Y": -72.25, + "Z": 169.17664 + }, + "StopDistance": 7, + "TerritoryId": 756, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 756, + "InteractionType": "Duty", + "ContentFinderConditionId": 289 + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1021947, + "Position": { + "X": 476.73767, + "Y": 69.83099, + "Z": 526.604 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023687, + "Position": { + "X": 112.7489, + "Y": 0.65204155, + "Z": 60.227295 + }, + "TerritoryId": 635, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "NextQuestId": 3154 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3154_In the Beginning, There Was Chaos.json b/QuestPaths/4.x - Stormblood/Raid Quests/3154_In the Beginning, There Was Chaos.json new file mode 100644 index 000000000..17dd09d34 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3154_In the Beginning, There Was Chaos.json @@ -0,0 +1,90 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1023687, + "Position": { + "X": 112.7489, + "Y": 0.65204155, + "Z": 60.227295 + }, + "TerritoryId": 635, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021937, + "Position": { + "X": 465.5984, + "Y": 69.25287, + "Z": 518.88293 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "AetheryteShortcut": "Fringes - Peering Stones", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDR301_03154_Q2_000_051", + "Answer": "TEXT_STMBDR301_03154_A2_000_052" + } + ] + } + ] + }, + { + "Sequence": 2 + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026450, + "Position": { + "X": -35.01947, + "Y": -16.150002, + "Z": 156.20654 + }, + "TerritoryId": 807, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "TerritoryId": 807, + "InteractionType": "Duty", + "ContentFinderConditionId": 587 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026453, + "Position": { + "X": -34.836426, + "Y": -16.15, + "Z": 153.8872 + }, + "StopDistance": 5, + "TerritoryId": 807, + "InteractionType": "CompleteQuest", + "NextQuestId": 3155 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3155_And Like Fire Was His Mane.json b/QuestPaths/4.x - Stormblood/Raid Quests/3155_And Like Fire Was His Mane.json new file mode 100644 index 000000000..4816cb772 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3155_And Like Fire Was His Mane.json @@ -0,0 +1,49 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026452, + "Position": { + "X": -35.01947, + "Y": -16.150002, + "Z": 156.11499 + }, + "StopDistance": 7, + "TerritoryId": 807, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "TerritoryId": 807, + "InteractionType": "Duty", + "ContentFinderConditionId": 588 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026450, + "Position": { + "X": -35.01947, + "Y": -16.150002, + "Z": 156.20654 + }, + "StopDistance": 7, + "TerritoryId": 807, + "InteractionType": "CompleteQuest", + "NextQuestId": 3156 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3156_In the End, There Is Omega.json b/QuestPaths/4.x - Stormblood/Raid Quests/3156_In the End, There Is Omega.json new file mode 100644 index 000000000..b37a3eeec --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3156_In the End, There Is Omega.json @@ -0,0 +1,143 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026450, + "Position": { + "X": -35.01947, + "Y": -16.150002, + "Z": 156.20654 + }, + "StopDistance": 7, + "TerritoryId": 807, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1021937, + "Position": { + "X": 465.5984, + "Y": 69.25287, + "Z": 518.88293 + }, + "StopDistance": 7, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009608, + "Position": { + "X": 103.07471, + "Y": 0.62561035, + "Z": 41.794434 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "AetheryteShortcut": "Rhalgr's Reach" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026472, + "Position": { + "X": 116.50256, + "Y": 0.6520418, + "Z": 43.9917 + }, + "TerritoryId": 635, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1021947, + "Position": { + "X": 476.73767, + "Y": 69.83099, + "Z": 526.604 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "AetheryteShortcut": "Fringes - Peering Stones", + "Fly": true, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDR303_03156_SYSTEM_000_006", + "Yes": true + } + ] + }, + { + "DataId": 1026456, + "Position": { + "X": -19.638367, + "Y": -16.65, + "Z": 144.06042 + }, + "TerritoryId": 812, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "TerritoryId": 812, + "InteractionType": "Duty", + "ContentFinderConditionId": 589 + } + ] + }, + { + "Sequence": 6 + }, + { + "Sequence": 7, + "Steps": [ + { + "TerritoryId": 812, + "InteractionType": "Duty", + "ContentFinderConditionId": 590 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1021937, + "Position": { + "X": 465.5984, + "Y": 69.25287, + "Z": 518.88293 + }, + "StopDistance": 7, + "TerritoryId": 612, + "InteractionType": "CompleteQuest", + "NextQuestId": 3157 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3157_To Kweh under Distant Skies.json b/QuestPaths/4.x - Stormblood/Raid Quests/3157_To Kweh under Distant Skies.json new file mode 100644 index 000000000..3f52f4bc7 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3157_To Kweh under Distant Skies.json @@ -0,0 +1,167 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1021939, + "Position": { + "X": 464.98804, + "Y": 69.34, + "Z": 522.4231 + }, + "StopDistance": 5, + "TerritoryId": 612, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024746, + "Position": { + "X": 462.8518, + "Y": 69.31414, + "Z": 525.9021 + }, + "StopDistance": 6, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1023687, + "Position": { + "X": 112.7489, + "Y": 0.65204155, + "Z": 60.227295 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "AetheryteShortcut": "Rhalgr's Reach" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026712, + "Position": { + "X": 113.23718, + "Y": 0.6520417, + "Z": 56.839844 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDR304_03157_Q1_000_102", + "Answer": "TEXT_STMBDR304_03157_A1_000_103" + } + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1026465, + "Position": { + "X": -38.92578, + "Y": -0.0364509, + "Z": -3.7385254 + }, + "TerritoryId": 635, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1026466, + "Position": { + "X": -114.58002, + "Y": 0.5980477, + "Z": -33.829346 + }, + "TerritoryId": 635, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1026467, + "Position": { + "X": -150.4082, + "Y": -2.7350852, + "Z": -139.20807 + }, + "TerritoryId": 635, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1026467, + "Position": { + "X": -150.4082, + "Y": -2.7350852, + "Z": -139.20807 + }, + "TerritoryId": 635, + "InteractionType": "Emote", + "Emote": "pet" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1026468, + "Position": { + "X": -13.778931, + "Y": 0.98160696, + "Z": 70.54236 + }, + "TerritoryId": 635, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023687, + "Position": { + "X": 112.7489, + "Y": 0.65204155, + "Z": 60.227295 + }, + "TerritoryId": 635, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} From a6f684248fb582e06172b334ac0ffc4589f6769f Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 17:16:15 +0200 Subject: [PATCH 53/73] Add Gold Saucer unlock --- .../434_It Could Happen to You.json | 49 ++++ .../Gold Saucer/435_World of Wonders.json | 243 ++++++++++++++++++ .../MSQ/B-4.1/2968_A Sultana's Duty.json | 20 +- .../Common/EAetheryteLocation.cs | 1 + .../Converter/AethernetShardConverter.cs | 1 + Questionable.Model/common-schema.json | 1 + Questionable/Data/AetheryteData.cs | 11 +- 7 files changed, 311 insertions(+), 15 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json new file mode 100644 index 000000000..97124065c --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json @@ -0,0 +1,49 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1011565, + "Position": { + "X": -78.8739, + "Y": 4, + "Z": -110.429565 + }, + "TerritoryId": 130, + "InteractionType": "AcceptQuest", + "PickUpQuestId": 434 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1004433, + "Position": { + "X": -23.605713, + "Y": 83.19999, + "Z": -2.3041382 + }, + "TerritoryId": 130, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Airship Landing" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_SUBGSC001_00434_Q1_000_000", + "Yes": true + } + ], + "NextQuestId": 435 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json new file mode 100644 index 000000000..71199ea04 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json @@ -0,0 +1,243 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": ["liza", "JerryWester"], + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1011022, + "Position": { + "X": -38.895264, + "Y": -2.7930364E-06, + "Z": 97.33728 + }, + "StopDistance": 7, + "TerritoryId": 144, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "TerritoryId": 144, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Entrance & Card Squares" + }, + { + "DataId": 1010448, + "Position": { + "X": -54.00177, + "Y": 1.6000003, + "Z": 30.685791 + }, + "StopDistance": 5, + "TerritoryId": 144, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1011038, + "Position": { + "X": -58.884644, + "Y": 1.6000003, + "Z": 27.634033 + }, + "StopDistance": 5, + "TerritoryId": 144, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1010478, + "Position": { + "X": -99.19891, + "Y": -0.86297023, + "Z": 66.11731 + }, + "TerritoryId": 144, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1011044, + "Position": { + "X": -84.45868, + "Y": 3.7690625E-06, + "Z": 29.06836 + }, + "TerritoryId": 144, + "InteractionType": "Interact", + "TargetTerritoryId": 388 + }, + { + "TerritoryId": 388, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Minion Square" + }, + { + "TerritoryId": 388, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Chocobo Square" + }, + { + "TerritoryId": 144, + "InteractionType": "AttuneAetheryte", + "Aetheryte": "Gold Saucer", + "AethernetShortcut": [ + "[Gold Saucer] Chocobo Square", + "[Gold Saucer] Entrance & Card Squares" + ] + }, + { + "DataId": 1011080, + "Position": { + "X": 21.530457, + "Y": 3.9997296, + "Z": 39.902344 + }, + "TerritoryId": 144, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "Position": { + "X": 12.5078335, + "Y": 4.1552944, + "Z": 45.718685 + }, + "TerritoryId": 144, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": 12.60962, + "Y": 4.2181597, + "Z": 49.651253 + } + } + }, + { + "TerritoryId": 144, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Wonder Square West", + "DelaySecondsAtStart": 3 + }, + { + "TerritoryId": 144, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Wonder Square East" + }, + { + "TerritoryId": 144, + "InteractionType": "None", + "AethernetShortcut": [ + "[Gold Saucer] Wonder Square East", + "[Gold Saucer] Aetheryte Plaza" + ] + }, + { + "TerritoryId": 144, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Event Square" + }, + { + "Position": { + "X": 89.128395, + "Y": -5.000001, + "Z": -66.6124 + }, + "StopDistance": 0.5, + "TerritoryId": 144, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": 85.47148, + "Y": -4.7818403, + "Z": -63.892 + }, + "DelaySeconds": 0.1 + } + }, + { + "TerritoryId": 144, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Cactpot Board", + "DelaySecondsAtStart": 3 + }, + { + "DataId": 1011079, + "Position": { + "X": 125.078125, + "Y": 13.000635, + "Z": -13.778931 + }, + "StopDistance": 4, + "TerritoryId": 144, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1011084, + "Position": { + "X": -12.527649, + "Y": 3.2546434, + "Z": -73.16705 + }, + "TerritoryId": 144, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Gold Saucer] Cactpot Board", + "[Gold Saucer] Aetheryte Plaza" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "TerritoryId": 144, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Gold Saucer] Round Square" + }, + { + "DataId": 1010448, + "Position": { + "X": -54.00177, + "Y": 1.6000003, + "Z": 30.685791 + }, + "StopDistance": 5, + "TerritoryId": 144, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Gold Saucer] Round Square", + "[Gold Saucer] Entrance & Card Squares" + ] + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json index db940a8b3..4b430f944 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json @@ -85,20 +85,12 @@ "Sequence": 255, "Steps": [ { - "Position": { - "X": 12.5078335, - "Y": 4.1552944, - "Z": 45.718685 - }, "TerritoryId": 144, - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": 12.60962, - "Y": 4.2181597, - "Z": 49.651253 - } - } + "AethernetShortcut": [ + "[Gold Saucer] Entrance & Card Squares", + "[Gold Saucer] Wonder Square West" + ], + "InteractionType": "None" }, { "DataId": 1024043, @@ -113,4 +105,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Questionable.Model/Common/EAetheryteLocation.cs b/Questionable.Model/Common/EAetheryteLocation.cs index 7142cfe79..c17030170 100644 --- a/Questionable.Model/Common/EAetheryteLocation.cs +++ b/Questionable.Model/Common/EAetheryteLocation.cs @@ -82,6 +82,7 @@ public enum EAetheryteLocation GoldSaucerCactpotBoard = 67, GoldSaucerRoundSquare = 68, GoldSaucerChocoboSquare = 69, + GoldSaucerMinionSquare = 89, Ishgard = 70, IshgardForgottenKnight = 80, diff --git a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs index 6367c9d77..efd2a9bd2 100644 --- a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs +++ b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs @@ -54,6 +54,7 @@ public sealed class AethernetShardConverter() : EnumConverter Date: Fri, 23 Aug 2024 18:10:27 +0200 Subject: [PATCH 54/73] Add SB WAR quests --- .../Class Quests/WAR/601_And My Axe.json | 3 +- .../2900_Curious Gorge Meets His Match.json | 61 +++++++ .../Class Quests/WAR/2901_Field Training.json | 121 +++++++++++++ .../WAR/2902_When Push Comes to Shove.json | 158 ++++++++++++++++ .../WAR/2903_Going the Distance.json | 168 ++++++++++++++++++ .../WAR/2904_The Heart of the Problem.json | 148 +++++++++++++++ 6 files changed, 658 insertions(+), 1 deletion(-) create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/WAR/2900_Curious Gorge Meets His Match.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/WAR/2901_Field Training.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/WAR/2902_When Push Comes to Shove.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/WAR/2903_Going the Distance.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json index 241c804ac..fca23e000 100644 --- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json +++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json @@ -110,7 +110,8 @@ "Z": 63.553833 }, "TerritoryId": 138, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "NextQuestId": 2900 } ] } diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2900_Curious Gorge Meets His Match.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2900_Curious Gorge Meets His Match.json new file mode 100644 index 000000000..d17c860b1 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2900_Curious Gorge Meets His Match.json @@ -0,0 +1,61 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "TerritoryId": 135, + "InteractionType": "Interact", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "StopDistance": 5, + "TerritoryId": 135, + "InteractionType": "CompleteQuest", + "NextQuestId": 2901 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2901_Field Training.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2901_Field Training.json new file mode 100644 index 000000000..b558a026e --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2901_Field Training.json @@ -0,0 +1,121 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "StopDistance": 5, + "TerritoryId": 135, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1022806, + "Position": { + "X": -164.5686, + "Y": 81.072655, + "Z": -294.33136 + }, + "TerritoryId": 180, + "InteractionType": "Interact", + "AetheryteShortcut": "Outer La Noscea - Camp Overlook", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2008649, + "Position": { + "X": -295.85718, + "Y": 53.20813, + "Z": -283.98572 + }, + "TerritoryId": 180, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 7500, + 7501 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2008650, + "Position": { + "X": -408.9876, + "Y": 46.860474, + "Z": -305.43988 + }, + "TerritoryId": 180, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 7500, + 7501 + ], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1022811, + "Position": { + "X": -359.9756, + "Y": 58.723488, + "Z": -365.37732 + }, + "TerritoryId": 180, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "StopDistance": 5, + "TerritoryId": 135, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", + "NextQuestId": 2902 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2902_When Push Comes to Shove.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2902_When Push Comes to Shove.json new file mode 100644 index 000000000..11b3f38ab --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2902_When Push Comes to Shove.json @@ -0,0 +1,158 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "StopDistance": 5, + "TerritoryId": 135, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1022816, + "Position": { + "X": -4.3183594, + "Y": 39.78392, + "Z": 197.52808 + }, + "TerritoryId": 137, + "InteractionType": "Interact", + "AetheryteShortcut": "Eastern La Noscea - Wineport", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2008651, + "Position": { + "X": -4.8066406, + "Y": 39.475098, + "Z": 348.2871 + }, + "TerritoryId": 137, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 7500, + 7501 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2008652, + "Position": { + "X": -82.59711, + "Y": 38.437378, + "Z": 501.42664 + }, + "TerritoryId": 137, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 7502, + 7503 + ], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2008653, + "Position": { + "X": -115.70923, + "Y": 49.66809, + "Z": 603.02124 + }, + "TerritoryId": 137, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 7502, + 7503 + ], + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1022821, + "Position": { + "X": -149.85895, + "Y": 55.805172, + "Z": 642.7251 + }, + "TerritoryId": 137, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1022825, + "Position": { + "X": -208.08728, + "Y": 46.619385, + "Z": 467.73462 + }, + "TerritoryId": 137, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "StopDistance": 5, + "TerritoryId": 135, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", + "NextQuestId": 2903 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2903_Going the Distance.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2903_Going the Distance.json new file mode 100644 index 000000000..b9bc9fa7f --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2903_Going the Distance.json @@ -0,0 +1,168 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "StopDistance": 5, + "TerritoryId": 135, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1019355, + "Position": { + "X": 556.8779, + "Y": -19.505642, + "Z": 397.14648 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "AetheryteShortcut": "Azim Steppe - Reunion", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1019347, + "Position": { + "X": 575.2803, + "Y": -19.505632, + "Z": 343.74 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1019354, + "Position": { + "X": 573.6323, + "Y": -19.505655, + "Z": 311.6654 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": -186.52919, + "Y": 2.935472, + "Z": 369.28806 + }, + "StopDistance": 0.5, + "TerritoryId": 622, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 6641 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1022832, + "Position": { + "X": -183.76447, + "Y": 2.8128173, + "Z": 370.3822 + }, + "StopDistance": 5, + "TerritoryId": 622, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1022834, + "Position": { + "X": -339.25385, + "Y": 21.774029, + "Z": 268.6045 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1022836, + "Position": { + "X": 525.10876, + "Y": -19.50681, + "Z": 403.3722 + }, + "TerritoryId": 622, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Azim Steppe - Reunion", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_JOBWAR680_02903_Q1_000_075", + "Answer": "TEXT_JOBWAR680_02903_A1_000_076" + } + ], + "NextQuestId": 2904 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json new file mode 100644 index 000000000..9cefdbc5c --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json @@ -0,0 +1,148 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1022836, + "Position": { + "X": 525.10876, + "Y": -19.50681, + "Z": 403.3722 + }, + "TerritoryId": 622, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1022837, + "Position": { + "X": 548.97375, + "Y": -19.503174, + "Z": 277.57678 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 534.11285, + "Y": 38.830116, + "Z": -473.95575 + }, + "TerritoryId": 622, + "InteractionType": "WalkTo" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1022839, + "Position": { + "X": 467.46008, + "Y": 39.964607, + "Z": -440.8484 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1022836, + "Position": { + "X": 525.10876, + "Y": -19.50681, + "Z": 403.3722 + }, + "TerritoryId": 622, + "InteractionType": "Interact", + "AetheryteShortcut": "Azim Steppe - Reunion", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1022836, + "Position": { + "X": 525.10876, + "Y": -19.50681, + "Z": 403.3722 + }, + "TerritoryId": 622, + "InteractionType": "Emote", + "Emote": "slap" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1022840, + "Position": { + "X": 233.38672, + "Y": 23.094816, + "Z": -234.57697 + }, + "TerritoryId": 622, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1022841, + "Position": { + "X": 233.17297, + "Y": 23.085413, + "Z": -234.42438 + }, + "TerritoryId": 622, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023885, + "Position": { + "X": 217.30359, + "Y": 7.999984, + "Z": 686.427 + }, + "StopDistance": 5, + "TerritoryId": 135, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks" + } + ] + } + ] +} From f973f3cc5c35a34f4eb2369cbc2bfe3f95950951 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 18:31:30 +0200 Subject: [PATCH 55/73] Small Gold Saucer adjustment --- .../Unlocks/Gold Saucer/434_It Could Happen to You.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json index 97124065c..5605d0823 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json @@ -13,8 +13,7 @@ "Z": -110.429565 }, "TerritoryId": 130, - "InteractionType": "AcceptQuest", - "PickUpQuestId": 434 + "InteractionType": "AcceptQuest" } ] }, From 1eed73afdf718590e62046ee566e0cdb83d220ce Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 23 Aug 2024 19:46:37 +0200 Subject: [PATCH 56/73] Minor cleanup for SB part 3 --- .../WAR/2904_The Heart of the Problem.json | 3 ++ .../MSQ/B-4.1/2963_The Darkness Below.json | 44 ++++++++++++++++--- .../MSQ/B-4.1/2964_The Mad King's Trove.json | 4 +- .../MSQ/B-4.1/2965_The Butcher's Blood.json | 14 +++++- .../MSQ/B-4.1/2966_Echoes of an Echo.json | 18 ++++++-- .../MSQ/B-4.1/2967_A Sultana's Strings.json | 25 ++++++++++- .../MSQ/B-4.1/2969_A Sultana's Resolve.json | 4 +- .../MSQ/B-4.1/2970_Securing the Saltery.json | 15 ++++--- .../MSQ/B-4.1/2971_A Blissful Arrival.json | 16 ++++++- .../MSQ/B-4.1/2972_Return of the Bull.json | 15 ++++++- .../C-4.2/3023_The Sword in the Store.json | 3 +- .../MSQ/C-4.2/3024_Hope on the Waves.json | 3 +- .../C-4.2/3025_Elation and Trepidation.json | 37 ++++++++++------ .../MSQ/C-4.2/3026_Storm on the Horizon.json | 44 +++++++------------ .../MSQ/C-4.2/3029_Rise of a New Sun.json | 3 +- .../MSQ/D-4.3/3070_Gosetsu and Tsuyu.json | 7 ++- .../D-4.3/3071_Gone Like the Morning Dew.json | 21 +++++++-- .../MSQ/D-4.3/3074_The Primary Agreement.json | 3 +- .../MSQ/D-4.3/3075_Under the Moonlight.json | 17 +++++-- .../Raid Quests/3035_Test World of Ruin.json | 3 ++ .../Common/EAetheryteLocation.cs | 1 + .../Converter/AethernetShardConverter.cs | 7 +++ Questionable.Model/common-schema.json | 6 +++ 23 files changed, 233 insertions(+), 80 deletions(-) diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json index 9cefdbc5c..c4710dc44 100644 --- a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json +++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json @@ -112,6 +112,9 @@ } ] }, + { + "Sequence": 7 + }, { "Sequence": 8, "Steps": [ diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json index 9921542b7..c24a8f012 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json @@ -12,6 +12,7 @@ "Y": 0, "Z": 58.64038 }, + "StopDistance": 5, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -36,7 +37,14 @@ "TerritoryId": 621, "InteractionType": "Interact", "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1024131, @@ -47,7 +55,24 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "Position": { + "X": 682.593, + "Y": 69.99999, + "Z": 538.1847 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", "Fly": true }, { @@ -59,7 +84,14 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "Fly": true + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -74,8 +106,7 @@ "Z": 489.76868 }, "TerritoryId": 621, - "InteractionType": "Interact", - "Fly": true + "InteractionType": "Interact" } ] }, @@ -91,9 +122,10 @@ }, "TerritoryId": 621, "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", "Fly": true } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json index 8facd9488..6f3c9c7fe 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json @@ -12,6 +12,7 @@ "Y": 70, "Z": 576.0128 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", @@ -99,10 +100,11 @@ "Y": 70, "Z": 576.0128 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json index b09978d32..79615f5e1 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json @@ -12,6 +12,7 @@ "Y": 70, "Z": 576.1653 }, + "StopDistance": 7, "TerritoryId": 621, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", @@ -49,6 +50,7 @@ "Y": 69.999916, "Z": 637.3845 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "Interact" } @@ -64,10 +66,18 @@ "Y": 69.9999, "Z": 634.76 }, + "StopDistance": 7, "TerritoryId": 621, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDB104_02965_Q1_000_000", + "Yes": true + } + ] } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json index 0fad695cf..683ad95ee 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json @@ -35,7 +35,14 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "Fly": true + "Fly": true, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDB105_02966_Q1_000_000", + "Yes": true + } + ] } ] }, @@ -70,7 +77,8 @@ "X": -2.9769177, "Y": -1.3092512, "Z": -36.29651 - } + }, + "DelaySeconds": 0.1 }, "StopDistance": 0.25 }, @@ -87,7 +95,8 @@ "X": -2.8188858, "Y": 0.16235979, "Z": -38.626305 - } + }, + "DelaySeconds": 0.1 }, "StopDistance": 0.25 }, @@ -101,6 +110,7 @@ "TerritoryId": 738, "InteractionType": "Interact", "StopDistance": 4, + "DelaySecondsAtStart": 3, "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128" }, { @@ -156,4 +166,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json index c044ad4c0..accbb6f8b 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json @@ -26,6 +26,22 @@ { "Sequence": 1, "Steps": [ + { + "TerritoryId": 131, + "InteractionType": "None", + "AetheryteShortcut": "Ul'dah" + }, + { + "DataId": 1011565, + "Position": { + "X": -78.8739, + "Y": 4, + "Z": -110.429565 + }, + "TerritoryId": 130, + "InteractionType": "AcceptQuest", + "PickUpQuestId": 434 + }, { "DataId": 1001821, "Position": { @@ -39,7 +55,12 @@ "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] The Chamber of Rule" - ] + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } } ] }, @@ -142,4 +163,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json index 5fdd5f68c..44e6cceb0 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json @@ -80,6 +80,7 @@ "Y": -2.0000012, "Z": -17.166443 }, + "StopDistance": 5, "TerritoryId": 212, "InteractionType": "Interact" } @@ -95,10 +96,11 @@ "Y": -2.0000012, "Z": -17.166443 }, + "StopDistance": 5, "TerritoryId": 212, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json index 10759bdc1..284a29d32 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json @@ -12,6 +12,7 @@ "Y": -2.0000012, "Z": -17.166443 }, + "StopDistance": 5, "TerritoryId": 212, "InteractionType": "AcceptQuest" } @@ -45,7 +46,8 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "Fly": true + "Fly": true, + "AetheryteShortcut": "Lochs - Porta Praetoria" } ] }, @@ -60,8 +62,9 @@ "Z": 196.55139 }, "TerritoryId": 621, - "InteractionType": "Interact", - "Comment": "Aim at jaw" + "InteractionType": "Instruction", + "Comment": "Aim at jaw", + "Fly": true } ] }, @@ -75,6 +78,7 @@ "Y": -0.3, "Z": 207.6294 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "Interact" } @@ -91,7 +95,7 @@ "Z": 282.7954 }, "TerritoryId": 621, - "InteractionType": "Interact", + "InteractionType": "Instruction", "Fly": true, "Comment": "Aim at nearest eye" } @@ -107,6 +111,7 @@ "Y": 3.1742485, "Z": 249.34766 }, + "StopDistance": 6, "TerritoryId": 621, "InteractionType": "Interact" } @@ -129,4 +134,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json index 5a1e96029..1241d40fa 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json @@ -12,6 +12,7 @@ "Y": 11.183233, "Z": 187.02979 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "AcceptQuest" } @@ -20,6 +21,16 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 528.8298, + "Y": 70, + "Z": 580.3701 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", + "Fly": true + }, { "DataId": 2009047, "Position": { @@ -27,9 +38,9 @@ "Y": 69.962524, "Z": 577.3861 }, + "StopDistance": 4, "TerritoryId": 621, "InteractionType": "Interact", - "Fly": true, "AetheryteShortcut": "Lochs - Ala Mhigan Quarter" } ] @@ -44,6 +55,7 @@ "Y": 70, "Z": 574.6699 }, + "StopDistance": 7, "TerritoryId": 621, "InteractionType": "Interact" } @@ -66,4 +78,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json index ec0914e70..ace6118a9 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json +++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json @@ -12,6 +12,7 @@ "Y": 74.00002, "Z": 75.48633 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "AcceptQuest", "DialogueChoices": [ @@ -52,7 +53,14 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "Fly": true + "Fly": true, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDB111_02972_Q2_000_000", + "Yes": true + } + ] } ] }, @@ -66,6 +74,7 @@ "Y": 122, "Z": -349.0807 }, + "StopDistance": 5, "TerritoryId": 737, "InteractionType": "SinglePlayerDuty" } @@ -99,6 +108,7 @@ "Y": 70, "Z": 525.5055 }, + "StopDistance": 6, "TerritoryId": 621, "InteractionType": "Interact" } @@ -114,6 +124,7 @@ "Y": 70, "Z": 525.5055 }, + "StopDistance": 6, "TerritoryId": 621, "InteractionType": "Interact" } @@ -140,4 +151,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json index 5e64545dc..125abad66 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json @@ -12,6 +12,7 @@ "Y": 10.503965, "Z": -213.76367 }, + "StopDistance": 4, "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", @@ -62,4 +63,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json index 7d6c5d52b..ab3f9d516 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json @@ -97,10 +97,11 @@ "Y": 11.709066, "Z": -283.0091 }, + "StopDistance": 7, "TerritoryId": 613, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json index 9faacdcfd..4248027b8 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json @@ -12,6 +12,7 @@ "Y": 12.349811, "Z": -283.8026 }, + "StopDistance": 7, "TerritoryId": 613, "InteractionType": "AcceptQuest" } @@ -56,7 +57,14 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1019286, @@ -66,7 +74,15 @@ "Z": -425.3758 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -111,6 +127,7 @@ "Y": 36.90612, "Z": -524.71204 }, + "StopDistance": 4, "TerritoryId": 614, "InteractionType": "Interact" } @@ -119,16 +136,6 @@ { "Sequence": 255, "Steps": [ - { - "Position": { - "X": 228.99776, - "Y": 5.218606, - "Z": -407.7175 - }, - "TerritoryId": 614, - "InteractionType": "WalkTo", - "Fly": true - }, { "DataId": 1020524, "Position": { @@ -137,9 +144,11 @@ "Z": -433.24945 }, "TerritoryId": 614, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Yanxia - House of the Fierce", + "Fly": true } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json index 5abb5ca4f..ba83bedd1 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json @@ -50,6 +50,7 @@ "Y": 1.7862457, "Z": 738.9486 }, + "StopDistance": 5, "TerritoryId": 614, "InteractionType": "Interact" } @@ -86,43 +87,25 @@ "TargetTerritoryId": 759 }, { - "DataId": 162, - "Position": { - "X": 96.269165, - "Y": -3.4332886, - "Z": 81.01013 - }, "TerritoryId": 759, - "InteractionType": "Interact", - "Comment": "Aethernet Attunement: [Doman Enclave] Ferry Docks" + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Doman Enclave] Ferry Docks" }, { - "DataId": 130, - "Position": { - "X": -61.57019, - "Y": 0.77819824, - "Z": 90.684326 - }, "TerritoryId": 759, - "InteractionType": "Interact", - "Comment": "Aethernet Attunement: [Doman Enclave] The Southern Enclave" - }, - { - "DataId": 129, - "Position": { - "X": 8.987488, - "Y": 0.8086548, - "Z": -105.85187 - }, - "TerritoryId": 759, - "InteractionType": "Interact", - "Comment": "Aethernet Attunement: [Doman Enclave] The Northern Enclave" + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Doman Enclave] The Southern Enclave" }, { "TerritoryId": 759, "InteractionType": "AttuneAetheryte", "Aetheryte": "Doman Enclave" }, + { + "TerritoryId": 759, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Doman Enclave] The Northern Enclave" + }, { "DataId": 1024970, "Position": { @@ -132,6 +115,10 @@ }, "TerritoryId": 759, "InteractionType": "Interact", + "AethernetShortcut": [ + "[Doman Enclave] The Northern Enclave", + "[Doman Enclave] Aetheryte Plaza" + ], "DialogueChoices": [ { "Type": "List", @@ -178,6 +165,7 @@ "Y": 0.19999999, "Z": -4.837158 }, + "StopDistance": 7, "TerritoryId": 744, "InteractionType": "Interact" } @@ -210,4 +198,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json index 6f89975ed..e7a12a161 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json +++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json @@ -56,6 +56,7 @@ "Y": 1.286227, "Z": 746.2118 }, + "StopDistance": 5, "TerritoryId": 614, "InteractionType": "Interact" } @@ -93,4 +94,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json index cdc7c89b2..37c0320d8 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json @@ -74,9 +74,12 @@ }, "TerritoryId": 759, "InteractionType": "CompleteQuest", - "Comment": "AethernetShortcut: [Doman Enclave] Aetheryte Plaza -> [Doman Enclave] Ferry Docks" + "AethernetShortcut": [ + "[Doman Enclave] Aetheryte Plaza", + "[Doman Enclave] Ferry Docks" + ] } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json index 68ab9388d..dbf9f4749 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json @@ -36,7 +36,14 @@ "TerritoryId": 614, "InteractionType": "Interact", "Fly": true, - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1019303, @@ -46,7 +53,15 @@ "Z": 512.47424 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -115,4 +130,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json index c5ac52f01..9a5fee8f5 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json @@ -60,6 +60,7 @@ "Y": -8.000055, "Z": 44.327393 }, + "StopDistance": 5, "TerritoryId": 786, "InteractionType": "Interact" } @@ -117,4 +118,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json index fd75aab2e..920c183b9 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json @@ -40,6 +40,17 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": 70.965355, + "Y": 26.085297, + "Z": -607.26685 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", + "Fly": true, + "AetheryteShortcut": "Lochs - Porta Praetoria" + }, { "DataId": 1025546, "Position": { @@ -48,9 +59,7 @@ "Z": -609.43005 }, "TerritoryId": 621, - "InteractionType": "Interact", - "Fly": true, - "AetheryteShortcut": "Lochs - Porta Praetoria" + "InteractionType": "Interact" } ] }, @@ -70,4 +79,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json b/QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json index 13de679ba..017506175 100644 --- a/QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json +++ b/QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json @@ -44,6 +44,9 @@ } ] }, + { + "Sequence": 3 + }, { "Sequence": 4, "Steps": [ diff --git a/Questionable.Model/Common/EAetheryteLocation.cs b/Questionable.Model/Common/EAetheryteLocation.cs index c17030170..117382067 100644 --- a/Questionable.Model/Common/EAetheryteLocation.cs +++ b/Questionable.Model/Common/EAetheryteLocation.cs @@ -156,6 +156,7 @@ public enum EAetheryteLocation DomanEnclaveSouthern = 130, DomanEnclaveOneRiver = 131, DomanEnclaveDocks = 162, + DomanEnclaveGangos = 163, Crystarium = 133, CrystariumMarkets = 149, diff --git a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs index efd2a9bd2..e75b3ad0f 100644 --- a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs +++ b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs @@ -100,6 +100,13 @@ public sealed class AethernetShardConverter() : EnumConverter Date: Fri, 23 Aug 2024 23:21:03 +0200 Subject: [PATCH 57/73] Minor cleanup for SB part 4 --- .../MSQ/D-4.3/3076_Emissary of the Dawn.json | 12 ++++++-- .../MSQ/E-4.4/3143_Sisterly Act.json | 3 +- .../MSQ/E-4.4/3144_Feel the Burn.json | 3 +- .../MSQ/E-4.4/3145_Shadows in the Empire.json | 19 +++++++++--- .../MSQ/E-4.4/3146_A Power in Slumber.json | 3 +- .../MSQ/E-4.4/3147_The Will of the Moon.json | 4 ++- .../MSQ/E-4.4/3148_The Call.json | 3 +- .../MSQ/E-4.4/3149_Prelude in Violet.json | 3 +- .../MSQ/F-4.5/3179_Soul Searching.json | 18 ++++------- .../MSQ/F-4.5/3180_A Defector's Tidings.json | 4 ++- .../F-4.5/3182_Parley on the Front Lines.json | 30 +++++++++++++++++-- .../MSQ/F-4.5/3183_The Face of War.json | 3 +- 12 files changed, 76 insertions(+), 29 deletions(-) diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json index 05c5cf91b..acc572afa 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json +++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json @@ -28,7 +28,14 @@ "Z": 0.3689831 }, "TerritoryId": 351, - "InteractionType": "SinglePlayerDuty" + "InteractionType": "SinglePlayerDuty", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDD107_03076_Q1_100_012", + "Yes": true + } + ] } ] }, @@ -42,10 +49,11 @@ "Y": -1.1041565E-05, "Z": -11.734253 }, + "StopDistance": 5, "TerritoryId": 351, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json index 9d50c5886..e047e82ea 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3143_Sisterly Act.json @@ -12,6 +12,7 @@ "Y": -1.1041565E-05, "Z": -11.734253 }, + "StopDistance": 5, "TerritoryId": 351, "InteractionType": "AcceptQuest" } @@ -99,4 +100,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json index bfce7d3dc..25ec97183 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json @@ -54,10 +54,11 @@ "Y": -4.178714, "Z": 87.296875 }, + "StopDistance": 7, "TerritoryId": 759, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json index cc2bd52fc..bcaa9b09c 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3145_Shadows in the Empire.json @@ -12,6 +12,7 @@ "Y": -4.178714, "Z": 87.296875 }, + "StopDistance": 7, "TerritoryId": 759, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Doman Enclave", @@ -43,7 +44,10 @@ } ], "TargetTerritoryId": 744, - "Comment": "AethernetShortcut: [Doman Enclave] Ferry Docks -> [Doman Enclave] Aetheryte Plaza" + "AethernetShortcut": [ + "[Doman Enclave] Ferry Docks", + "[Doman Enclave] Aetheryte Plaza" + ] } ] }, @@ -57,6 +61,7 @@ "Y": 0.021091362, "Z": -3.0060425 }, + "StopDistance": 7, "TerritoryId": 744, "InteractionType": "Interact" } @@ -85,7 +90,10 @@ }, "TerritoryId": 759, "InteractionType": "Interact", - "Comment": "AethernetShortcut: [Doman Enclave] Aetheryte Plaza -> [Doman Enclave] Ferry Docks" + "AethernetShortcut": [ + "[Doman Enclave] Aetheryte Plaza", + "[Doman Enclave] Ferry Docks" + ] } ] }, @@ -109,7 +117,10 @@ } ], "TargetTerritoryId": 744, - "Comment": "AethernetShortcut: [Doman Enclave] Ferry Docks -> [Doman Enclave] Aetheryte Plaza" + "AethernetShortcut": [ + "[Doman Enclave] Ferry Docks", + "[Doman Enclave] Aetheryte Plaza" + ] }, { "DataId": 1025597, @@ -124,4 +135,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json index e55780fde..0777eeda0 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3146_A Power in Slumber.json @@ -51,6 +51,7 @@ "Y": -19.30375, "Z": 271.99194 }, + "StopDistance": 6, "TerritoryId": 622, "InteractionType": "Interact" } @@ -73,4 +74,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json index 5c521f8b4..cd563068b 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json @@ -12,6 +12,7 @@ "Y": 40.86853, "Z": -503.37988 }, + "StopDistance": 5, "TerritoryId": 622, "InteractionType": "AcceptQuest" } @@ -101,10 +102,11 @@ "Y": 40.836098, "Z": -508.20172 }, + "StopDistance": 5, "TerritoryId": 622, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json index feb70ed2a..ede4cd626 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3148_The Call.json @@ -131,10 +131,11 @@ "Y": 80, "Z": 437.70496 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json index 15f45d46e..7f81e8cd1 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json +++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3149_Prelude in Violet.json @@ -12,6 +12,7 @@ "Y": 80, "Z": 437.70496 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", @@ -101,4 +102,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json index d9590ccec..ed050bb39 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3179_Soul Searching.json @@ -20,17 +20,6 @@ { "Sequence": 1, "Steps": [ - { - "Position": { - "X": 71.86769, - "Y": 204.99998, - "Z": 145.98666 - }, - "TerritoryId": 478, - "InteractionType": "WalkTo", - "TargetTerritoryId": 399, - "AetheryteShortcut": "Idyllshire" - }, { "DataId": 1026781, "Position": { @@ -40,6 +29,11 @@ }, "TerritoryId": 399, "InteractionType": "Interact", + "AetheryteShortcut": "Idyllshire", + "AethernetShortcut": [ + "[Idyllshire] Aetheryte Plaza", + "[Idyllshire] Prologue Gate (Western Hinterlands)" + ], "Fly": true } ] @@ -60,4 +54,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json index c28613305..9d97cf8a1 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3180_A Defector's Tidings.json @@ -30,6 +30,7 @@ "TerritoryId": 621, "InteractionType": "Interact", "AetheryteShortcut": "Lochs - Ala Mhigan Quarter", + "Fly": true, "DialogueChoices": [ { "Type": "YesNo", @@ -50,6 +51,7 @@ "Y": 69.99995, "Z": 521.599 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "Interact" } @@ -90,4 +92,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json index addb3a727..46719143a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3182_Parley on the Front Lines.json @@ -102,7 +102,14 @@ "Answer": "TEXT_STMBDF104_03182_A3_000_001" } ], - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 64" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1026817, @@ -121,7 +128,14 @@ "Answer": "TEXT_STMBDF104_03182_A2_000_001" } ], - "$": "QW: 1 0 0 0 0 64 -> QW: 2 0 0 0 0 96" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1026818, @@ -138,6 +152,14 @@ "Prompt": "TEXT_STMBDF104_03182_Q1_000_000", "Answer": "TEXT_STMBDF104_03182_A1_000_001" } + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 ] } ] @@ -152,6 +174,7 @@ "Y": 0.014375329, "Z": 3.2807007 }, + "StopDistance": 7, "TerritoryId": 829, "InteractionType": "Interact" } @@ -167,10 +190,11 @@ "Y": 107.62999, "Z": 130.9071 }, + "StopDistance": 6, "TerritoryId": 829, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json index 378349697..c32f5c02c 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json +++ b/QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json @@ -15,6 +15,7 @@ "Y": 107.62999, "Z": 130.9071 }, + "StopDistance": 6, "TerritoryId": 829, "InteractionType": "AcceptQuest" } @@ -89,4 +90,4 @@ ] } ] -} \ No newline at end of file +} From f18fd8a87c9ce1ee435eadcff02bf7c68f872add Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 00:02:05 +0200 Subject: [PATCH 58/73] Daily quest updates --- .../3904_Quality Parts, Guaranteed.json | 3 +- .../Dwarves/Dailies/3905_The New Batch.json | 64 +++++++++++++++++++ .../Dwarves/Dailies/3905_The New Batch.md | 6 ++ .../Dailies/4696_A Sound Endeavor.json | 3 +- .../Dailies/4697_Prototypical Retrieval.json | 33 +++++++++- .../Dailies/4698_Always Wear Protection.json | 21 +++++- .../PCT/4855_Mind over Manor.json | 23 +++++++ 7 files changed, 147 insertions(+), 6 deletions(-) create mode 100644 QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.md diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3904_Quality Parts, Guaranteed.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3904_Quality Parts, Guaranteed.json index 9e176954f..b8255d949 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3904_Quality Parts, Guaranteed.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3904_Quality Parts, Guaranteed.json @@ -57,8 +57,7 @@ "Z": -423.84705 }, "TerritoryId": 813, - "InteractionType": "WalkTo", - "Fly": true + "InteractionType": "WalkTo" }, { "DataId": 1033712, diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.json index 737476bad..44d799f08 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.json @@ -29,6 +29,40 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 2011179, + "Position": { + "X": -304.036, + "Y": 19.860376, + "Z": -244.1596 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "Low": 2 + }, + { + "Low": 3 + } + ], + null, + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, { "DataId": 2011178, "Position": { @@ -39,6 +73,21 @@ "TerritoryId": 813, "InteractionType": "Interact", "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 2 + } + ], + null, + null, + null + ], "CompletionQuestVariablesFlags": [ null, null, @@ -58,6 +107,21 @@ "TerritoryId": 813, "InteractionType": "Interact", "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 3 + } + ], + null, + null, + null + ], "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.md b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.md new file mode 100644 index 000000000..98f1daab6 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3905_The New Batch.md @@ -0,0 +1,6 @@ +``` +0 0 x 0 0 0 | 2011177 2011178 2011179 + 33(1) | x x + 34(2) | x x + 35(3) | x x +``` diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4696_A Sound Endeavor.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4696_A Sound Endeavor.json index a2c777b97..453944843 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4696_A Sound Endeavor.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4696_A Sound Endeavor.json @@ -58,7 +58,8 @@ "Z": -706.9963 }, "TerritoryId": 959, - "InteractionType": "Interact" + "InteractionType": "Interact", + "Fly": true } ] }, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4697_Prototypical Retrieval.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4697_Prototypical Retrieval.json index 4d767333d..ceaa849eb 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4697_Prototypical Retrieval.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4697_Prototypical Retrieval.json @@ -39,7 +39,38 @@ "TerritoryId": 959, "InteractionType": "Interact", "AetheryteShortcut": "Mare Lamentorum - Sinus Lacrimarum", - "Fly": true + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + 16 + ], + null, + null, + null + ] + }, + { + "DataId": 2013260, + "Position": { + "X": 725.063, + "Y": 141.37488, + "Z": 233.02039 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + 32 + ], + null, + null, + null + ] } ] }, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4698_Always Wear Protection.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4698_Always Wear Protection.json index d731dcbc4..4d1bd1753 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4698_Always Wear Protection.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4698_Always Wear Protection.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,11 +29,28 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044583, + "Position": { + "X": -52.018066, + "Y": -137.4167, + "Z": -622.4613 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } ] }, { "Sequence": 255, "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38869, + "ItemCount": 4 + }, { "Position": { "X": -201.42024, @@ -42,7 +58,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/7.x - Dawntrail/Class Quests/PCT/4855_Mind over Manor.json b/QuestPaths/7.x - Dawntrail/Class Quests/PCT/4855_Mind over Manor.json index ee9ad55cd..d134ace35 100644 --- a/QuestPaths/7.x - Dawntrail/Class Quests/PCT/4855_Mind over Manor.json +++ b/QuestPaths/7.x - Dawntrail/Class Quests/PCT/4855_Mind over Manor.json @@ -84,9 +84,32 @@ "AethernetShortcut": [ "[Gridania] Conjurers' Guild", "[Gridania] Lancers' Guild" + ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGBB202_04855_Q1_000_000", + "Answer": "TEXT_KINGBB202_04855_A1_000_001" + } ] } ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049796, + "Position": { + "X": 27.695068, + "Y": 16.16987, + "Z": -339.13184 + }, + "StopDistance": 5, + "TerritoryId": 133, + "InteractionType": "CompleteQuest" + } + ] } ] } From a4d79079ba88aa9ddf128c55534a0a02a654e14e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 00:05:17 +0200 Subject: [PATCH 59/73] Remove lv80 class quests from priority quest list --- Directory.Build.targets | 2 +- Questionable/Data/QuestData.cs | 36 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 5dacb6b5c..4531c4151 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.14 + 2.15 diff --git a/Questionable/Data/QuestData.cs b/Questionable/Data/QuestData.cs index f9164806f..3a5f64acc 100644 --- a/Questionable/Data/QuestData.cs +++ b/Questionable/Data/QuestData.cs @@ -102,38 +102,38 @@ internal sealed class QuestData // ARR EClassJob.Gladiator => [63], - EClassJob.Paladin => [72, 73, 74, 75], + EClassJob.Paladin => [72, 73, 74], EClassJob.Marauder => [64], - EClassJob.Warrior => [76, 77, 78, 79], + EClassJob.Warrior => [76, 77, 78], EClassJob.Conjurer => [65], - EClassJob.WhiteMage => [86, 87, 88, 89], + EClassJob.WhiteMage => [86, 87, 88], EClassJob.Arcanist => [66], - EClassJob.Summoner => [127, 128, 129, 130], - EClassJob.Scholar => [90, 91, 92, 93], + EClassJob.Summoner => [127, 128, 129], + EClassJob.Scholar => [90, 91, 92], EClassJob.Pugilist => [67], - EClassJob.Monk => [98, 99, 100, 101], + EClassJob.Monk => [98, 99, 100], EClassJob.Lancer => [68], - EClassJob.Dragoon => [102, 103, 104, 105], + EClassJob.Dragoon => [102, 103, 104], EClassJob.Rogue => [69], - EClassJob.Ninja => [106, 107, 108, 109], + EClassJob.Ninja => [106, 107, 108], EClassJob.Archer => [70], - EClassJob.Bard => [113, 114, 115, 116], + EClassJob.Bard => [113, 114, 115], EClassJob.Thaumaturge => [71], - EClassJob.BlackMage => [123, 124, 125, 126], + EClassJob.BlackMage => [123, 124, 125], // HW - EClassJob.DarkKnight => [80, 81, 82, 83], - EClassJob.Astrologian => [94, 95, 96, 97], - EClassJob.Machinist => [117, 118, 119, 120], + EClassJob.DarkKnight => [80, 81, 82], + EClassJob.Astrologian => [94, 95, 96], + EClassJob.Machinist => [117, 118, 119], // SB - EClassJob.Samurai => [110, 111, 112], - EClassJob.RedMage => [131, 132, 133], - EClassJob.BlueMage => [134, 135, 146, 170], + EClassJob.Samurai => [110, 111], + EClassJob.RedMage => [131, 132], + EClassJob.BlueMage => [134, 135, 146], // ShB - EClassJob.Gunbreaker => [84, 85], - EClassJob.Dancer => [121, 122], + EClassJob.Gunbreaker => [84], + EClassJob.Dancer => [121], // EW EClassJob.Sage => [152], From dcf054a7635b5c6fb9463f4ace4767c8ec31498e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 00:14:45 +0200 Subject: [PATCH 60/73] Fix teleport cost estimation --- Questionable/Functions/QuestFunctions.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Questionable/Functions/QuestFunctions.cs b/Questionable/Functions/QuestFunctions.cs index 6c51b2e5e..6fb34dda4 100644 --- a/Questionable/Functions/QuestFunctions.cs +++ b/Questionable/Functions/QuestFunctions.cs @@ -12,7 +12,6 @@ using FFXIVClientStructs.FFXIV.Component.GUI; using LLib.GameData; using LLib.GameUI; using Lumina.Excel.GeneratedSheets; -using Microsoft.Extensions.Logging; using Questionable.Controller; using Questionable.Controller.Steps.Interactions; using Questionable.Data; @@ -32,7 +31,6 @@ internal sealed unsafe class QuestFunctions private readonly IDataManager _dataManager; private readonly IClientState _clientState; private readonly IGameGui _gameGui; - private readonly ILogger _logger; public QuestFunctions( QuestRegistry questRegistry, @@ -41,8 +39,7 @@ internal sealed unsafe class QuestFunctions Configuration configuration, IDataManager dataManager, IClientState clientState, - IGameGui gameGui, - ILogger logger) + IGameGui gameGui) { _questRegistry = questRegistry; _questData = questData; @@ -51,7 +48,6 @@ internal sealed unsafe class QuestFunctions _dataManager = dataManager; _clientState = clientState; _gameGui = gameGui; - _logger = logger; } public (ElementId? CurrentQuest, byte Sequence) GetCurrentQuest() @@ -309,13 +305,10 @@ internal sealed unsafe class QuestFunctions private static int EstimateTeleportCosts(Quest quest) { - /* if (quest.Info.Expansion == EExpansionVersion.ARealmReborn) return 300 * quest.AllSteps().Count(x => x.Step.AetheryteShortcut != null); else return 1000 * quest.AllSteps().Count(x => x.Step.AetheryteShortcut != null); - */ - return 0; } private List GetPriorityQuestsThatCanBeAccepted() From a1988cc9c789297141a8e2fb1d86be2beaedf3e7 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 17:40:05 +0200 Subject: [PATCH 61/73] Change teleport indicator icon --- Questionable/Windows/QuestComponents/ActiveQuestComponent.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs index 318b1f80c..646d9e874 100644 --- a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs +++ b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs @@ -157,9 +157,7 @@ internal sealed partial class ActiveQuestComponent if (_configuration.Advanced.AdditionalStatusInformation && _questController.IsInterruptible()) { ImGui.SameLine(); - ImGui.PushFont(UiBuilder.IconFont); - ImGui.TextColored(ImGuiColors.DalamudYellow, FontAwesomeIcon.Pause.ToIconString()); - ImGui.PopFont(); + ImGui.TextColored(ImGuiColors.DalamudYellow, SeIconChar.Hyadelyn.ToIconString()); } } From f348e92cba719b03db9e92edcbb17524c45b2f02 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 25 Aug 2024 03:03:41 +0800 Subject: [PATCH 62/73] Added Omicron 2nd story quest --- .../4602_Longing So for All the Fish.json | 260 ++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Story/4602_Longing So for All the Fish.json diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Story/4602_Longing So for All the Fish.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Story/4602_Longing So for All the Fish.json new file mode 100644 index 000000000..6745e7d5a --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Story/4602_Longing So for All the Fish.json @@ -0,0 +1,260 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1043951, + "Position": { + "X": 303.8529, + "Y": 481.99442, + "Z": 154.83325 + }, + "TerritoryId": 960, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1043865, + "Position": { + "X": 301.8081, + "Y": 482.13644, + "Z": 165.02625 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_BANOMI002_04602_Q5_000_000", + "Yes": true + } + ], + "Mount": true + }, + { + "DataId": 1043586, + "Position": { + "X": 205.3711, + "Y": 567.4998, + "Z": 246.72314 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2012484, + "Position": { + "X": 492.48486, + "Y": 438.04077, + "Z": 365.43823 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Base Omicron", + "TargetTerritoryId": 960, + "Fly": true + }, + { + "DataId": 1043527, + "Position": { + "X": 463.5537, + "Y": 417.06747, + "Z": 407.12585 + }, + "TerritoryId": 960, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2012485, + "Position": { + "X": 469.3828, + "Y": 418.14294, + "Z": 403.3722 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960 + }, + { + "DataId": 1043529, + "Position": { + "X": 504.90576, + "Y": 436.9996, + "Z": 341.5122 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "Mount": true + }, + { + "DataId": 1043530, + "Position": { + "X": 475.0896, + "Y": 437.00183, + "Z": 319.53918 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "Mount": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1043531, + "Position": { + "X": 502.49475, + "Y": 436.99988, + "Z": 324.84924 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "Mount": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1043533, + "Position": { + "X": 77.3479, + "Y": 269.00006, + "Z": -607.72107 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Abode of the Ea", + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1043537, + "Position": { + "X": -321.24823, + "Y": 263.2611, + "Z": -523.7049 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "TerritoryId": 960, + "InteractionType": "None", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38277, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38301, + "ItemCount": 3 + } + ] + }, + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Base Omicron", + "TargetTerritoryId": 960, + "Mount": true + }, + { + "DataId": 1043865, + "Position": { + "X": 301.8081, + "Y": 482.13644, + "Z": 165.02625 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "Fly": true + }, + { + "DataId": 1043585, + "Position": { + "X": 203.84521, + "Y": 567.4998, + "Z": 246.87573 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1043864, + "Position": { + "X": 244.83093, + "Y": 564.8203, + "Z": 261.76843 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_BANOMI002_04602_Q2_000_000", + "Yes": true + } + ], + "Fly": true + }, + { + "DataId": 1043951, + "Position": { + "X": 303.8529, + "Y": 481.99442, + "Z": 154.83325 + }, + "TerritoryId": 960, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} \ No newline at end of file From f8a43a8558626278ba32c7578a5e5d62a491487b Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Fri, 23 Aug 2024 22:55:03 +0800 Subject: [PATCH 63/73] Added another daily quest --- .../Dailies/4616_Working Up a Thirst.json | 91 ++++++++++++++++++- .../Dailies/4616_Working Up a Thirst.md | 8 ++ 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.md diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json index 368803c3a..4d240d6fd 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,99 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044051, + "Position": { + "X": -543.20593, + "Y": 72.39467, + "Z": 298.146 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [1], null, null], + "Fly": true + }, + { + "DataId": 1044052, + "Position": { + "X": -110.27698, + "Y": 53.589848, + "Z": 538.41455 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [1], null, null], + "Fly": true + }, + { + "DataId": 1044054, + "Position": { + "X": 83.69568, + "Y": 269.0921, + "Z": -483.0854 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [2], null, null], + "Fly": true + }, + { + "DataId": 1044053, + "Position": { + "X": -225.66571, + "Y": 271.7499, + "Z": -308.6748 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [2], null, null], + "Fly": true + }, + { + "DataId": 1044056, + "Position": { + "X": 582.7573, + "Y": 441.71567, + "Z": 427.9392 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [3], null, null], + "Fly": true + }, + { + "DataId": 1044055, + "Position": { + "X": 636.59106, + "Y": 438.6276, + "Z": 271.5343 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [3], null, null], + "Fly": true + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Base Omicron", + "TargetTerritoryId": 960, + "Mount": true + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.md b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.md new file mode 100644 index 000000000..98532d701 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.md @@ -0,0 +1,8 @@ +## Working Up a Thirst + +``` +0 0 0 ? 0 0 + 1 → 1044051 1044052 + 2 → 1044053 1044054 + 3 → 1044055 1044056 +``` From 13037de8f1a15619f2869d299d62aeb82050f7ed Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Fri, 23 Aug 2024 23:12:33 +0800 Subject: [PATCH 64/73] Added step to enter Elysion --- .../Dailies/4611_Grounds for Improvement.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json index 9b34e8315..3b5632c96 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json @@ -21,7 +21,18 @@ "Sequence": 1, "Steps": [ { + "DataId": 2013074, + "Position": { + "X": 304.3412, + "Y": 483.48206, + "Z": 143.11438 + }, "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 1073 + }, + { + "TerritoryId": 1073, "InteractionType": "None", "RequiredGatheredItems": [ { From 7e8f20146092219b3693e0373f1384092990e2f7 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 25 Aug 2024 01:42:30 +0800 Subject: [PATCH 65/73] Updated Omicron daily quest The Robot and the Sea --- .../Dailies/4614_The Robot and the Sea.json | 57 ++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json index 368803c3a..ca19a5abb 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,65 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2013074, + "Position": { + "X": 304.3412, + "Y": 483.48206, + "Z": 143.11438 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 1073 + }, + { + "TerritoryId": 1073, + "InteractionType": "None", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38285, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38309, + "ItemCount": 3 + } + ] + }, + { + "DataId": 1044050, + "Position": { + "X": 472.03772, + "Y": 437.00162, + "Z": 336.6598 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Base Omicron", + "Mount": true + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "Mount": true + }, { "DataId": 1043417, "Position": { From 40d435ebc07c0ef67f994e2e616f269c83568870 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 25 Aug 2024 03:00:24 +0800 Subject: [PATCH 66/73] Updated Omicron daily quest Using Their heads. Also added required gathering paths. --- .../Ultima Thule/905__MIN.json | 61 +++++++++++++++++++ .../Ultima Thule/907__BTN.json | 61 +++++++++++++++++++ .../Dailies/4615_Using Their Heads.json | 31 +++++++++- 3 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json create mode 100644 GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json diff --git a/GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json b/GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json new file mode 100644 index 000000000..ecca92e63 --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json @@ -0,0 +1,61 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "plogon_enjoyer", + "Steps": [ + { + "TerritoryId": 960, + "InteractionType": "None", + "AetheryteShortcut": "Ultima Thule - Reah Tahra" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34364, + "Locations": [ + { + "Position": { + "X": -470.5523, + "Y": 79.49631, + "Z": 259.4856 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34365, + "Locations": [ + { + "Position": { + "X": -493.5432, + "Y": 73.7095, + "Z": 288.547 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34366, + "Locations": [ + { + "Position": { + "X": -478.8098, + "Y": 76.21393, + "Z": 280.0947 + } + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json b/GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json new file mode 100644 index 000000000..63fb907fb --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json @@ -0,0 +1,61 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "plogon_enjoyer", + "Steps": [ + { + "TerritoryId": 960, + "InteractionType": "None", + "AetheryteShortcut": "Ultima Thule - Reah Tahra" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34370, + "Locations": [ + { + "Position": { + "X": -614.3087, + "Y": 81.96295, + "Z": 262.5681 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34371, + "Locations": [ + { + "Position": { + "X": -624.2021, + "Y": 79.12945, + "Z": 278.3768 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34372, + "Locations": [ + { + "Position": { + "X": -639.8513, + "Y": 78.34773, + "Z": 274.0034 + } + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json index 368803c3a..a48255529 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -21,6 +20,36 @@ { "Sequence": 255, "Steps": [ + { + "TerritoryId": 960, + "InteractionType": "None", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38286, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38310, + "ItemCount": 3 + } + ], + "Fly": true + }, + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Base Omicron", + "Mount": true, + "TargetTerritoryId": 960 + }, { "DataId": 1043417, "Position": { From f4beceec05a1397bdd036d6de112c32d11f2ce4d Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 22:42:32 +0200 Subject: [PATCH 67/73] Update tooltips --- .../Windows/QuestComponents/ActiveQuestComponent.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs index 646d9e874..1234b1f13 100644 --- a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs +++ b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs @@ -142,7 +142,8 @@ internal sealed partial class ActiveQuestComponent ImGui.SameLine(0); if (ImGui.IsItemHovered()) - ImGui.SetTooltip("This quest is loaded from your 'pluginConfigs\\Questionable\\Quests' directory.\nThis gets loaded even if Questionable ships with a newer/different version of the quest."); + ImGui.SetTooltip( + "This quest is loaded from your 'pluginConfigs\\Questionable\\Quests' directory.\nThis gets loaded even if Questionable ships with a newer/different version of the quest."); } ImGui.TextUnformatted( @@ -158,6 +159,9 @@ internal sealed partial class ActiveQuestComponent { ImGui.SameLine(); ImGui.TextColored(ImGuiColors.DalamudYellow, SeIconChar.Hyadelyn.ToIconString()); + if (ImGui.IsItemHovered()) + ImGui.SetTooltip( + "This quest sequence starts with a teleport to an Aetheryte.\nCertain priority quest (e.g. class quests) may be started/completed by the plugin prior to continuing with this quest."); } } From 1a6646cb525893d4936086bcc8a6abbcfc67fdd2 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 22:42:52 +0200 Subject: [PATCH 68/73] Minor cleanup for ARR BRD --- .../BRD/1085_A Song of Bards and Bowmen.json | 15 +- .../BRD/1086_The Archer's Anthem.json | 28 ++- .../BRD/1087_Bard's-eye View.json | 18 +- .../BRD/1088_Doing It the Bard Way.json | 19 +- .../BRD/1089_Pieces of the Past.json | 53 +++- .../BRD/1090_Requiem for the Fallen.json | 11 +- .../BRD/134_Training with Leih.json | 227 +++++++++++------- .../Class Quests/BRD/219_My First Bow.json | 82 +++---- .../BRD/46_A Matter of Perspective.json | 211 +++++++++------- .../BRD/68_Violators Will Be Shot.json | 150 ++++++++++-- .../BRD/70_To Catch a Poacher.json | 69 +++++- .../Class Quests/BRD/71_Homecoming.json | 28 ++- .../BRD/76_The One That Got Away.json | 16 +- .../BRD/1713_On the Road Again.json | 22 +- 14 files changed, 591 insertions(+), 358 deletions(-) rename QuestPaths/{2.x - A Realm Reborn => 3.x - Heavensward}/Class Quests/BRD/1713_On the Road Again.json (91%) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json index 9fae75ae5..196337ecb 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json @@ -12,6 +12,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", @@ -21,10 +22,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -46,10 +44,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } } } @@ -107,6 +102,7 @@ "Y": 2.147105, "Z": 21.86615 }, + "StopDistance": 7, "TerritoryId": 153, "InteractionType": "Interact", "Fly": false @@ -125,7 +121,8 @@ }, "TerritoryId": 153, "InteractionType": "CompleteQuest", - "Fly": true + "Fly": true, + "NextQuestId": 1085 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json index dab7c28a1..58b792d69 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json @@ -5,6 +5,15 @@ { "Sequence": 0, "Steps": [ + { + "TerritoryId": 153, + "InteractionType": "EquipItem", + "ItemId": 4546 + }, + { + "TerritoryId": 153, + "InteractionType": "EquipRecommended" + }, { "DataId": 1006750, "Position": { @@ -18,10 +27,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } } } @@ -37,6 +43,7 @@ "Y": 68.192505, "Z": 586.1448 }, + "StopDistance": 0.5, "TerritoryId": 137, "InteractionType": "Combat", "EnemySpawnType": "AfterInteraction", @@ -47,10 +54,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 137 - ] + "InSameTerritory": true } } } @@ -72,12 +76,10 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } - } + }, + "NextQuestId": 1087 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json index 7332dbc98..f7d9359f0 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1087_Bard's-eye View.json @@ -18,10 +18,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } } } @@ -47,10 +44,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 145 - ] + "InSameTerritory": true } } } @@ -72,12 +66,10 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } - } + }, + "NextQuestId": 1088 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json index e357eb15f..50b44bf83 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1088_Doing It the Bard Way.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "pot0to", - "Comment": "Need to enable some way of doing single player duty first?", "QuestSequence": [ { "Sequence": 0, @@ -19,10 +18,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } } } @@ -46,12 +42,10 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 137 - ] + "InSameTerritory": true } - } + }, + "$": "Actually a SinglePlayerDuty" } ] }, @@ -71,10 +65,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } }, "NextQuestId": 1089 diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json index dbde6fc2d..5336502f8 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1089_Pieces of the Past.json @@ -18,10 +18,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } }, "DialogueChoices": [ @@ -46,7 +43,15 @@ }, "TerritoryId": 153, "InteractionType": "Interact", - "Fly": true + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2002530, @@ -58,7 +63,15 @@ "TerritoryId": 152, "InteractionType": "Interact", "Fly": true, - "AetheryteShortcut": "East Shroud - Hawthorne Hut" + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "Position": { @@ -80,7 +93,15 @@ }, "TerritoryId": 138, "InteractionType": "Interact", - "Fly": false + "Fly": false, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2002529, @@ -92,7 +113,15 @@ "TerritoryId": 147, "InteractionType": "Interact", "Fly": true, - "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant" + "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -112,12 +141,10 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } - } + }, + "NextQuestId": 1090 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json index d92324220..733606d01 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1090_Requiem for the Fallen.json @@ -18,10 +18,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } } } @@ -42,7 +39,8 @@ "ItemId": 2000953, "EnemySpawnType": "AutoOnEnterArea", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "Fly": true + "Fly": true, + "$": "Actually a SinglePlayerDuty" } ] }, @@ -57,7 +55,8 @@ "Z": 381.30762 }, "TerritoryId": 155, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "NextQuestId": 1713 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json index a42df4428..bcae3086d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/134_Training with Leih.json @@ -12,6 +12,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", @@ -21,10 +22,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -56,7 +54,8 @@ }, "TerritoryId": 148, "InteractionType": "WalkTo", - "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows", + "Fly": true }, { "DataId": 2001177, @@ -68,7 +67,15 @@ "TerritoryId": 148, "StopDistance": 15, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 2 + ] }, { "Position": { @@ -77,7 +84,19 @@ "Z": -61.20561 }, "TerritoryId": 148, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 4 + ] + } + } }, { "DataId": 2001175, @@ -89,7 +108,15 @@ "TerritoryId": 148, "StopDistance": 15, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 4 + ] }, { "Position": { @@ -98,7 +125,19 @@ "Z": -69.45994 }, "TerritoryId": 148, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] + } + } }, { "DataId": 2000959, @@ -110,7 +149,15 @@ "TerritoryId": 148, "StopDistance": 15, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "Position": { @@ -119,7 +166,19 @@ "Z": -132.85217 }, "TerritoryId": 148, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + } }, { "DataId": 2000958, @@ -131,7 +190,15 @@ "TerritoryId": 148, "StopDistance": 15, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "Position": { @@ -140,7 +207,19 @@ "Z": -173.19547 }, "TerritoryId": 148, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } }, { "DataId": 2000957, @@ -152,7 +231,15 @@ "TerritoryId": 148, "StopDistance": 15, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "Position": { @@ -200,57 +287,13 @@ { "Sequence": 4, "Steps": [ - { - "Position": { - "X": -353.36465, - "Y": 4.1194496, - "Z": 288.19882 - }, - "TerritoryId": 152, - "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 5, - "MinimumKillCount": 8, - "$": "Slay northern vultures." - }, - { - "DataId": 39, - "MinimumKillCount": 8, - "$": "Slay tree slugs." - } - ] - }, - { - "Position": { - "X": -424.11658, - "Y": 7.2559156, - "Z": 277.93048 - }, - "TerritoryId": 152, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 5, - "MinimumKillCount": 8, - "$": "Slay northern vultures." - }, - { - "DataId": 39, - "MinimumKillCount": 8, - "$": "Slay tree slugs." - } - ] - }, { "Position": { "X": -431.09494, "Y": 2.9039853, "Z": 239.26413 }, + "StopDistance": 0.5, "TerritoryId": 152, "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", @@ -258,43 +301,41 @@ { "DataId": 5, "MinimumKillCount": 8, - "$": "Slay northern vultures." + "$": "Slay northern vultures.", + "CompletionQuestVariablesFlags": [ + null, + { + "High": 8 + }, + null, + null, + null, + null + ] }, { "DataId": 39, "MinimumKillCount": 8, - "$": "Slay tree slugs." - } - ] - }, - { - "Position": { - "X": -380.5414, - "Y": 1.1250772, - "Z": 236.78247 - }, - "TerritoryId": 152, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 5, - "MinimumKillCount": 8, - "$": "Slay northern vultures." + "$": "Slay tree slugs.", + "CompletionQuestVariablesFlags": [ + { + "Low": 8 + }, + null, + null, + null, + null, + null + ] } ], - "CompletionQuestVariablesFlags": [ - { - "Low": 8 - }, - { - "High": 8 - }, - null, - null, - null, - null - ] + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } } ] }, @@ -328,6 +369,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "CompleteQuest", "DialogueChoices": [ @@ -336,9 +378,10 @@ "Prompt": "TEXT_CLSARC997_00134_Q1_000_1", "Yes": true } - ] + ], + "NextQuestId": 68 } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json index f2e24c67d..b81a741f2 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/219_My First Bow.json @@ -21,10 +21,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -46,11 +43,31 @@ { "DataId": 37, "MinimumKillCount": 3, - "$": "Slay ground squirrels as an archer" + "$": "Slay ground squirrels as an archer", + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] }, { "DataId": 49, "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + null, + { + "High": 3 + }, + null, + null, + null, + null + ], "$": "Slay little ladybugs as an archer" } ], @@ -63,61 +80,23 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 132, 148 ] } - } - }, - { - "Position": { - "X": 72.74856, - "Y": 14.679733, - "Z": -257.5843 }, - "TerritoryId": 148, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 37, - "MinimumKillCount": 3, - "$": "Slay ground squirrels as an archer" - }, - { - "DataId": 49, - "MinimumKillCount": 3, - "$": "Slay little ladybugs as an archer" - } - ], "CompletionQuestVariablesFlags": [ { "Low": 3 }, - 32, + { + "High": 3 + }, null, null, null, null ] }, - { - "Position": { - "X": 92.364235, - "Y": 3.463302, - "Z": -193.49184 - }, - "TerritoryId": 148, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 47, - "MinimumKillCount": 3, - "$": "Slay forest funguars as an archer" - } - ] - }, { "Position": { "X": 126.943115, @@ -135,7 +114,7 @@ } ], "CompletionQuestVariablesFlags": [ - 16, + null, { "Low": 3 }, @@ -157,6 +136,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "CompleteQuest", "AetheryteShortcut": "Gridania", @@ -166,12 +146,10 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } - } + }, + "NextQuestId": 46 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json index f0a78f61d..1a1edfecc 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/46_A Matter of Perspective.json @@ -12,6 +12,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", @@ -21,10 +22,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -43,7 +41,15 @@ "TerritoryId": 132, "StopDistance": 15, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "Position": { @@ -52,7 +58,19 @@ "Z": 57.230045 }, "TerritoryId": 132, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + } }, { "DataId": 2000926, @@ -64,7 +82,15 @@ "TerritoryId": 132, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "Position": { @@ -73,7 +99,19 @@ "Z": 15.033528 }, "TerritoryId": 132, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 2 + ] + } + } }, { "DataId": 2000931, @@ -85,7 +123,15 @@ "TerritoryId": 132, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 2 + ] }, { "Position": { @@ -94,7 +140,19 @@ "Z": 21.23782 }, "TerritoryId": 132, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] + } + } }, { "DataId": 2000929, @@ -106,7 +164,15 @@ "TerritoryId": 132, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "Position": { @@ -115,7 +181,19 @@ "Z": 60.44494 }, "TerritoryId": 132, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + } }, { "DataId": 2000928, @@ -127,7 +205,15 @@ "TerritoryId": 132, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "Position": { @@ -136,7 +222,19 @@ "Z": 88.24835 }, "TerritoryId": 132, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } }, { "DataId": 2000930, @@ -148,7 +246,15 @@ "TerritoryId": 132, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -164,19 +270,10 @@ }, "TerritoryId": 132, "InteractionType": "Interact", - "AetheryteShortcut": "Gridania", "AethernetShortcut": [ "[Gridania] Aetheryte Plaza", "[Gridania] Archers' Guild" - ], - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] - } - } + ] } ] }, @@ -189,6 +286,7 @@ "Y": -21.916101, "Z": 210.33368 }, + "StopDistance": 0.5, "TerritoryId": 154, "AethernetShortcut": [ "[Gridania] Archers' Guild", @@ -196,23 +294,6 @@ ], "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 5, - "MinimumKillCount": 8, - "$": "Slay opo-opos." - } - ] - }, - { - "Position": { - "X": 316.9498, - "Y": -16.625727, - "Z": 190.52563 - }, - "TerritoryId": 154, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", "ComplexCombatData": [ { "DataId": 5, @@ -220,6 +301,7 @@ "$": "Slay opo-opos." } ], + "Fly": true, "CompletionQuestVariablesFlags": [ { "Low": 8 @@ -237,40 +319,7 @@ "Y": -11.9244995, "Z": 40.554157 }, - "TerritoryId": 154, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 32, - "MinimumKillCount": 8, - "$": "Slay microchus." - } - ] - }, - { - "Position": { - "X": 315.33475, - "Y": -8.230231, - "Z": -6.9168186 - }, - "TerritoryId": 154, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 32, - "MinimumKillCount": 8, - "$": "Slay microchus." - } - ] - }, - { - "Position": { - "X": 276.26797, - "Y": -6.927437, - "Z": -31.987146 - }, + "StopDistance": 0.5, "TerritoryId": 154, "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", @@ -281,6 +330,7 @@ "$": "Slay microchus." } ], + "Fly": true, "CompletionQuestVariablesFlags": [ null, { @@ -304,6 +354,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "CompleteQuest", "AetheryteShortcut": "Gridania", @@ -313,12 +364,10 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } - } + }, + "NextQuestId": 134 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json index 88c35e717..bb81bb25a 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/68_Violators Will Be Shot.json @@ -12,6 +12,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", @@ -21,10 +22,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -56,7 +54,23 @@ }, "TerritoryId": 152, "InteractionType": "WalkTo", - "AetheryteShortcut": "East Shroud - Hawthorne Hut" + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + }, + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + } }, { "DataId": 2000944, @@ -68,7 +82,15 @@ "TerritoryId": 152, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "Position": { @@ -77,7 +99,19 @@ "Z": 297.61597 }, "TerritoryId": 152, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } }, { "DataId": 2000943, @@ -89,7 +123,15 @@ "TerritoryId": 152, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "Position": { @@ -98,7 +140,19 @@ "Z": 306.18744 }, "TerritoryId": 152, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] + } + } }, { "DataId": 2000945, @@ -110,7 +164,15 @@ "TerritoryId": 152, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "Position": { @@ -119,7 +181,19 @@ "Z": 269.35767 }, "TerritoryId": 152, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + } }, { "DataId": 2000942, @@ -131,7 +205,15 @@ "TerritoryId": 152, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "Position": { @@ -140,7 +222,19 @@ "Z": 257.9185 }, "TerritoryId": 152, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 2 + ] + } + } }, { "DataId": 2001179, @@ -152,7 +246,15 @@ "TerritoryId": 152, "StopDistance": 20, "InteractionType": "Action", - "Action": "Heavy Shot" + "Action": "Heavy Shot", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 2 + ] }, { "Position": { @@ -200,16 +302,6 @@ { "Sequence": 4, "Steps": [ - { - "Position": { - "X": 288.74252, - "Y": -11.241169, - "Z": 42.220448 - }, - "TerritoryId": 154, - "InteractionType": "WalkTo", - "AetheryteShortcut": "North Shroud - Fallgourd Float" - }, { "DataId": 2000962, "Position": { @@ -218,7 +310,12 @@ "Z": 52.384155 }, "TerritoryId": 154, - "InteractionType": "SinglePlayerDuty" + "InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ + "[Gridania] Archers' Guild", + "[Gridania] Yellow Serpent Gate (North Shroud)" + ], + "Fly": true } ] }, @@ -253,7 +350,8 @@ "Z": 35.01941 }, "TerritoryId": 132, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "NextQuestId": 70 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json index 95fd13ef6..a72083ecb 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/70_To Catch a Poacher.json @@ -12,6 +12,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", @@ -21,10 +22,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -33,6 +31,23 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -166.19086, + "Y": 8.399985, + "Z": -64.10584 + }, + "TerritoryId": 153, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, + "$": "Buscarron SE steps", + "AetheryteShortcut": "South Shroud - Quarrymill" + }, { "DataId": 1000590, "Position": { @@ -41,8 +56,7 @@ "Z": -81.34589 }, "TerritoryId": 153, - "InteractionType": "Interact", - "AetheryteShortcut": "South Shroud - Quarrymill" + "InteractionType": "Interact" } ] }, @@ -57,7 +71,15 @@ "Z": -46.00598 }, "TerritoryId": 153, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2000948, @@ -67,7 +89,15 @@ "Z": -91.17267 }, "TerritoryId": 153, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2000947, @@ -77,7 +107,15 @@ "Z": -165.11792 }, "TerritoryId": 153, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -111,6 +149,15 @@ { "Sequence": 4, "Steps": [ + { + "Position": { + "X": -192.12004, + "Y": 8.180927, + "Z": -65.00513 + }, + "TerritoryId": 153, + "InteractionType": "WalkTo" + }, { "DataId": 2000136, "Position": { @@ -148,13 +195,15 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "CompleteQuest", "AetheryteShortcut": "Gridania", "AethernetShortcut": [ "[Gridania] Aetheryte Plaza", "[Gridania] Archers' Guild" - ] + ], + "NextQuestId": 71 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json index f8f3f2232..77c52c235 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/71_Homecoming.json @@ -12,6 +12,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", @@ -21,10 +22,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -73,6 +71,7 @@ "TerritoryId": 153, "InteractionType": "Interact", "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true, "DialogueChoices": [ { "Type": "List", @@ -86,6 +85,21 @@ { "Sequence": 4, "Steps": [ + { + "Position": { + "X": 60.130726, + "Y": -5.9999475, + "Z": 63.516415 + }, + "TerritoryId": 148, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, { "DataId": 1000534, "Position": { @@ -95,7 +109,7 @@ }, "TerritoryId": 148, "InteractionType": "SinglePlayerDuty", - "AetheryteShortcut": "Central Shroud - Bentbranch Meadows" + "Fly": true } ] }, @@ -109,13 +123,15 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "CompleteQuest", "AetheryteShortcut": "Gridania", "AethernetShortcut": [ "[Gridania] Aetheryte Plaza", "[Gridania] Archers' Guild" - ] + ], + "NextQuestId": 76 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json index 90eca1760..d888625ae 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json @@ -12,6 +12,7 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", @@ -21,10 +22,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -42,7 +40,8 @@ }, "TerritoryId": 153, "InteractionType": "SinglePlayerDuty", - "AetheryteShortcut": "South Shroud - Quarrymill" + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true } ] }, @@ -57,7 +56,8 @@ "Z": 61.08191 }, "TerritoryId": 153, - "InteractionType": "SinglePlayerDuty" + "InteractionType": "SinglePlayerDuty", + "Fly": true } ] }, @@ -71,13 +71,15 @@ "Y": 0.9999819, "Z": 35.01941 }, + "StopDistance": 7, "TerritoryId": 132, "InteractionType": "CompleteQuest", "AetheryteShortcut": "Gridania", "AethernetShortcut": [ "[Gridania] Aetheryte Plaza", "[Gridania] Archers' Guild" - ] + ], + "NextQuestId": 1085 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1713_On the Road Again.json b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1713_On the Road Again.json similarity index 91% rename from QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1713_On the Road Again.json rename to QuestPaths/3.x - Heavensward/Class Quests/BRD/1713_On the Road Again.json index 03dfae4b4..e09b86132 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1713_On the Road Again.json +++ b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1713_On the Road Again.json @@ -18,10 +18,7 @@ "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 153 - ] + "InSameTerritory": true } } } @@ -46,10 +43,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -148,6 +142,7 @@ "Y": 6.386869, "Z": 414.9386 }, + "StopDistance": 7, "TerritoryId": 152, "InteractionType": "Interact" } @@ -172,10 +167,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } } @@ -191,15 +183,13 @@ "Y": 8.059147, "Z": 31.72351 }, + "StopDistance": 7, "TerritoryId": 418, "InteractionType": "CompleteQuest", "AetheryteShortcut": "Ishgard", "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 418 - ] + "InSameTerritory": true } } } From 0dd392950a7d309ff368bcee008c5a91ce3de99c Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 22:47:52 +0200 Subject: [PATCH 69/73] Change author for new omicron quests --- .../6.x - Endwalker/Ultima Thule/905__MIN.json | 14 ++++++++++---- .../6.x - Endwalker/Ultima Thule/907__BTN.json | 10 +++++++--- .../Dailies/4611_Grounds for Improvement.json | 2 +- .../Dailies/4614_The Robot and the Sea.json | 2 +- .../Omicrons/Dailies/4615_Using Their Heads.json | 2 +- .../Omicrons/Dailies/4616_Working Up a Thirst.json | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json b/GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json index ecca92e63..459a3d127 100644 --- a/GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json +++ b/GatheringPaths/6.x - Endwalker/Ultima Thule/905__MIN.json @@ -19,7 +19,9 @@ "X": -470.5523, "Y": 79.49631, "Z": 259.4856 - } + }, + "MinimumAngle": 0, + "MaximumAngle": 150 } ] } @@ -35,7 +37,9 @@ "X": -493.5432, "Y": 73.7095, "Z": 288.547 - } + }, + "MinimumAngle": 15, + "MaximumAngle": 215 } ] } @@ -51,11 +55,13 @@ "X": -478.8098, "Y": 76.21393, "Z": 280.0947 - } + }, + "MinimumAngle": 50, + "MaximumAngle": 180 } ] } ] } ] -} +} \ No newline at end of file diff --git a/GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json b/GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json index 63fb907fb..1b2a3511c 100644 --- a/GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json +++ b/GatheringPaths/6.x - Endwalker/Ultima Thule/907__BTN.json @@ -19,7 +19,9 @@ "X": -614.3087, "Y": 81.96295, "Z": 262.5681 - } + }, + "MinimumAngle": -150, + "MaximumAngle": 20 } ] } @@ -51,11 +53,13 @@ "X": -639.8513, "Y": 78.34773, "Z": 274.0034 - } + }, + "MinimumAngle": -60, + "MaximumAngle": 95 } ] } ] } ] -} +} \ No newline at end of file diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json index 3b5632c96..47d61f149 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json index ca19a5abb..70ae5932a 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json index a48255529..88f3b658d 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json index 4d240d6fd..a2478d3ad 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json @@ -1,6 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, From ec6687ec12d8dba262e13291cfd88a25d0cea1fb Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 24 Aug 2024 22:53:30 +0200 Subject: [PATCH 70/73] Minor chocobo updates --- .../Central Shroud/1560_Bird in Hand.json | 53 ++++++++++++++++--- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json index 7e4abb73a..4038b5b7d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json +++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Central Shroud/1560_Bird in Hand.json @@ -28,7 +28,15 @@ "Z": 5.355835 }, "TerritoryId": 148, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "DataId": 2004432, @@ -38,7 +46,15 @@ "Z": -5.2339478 }, "TerritoryId": 148, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2004433, @@ -48,7 +64,15 @@ "Z": -4.0131226 }, "TerritoryId": 148, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2004434, @@ -58,7 +82,15 @@ "Z": 16.128723 }, "TerritoryId": 148, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2004435, @@ -68,7 +100,15 @@ "Z": 16.03717 }, "TerritoryId": 148, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] } ] }, @@ -142,6 +182,7 @@ "Y": -0.020424694, "Z": 28.54956 }, + "StopDistance": 7, "TerritoryId": 148, "InteractionType": "Interact" } @@ -178,4 +219,4 @@ ] } ] -} \ No newline at end of file +} From 4ca4e38af7fab05c3335982b0d512808ecb1952f Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 25 Aug 2024 00:49:53 +0200 Subject: [PATCH 71/73] Make allied society quests non-interruptible --- Questionable/Controller/QuestController.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index c4805bb00..d932b4718 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -719,6 +719,9 @@ internal sealed class QuestController : MiniTaskController, IDi if (type != ECurrentQuestType.Normal) return false; + if (currentQuest.Quest.Info.AlliedSociety != EAlliedSociety.None) + return false; + QuestSequence? currentSequence = currentQuest.Quest.FindSequence(currentQuest.Sequence); if (currentQuest.Step > 0) return false; From 581976b06b3c5831709c474d818b7e3b3e8a959a Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 25 Aug 2024 01:27:41 +0200 Subject: [PATCH 72/73] Minor adjustments to unlock quests --- .../190_So You Want to Be an Alchemist.json | 47 ++-- .../ALC/575_Way of the Alchemist.json | 83 +++---- .../ARM/186_So You Want to Be an Armorer.json | 43 ++-- .../ARM/273_Way of the Armorer.json | 84 +++---- .../183_So You Want to Be a Thaumaturge.json | 52 ++-- .../BLM/344_Way of the Thaumaturge.json | 84 +++---- .../BRD/131_Way of the Archer.json | 84 +++---- .../BRD/181_So You Want to Be an Archer.json | 73 +++--- .../185_So You Want to Be a Blacksmith.json | 40 +-- .../BSM/291_Way of the Blacksmith.json | 88 +++---- .../BTN/193_So You Want to Be a Botanist.json | 64 ++--- .../BTN/3_Way of the Botanist.json | 84 +++---- .../184_So You Want to Be a Carpenter.json | 63 +++-- .../191_So You Want to Be a Culinarian.json | 43 ++-- .../CUL/271_Way of the Culinarian.json | 84 +++---- .../DRG/180_So You Want to Be a Lancer.json | 62 ++--- .../FSH/1107_Way of the Fisher.json | 104 ++++---- .../FSH/1108_My First Fishing Rod.json | 121 ++++------ .../FSH/1134_So You Want to Be a Fisher.json | 116 +++++---- .../FSH/3843_All the Fish in the Sea.json | 74 +++--- .../187_So You Want to Be a Goldsmith.json | 47 ++-- .../GSM/608_Way of the Goldsmith.json | 53 ++-- .../LTW/105_Way of the Leatherworker.json | 84 +++---- ...188_So You Want to Be a Leatherworker.json | 41 ++-- .../MNK/178_So You Want to Be a Pugilist.json | 46 ++-- .../MNK/532_Way of the Pugilist.json | 84 +++---- .../NIN/101_So You Want to Be a Rogue.json | 48 ++-- .../Class Quests/NIN/102_My First Dagger.json | 61 +++++ .../NIN/102_Way of the Rogue.json | 50 ---- .../PLD/1055_Paladin's Pledge.json | 155 ++++++------ .../177_So You Want to Be a Gladiator.json | 41 ++++ .../PLD/253_Way of the Gladiator.json | 18 +- .../PLD/261_Ul'dah's Most Wanted.json | 145 +++++------ .../PLD/262_That Old Familiar Feeling.json | 116 ++++----- .../PLD/263_The Face of Thal.json | 215 ++++++++++------- .../Class Quests/PLD/264_On Holy Ground.json | 143 +++++------ .../Class Quests/PLD/265_The Rematch.json | 227 +++++++++++------- .../PLD/285_Way of the Gladiator.json | 44 ++++ .../PLD/286_My First Gladius.json | 154 ++++++++++++ .../PLD/288_Ul'dah's Most Wanted.json | 163 +++++++++++++ .../451_So You Want to Be an Arcanist.json | 82 +++---- .../{ACN => SMN}/452_Way of the Arcanist.json | 82 +++---- .../WAR/179_So You Want to Be a Marauder.json | 43 ++-- .../WAR/310_Way of the Marauder.json | 84 +++---- .../WVR/189_So You Want to Be a Weaver.json | 47 ++-- .../WVR/534_Way of the Weaver.json | 84 +++---- 46 files changed, 2184 insertions(+), 1666 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_My First Dagger.json delete mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/177_So You Want to Be a Gladiator.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/285_Way of the Gladiator.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/286_My First Gladius.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/288_Ul'dah's Most Wanted.json rename QuestPaths/2.x - A Realm Reborn/Class Quests/{ACN => SMN}/451_So You Want to Be an Arcanist.json (96%) rename QuestPaths/2.x - A Realm Reborn/Class Quests/{ACN => SMN}/452_Way of the Arcanist.json (95%) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json index 4b16c6d03..e53954bbc 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json @@ -1,21 +1,24 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1002281, -"Position": { - "X": -115.739685, - "Y": 41.600117, - "Z": 118.88306 -}, -"TerritoryId": 131, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002281, + "Position": { + "X": -115.739685, + "Y": 41.600117, + "Z": 118.88306 + }, + "TerritoryId": 131, + "InteractionType": "Interact", "AetheryteShortcut": "Ul'dah", - "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", - "[Ul'dah] Alchemists' Guild"], + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Alchemists' Guild" + ], "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, @@ -30,9 +33,9 @@ "Prompt": "TEXT_CLSALC001_00190_Q1_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json index 35f1bc7df..8a8c2e402 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json @@ -1,42 +1,43 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1002281, -"Position": { - "X": -115.739685, - "Y": 41.600117, - "Z": 118.88306 -}, -"TerritoryId": 131, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1002299, -"Position": { - "X": -98.8938, - "Y": 40.200146, - "Z": 120.83618 -}, -"TerritoryId": 131, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSALC011_00575_Q1_1", - "Yes": true - } - ], - "NextQuestId": 575 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002281, + "Position": { + "X": -115.739685, + "Y": 41.600117, + "Z": 118.88306 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1002299, + "Position": { + "X": -98.8938, + "Y": 40.200146, + "Z": 120.83618 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSALC011_00575_Q1_1", + "Yes": true + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json index f365f339c..7cd043fc1 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json @@ -1,18 +1,19 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000998, -"Position": { - "X": -51.651794, - "Y": 42.79979, - "Z": 190.41736 -}, -"TerritoryId": 128, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000998, + "Position": { + "X": -51.651794, + "Y": 42.79979, + "Z": 190.41736 + }, + "TerritoryId": 128, + "InteractionType": "Interact", "AetheryteShortcut": "Limsa Lominsa", "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", @@ -22,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] } }, @@ -32,9 +33,9 @@ "Prompt": "TEXT_CLSARM001_00186_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json index 91ca9538f..93fef75bf 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000998, - "Position": { - "X": -51.651794, - "Y": 42.79979, - "Z": 190.41736 - }, - "TerritoryId": 128, - "InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1001000, - "Position": { - "X": -32.028687, - "Y": 41.499985, - "Z": 208.39233 - }, - "TerritoryId": 128, - "InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSARM011_00273_Q1_000_1", - "Yes": true - } - ], - "NextQuestId": 273 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000998, + "Position": { + "X": -51.651794, + "Y": 42.79979, + "Z": 190.41736 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001000, + "Position": { + "X": -32.028687, + "Y": 41.499985, + "Z": 208.39233 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARM011_00273_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 273 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json index f4678d54c..fbd681699 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json @@ -1,27 +1,27 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1002279, -"Position": { - "X": -196.8872, - "Y": 18.459997, - "Z": 59.952637 -}, -"TerritoryId": 130, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002279, + "Position": { + "X": -196.8872, + "Y": 18.459997, + "Z": 59.952637 + }, + "TerritoryId": 130, + "InteractionType": "Interact", "AetheryteShortcut": "Ul'dah", - "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", - "[Ul'dah] Thaumaturges' Guild"], + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Thaumaturges' Guild" + ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 130 - ] + "InSameTerritory": true } }, "DialogueChoices": [ @@ -30,9 +30,9 @@ "Prompt": "TEXT_CLSTHM001_00183_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json index 9dc1536a5..902c1ef93 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1002279, -"Position": { - "X": -196.8872, - "Y": 18.459997, - "Z": 59.952637 -}, -"TerritoryId": 130, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1001709, -"Position": { - "X": -240.4975, - "Y": 18.7, - "Z": 85.58777 -}, -"TerritoryId": 130, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSTHM011_00344_Q1_001_1", - "Yes": true - } - ], - "NextQuestId": 553 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002279, + "Position": { + "X": -196.8872, + "Y": 18.459997, + "Z": 59.952637 + }, + "TerritoryId": 130, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001709, + "Position": { + "X": -240.4975, + "Y": 18.7, + "Z": 85.58777 + }, + "TerritoryId": 130, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSTHM011_00344_Q1_001_1", + "Yes": true + } + ], + "NextQuestId": 553 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json index 691469631..33fd93486 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000197, -"Position": { - "X": 201.31226, - "Y": -3.1634123E-15, - "Z": 43.900146 -}, -"TerritoryId": 132, - "InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000200, -"Position": { - "X": 209.55212, - "Y": 0.9999819, - "Z": 35.01941 -}, -"TerritoryId": 132, -"InteractionType": "CompleteQuest", - - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSARC998_00131_Q1_000_1", - "Yes": true - } - ] - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000197, + "Position": { + "X": 201.31226, + "Y": -3.1634123E-15, + "Z": 43.900146 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000200, + "Position": { + "X": 209.55212, + "Y": 0.9999819, + "Z": 35.01941 + }, + "StopDistance": 5, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARC998_00131_Q1_000_1", + "Yes": true + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json index 7ea66e41d..8dd398f70 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json @@ -1,42 +1,39 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000197, -"Position": { - "X": 201.31226, - "Y": -3.1634123E-15, - "Z": 43.900146 -}, -"TerritoryId": 132, -"AetheryteShortcut": "Gridania", - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Archers' Guild" - ], - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSARC999_00181_Q1_000_1", - "Yes": true, - "$": "No Godbert prompt" - } - ], - "InteractionType": "AcceptQuest", - "SkipConditions": { + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000197, + "Position": { + "X": 201.31226, + "Y": -3.1634123E-15, + "Z": 43.900146 + }, + "TerritoryId": 132, + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Archers' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSARC999_00181_Q1_000_1", + "Yes": true, + "$": "No Godbert prompt" + } + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } - } - ] - } - ] - } - \ No newline at end of file + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json index ff547934c..32c64c56f 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json @@ -1,18 +1,19 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000995, -"Position": { - "X": -52.018066, - "Y": 42.799637, - "Z": 192.2179 -}, -"TerritoryId": 128, -"InteractionType": "AcceptQuest", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000995, + "Position": { + "X": -52.018066, + "Y": 42.799637, + "Z": 192.2179 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", @@ -22,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] } }, @@ -35,8 +36,7 @@ ], "NextQuestId": 291 } - ] - } - ] - } - \ No newline at end of file + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json index d175b90d8..8430dab8b 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json @@ -1,18 +1,19 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000995, -"Position": { - "X": -52.018066, - "Y": 42.799637, - "Z": 192.2179 -}, -"TerritoryId": 128, -"InteractionType": "AcceptQuest", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000995, + "Position": { + "X": -52.018066, + "Y": 42.799637, + "Z": 192.2179 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", @@ -22,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] } }, @@ -32,31 +33,32 @@ "Prompt": "TEXT_CLSBSM001_00185_Q1_000_1", "Yes": true } - ]} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000997, -"Position": { - "X": -31.265808, - "Y": 44.49997, - "Z": 185.53442 -}, -"TerritoryId": 128, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSBSM011_00291_Q1_000_1", - "Yes": true - } - ], - "NextQuestId": 292 - } - ] - } - ] - } - \ No newline at end of file + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000997, + "Position": { + "X": -31.265808, + "Y": 44.49997, + "Z": 185.53442 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSBSM011_00291_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 292 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json index 048b8ad3d..aad03a63e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json @@ -1,39 +1,41 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000294, -"Position": { - "X": -238.05603, - "Y": 8, - "Z": -142.93127 -}, -"TerritoryId": 133, -"AetheryteShortcut": "Gridania", -"AethernetShortcut": ["[Gridania] Aetheryte Plaza", "[Gridania] Botanists' Guild"], - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSHRV999_00193_Q1_000_1", - "Yes": true - } - ], - "InteractionType": "AcceptQuest", - "SkipConditions": { + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000294, + "Position": { + "X": -238.05603, + "Y": 8, + "Z": -142.93127 + }, + "TerritoryId": 133, + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Botanists' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSHRV999_00193_Q1_000_1", + "Yes": true + } + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 132,133 + 133 ] } } - + } + ] + } + ] } - ] - } - ] - } - \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json index 02440c89b..aa2443e85 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000294, -"Position": { - "X": -238.05603, - "Y": 8, - "Z": -142.93127 -}, -"TerritoryId": 133, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000815, -"Position": { - "X": -233.9361, - "Y": 6.668152, - "Z": -171.03839 -}, -"TerritoryId": 133, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSHRV001_00003_Q1_000_1", - "Yes": true - } - ], - "NextQuestId": 3 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000294, + "Position": { + "X": -238.05603, + "Y": 8, + "Z": -142.93127 + }, + "TerritoryId": 133, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000815, + "Position": { + "X": -233.9361, + "Y": 6.668152, + "Z": -171.03839 + }, + "TerritoryId": 133, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSHRV001_00003_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 3 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json index a157b4677..7cc8451f7 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json @@ -1,37 +1,34 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000148, -"Position": { - "X": -20.279297, - "Y": -3.25, - "Z": 45.97534 -}, -"TerritoryId": 132, - "AetheryteShortcut": "Gridania", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSWDK999_00184_Q1_000_1", - "Yes": true - } - ], - "InteractionType": "AcceptQuest", - "SkipConditions": { + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000148, + "Position": { + "X": -20.279297, + "Y": -3.25, + "Z": 45.97534 + }, + "TerritoryId": 132, + "AetheryteShortcut": "Gridania", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSWDK999_00184_Q1_000_1", + "Yes": true + } + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 132 - ] + "InSameTerritory": true } } - } - ] - } - ] - } - \ No newline at end of file + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json index 762b5f79a..95d5ecf9c 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json @@ -1,18 +1,19 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000946, -"Position": { - "X": -61.142883, - "Y": 42.299698, - "Z": -164.0498 -}, -"TerritoryId": 128, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000946, + "Position": { + "X": -61.142883, + "Y": 42.299698, + "Z": -164.0498 + }, + "TerritoryId": 128, + "InteractionType": "Interact", "AetheryteShortcut": "Limsa Lominsa", "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", @@ -22,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129 + 128 ] } }, @@ -32,9 +33,9 @@ "Prompt": "TEXT_CLSCUL001_00191_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json index cbc91453d..2a7bd1a33 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000946, -"Position": { - "X": -61.142883, - "Y": 42.299698, - "Z": -164.0498 -}, -"TerritoryId": 128, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000947, -"Position": { - "X": -54.64258, - "Y": 44, - "Z": -151.23218 -}, -"TerritoryId": 128, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSCUL011_00271_Q1_000_1", - "Yes": true - } - ], - "NextQuestId": 271 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000946, + "Position": { + "X": -61.142883, + "Y": 42.299698, + "Z": -164.0498 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000947, + "Position": { + "X": -54.64258, + "Y": 44, + "Z": -151.23218 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSCUL011_00271_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 271 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json index f2cb05de2..f1b94278f 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json @@ -1,32 +1,32 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000251, - "Position": { - "X": 147.08167, - "Y": 15.5, - "Z": -267.99426 - }, - "TerritoryId": 133, - "AethernetShortcut": [ - "[Gridania] Aetheryte Plaza", - "[Gridania] Lancers' Guild" - ], - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSLNC999_00180_Q1_000_1", - "Yes": true - } - ], - "InteractionType": "Interact" - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000251, + "Position": { + "X": 147.08167, + "Y": 15.5, + "Z": -267.99426 + }, + "TerritoryId": 133, + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Lancers' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSLNC999_00180_Q1_000_1", + "Yes": true + } + ], + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json index d28fa0e01..3cc4d179c 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json @@ -1,57 +1,63 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000859, -"Position": { - "X": -166.76587, - "Y": 4.5496645, - "Z": 150.04187 -}, -"TerritoryId": 129, -"InteractionType": "Interact", -"AetheryteShortcut": "Limsa Lominsa", -"AethernetShortcut": [ - "[Limsa Lominsa] Aetheryte Plaza", - "[Limsa Lominsa] Fishermens' Guild" - ], - "SkipConditions": { + "DataId": 1000859, + "Position": { + "X": -166.76587, + "Y": 4.5496645, + "Z": 150.04187 + }, + "TerritoryId": 129, + "InteractionType": "Interact", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Fishermens' Guild" + ], + "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 129 - ] + "InSameTerritory": true } } - } - ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": -167.60791, + "Y": 4.550005, + "Z": 165.35986 + }, + "TerritoryId": 129, + "InteractionType": "WalkTo" }, { - "Sequence": 255, - "Steps": [ - { - "DataId": 1000857, -"Position": { - "X": -165.27051, - "Y": 5.2500057, - "Z": 164.29382 -}, -"TerritoryId": 129, -"DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSFSH011_01107_Q1_000_001", - "Yes": true - } - ], -"InteractionType": "CompleteQuest", -"NextQuestId": 1108 - } - ] + "DataId": 1000857, + "Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 + }, + "TerritoryId": 129, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSFSH011_01107_Q1_000_001", + "Yes": true + } + ], + "InteractionType": "CompleteQuest", + "NextQuestId": 1108 } - ] -} \ No newline at end of file + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json index 67bd92543..c994aadd7 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json @@ -1,76 +1,59 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "TerritoryId": 129, - "InteractionType": "EquipItem", - "ItemId": 2571, - "SkipConditions": { - "StepIf": { - "Item": { - "NotInInventory": true - } - } - } - }, - { - "TerritoryId": 129, - "InteractionType": "EquipRecommended" - }, - - { - "DataId": 1000857, -"Position": { - "X": -165.27051, - "Y": 5.2500057, - "Z": 164.29382 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest" - } - ] + "TerritoryId": 129, + "InteractionType": "EquipItem", + "ItemId": 2571, + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } }, { - "Sequence": 1, - "Steps": [ - { -"Position": { - "X": -42.679565, - "Y": 39.999966, - "Z": 119.920654 -}, -"TerritoryId": 128, -"InteractionType": "WaitForManualProgress", - "AethernetShortcut": [ - "[Limsa Lominsa] Fishermens' Guild", - "[Limsa Lominsa] The Aftcastle" - ] - } - ] + "TerritoryId": 129, + "InteractionType": "EquipRecommended" }, { - "Sequence": 255, - "Steps": [ - { - "DataId": 1000857, -"Position": { - "X": -165.27051, - "Y": 5.2500057, - "Z": 164.29382 -}, -"TerritoryId": 129, -"InteractionType": "CompleteQuest", -"AethernetShortcut": [ - "[Limsa Lominsa] The Aftcastle", - "[Limsa Lominsa] Fishermens' Guild" - ], - "NextQuestId": 3843 - } - ] + "DataId": 1000857, + "Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 + }, + "TerritoryId": 129, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000857, + "Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 + }, + "TerritoryId": 129, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Limsa Lominsa] The Aftcastle", + "[Limsa Lominsa] Fishermens' Guild" + ], + "NextQuestId": 3843, + "Disabled": true, + "Comment": "Catch/turn in fish manually" + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json index 037f2dad8..d9fcf3c18 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json @@ -1,67 +1,59 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000859, -"Position": { - "X": -166.76587, - "Y": 4.5496645, - "Z": 150.04187 -}, -"TerritoryId": 129, -"AethernetShortcut": [ - "[Limsa Lominsa] Aetheryte Plaza", - "[Limsa Lominsa] Fishermens' Guild" - ], -"DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSFSH001_01134_Q1_000_1", - "Yes": true, - "$": "Need to find real prompt in godbert" - } - ], -"InteractionType": "Interact" - }, - { - "DataId": 1000859, -"Position": { - "X": -166.76587, - "Y": 4.5496645, - "Z": 150.04187 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest" - } - ] + "DataId": 1000859, + "Position": { + "X": -166.76587, + "Y": 4.5496645, + "Z": 150.04187 + }, + "TerritoryId": 129, + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Fishermens' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSFSH001_01134_Q1_000_1", + "Yes": true + } + ], + "InteractionType": "Interact" }, { - "Sequence": 255, - "Steps": [ - { - "DataId": 1000857, -"Position": { - "X": -165.27051, - "Y": 5.2500057, - "Z": 164.29382 -}, -"TerritoryId": 129, -"DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSGLA020_00253_Q1_000_1", - "Yes": true, - "$": "Need to find real prompt in godbert" - } - ], -"InteractionType": "CompleteQuest", -"NextQuestId": 1108 - } - ] + "DataId": 1000859, + "Position": { + "X": -166.76587, + "Y": 4.5496645, + "Z": 150.04187 + }, + "TerritoryId": 129, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000857, + "Position": { + "X": -165.27051, + "Y": 5.2500057, + "Z": 164.29382 + }, + "TerritoryId": 129, + "InteractionType": "CompleteQuest", + "NextQuestId": 1108 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json index 985f50b6b..3bf587f80 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/3843_All the Fish in the Sea.json @@ -1,40 +1,40 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1000858, -"Position": { - "X": -168.47485, - "Y": 4.5500045, - "Z": 163.65295 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "DataId": 1005424, -"Position": { - "X": -412.80237, - "Y": 4, - "Z": 75.05908 -}, -"TerritoryId": 129, -"InteractionType": "CompleteQuest", - "AethernetShortcut": [ - "[Limsa Lominsa] Fishermens' Guild", - "[Limsa Lominsa] Arcanists' Guild" - ] - } - ] + "DataId": 1000858, + "Position": { + "X": -168.47485, + "Y": 4.5500045, + "Z": 163.65295 + }, + "TerritoryId": 129, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005424, + "Position": { + "X": -412.80237, + "Y": 4, + "Z": 75.05908 + }, + "TerritoryId": 129, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Limsa Lominsa] Fishermens' Guild", + "[Limsa Lominsa] Arcanists' Guild" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json index 0151fc858..a66a332f7 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json @@ -1,21 +1,24 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1002280, -"Position": { - "X": -35.385742, - "Y": 13.599962, - "Z": 97.24573 -}, -"TerritoryId": 131, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002280, + "Position": { + "X": -35.385742, + "Y": 13.599962, + "Z": 97.24573 + }, + "TerritoryId": 131, + "InteractionType": "Interact", "AetheryteShortcut": "Ul'dah", - "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", - "[Ul'dah] Goldsmiths' Guild"], + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Goldsmiths' Guild" + ], "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, @@ -30,9 +33,9 @@ "Prompt": "TEXT_CLSGLD001_00187_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json index eab3d2282..2ba0018c1 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json @@ -5,36 +5,39 @@ { "Sequence": 0, "Steps": [ - { "DataId": 1002280, -"Position": { - "X": -35.385742, - "Y": 13.599962, - "Z": 97.24573 -}, -"TerritoryId": 131, -"InteractionType": "AcceptQuest"} + { + "DataId": 1002280, + "Position": { + "X": -35.385742, + "Y": 13.599962, + "Z": 97.24573 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" + } ] }, { "Sequence": 255, "Steps": [ - { "DataId": 1004093, -"Position": { - "X": -25.162231, - "Y": 12.200003, - "Z": 110.795654 -}, -"TerritoryId": 131, -"InteractionType": "CompleteQuest", -"DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSGLD011_00608_A1_000_1", - "Yes": true - } - ], -"NextQuestId": 608 -} + { + "DataId": 1004093, + "Position": { + "X": -25.162231, + "Y": 12.200003, + "Z": 110.795654 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSGLD011_00608_A1_000_1", + "Yes": true + } + ], + "NextQuestId": 608 + } ] } ] diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json index 8c8f840af..c263bfdaa 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000352, -"Position": { - "X": 65.69006, - "Y": 8, - "Z": -147.41742 -}, -"TerritoryId": 133, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000691, -"Position": { - "X": 71.97681, - "Y": 8, - "Z": -166.52173 -}, -"TerritoryId": 133, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSTAN000_00105_Q1_000_1", - "Yes": true - } - ], - "NextQuestId": 105 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000352, + "Position": { + "X": 65.69006, + "Y": 8, + "Z": -147.41742 + }, + "TerritoryId": 133, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000691, + "Position": { + "X": 71.97681, + "Y": 8, + "Z": -166.52173 + }, + "TerritoryId": 133, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSTAN000_00105_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 105 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json index 1114efb19..4412c8f6f 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json @@ -1,18 +1,19 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000352, -"Position": { - "X": 65.69006, - "Y": 8, - "Z": -147.41742 -}, -"TerritoryId": 133, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000352, + "Position": { + "X": 65.69006, + "Y": 8, + "Z": -147.41742 + }, + "TerritoryId": 133, + "InteractionType": "Interact", "AetheryteShortcut": "Gridania", "AethernetShortcut": [ "[Gridania] Aetheryte Plaza", @@ -32,9 +33,9 @@ "Prompt": "TEXT_CLSTAN999_00188_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json index 5a950afb8..8494b6987 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json @@ -1,25 +1,23 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1001286, -"Position": { - "X": -88.9754, - "Y": 2.55, - "Z": -51.163513 -}, -"TerritoryId": 130, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001286, + "Position": { + "X": -88.9754, + "Y": 2.55, + "Z": -51.163513 + }, + "TerritoryId": 130, + "InteractionType": "Interact", "AetheryteShortcut": "Ul'dah", "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 130 - ] + "InSameTerritory": true } }, "DialogueChoices": [ @@ -28,9 +26,9 @@ "Prompt": "TEXT_CLSPGL001_00178_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json index fd3e9fcbd..2e25eb221 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1001286, -"Position": { - "X": -88.9754, - "Y": 2.55, - "Z": -51.163513 -}, -"TerritoryId": 130, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1003817, -"Position": { - "X": -74.57086, - "Y": 1.9999951, - "Z": -42.404846 -}, -"TerritoryId": 130, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSPGL011_00532_Q1_000_1", - "Yes": true - } - ], - "NextQuestId": 553 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001286, + "Position": { + "X": -88.9754, + "Y": 2.55, + "Z": -51.163513 + }, + "TerritoryId": 130, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1003817, + "Position": { + "X": -74.57086, + "Y": 1.9999951, + "Z": -42.404846 + }, + "TerritoryId": 130, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSPGL011_00532_Q1_000_1", + "Yes": true + } + ], + "NextQuestId": 553 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json index 6d6923c9e..e73ae1cd2 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json @@ -1,28 +1,27 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 255, - "Steps": [ - { "DataId": 1009944, -"Position": { - "X": -152.66656, - "Y": 2.8562405, - "Z": 243.18298 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1009944, + "Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 + }, + "TerritoryId": 129, + "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", "AethernetShortcut": [ - "[Limsa Lominsa] Aetheryte Plaza","[Limsa Lominsa] Fishermens' Guild" + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Fishermens' Guild" ], "SkipConditions": { "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 129 - ] + "InSameTerritory": true } }, "DialogueChoices": [ @@ -32,10 +31,9 @@ "Yes": true } ], - "NextQuestID": 102 + "NextQuestId": 102 } - ] - } - ] - } - \ No newline at end of file + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_My First Dagger.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_My First Dagger.json new file mode 100644 index 000000000..431a9e90b --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_My First Dagger.json @@ -0,0 +1,61 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1009944, + "Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 + }, + "TerritoryId": 129, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1009944, + "Position": { + "X": -152.66656, + "Y": 2.8562405, + "Z": 243.18298 + }, + "TerritoryId": 129, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSROG011_00102_Q9_000_901", + "Yes": true + } + ] + }, + { + "DataId": 1009943, + "Position": { + "X": -153.36847, + "Y": -129.4397, + "Z": 265.88843 + }, + "StopDistance": 7, + "TerritoryId": 129, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSROG011_00102_Q1_000_030", + "Yes": true + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json deleted file mode 100644 index 5006b09f2..000000000 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1009944, -"Position": { - "X": -152.66656, - "Y": 2.8562405, - "Z": 243.18298 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1009944, -"Position": { - "X": -152.66656, - "Y": 2.8562405, - "Z": 243.18298 -}, -"TerritoryId": 129, -"InteractionType": "Interact" -}, - { "DataId": 1009943, -"Position": { - "X": -153.36847, - "Y": -129.4397, - "Z": 265.88843 -}, -"TerritoryId": 129, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSROG011_00102_Q1_000_030", - "Yes": true - } - ] - } - ] - } - ] - } - \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json index ee440d593..eba6e3051 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json @@ -7,18 +7,18 @@ "Steps": [ { "DataId": 1002277, -"Position": { - "X": -97.550964, - "Y": 7.05, - "Z": 23.605652 -}, -"TerritoryId": 131, -"InteractionType": "AcceptQuest", -"AethernetShortcut": [ + "Position": { + "X": -97.550964, + "Y": 7.05, + "Z": 23.605652 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -33,18 +33,18 @@ "Sequence": 1, "Steps": [ { - "DataId": 1006747, -"Position": { - "X": -20.828613, - "Y": 29.999964, - "Z": -2.4262085 -}, -"TerritoryId": 131, -"InteractionType": "Interact", -"AethernetShortcut": [ - "[Ul'dah] Gladiators' Guild", + "DataId": 1006747, + "Position": { + "X": -20.828613, + "Y": 29.999964, + "Z": -2.4262085 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", "[Ul'dah] The Chamber of Rule" - ] + ] } ] }, @@ -52,66 +52,75 @@ "Sequence": 2, "Steps": [ { - "DataId": 2002344, -"Position": { - "X": -97.39838, - "Y": 14.846985, - "Z": -188.2201 -}, -"TerritoryId": 146, -"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", -"InteractionType": "Combat", -"EnemySpawnType": "AfterInteraction", -"KillEnemyDataIds": [18,19] - } + "DataId": 2002344, + "Position": { + "X": -97.39838, + "Y": 14.846985, + "Z": -188.2201 + }, + "TerritoryId": 146, + "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 18, + 19 + ], + "Fly": true + } ] }, - { "Sequence": 3, - "Steps": [ + { + "Sequence": 3, + "Steps": [ { - "DataId": 2002345, -"Position": { - "X": -97.39838, - "Y": 16.433899, - "Z": -188.2201 -}, -"TerritoryId": 146, -"InteractionType": "UseItem", -"ItemId": 2000821 + "DataId": 2002345, + "Position": { + "X": -97.39838, + "Y": 16.433899, + "Z": -188.2201 + }, + "TerritoryId": 146, + "InteractionType": "UseItem", + "ItemId": 2000821 } - ]}, - { "Sequence": 4, - "Steps": [ + ] + }, + { + "Sequence": 4, + "Steps": [ { - "DataId": 1006747, -"Position": { - "X": -20.828613, - "Y": 29.999964, - "Z": -2.4262085 -}, -"TerritoryId": 131, -"InteractionType": "Interact", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ - "[Ul'dah] Aetheryte Plaza", + "DataId": 1006747, + "Position": { + "X": -20.828613, + "Y": 29.999964, + "Z": -2.4262085 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", "[Ul'dah] The Chamber of Rule" - ] + ] } - ]} - , - { "Sequence": 255, - "Steps": [ + ] + }, + { + "Sequence": 255, + "Steps": [ { - "DataId": 1006747, -"Position": { - "X": -20.828613, - "Y": 29.999964, - "Z": -2.4262085 -}, -"TerritoryId": 131, -"InteractionType": "CompleteQuest", - "NextQuestId": 1056 + "DataId": 1006747, + "Position": { + "X": -20.828613, + "Y": 29.999964, + "Z": -2.4262085 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "NextQuestId": 1056 } - ]} + ] + } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/177_So You Want to Be a Gladiator.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/177_So You Want to Be a Gladiator.json new file mode 100644 index 000000000..c0c38a447 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/177_So You Want to Be a Gladiator.json @@ -0,0 +1,41 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002277, + "Position": { + "X": -97.550964, + "Y": 7.05, + "Z": 23.605652 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSGLA001_00177_Q1_000_1", + "Yes": true + } + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/253_Way of the Gladiator.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/253_Way of the Gladiator.json index 09113bd9a..5d6ef84a3 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/253_Way of the Gladiator.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/253_Way of the Gladiator.json @@ -84,8 +84,7 @@ "MinimumKillCount": 3, "CompletionQuestVariablesFlags": [ { - "Low": 3, - "Mode": "Exact" + "Low": 3 }, null, null, @@ -100,8 +99,7 @@ "CompletionQuestVariablesFlags": [ null, { - "High": 3, - "Mode": "Exact" + "High": 3 }, null, null, @@ -112,12 +110,10 @@ ], "CompletionQuestVariablesFlags": [ { - "Low": 3, - "Mode": "Exact" + "Low": 3 }, { - "High": 3, - "Mode": "Exact" + "High": 3 }, null, null, @@ -141,8 +137,7 @@ "CompletionQuestVariablesFlags": [ null, { - "Low": 3, - "Mode": "Exact" + "Low": 3 }, null, null, @@ -154,8 +149,7 @@ "CompletionQuestVariablesFlags": [ null, { - "Low": 3, - "Mode": "Exact" + "Low": 3 }, null, null, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json index 1c0293f70..2715bf999 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json @@ -13,13 +13,13 @@ "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "AcceptQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -35,19 +35,21 @@ "Steps": [ { "DataId": 1002296, -"Position": { - "X": -139.42175, - "Y": 4.019726, - "Z": 205.0354 -}, -"TerritoryId": 141, -"InteractionType": "Combat", -"EnemySpawnType": "AfterInteraction", -"AethernetShortcut": [ + "Position": { + "X": -139.42175, + "Y": 4.019726, + "Z": 205.0354 + }, + "TerritoryId": 141, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "AethernetShortcut": [ "[Ul'dah] Gladiators' Guild", "[Ul'dah] Gate of Nald (Central Thanalan)" ], - "KillEnemyDataIds": [1245] + "KillEnemyDataIds": [ + 1245 + ] } ] }, @@ -56,13 +58,13 @@ "Steps": [ { "DataId": 1002296, -"Position": { - "X": -139.42175, - "Y": 4.019726, - "Z": 205.0354 -}, -"TerritoryId": 141, -"InteractionType": "Interact" + "Position": { + "X": -139.42175, + "Y": 4.019726, + "Z": 205.0354 + }, + "TerritoryId": 141, + "InteractionType": "Interact" } ] }, @@ -77,13 +79,13 @@ "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "Interact", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -93,66 +95,69 @@ } } ] - }, + }, { - "Sequence": 4, - "Steps": [ - { - "DataId": 2001426, -"Position": { - "X": 27.206787, - "Y": 12.985352, - "Z": 51.83484 -}, -"TerritoryId": 141, -"InteractionType": "SinglePlayerDuty", - "AethernetShortcut": [ - "[Ul'dah] Gladiators' Guild", - "[Ul'dah] Gate of Nald (Central Thanalan)" - ] - } - ] - }, - - { "Sequence": 5, + "Sequence": 4, "Steps": [ - { - "DataId": 1003945, -"Position": { - "X": 24.917969, - "Y": 13, - "Z": 50.156372 -}, -"TerritoryId": 141, -"InteractionType": "Interact" - } - ]}, - - { "Sequence": 255, - "Steps": [ { - "DataId": 1001739, + "DataId": 2001426, + "Position": { + "X": 27.206787, + "Y": 12.985352, + "Z": 51.83484 + }, + "TerritoryId": 141, + "InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1003945, + "Position": { + "X": 24.917969, + "Y": 13, + "Z": 50.156372 + }, + "StopDistance": 5, + "TerritoryId": 141, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "CompleteQuest", -"AetheryteShortcut": "Ul'dah", -"DialogueChoices": [ + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "DialogueChoices": [ { "Type": "List", "Prompt": "TEXT_CLSGLA100_00261_Q1_000_160", "Answer": "TEXT_CLSGLA100_00261_A1_000_161" } ], -"AethernetShortcut": [ + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "NextQuestId": 262 + ], + "NextQuestId": 262 } - ]} + ] + } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json index 6a32e9756..f3ed11add 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json @@ -13,13 +13,13 @@ "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "AcceptQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -34,17 +34,19 @@ "Sequence": 1, "Steps": [ { - "DataId": 1004224, -"Position": { - "X": -220.93542, - "Y": -38.407475, - "Z": 63.91992 -}, -"TerritoryId": 145, -"InteractionType": "Combat", -"AetheryteShortcut": "Eastern Thanalan - Camp Drybone", -"EnemySpawnType":"AfterInteraction", -"KillEnemyDataIds":[1244] + "DataId": 1004224, + "Position": { + "X": -220.93542, + "Y": -38.407475, + "Z": 63.91992 + }, + "TerritoryId": 145, + "InteractionType": "Combat", + "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 1244 + ] } ] }, @@ -53,13 +55,13 @@ "Steps": [ { "DataId": 1004224, -"Position": { - "X": -220.93542, - "Y": -38.407475, - "Z": 63.91992 -}, -"TerritoryId": 145, -"InteractionType": "Interact" + "Position": { + "X": -220.93542, + "Y": -38.407475, + "Z": 63.91992 + }, + "TerritoryId": 145, + "InteractionType": "Interact" } ] }, @@ -74,13 +76,13 @@ "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "Interact", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -90,43 +92,45 @@ } } ] - }, + }, { - "Sequence": 4, - "Steps": [ - { - "DataId": 1004091, -"Position": { - "X": 24.12439, - "Y": 7.1999984, - "Z": -102.76953 -}, -"TerritoryId": 130, -"InteractionType": "SinglePlayerDuty", - "AethernetShortcut": [ - "[Ul'dah] Gladiators' Guild", - "[Ul'dah] Adventurers' Guild" - ] - } - ] - }, - { "Sequence": 255, - "Steps": [ + "Sequence": 4, + "Steps": [ { - "DataId": 1001739, + "DataId": 1004091, + "Position": { + "X": 24.12439, + "Y": 7.1999984, + "Z": -102.76953 + }, + "TerritoryId": 130, + "InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Adventurers' Guild" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "CompleteQuest", -"AethernetShortcut": [ - "[Ul'dah] Aetheryte Plaza", + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Ul'dah] Adventurers' Guild", "[Ul'dah] Gladiators' Guild" - ], - "NextQuestId": 263 + ], + "NextQuestId": 263 } - ]} + ] + } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json index 46473b39e..9afca9f9d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json @@ -13,13 +13,13 @@ "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "AcceptQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -34,15 +34,15 @@ "Sequence": 1, "Steps": [ { - "DataId": 1004140, -"Position": { - "X": -72.34308, - "Y": -12.372956, - "Z": -69.13867 -}, -"TerritoryId": 141, -"InteractionType": "Interact", -"AetheryteShortcut": "Central Thanalan - Black Brush Station" + "DataId": 1004140, + "Position": { + "X": -72.34308, + "Y": -12.372956, + "Z": -69.13867 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "AetheryteShortcut": "Central Thanalan - Black Brush Station" } ] }, @@ -51,81 +51,108 @@ "Steps": [ { "DataId": 1001462, -"Position": { - "X": -93.33948, - "Y": -11.367981, - "Z": -41.397766 -}, -"TerritoryId": 141, -"InteractionType": "Interact" + "Position": { + "X": -93.33948, + "Y": -11.367981, + "Z": -41.397766 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1001438, -"Position": { - "X": -30.838562, - "Y": -1.0332576, - "Z": -145.67792 -}, -"TerritoryId": 141, -"InteractionType": "Interact" + "Position": { + "X": -30.838562, + "Y": -1.0332576, + "Z": -145.67792 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, - {"DataId": 2001434, -"Position": { - "X": -115.77026, - "Y": 0.015197754, - "Z": -149.24854 -}, -"TerritoryId": 141, -"InteractionType": "Interact" -} + { + "DataId": 2001434, + "Position": { + "X": -115.77026, + "Y": 0.015197754, + "Z": -149.24854 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } ] }, { "Sequence": 3, "Steps": [ - {"DataId": 1004140, -"Position": { - "X": -72.34308, - "Y": -12.372956, - "Z": -69.13867 -}, -"TerritoryId": 141, -"InteractionType": "Interact" + { + "DataId": 1004140, + "Position": { + "X": -72.34308, + "Y": -12.372956, + "Z": -69.13867 + }, + "TerritoryId": 141, + "InteractionType": "Interact" } ] - }, + }, { - "Sequence": 4, - "Steps": [ - { - "DataId": 1001285, -"Position": { - "X": -68.77246, - "Y": 4.0411124, - "Z": -126.51257 -}, -"TerritoryId": 130, -"InteractionType": "Interact", - "AetheryteShortcut": "Ul'dah" - } - ] - }, - { "Sequence": 5, - "Steps": [ + "Sequence": 4, + "Steps": [ { - "DataId": 1001739, + "DataId": 1001285, + "Position": { + "X": -68.77246, + "Y": 4.0411124, + "Z": -126.51257 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "Interact", -"AethernetShortcut": [ + "InteractionType": "Interact", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "DialogueChoices": [ + ], + "DialogueChoices": [ { "Type": "List", "Prompt": "TEXT_CLSGLA200_00263_Q1_000_124", @@ -133,42 +160,48 @@ } ] } - ]}, - { "Sequence": 6, - "Steps": [ + ] + }, + { + "Sequence": 6, + "Steps": [ { - "DataId": 1004092, -"Position": { - "X": -241.16882, - "Y": 32.47634, - "Z": 398.9165 -}, -"TerritoryId": 140, -"InteractionType": "SinglePlayerDuty", -"AethernetShortcut": [ + "DataId": 1004092, + "Position": { + "X": -241.16882, + "Y": 32.47634, + "Z": 398.9165 + }, + "TerritoryId": 140, + "InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ "[Ul'dah] Gladiators' Guild", "[Ul'dah] Gate of the Sultana (Western Thanalan)" - ] + ], + "Fly": true } - ]}, - { "Sequence": 255, - "Steps": [ + ] + }, + { + "Sequence": 255, + "Steps": [ { - "DataId": 1001739, + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "CompleteQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "NextQuestId": 264 + ], + "NextQuestId": 264 } - ]} + ] + } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json index 8756d67b7..200951f44 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json @@ -13,13 +13,13 @@ "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "AcceptQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -34,20 +34,23 @@ "Sequence": 1, "Steps": [ { - "DataId": 1004225, -"Position": { - "X": 62.974, - "Y": 54.60642, - "Z": 284.90112 -}, -"TerritoryId": 140, -"InteractionType": "Combat", -"EnemySpawnType": "AfterInteraction", -"KillEnemyDataIds": [1243], -"AethernetShortcut": [ + "DataId": 1004225, + "Position": { + "X": 62.974, + "Y": 54.60642, + "Z": 284.90112 + }, + "TerritoryId": 140, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 1243 + ], + "AethernetShortcut": [ "[Ul'dah] Gladiators' Guild", "[Ul'dah] Gate of the Sultana (Western Thanalan)" - ] + ], + "Fly": true } ] }, @@ -56,61 +59,65 @@ "Steps": [ { "DataId": 1004225, -"Position": { - "X": 62.974, - "Y": 54.60642, - "Z": 284.90112 -}, -"TerritoryId": 140, -"InteractionType": "Interact" + "Position": { + "X": 62.974, + "Y": 54.60642, + "Z": 284.90112 + }, + "TerritoryId": 140, + "InteractionType": "Interact" } ] }, - { "Sequence": 3, - "Steps": [ + { + "Sequence": 3, + "Steps": [ { - "DataId": 1001739, + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "Interact", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ] + ] } - ]}, - { "Sequence": 4, - "Steps": [ + ] + }, + { + "Sequence": 4, + "Steps": [ { - "DataId": 1002277, -"Position": { - "X": -97.550964, - "Y": 7.05, - "Z": 23.605652 -}, -"TerritoryId": 131, -"InteractionType": "Interact" + "DataId": 1002277, + "Position": { + "X": -97.550964, + "Y": 7.05, + "Z": 23.605652 + }, + "TerritoryId": 131, + "InteractionType": "Interact" } - ]} - , - { "Sequence": 5, - "Steps": [ + ] + }, + { + "Sequence": 5, + "Steps": [ { - "DataId": 1004141, -"Position": { - "X": -520.5005, - "Y": -21.460285, - "Z": 123.46069 -}, -"TerritoryId": 145, -"InteractionType": "SinglePlayerDuty", -"AetheryteShortcut": "Eastern Thanalan - Camp Drybone", -"DialogueChoices": [ + "DataId": 1004141, + "Position": { + "X": -520.5005, + "Y": -21.460285, + "Z": 123.46069 + }, + "TerritoryId": 145, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", + "DialogueChoices": [ { "Type": "List", "Prompt": "TEXT_CLSGLA250_00264_Q1_000_170", @@ -118,26 +125,28 @@ } ] } - ]} - , - { "Sequence": 255, - "Steps": [ + ] + }, + { + "Sequence": 255, + "Steps": [ { - "DataId": 1001739, + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "CompleteQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "NextQuestId": 265 + ], + "NextQuestId": 265 } - ]} + ] + } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json index e644803ca..2dd6e1d0b 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json @@ -13,13 +13,13 @@ "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "AcceptQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "SkipConditions": { + ], + "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ @@ -34,19 +34,19 @@ "Sequence": 1, "Steps": [ { - "DataId": 1001285, -"Position": { - "X": -68.77246, - "Y": 4.0411124, - "Z": -126.51257 -}, -"TerritoryId": 130, -"InteractionType": "Interact", -"AethernetShortcut": [ - "[Ul'dah] Gladiators' Guild", + "DataId": 1001285, + "Position": { + "X": -68.77246, + "Y": 4.0411124, + "Z": -126.51257 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", "[Ul'dah] Aetheryte Plaza" - ], - "DialogueChoices": [ + ], + "DialogueChoices": [ { "Type": "List", "Prompt": "TEXT_CLSGLA300_00265_Q1_000_40", @@ -61,109 +61,150 @@ "Steps": [ { "Position": { - "X": 235.23369, - "Y": 2.747214, - "Z": 673.64215 -}, -"TerritoryId": 141, -"InteractionType": "WalkTo", -"AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gate of Thal (Central Thanalan)"] + "X": 235.23369, + "Y": 2.747214, + "Z": 673.64215 + }, + "TerritoryId": 141, + "InteractionType": "WalkTo", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gate of Thal (Central Thanalan)" + ], + "SkipConditions": { + "StepIf": { + "AetheryteUnlocked": "Southern Thanalan - Little Ala Mhigo" + } + } }, -{ -"TerritoryId": 146, -"Aetheryte": "Southern Thanalan - Little Ala Mhigo", -"InteractionType": "AttuneAetheryte" -}, -{"Position": { - "X": 140.30618, - "Y": 4.2185926, - "Z": -585.2695 -}, -"TerritoryId": 146, -"InteractionType": "WalkTo"}, { - "DataId": 2001455, -"Position": { - "X": 28.091797, - "Y": 6.9733276, - "Z": -611.2917 -}, -"TerritoryId": 146, -"InteractionType": "Interact" - }, - { - "DataId": 2001435, -"Position": { - "X": 101.823364, - "Y": 7.248047, - "Z": -534.56934 -}, -"TerritoryId": 146, -"InteractionType": "Interact" - }, + "TerritoryId": 146, + "Aetheryte": "Southern Thanalan - Little Ala Mhigo", + "InteractionType": "AttuneAetheryte", + "SkipConditions": { + "StepIf": { + "AetheryteUnlocked": "Southern Thanalan - Little Ala Mhigo" + } + } + }, { -"Position": { - "X": 164.75665, - "Y": 3.3963587, - "Z": -585.49005 -}, -"TerritoryId": 146, -"InteractionType": "WalkTo" - + "Position": { + "X": 140.30618, + "Y": 4.2185926, + "Z": -585.2695 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", + "SkipConditions": { + "AetheryteShortcutIf": { + "AetheryteLocked": "Southern Thanalan - Little Ala Mhigo" + } + } + }, + { + "DataId": 2001455, + "Position": { + "X": 28.091797, + "Y": 6.9733276, + "Z": -611.2917 + }, + "TerritoryId": 146, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2001435, + "Position": { + "X": 101.823364, + "Y": 7.248047, + "Z": -534.56934 + }, + "TerritoryId": 146, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, - { "Sequence": 3, - "Steps": [ + { + "Sequence": 3, + "Steps": [ { - "DataId": 1001739, + "Position": { + "X": 164.75665, + "Y": 3.3963587, + "Z": -585.49005 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo" + }, + { + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "Interact", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ] + ] } - ]}, - { "Sequence": 4, - "Steps": [ + ] + }, + { + "Sequence": 4, + "Steps": [ { - "DataId": 1004142, -"Position": { - "X": -19.97406, - "Y": -30.999985, - "Z": -33.951355 -}, -"TerritoryId": 145, -"InteractionType": "SinglePlayerDuty", -"AetheryteShortcut": "Eastern Thanalan - Camp Drybone" + "DataId": 1004142, + "Position": { + "X": -19.97406, + "Y": -30.999985, + "Z": -33.951355 + }, + "TerritoryId": 145, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Eastern Thanalan - Camp Drybone" } - ]} - , - { "Sequence": 255, - "Steps": [ + ] + }, + { + "Sequence": 255, + "Steps": [ { - "DataId": 1001739, + "DataId": 1001739, "Position": { "X": -94.529724, "Y": 6.4999976, "Z": 39.81079 }, "TerritoryId": 131, -"InteractionType": "CompleteQuest", -"AetheryteShortcut": "Ul'dah", -"AethernetShortcut": [ + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gladiators' Guild" - ], - "NextQuestId": 1055 + ], + "NextQuestId": 1055 } - ]} + ] + } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/285_Way of the Gladiator.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/285_Way of the Gladiator.json new file mode 100644 index 000000000..126115bb8 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/285_Way of the Gladiator.json @@ -0,0 +1,44 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002277, + "Position": { + "X": -97.550964, + "Y": 7.05, + "Z": 23.605652 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSGLA011_00285_Q2_000_1", + "Yes": true + } + ], + "NextQuestId": 286 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/286_My First Gladius.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/286_My First Gladius.json new file mode 100644 index 000000000..7a43259b3 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/286_My First Gladius.json @@ -0,0 +1,154 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 45.13088, + "Y": 3.889354, + "Z": -166.51999 + }, + "TerritoryId": 130, + "InteractionType": "WalkTo", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Adventurers' Guild" + ], + "SkipConditions": { + "StepIf": { + "InTerritory": [ + 141 + ] + } + } + }, + { + "Position": { + "X": -116.10664, + "Y": 10.801613, + "Z": 276.979 + }, + "TerritoryId": 141, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 351, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + }, + { + "DataId": 141, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + null, + { + "High": 3 + }, + null, + null, + null, + null + ] + } + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + { + "High": 3 + }, + null, + null, + null, + null + ] + }, + { + "Position": { + "X": 39.635372, + "Y": 3.2401803, + "Z": 273.41232 + }, + "TerritoryId": 141, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 205, + "MinimumKillCount": 3, + "CompletionQuestVariablesFlags": [ + null, + { + "Low": 3 + }, + null, + null, + null, + null + ] + } + ], + "CompletionQuestVariablesFlags": [ + null, + { + "Low": 3 + }, + null, + null, + null, + null + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/288_Ul'dah's Most Wanted.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/288_Ul'dah's Most Wanted.json new file mode 100644 index 000000000..a566207a4 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/288_Ul'dah's Most Wanted.json @@ -0,0 +1,163 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1002296, + "Position": { + "X": -139.42175, + "Y": 4.019726, + "Z": 205.0354 + }, + "TerritoryId": 141, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ], + "KillEnemyDataIds": [ + 1245 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1002296, + "Position": { + "X": -139.42175, + "Y": 4.019726, + "Z": 205.0354 + }, + "TerritoryId": 141, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2001756, + "Position": { + "X": 27.206787, + "Y": 12.985352, + "Z": 51.83484 + }, + "TerritoryId": 141, + "InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ + "[Ul'dah] Gladiators' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1003945, + "Position": { + "X": 24.917969, + "Y": 13, + "Z": 50.156372 + }, + "StopDistance": 5, + "TerritoryId": 141, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1001739, + "Position": { + "X": -94.529724, + "Y": 6.4999976, + "Z": 39.81079 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CLSGLA101_00288_Q1_000_160", + "Answer": "TEXT_CLSGLA101_00288_A1_000_161" + } + ], + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Gladiators' Guild" + ], + "NextQuestId": 262 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SMN/451_So You Want to Be an Arcanist.json similarity index 96% rename from QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json rename to QuestPaths/2.x - A Realm Reborn/Class Quests/SMN/451_So You Want to Be an Arcanist.json index 020ff0d5a..b134aff79 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SMN/451_So You Want to Be an Arcanist.json @@ -1,42 +1,42 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000895, -"Position": { - "X": -335.74432, - "Y": 12.899764, - "Z": 1.3884888 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest", - "AetheryteShortcut": "Limsa Lominsa", - "AethernetShortcut": [ - "[Limsa Lominsa] Aetheryte Plaza", - "[Limsa Lominsa] Arcanists' Guild" - ], - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 129 - ] - } - }, - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSACN001_00451_Q1_000_000", - "Yes": true - } - ], - "NextQuestId": 452 - } - ] - } - ] - } +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000895, +"Position": { + "X": -335.74432, + "Y": 12.899764, + "Z": 1.3884888 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Arcanists' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 129 + ] + } + }, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSACN001_00451_Q1_000_000", + "Yes": true + } + ], + "NextQuestId": 452 + } + ] + } + ] + } \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/452_Way of the Arcanist.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SMN/452_Way of the Arcanist.json similarity index 95% rename from QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/452_Way of the Arcanist.json rename to QuestPaths/2.x - A Realm Reborn/Class Quests/SMN/452_Way of the Arcanist.json index dad2a9282..a20b24e07 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/452_Way of the Arcanist.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SMN/452_Way of the Arcanist.json @@ -1,42 +1,42 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000895, -"Position": { - "X": -335.74432, - "Y": 12.899764, - "Z": 1.3884888 -}, -"TerritoryId": 129, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000909, -"Position": { - "X": -326.37524, - "Y": 12.899658, - "Z": 9.994568 -}, -"TerritoryId": 129, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSACN011_00452_Q1_000_000", - "Yes": true - } - ], - "NextQuestId": 454 - } - ] - } - ] - } +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { "DataId": 1000895, +"Position": { + "X": -335.74432, + "Y": 12.899764, + "Z": 1.3884888 +}, +"TerritoryId": 129, +"InteractionType": "AcceptQuest"} + ] + }, + { + "Sequence": 255, + "Steps": [ + { "DataId": 1000909, +"Position": { + "X": -326.37524, + "Y": 12.899658, + "Z": 9.994568 +}, +"TerritoryId": 129, +"InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSACN011_00452_Q1_000_000", + "Yes": true + } + ], + "NextQuestId": 454 + } + ] + } + ] + } \ No newline at end of file diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json index b989176bc..eaa718eea 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json @@ -1,18 +1,19 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000926, -"Position": { - "X": -10.055725, - "Y": 44.999794, - "Z": -245.80762 -}, -"TerritoryId": 128, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000926, + "Position": { + "X": -10.055725, + "Y": 44.999794, + "Z": -245.80762 + }, + "TerritoryId": 128, + "InteractionType": "Interact", "AetheryteShortcut": "Limsa Lominsa", "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", @@ -22,7 +23,7 @@ "AetheryteShortcutIf": { "InSameTerritory": true, "InTerritory": [ - 129, 128 + 128 ] } }, @@ -32,9 +33,9 @@ "Prompt": "TEXT_CLSEXC001_00179_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json index 16829c6db..e2cb02fce 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1000926, -"Position": { - "X": -10.055725, - "Y": 44.999794, - "Z": -245.80762 -}, -"TerritoryId": 128, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1000927, -"Position": { - "X": -1.2055054, - "Y": 44.999886, - "Z": -255.8786 -}, -"TerritoryId": 128, -"InteractionType": "AcceptQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSEXC011_00310_Q2_000_1", - "Yes": true - } - ], - "NextQuestId": 312 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1000926, + "Position": { + "X": -10.055725, + "Y": 44.999794, + "Z": -245.80762 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1000927, + "Position": { + "X": -1.2055054, + "Y": 44.999886, + "Z": -255.8786 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSEXC011_00310_Q2_000_1", + "Yes": true + } + ], + "NextQuestId": 312 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json index 9428fff94..66ab5a05c 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json @@ -1,21 +1,24 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1002283, -"Position": { - "X": 134.90503, - "Y": 7.5919275, - "Z": 98.039185 -}, -"TerritoryId": 131, -"InteractionType": "Interact", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002283, + "Position": { + "X": 134.90503, + "Y": 7.5919275, + "Z": 98.039185 + }, + "TerritoryId": 131, + "InteractionType": "Interact", "AetheryteShortcut": "Ul'dah", - "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", - "[Ul'dah] Weavers' Guild"], + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], "SkipConditions": { "AetheryteShortcutIf": { "InSameTerritory": true, @@ -30,9 +33,9 @@ "Prompt": "TEXT_CLSWVR001_00189_Q1_000_1", "Yes": true } - ]} - ] - } - ] - } - \ No newline at end of file + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json index 6196aadd7..0388389fd 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json @@ -1,42 +1,44 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { "DataId": 1002283, -"Position": { - "X": 134.90503, - "Y": 7.5919275, - "Z": 98.039185 -}, -"TerritoryId": 131, -"InteractionType": "AcceptQuest"} - ] - }, - { - "Sequence": 255, - "Steps": [ - { "DataId": 1003818, -"Position": { - "X": 157.36621, - "Y": 7.7920074, - "Z": 98.924194 -}, -"TerritoryId": 131, -"InteractionType": "CompleteQuest", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSWVR011_00534_SYSTEM_Q0", - "Yes": true - } - ], - "NextQuestId": 534 - } - ] - } - ] - } - \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1002283, + "Position": { + "X": 134.90503, + "Y": 7.5919275, + "Z": 98.039185 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1003818, + "Position": { + "X": 157.36621, + "Y": 7.7920074, + "Z": 98.924194 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSWVR011_00534_SYSTEM_Q0", + "Yes": true + } + ], + "NextQuestId": 534 + } + ] + } + ] +} From b4a649189ace47d8875ac95d85cac267473e52c0 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 25 Aug 2024 01:30:42 +0200 Subject: [PATCH 73/73] Add quest priority window --- Questionable/Controller/QuestController.cs | 10 +- Questionable/DalamudInitializer.cs | 2 + Questionable/Functions/QuestFunctions.cs | 17 +- Questionable/QuestionablePlugin.cs | 1 + Questionable/Windows/PriorityWindow.cs | 223 ++++++++++++++++++ .../QuestComponents/ActiveQuestComponent.cs | 11 + 6 files changed, 259 insertions(+), 5 deletions(-) create mode 100644 Questionable/Windows/PriorityWindow.cs diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index d932b4718..529b4603a 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -138,6 +138,8 @@ internal sealed class QuestController : MiniTaskController, IDi /// public QuestProgress? PendingQuest => _pendingQuest; + public List ManualPriorityQuests { get; } = []; + public string? DebugState { get; private set; } public void Reload() @@ -291,7 +293,13 @@ internal sealed class QuestController : MiniTaskController, IDi } else { - (ElementId? currentQuestId, currentSequence) = _questFunctions.GetCurrentQuest(); + (ElementId? currentQuestId, currentSequence) = + ManualPriorityQuests + .Where(x => _questFunctions.IsReadyToAcceptQuest(x.Id) || _questFunctions.IsQuestAccepted(x.Id)) + .Select(x => + ((ElementId?, byte)?)(x.Id, _questFunctions.GetQuestProgressInfo(x.Id)?.Sequence ?? 0)) + .FirstOrDefault() ?? + _questFunctions.GetCurrentQuest(); if (currentQuestId == null || currentQuestId.Value == 0) { if (_startedQuest != null) diff --git a/Questionable/DalamudInitializer.cs b/Questionable/DalamudInitializer.cs index f743ac39f..78ac865ce 100644 --- a/Questionable/DalamudInitializer.cs +++ b/Questionable/DalamudInitializer.cs @@ -36,6 +36,7 @@ internal sealed class DalamudInitializer : IDisposable QuestSelectionWindow questSelectionWindow, QuestValidationWindow questValidationWindow, JournalProgressWindow journalProgressWindow, + PriorityWindow priorityWindow, IToastGui toastGui, ILogger logger) { @@ -55,6 +56,7 @@ internal sealed class DalamudInitializer : IDisposable _windowSystem.AddWindow(questSelectionWindow); _windowSystem.AddWindow(questValidationWindow); _windowSystem.AddWindow(journalProgressWindow); + _windowSystem.AddWindow(priorityWindow); _pluginInterface.UiBuilder.Draw += _windowSystem.Draw; _pluginInterface.UiBuilder.OpenMainUi += _questWindow.Toggle; diff --git a/Questionable/Functions/QuestFunctions.cs b/Questionable/Functions/QuestFunctions.cs index 6fb34dda4..7e360cd69 100644 --- a/Questionable/Functions/QuestFunctions.cs +++ b/Questionable/Functions/QuestFunctions.cs @@ -449,6 +449,18 @@ internal sealed unsafe class QuestFunctions } public bool IsQuestLocked(QuestId questId, ElementId? extraCompletedQuest = null) + { + if (IsQuestUnobtainable(questId, extraCompletedQuest)) + return true; + + var questInfo = (QuestInfo)_questData.GetQuestInfo(questId); + if (questInfo.GrandCompany != GrandCompany.None && questInfo.GrandCompany != GetGrandCompany()) + return true; + + return !HasCompletedPreviousQuests(questInfo, extraCompletedQuest) || !HasCompletedPreviousInstances(questInfo); + } + + public bool IsQuestUnobtainable(QuestId questId, ElementId? extraCompletedQuest = null) { var questInfo = (QuestInfo)_questData.GetQuestInfo(questId); if (questInfo.QuestLocks.Count > 0) @@ -460,13 +472,10 @@ internal sealed unsafe class QuestFunctions return true; } - if (questInfo.GrandCompany != GrandCompany.None && questInfo.GrandCompany != GetGrandCompany()) - return true; - if (_questData.GetLockedClassQuests().Contains(questId)) return true; - return !HasCompletedPreviousQuests(questInfo, extraCompletedQuest) || !HasCompletedPreviousInstances(questInfo); + return false; } public bool IsQuestLocked(LeveId leveId) diff --git a/Questionable/QuestionablePlugin.cs b/Questionable/QuestionablePlugin.cs index db3510cf5..207cf2b11 100644 --- a/Questionable/QuestionablePlugin.cs +++ b/Questionable/QuestionablePlugin.cs @@ -208,6 +208,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); } private static void AddQuestValidators(ServiceCollection serviceCollection) diff --git a/Questionable/Windows/PriorityWindow.cs b/Questionable/Windows/PriorityWindow.cs new file mode 100644 index 000000000..7c76aca32 --- /dev/null +++ b/Questionable/Windows/PriorityWindow.cs @@ -0,0 +1,223 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Numerics; +using Dalamud.Interface; +using Dalamud.Interface.Colors; +using Dalamud.Interface.Components; +using Dalamud.Plugin; +using ImGuiNET; +using LLib.ImGui; +using Questionable.Controller; +using Questionable.Functions; +using Questionable.Model; +using Questionable.Model.Questing; +using Questionable.Windows.QuestComponents; + +namespace Questionable.Windows; + +internal sealed class PriorityWindow : LWindow +{ + private readonly QuestController _questController; + private readonly QuestRegistry _questRegistry; + private readonly QuestFunctions _questFunctions; + private readonly QuestTooltipComponent _questTooltipComponent; + private readonly UiUtils _uiUtils; + private readonly IDalamudPluginInterface _pluginInterface; + + private string _searchString = string.Empty; + private ElementId? _draggedItem; + + public PriorityWindow(QuestController questController, QuestRegistry questRegistry, QuestFunctions questFunctions, + QuestTooltipComponent questTooltipComponent, UiUtils uiUtils, IDalamudPluginInterface pluginInterface) + : base("Quest Priority###QuestionableQuestPriority") + { + _questController = questController; + _questRegistry = questRegistry; + _questFunctions = questFunctions; + _questTooltipComponent = questTooltipComponent; + _uiUtils = uiUtils; + _pluginInterface = pluginInterface; + + Size = new Vector2(400, 400); + SizeCondition = ImGuiCond.Once; + SizeConstraints = new WindowSizeConstraints + { + MinimumSize = new Vector2(400, 400), + MaximumSize = new Vector2(400, 999) + }; + } + + public override void Draw() + { + ImGui.Text("Quests to do first:"); + DrawQuestFilter(); + DrawQuestList(); + ImGui.Spacing(); + + ImGui.Separator(); + ImGui.Spacing(); + ImGui.TextWrapped( + "If you have an active MSQ quest, Questionable will generally try to do:"); + ImGui.BulletText("'Priority' quests: class quests, ARR primals, ARR raids"); + ImGui.BulletText( + "Supported quests in your 'To-Do list'\n(quests from your Journal that are always on-screen)"); + ImGui.BulletText("MSQ quest (if available, unless it is marked as 'ignored'\nin your Journal)"); + ImGui.TextWrapped( + "If you don't have any active MSQ quest, it will always try to pick up the next quest in the MSQ first."); + } + + private void DrawQuestFilter() + { + ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X); + if (ImGui.BeginCombo($"##QuestSelection", "Add Quest...", ImGuiComboFlags.HeightLarge)) + { + ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X); + bool addFirst = ImGui.InputTextWithHint("", "Filter...", ref _searchString, 256, + ImGuiInputTextFlags.AutoSelectAll | ImGuiInputTextFlags.EnterReturnsTrue); + + IEnumerable foundQuests; + if (!string.IsNullOrEmpty(_searchString)) + { + foundQuests = _questRegistry.AllQuests + .Where(x => x.Info.Name.Contains(_searchString, StringComparison.CurrentCultureIgnoreCase)) + .Where(x => x.Id is not QuestId questId || !_questFunctions.IsQuestUnobtainable(questId)); + } + else + { + foundQuests = _questRegistry.AllQuests.Where(x => _questFunctions.IsQuestAccepted(x.Id)); + } + + foreach (var quest in foundQuests) + { + if (quest.Info.IsMainScenarioQuest || _questController.ManualPriorityQuests.Contains(quest)) + continue; + + bool addThis = ImGui.Selectable(quest.Info.Name); + if (addThis || addFirst) + { + _questController.ManualPriorityQuests.Add(quest); + + if (addFirst) + { + ImGui.CloseCurrentPopup(); + addFirst = false; + } + } + } + + ImGui.EndCombo(); + } + + ImGui.Spacing(); + } + + private void DrawQuestList() + { + List priorityQuests = _questController.ManualPriorityQuests; + Quest? itemToRemove = null; + Quest? itemToAdd = null; + int indexToAdd = 0; + + float width = ImGui.GetContentRegionAvail().X; + List<(Vector2 TopLeft, Vector2 BottomRight)> itemPositions = []; + + for (int i = 0; i < priorityQuests.Count; ++i) + { + Vector2 topLeft = ImGui.GetCursorScreenPos() + + new Vector2(0, -ImGui.GetStyle().ItemSpacing.Y / 2); + var quest = priorityQuests[i]; + ImGui.PushID($"Quest{quest.Id}"); + + var style = _uiUtils.GetQuestStyle(quest.Id); + bool hovered; + using (var _ = _pluginInterface.UiBuilder.IconFontFixedWidthHandle.Push()) + { + ImGui.AlignTextToFramePadding(); + ImGui.TextColored(style.Color, style.Icon.ToIconString()); + hovered = ImGui.IsItemHovered(); + } + + ImGui.SameLine(); + ImGui.AlignTextToFramePadding(); + ImGui.Text(quest.Info.Name); + hovered |= ImGui.IsItemHovered(); + + if (hovered) + _questTooltipComponent.Draw(quest.Info); + + if (priorityQuests.Count > 1) + { + ImGui.PushFont(UiBuilder.IconFont); + ImGui.SameLine(ImGui.GetContentRegionAvail().X + + ImGui.GetStyle().WindowPadding.X - + ImGui.CalcTextSize(FontAwesomeIcon.ArrowsUpDown.ToIconString()).X - + ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X - + ImGui.GetStyle().FramePadding.X * 4 - + ImGui.GetStyle().ItemSpacing.X); + ImGui.PopFont(); + + if (_draggedItem == quest.Id) + { + ImGuiComponents.IconButton("##Move", FontAwesomeIcon.ArrowsUpDown, + ImGui.ColorConvertU32ToFloat4(ImGui.GetColorU32(ImGuiCol.ButtonActive))); + } + else + ImGuiComponents.IconButton("##Move", FontAwesomeIcon.ArrowsUpDown); + + if (_draggedItem == null && ImGui.IsItemActive() && ImGui.IsMouseDragging(ImGuiMouseButton.Left)) + _draggedItem = quest.Id; + + ImGui.SameLine(); + } + else + { + ImGui.PushFont(UiBuilder.IconFont); + ImGui.SameLine(ImGui.GetContentRegionAvail().X + + ImGui.GetStyle().WindowPadding.X - + ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X - + ImGui.GetStyle().FramePadding.X * 2); + ImGui.PopFont(); + } + + if (ImGuiComponents.IconButton($"##Remove{i}", FontAwesomeIcon.Times)) + itemToRemove = quest; + + ImGui.PopID(); + + Vector2 bottomRight = new Vector2(topLeft.X + width, + ImGui.GetCursorScreenPos().Y - ImGui.GetStyle().ItemSpacing.Y + 2); + itemPositions.Add((topLeft, bottomRight)); + } + + if (!ImGui.IsMouseDragging(ImGuiMouseButton.Left)) + _draggedItem = null; + else if (_draggedItem != null) + { + var draggedItem = priorityQuests.Single(x => x.Id == _draggedItem); + int oldIndex = priorityQuests.IndexOf(draggedItem); + + var (topLeft, bottomRight) = itemPositions[oldIndex]; + ImGui.GetWindowDrawList().AddRect(topLeft, bottomRight, ImGui.GetColorU32(ImGuiColors.DalamudGrey), 3f, + ImDrawFlags.RoundCornersAll); + + int newIndex = itemPositions.FindIndex(x => ImGui.IsMouseHoveringRect(x.TopLeft, x.BottomRight, true)); + if (newIndex >= 0 && oldIndex != newIndex) + { + itemToAdd = priorityQuests.Single(x => x.Id == _draggedItem); + indexToAdd = newIndex; + } + } + + if (itemToRemove != null) + { + priorityQuests.Remove(itemToRemove); + } + + if (itemToAdd != null) + { + priorityQuests.Remove(itemToAdd); + priorityQuests.Insert(indexToAdd, itemToAdd); + } + } +} diff --git a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs index 1234b1f13..6d4a4384b 100644 --- a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs +++ b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs @@ -31,6 +31,7 @@ internal sealed partial class ActiveQuestComponent private readonly ICommandManager _commandManager; private readonly Configuration _configuration; private readonly QuestRegistry _questRegistry; + private readonly PriorityWindow _priorityWindow; private readonly IChatGui _chatGui; public ActiveQuestComponent( @@ -42,6 +43,7 @@ internal sealed partial class ActiveQuestComponent ICommandManager commandManager, Configuration configuration, QuestRegistry questRegistry, + PriorityWindow priorityWindow, IChatGui chatGui) { _questController = questController; @@ -52,6 +54,7 @@ internal sealed partial class ActiveQuestComponent _commandManager = commandManager; _configuration = configuration; _questRegistry = questRegistry; + _priorityWindow = priorityWindow; _chatGui = chatGui; } @@ -111,6 +114,10 @@ internal sealed partial class ActiveQuestComponent _questController.Stop("Manual (no active quest)"); _gatheringController.Stop("Manual (no active quest)"); } + + ImGui.SameLine(); + if (ImGuiComponents.IconButton(FontAwesomeIcon.SortAmountDown)) + _priorityWindow.Toggle(); } } @@ -293,6 +300,10 @@ internal sealed partial class ActiveQuestComponent ImGui.PopStyleColor(); ImGui.EndDisabled(); + ImGui.SameLine(); + if (ImGuiComponents.IconButton(FontAwesomeIcon.SortAmountDown)) + _priorityWindow.Toggle(); + if (_commandManager.Commands.TryGetValue("/questinfo", out var commandInfo)) { ImGui.SameLine();