Minor quest updates

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json
index 8201d94ef0a8372a493fa28ca586fe3ca977ad9b..8ccb2041288443b508bdfea112e78f183acb1e32 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json
@@ -16,6 +16,56 @@
           "InteractionType": "AcceptQuest"
         }
       ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1006771,
+          "Position": {
+            "X": 89.829834,
+            "Y": 66.04188,
+            "Z": 18.753235
+          },
+          "TerritoryId": 137,
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Eastern La Noscea - Wineport",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1006774,
+          "Position": {
+            "X": -11.367981,
+            "Y": 69.20081,
+            "Z": 30.258545
+          },
+          "TerritoryId": 137,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006746,
+          "Position": {
+            "X": 460.65454,
+            "Y": 8.309061,
+            "Z": 74.47925
+          },
+          "TerritoryId": 137,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
+          "NextQuestId": 1054,
+          "Fly": true
+        }
+      ]
     }
   ]
 }

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json
index d0e61fe911521921a9343eb837ae90040cab42c0..23ba0cedc9c4b5622884ddadc3187ca144cd0fc0 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json
@@ -33,7 +33,6 @@
         },
         {
           "TerritoryId": 147,
-          "StopDistance": 5,
           "InteractionType": "AttuneAetheryte",
           "Aetheryte": "Northern Thanalan - Camp Bluefog"
         },

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json
index de3f260fcfb067644c83cf4ff608784e61571d9f..613bc6be5377eb26e2bbb3c8b34241c51700dc5e 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json
@@ -26,7 +26,6 @@
       "Steps": [
         {
           "TerritoryId": 147,
-          "StopDistance": 5,
           "InteractionType": "AttuneAetheryte",
           "Aetheryte": "Northern Thanalan - Ceruleum Processing Plant"
         },

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json
index 711d2b11951cdf3b24e3f8bd4824daea0a4c64df..3089df5c14c5c1ea18050a9e22f4a4460165b22c 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "JerryWester",
+  "TerritoryBlacklist": [
+    1043
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json
index 5c2200cec40ccd9a83244221ad43c468b6a1054d..776b81ed12df8af1e0bf9a91018e059f1b65da55 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "JerryWester",
+  "TerritoryBlacklist": [
+    1049
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json
index bb57fc2280ccd6d104bef0ab588cf636c6001a47..0a9de151763b0a6f712b5e3bafd26207eddd74aa 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json
@@ -1,6 +1,10 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "JerryWester",
+  "TerritoryBlacklist": [
+    1044,
+    1048
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

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
new file mode 100644 (file)
index 0000000..232a84b
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json
@@ -0,0 +1,70 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "TerritoryBlacklist": [
+    171
+  ],
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003281,
+          "Position": {
+            "X": 97.520386,
+            "Y": 40.248554,
+            "Z": 81.1322
+          },
+          "TerritoryId": 128,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1006516,
+          "Position": {
+            "X": -82.68872,
+            "Y": 233.23743,
+            "Z": 317.1892
+          },
+          "TerritoryId": 155,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "TerritoryId": 155,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 13
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003281,
+          "Position": {
+            "X": 97.520386,
+            "Y": 40.248554,
+            "Z": 81.1322
+          },
+          "TerritoryId": 128,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] The Aftcastle"
+          ]
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/979_Fort of Fear.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/979_Fort of Fear.json
new file mode 100644 (file)
index 0000000..c815d1b
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/979_Fort of Fear.json
@@ -0,0 +1,36 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006382,
+          "Position": {
+            "X": 165.20935,
+            "Y": 222.99998,
+            "Z": 367.72717
+          },
+          "TerritoryId": 155,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006516,
+          "Position": {
+            "X": -82.68872,
+            "Y": 233.23743,
+            "Z": 317.1892
+          },
+          "TerritoryId": 155,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json
new file mode 100644 (file)
index 0000000..5135284
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json
@@ -0,0 +1,56 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003281,
+          "Position": {
+            "X": 97.520386,
+            "Y": 40.248554,
+            "Z": 81.1322
+          },
+          "TerritoryId": 128,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1002484,
+          "Position": {
+            "X": 270.71033,
+            "Y": 4.4031205,
+            "Z": 719.9968
+          },
+          "TerritoryId": 135,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 250,
+          "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks",
+          "SkipIf": [
+            "AetheryteShortcutIfInSameTerritory"
+          ]
+        },
+        {
+          "TerritoryId": 250,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Wolves' Den Pier"
+        },
+        {
+          "DataId": 1005184,
+          "Position": {
+            "X": 0.015197754,
+            "Y": 3.5836844,
+            "Z": -30.380737
+          },
+          "TerritoryId": 250,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
index 9cc646af4bb4a2525eca1bd64aeb3684b41d1d9f..1a1a166986c22e6a9c566d64a299b99c291f5905 100644 (file)
--- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
+++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
@@ -23,6 +23,9 @@ internal sealed class MovementOverrideController
         // southern thanalan
         new BlacklistedPoint(146, new(-201.75f, 10.5f, -265.5f), new(-203.75235f, 10.130764f, -265.15314f)),
 
+        // lower la noscea - moraby drydocks aetheryte
+        new BlacklistedArea(135, new(156.11499f, 15.518433f, 673.21277f), 0.5f, 5f),
+
         // coerthas central highlands
         new BlacklistedPoint(155, new(-478.75f, 149.25f, -305.75f), new(-476.1802f, 149.06573f, -304.7811f)),