From f1698d46526463ad9ee15b5c79411c52dd7dca29 Mon Sep 17 00:00:00 2001
From: kaiser <carvel.jltjy@simplelogin.com>
Date: Sat, 21 Sep 2024 14:32:33 +1000
Subject: [PATCH 1/2] fix: getting stuck when starting quests or finishing, if
 we are not in the same territory.

---
 .../Dungeons/5013_It Belongs in a Museum.json | 23 ++++++++++--
 ...4_Something Stray in the Neighborhood.json | 36 ++++++++++++++++---
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json
index 1126461b5..c2e1939eb 100644
--- a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json	
+++ b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json	
@@ -13,7 +13,13 @@
             "Z": 75.66943
           },
           "TerritoryId": 1185,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Tuliyollal",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -77,7 +83,12 @@
           },
           "TerritoryId": 1187,
           "InteractionType": "Interact",
-          "AetheryteShortcut": "Urqopacha - Worlar's Echo"
+          "AetheryteShortcut": "Urqopacha - Worlar's Echo",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -92,7 +103,13 @@
             "Z": 145.00647
           },
           "TerritoryId": 1187,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Urqopacha - Worlar's Echo",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     }
diff --git a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json
index 891a47442..235b4349e 100644
--- a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json	
+++ b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json	
@@ -16,7 +16,17 @@
             "Z": 198.07727
           },
           "TerritoryId": 1186,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Solution Nine",
+          "AethernetShortcut": [
+            "[Solution Nine] Aetheryte Plaza",
+            "[Solution Nine] Neon Stein"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -31,7 +41,13 @@
             "Z": 761.68445
           },
           "TerritoryId": 1192,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Living Memory - Leynode Mnemo",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -63,7 +79,13 @@
           },
           "TerritoryId": 1192,
           "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Living Memory - Leynode Mnemo",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -90,7 +112,13 @@
           "StopDistance": 7,
           "TerritoryId": 1192,
           "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Living Memory - Leynode Mnemo",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

From d9d95f17a880bad52d11546c7c1ae6578805b031 Mon Sep 17 00:00:00 2001
From: kaiser <carvel.jltjy@simplelogin.com>
Date: Sat, 21 Sep 2024 14:54:05 +1000
Subject: [PATCH 2/2] chore: add fly when finishing quest, the completeQuest is
 in narnia.

---
 .../Unlocks/Dungeons/5013_It Belongs in a Museum.json            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json
index c2e1939eb..24c962b39 100644
--- a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json	
+++ b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json	
@@ -105,6 +105,7 @@
           "TerritoryId": 1187,
           "InteractionType": "CompleteQuest",
           "AetheryteShortcut": "Urqopacha - Worlar's Echo",
+          "Fly": true,
           "SkipConditions": {
             "AetheryteShortcutIf": {
               "InSameTerritory": true