From: Liza Carvelli Date: Wed, 9 Jul 2025 14:12:07 +0000 (+0200) Subject: Fixes for #220 X-Git-Tag: v5.21~8^2 X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=fb30b6f4f036bbfe041e7877ffabd3e5fe5320c5;p=Questionable.git Fixes for #220 --- diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json index 87a8c46c..394b056c 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json @@ -18,7 +18,18 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] The Aftcastle" - ] + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + }, + "AethernetShortcutIf": { + "InSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json index ae3e65d4..e93beaed 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json @@ -14,7 +14,12 @@ }, "TerritoryId": 132, "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Gridania" + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AethernetShortcutIf": { + "InSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json index 1af7c849..b32f6a92 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json @@ -14,7 +14,12 @@ }, "TerritoryId": 130, "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Ul'dah" + "AetheryteShortcut": "Ul'dah", + "SkipConditions": { + "AethernetShortcutIf": { + "InSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json index 1aa27113..35e69178 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json @@ -21,6 +21,7 @@ ], "SkipConditions": { "AetheryteShortcutIf": { + "InSameTerritory": true, "InTerritory": [ 128 ] diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/697_Hallo Halatali.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/697_Hallo Halatali.json index 3f11ca65..7707df9e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/697_Hallo Halatali.json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/697_Hallo Halatali.json @@ -5,6 +5,18 @@ { "Sequence": 0, "Steps": [ + { + "TerritoryId": 128, + "InteractionType": "UseItem", + "ItemId": 30362, + "SkipConditions": { + "StepIf": { + "InTerritory": [ + 140 + ] + } + } + }, { "DataId": 1005021, "Position": { @@ -13,8 +25,7 @@ "Z": -355.00116 }, "TerritoryId": 140, - "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Western Thanalan - Horizon" + "InteractionType": "AcceptQuest" } ] }, @@ -58,4 +69,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/764_Braving New Depths.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/764_Braving New Depths.json index acc723a0..28411902 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/764_Braving New Depths.json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/764_Braving New Depths.json @@ -5,6 +5,18 @@ { "Sequence": 0, "Steps": [ + { + "TerritoryId": 128, + "InteractionType": "UseItem", + "ItemId": 30362, + "SkipConditions": { + "StepIf": { + "InTerritory": [ + 140 + ] + } + } + }, { "DataId": 1005021, "Position": { @@ -13,8 +25,7 @@ "Z": -355.00116 }, "TerritoryId": 140, - "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Western Thanalan - Horizon" + "InteractionType": "AcceptQuest" } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/921_Dishonor Before Death.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/921_Dishonor Before Death.json index a09a0486..d295dc5f 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/921_Dishonor Before Death.json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/921_Dishonor Before Death.json @@ -1,59 +1,69 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Friendly", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1006440, - "Position": { - "X": 140.3982, - "Y": 4, - "Z": -54.154297 - }, - "TerritoryId": 131, - "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Ul'dah", - "AethernetShortcut": [ - "[Ul'dah] Aetheryte Plaza", - "[Ul'dah] Sapphire Avenue Exchange" - ] - } - ] - }, - - { - "Sequence": 1, - "Steps": [ - { - "DataId": 2001019, - "Position": { - "X": -276.60034, - "Y": -3.7995605, - "Z": -368.76483 - }, - "TerritoryId": 141, - "InteractionType": "UseItem", - "ItemId": 2000715, - "AetheryteShortcut": "Central Thanalan - Black Brush Station" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "DataId": 1007818, - "Position": { - "X": -282.88702, - "Y": -5.987557, - "Z": -372.64062 - }, - "TerritoryId": 141, - "InteractionType": "CompleteQuest" - } - ] - } - ] -} \ No newline at end of file + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Friendly", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006440, + "Position": { + "X": 140.3982, + "Y": 4, + "Z": -54.154297 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Sapphire Avenue Exchange" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 130 + ] + }, + "AethernetShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2001019, + "Position": { + "X": -276.60034, + "Y": -3.7995605, + "Z": -368.76483 + }, + "TerritoryId": 141, + "InteractionType": "UseItem", + "ItemId": 2000715, + "AetheryteShortcut": "Central Thanalan - Black Brush Station" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1007818, + "Position": { + "X": -282.88702, + "Y": -5.987557, + "Z": -372.64062 + }, + "TerritoryId": 141, + "InteractionType": "CompleteQuest" + } + ] + } + ] +}