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 87a8c46..394b056 100644 (file)
--- 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 ae3e65d..e93beae 100644 (file)
--- 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 1af7c84..b32f6a9 100644 (file)
--- 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 1aa2711..35e6917 100644 (file)
--- 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 3f11ca6..7707df9 100644 (file)
--- 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 acc723a..2841190 100644 (file)
--- 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 a09a048..d295dc5 100644 (file)
--- 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 @@
 {\r
-       "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",\r
-       "Author": "Friendly",\r
-       "QuestSequence": [\r
-               {\r
-                       "Sequence": 0,\r
-                       "Steps": [\r
-                               {\r
-                                       "DataId": 1006440,\r
-                                       "Position": {\r
-                                               "X": 140.3982,\r
-                                               "Y": 4,\r
-                                               "Z": -54.154297\r
-                                       },\r
-                                       "TerritoryId": 131,\r
-                                       "InteractionType": "AcceptQuest",\r
-                                       "AetheryteShortcut": "Ul'dah",\r
-                                       "AethernetShortcut": [\r
-                                       "[Ul'dah] Aetheryte Plaza",\r
-                                       "[Ul'dah] Sapphire Avenue Exchange"\r
-                                       ]\r
-                               }\r
-                       ]\r
-               },\r
-\r
-               {\r
-                       "Sequence": 1,\r
-                       "Steps": [\r
-                               {\r
-                                       "DataId": 2001019,\r
-                                       "Position": {\r
-                                               "X": -276.60034,\r
-                                               "Y": -3.7995605,\r
-                                               "Z": -368.76483\r
-                                       },\r
-                                       "TerritoryId": 141,\r
-                                       "InteractionType": "UseItem",\r
-                                       "ItemId": 2000715,\r
-                                       "AetheryteShortcut": "Central Thanalan - Black Brush Station"\r
-                               }\r
-                       ]\r
-               },\r
-               {\r
-                       "Sequence": 255,\r
-                       "Steps": [\r
-                               {\r
-                                       "DataId": 1007818,\r
-                                       "Position": {\r
-                                               "X": -282.88702,\r
-                                               "Y": -5.987557,\r
-                                               "Z": -372.64062\r
-                                       },\r
-                                       "TerritoryId": 141,\r
-                                       "InteractionType": "CompleteQuest"\r
-                               }\r
-                       ]\r
-               }\r
-       ]\r
-}
\ No newline at end of file
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",\r
+  "Author": "Friendly",\r
+  "QuestSequence": [\r
+    {\r
+      "Sequence": 0,\r
+      "Steps": [\r
+        {\r
+          "DataId": 1006440,\r
+          "Position": {\r
+            "X": 140.3982,\r
+            "Y": 4,\r
+            "Z": -54.154297\r
+          },\r
+          "TerritoryId": 131,\r
+          "InteractionType": "AcceptQuest",\r
+          "AetheryteShortcut": "Ul'dah",\r
+          "AethernetShortcut": [\r
+            "[Ul'dah] Aetheryte Plaza",\r
+            "[Ul'dah] Sapphire Avenue Exchange"\r
+          ],\r
+          "SkipConditions": {\r
+            "AetheryteShortcutIf": {\r
+              "InSameTerritory": true,\r
+              "InTerritory": [\r
+                130\r
+              ]\r
+            },\r
+            "AethernetShortcutIf": {\r
+              "InSameTerritory": true\r
+            }\r
+          }\r
+        }\r
+      ]\r
+    },\r
+    {\r
+      "Sequence": 1,\r
+      "Steps": [\r
+        {\r
+          "DataId": 2001019,\r
+          "Position": {\r
+            "X": -276.60034,\r
+            "Y": -3.7995605,\r
+            "Z": -368.76483\r
+          },\r
+          "TerritoryId": 141,\r
+          "InteractionType": "UseItem",\r
+          "ItemId": 2000715,\r
+          "AetheryteShortcut": "Central Thanalan - Black Brush Station"\r
+        }\r
+      ]\r
+    },\r
+    {\r
+      "Sequence": 255,\r
+      "Steps": [\r
+        {\r
+          "DataId": 1007818,\r
+          "Position": {\r
+            "X": -282.88702,\r
+            "Y": -5.987557,\r
+            "Z": -372.64062\r
+          },\r
+          "TerritoryId": 141,\r
+          "InteractionType": "CompleteQuest"\r
+        }\r
+      ]\r
+    }\r
+  ]\r
+}\r