Minor cleanup for SB part 3

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 9cefdbc5c686552e1e9521b09b1d005b8b478ddf..c4710dc444b92dc5c66bfbd46d034aa1ec3d995d 100644 (file)
--- 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 9921542b7830842af85804dd323d4eeac53231ba..c24a8f0126c33ac0f7372f0aec9be6e408133c4f 100644 (file)
--- 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,\r
             "Z": 58.64038\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 635,\r
           "InteractionType": "AcceptQuest",\r
           "AetheryteShortcut": "Rhalgr's Reach",\r
@@ -36,7 +37,14 @@
           "TerritoryId": 621,\r
           "InteractionType": "Interact",\r
           "AetheryteShortcut": "Lochs - Ala Mhigan Quarter",\r
-          "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128"\r
+          "CompletionQuestVariablesFlags": [\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            128\r
+          ]\r
         },\r
         {\r
           "DataId": 1024131,\r
@@ -47,7 +55,24 @@
           },\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact",\r
-          "$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192",\r
+          "Fly": true,\r
+          "CompletionQuestVariablesFlags": [\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            64\r
+          ]\r
+        },\r
+        {\r
+          "Position": {\r
+            "X": 682.593,\r
+            "Y": 69.99999,\r
+            "Z": 538.1847\r
+          },\r
+          "TerritoryId": 621,\r
+          "InteractionType": "WalkTo",\r
           "Fly": true\r
         },\r
         {\r
@@ -59,7 +84,14 @@
           },\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact",\r
-          "Fly": true\r
+          "CompletionQuestVariablesFlags": [\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            32\r
+          ]\r
         }\r
       ]\r
     },\r
@@ -74,8 +106,7 @@
             "Z": 489.76868\r
           },\r
           "TerritoryId": 621,\r
-          "InteractionType": "Interact",\r
-          "Fly": true\r
+          "InteractionType": "Interact"\r
         }\r
       ]\r
     },\r
@@ -91,9 +122,10 @@
           },\r
           "TerritoryId": 621,\r
           "InteractionType": "CompleteQuest",\r
+          "AetheryteShortcut": "Lochs - Ala Mhigan Quarter",\r
           "Fly": true\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 8facd94880353da69d01901df460dab0a934ee9a..6f3c9c7fe6fd18a382b0a2202d26bcbe26a8a0f3 100644 (file)
--- 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,\r
             "Z": 576.0128\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 621,\r
           "InteractionType": "AcceptQuest",\r
           "AetheryteShortcut": "Lochs - Ala Mhigan Quarter",\r
@@ -99,10 +100,11 @@
             "Y": 70,\r
             "Z": 576.0128\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 621,\r
           "InteractionType": "CompleteQuest"\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 b09978d324ca5ead15d0bfb13151b7805f4242b0..79615f5e16fdaa579ae6ae77e0b52d56706f9966 100644 (file)
--- 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,\r
             "Z": 576.1653\r
           },\r
+          "StopDistance": 7,\r
           "TerritoryId": 621,\r
           "InteractionType": "AcceptQuest",\r
           "AetheryteShortcut": "Lochs - Ala Mhigan Quarter",\r
@@ -49,6 +50,7 @@
             "Y": 69.999916,\r
             "Z": 637.3845\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact"\r
         }\r
@@ -64,10 +66,18 @@
             "Y": 69.9999,\r
             "Z": 634.76\r
           },\r
+          "StopDistance": 7,\r
           "TerritoryId": 621,\r
-          "InteractionType": "CompleteQuest"\r
+          "InteractionType": "CompleteQuest",\r
+          "DialogueChoices": [\r
+            {\r
+              "Type": "YesNo",\r
+              "Prompt": "TEXT_STMBDB104_02965_Q1_000_000",\r
+              "Yes": true\r
+            }\r
+          ]\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 0fad695cf5dbf667ca4de09599a55d0ee5331c06..683ad95eea1ccc9333712b78be3214a81423707a 100644 (file)
--- 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 @@
           },\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact",\r
-          "Fly": true\r
+          "Fly": true,\r
+          "DialogueChoices": [\r
+            {\r
+              "Type": "YesNo",\r
+              "Prompt": "TEXT_STMBDB105_02966_Q1_000_000",\r
+              "Yes": true\r
+            }\r
+          ]\r
         }\r
       ]\r
     },\r
@@ -70,7 +77,8 @@
               "X": -2.9769177,\r
               "Y": -1.3092512,\r
               "Z": -36.29651\r
-            }\r
+            },\r
+            "DelaySeconds": 0.1\r
           },\r
           "StopDistance": 0.25\r
         },\r
@@ -87,7 +95,8 @@
               "X": -2.8188858,\r
               "Y": 0.16235979,\r
               "Z": -38.626305\r
-            }\r
+            },\r
+            "DelaySeconds": 0.1\r
           },\r
           "StopDistance": 0.25\r
         },\r
@@ -101,6 +110,7 @@
           "TerritoryId": 738,\r
           "InteractionType": "Interact",\r
           "StopDistance": 4,\r
+          "DelaySecondsAtStart": 3,\r
           "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128"\r
         },\r
         {\r
@@ -156,4 +166,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 c044ad4c0b55e149549e2207b63c55536a929a76..accbb6f8bc17a7c30d442075c90b4e0f91e63bb1 100644 (file)
--- 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 @@
     {\r
       "Sequence": 1,\r
       "Steps": [\r
+        {\r
+          "TerritoryId": 131,\r
+          "InteractionType": "None",\r
+          "AetheryteShortcut": "Ul'dah"\r
+        },\r
+        {\r
+          "DataId": 1011565,\r
+          "Position": {\r
+            "X": -78.8739,\r
+            "Y": 4,\r
+            "Z": -110.429565\r
+          },\r
+          "TerritoryId": 130,\r
+          "InteractionType": "AcceptQuest",\r
+          "PickUpQuestId": 434\r
+        },\r
         {\r
           "DataId": 1001821,\r
           "Position": {\r
@@ -39,7 +55,12 @@
           "AethernetShortcut": [\r
             "[Ul'dah] Aetheryte Plaza",\r
             "[Ul'dah] The Chamber of Rule"\r
-          ]\r
+          ],\r
+          "SkipConditions": {\r
+            "AetheryteShortcutIf": {\r
+              "InSameTerritory": true\r
+            }\r
+          }\r
         }\r
       ]\r
     },\r
@@ -142,4 +163,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 5fdd5f68c968d045980984006bed3ce547c93097..44e6cceb011ed4d0d266f64e779e278473e24696 100644 (file)
--- 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,\r
             "Z": -17.166443\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 212,\r
           "InteractionType": "Interact"\r
         }\r
@@ -95,10 +96,11 @@
             "Y": -2.0000012,\r
             "Z": -17.166443\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 212,\r
           "InteractionType": "CompleteQuest"\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 10759bdc1cab5312179db5fcdbf21056597e69ec..284a29d32b18b35cfa19dd542ada99188a3902f9 100644 (file)
--- 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,\r
             "Z": -17.166443\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 212,\r
           "InteractionType": "AcceptQuest"\r
         }\r
@@ -45,7 +46,8 @@
           },\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact",\r
-          "Fly": true\r
+          "Fly": true,\r
+          "AetheryteShortcut": "Lochs - Porta Praetoria"\r
         }\r
       ]\r
     },\r
@@ -60,8 +62,9 @@
             "Z": 196.55139\r
           },\r
           "TerritoryId": 621,\r
-          "InteractionType": "Interact",\r
-          "Comment": "Aim at jaw"\r
+          "InteractionType": "Instruction",\r
+          "Comment": "Aim at jaw",\r
+          "Fly": true\r
         }\r
       ]\r
     },\r
@@ -75,6 +78,7 @@
             "Y": -0.3,\r
             "Z": 207.6294\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact"\r
         }\r
@@ -91,7 +95,7 @@
             "Z": 282.7954\r
           },\r
           "TerritoryId": 621,\r
-          "InteractionType": "Interact",\r
+          "InteractionType": "Instruction",\r
           "Fly": true,\r
           "Comment": "Aim at nearest eye"\r
         }\r
@@ -107,6 +111,7 @@
             "Y": 3.1742485,\r
             "Z": 249.34766\r
           },\r
+          "StopDistance": 6,\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact"\r
         }\r
@@ -129,4 +134,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 5a1e960294098b2e590789a121437ff49967fe5e..1241d40fa14c8762bd2ebec5cd8f6a993d77e19f 100644 (file)
--- 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,\r
             "Z": 187.02979\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 621,\r
           "InteractionType": "AcceptQuest"\r
         }\r
@@ -20,6 +21,16 @@
     {\r
       "Sequence": 1,\r
       "Steps": [\r
+        {\r
+          "Position": {\r
+            "X": 528.8298,\r
+            "Y": 70,\r
+            "Z": 580.3701\r
+          },\r
+          "TerritoryId": 621,\r
+          "InteractionType": "WalkTo",\r
+          "Fly": true\r
+        },\r
         {\r
           "DataId": 2009047,\r
           "Position": {\r
@@ -27,9 +38,9 @@
             "Y": 69.962524,\r
             "Z": 577.3861\r
           },\r
+          "StopDistance": 4,\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact",\r
-          "Fly": true,\r
           "AetheryteShortcut": "Lochs - Ala Mhigan Quarter"\r
         }\r
       ]\r
@@ -44,6 +55,7 @@
             "Y": 70,\r
             "Z": 574.6699\r
           },\r
+          "StopDistance": 7,\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact"\r
         }\r
@@ -66,4 +78,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 ec0914e7027243e646c5cf77f4c4874542785b63..ace6118a9421756f7becda761281fe600b59a5cb 100644 (file)
--- 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,\r
             "Z": 75.48633\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 621,\r
           "InteractionType": "AcceptQuest",\r
           "DialogueChoices": [\r
@@ -52,7 +53,14 @@
           },\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact",\r
-          "Fly": true\r
+          "Fly": true,\r
+          "DialogueChoices": [\r
+            {\r
+              "Type": "YesNo",\r
+              "Prompt": "TEXT_STMBDB111_02972_Q2_000_000",\r
+              "Yes": true\r
+            }\r
+          ]\r
         }\r
       ]\r
     },\r
@@ -66,6 +74,7 @@
             "Y": 122,\r
             "Z": -349.0807\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 737,\r
           "InteractionType": "SinglePlayerDuty"\r
         }\r
@@ -99,6 +108,7 @@
             "Y": 70,\r
             "Z": 525.5055\r
           },\r
+          "StopDistance": 6,\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact"\r
         }\r
@@ -114,6 +124,7 @@
             "Y": 70,\r
             "Z": 525.5055\r
           },\r
+          "StopDistance": 6,\r
           "TerritoryId": 621,\r
           "InteractionType": "Interact"\r
         }\r
@@ -140,4 +151,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 5e64545dc9910438c5c346d0abb3438605de8343..125abad66ecfbe49e80c61860fa9c56d3dcfc571 100644 (file)
--- 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,\r
             "Z": -213.76367\r
           },\r
+          "StopDistance": 4,\r
           "TerritoryId": 628,\r
           "InteractionType": "AcceptQuest",\r
           "AetheryteShortcut": "Kugane",\r
@@ -62,4 +63,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 7d6c5d52b77bdba558b652b075da153cbd3d3f21..ab3f9d516f57278ef29d40d8425ae779352771ca 100644 (file)
--- 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,\r
             "Z": -283.0091\r
           },\r
+          "StopDistance": 7,\r
           "TerritoryId": 613,\r
           "InteractionType": "CompleteQuest"\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 9faacdcfd71d1fc2301439e83f7916c0517c4ef6..4248027b85cd582929ae0f0d8bc1f3eeb2459f4e 100644 (file)
--- 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,\r
             "Z": -283.8026\r
           },\r
+          "StopDistance": 7,\r
           "TerritoryId": 613,\r
           "InteractionType": "AcceptQuest"\r
         }\r
@@ -56,7 +57,14 @@
           },\r
           "TerritoryId": 614,\r
           "InteractionType": "Interact",\r
-          "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128"\r
+          "CompletionQuestVariablesFlags": [\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            128\r
+          ]\r
         },\r
         {\r
           "DataId": 1019286,\r
@@ -66,7 +74,15 @@
             "Z": -425.3758\r
           },\r
           "TerritoryId": 614,\r
-          "InteractionType": "Interact"\r
+          "InteractionType": "Interact",\r
+          "CompletionQuestVariablesFlags": [\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            64\r
+          ]\r
         }\r
       ]\r
     },\r
@@ -111,6 +127,7 @@
             "Y": 36.90612,\r
             "Z": -524.71204\r
           },\r
+          "StopDistance": 4,\r
           "TerritoryId": 614,\r
           "InteractionType": "Interact"\r
         }\r
@@ -119,16 +136,6 @@
     {\r
       "Sequence": 255,\r
       "Steps": [\r
-        {\r
-          "Position": {\r
-            "X": 228.99776,\r
-            "Y": 5.218606,\r
-            "Z": -407.7175\r
-          },\r
-          "TerritoryId": 614,\r
-          "InteractionType": "WalkTo",\r
-          "Fly": true\r
-        },\r
         {\r
           "DataId": 1020524,\r
           "Position": {\r
@@ -137,9 +144,11 @@
             "Z": -433.24945\r
           },\r
           "TerritoryId": 614,\r
-          "InteractionType": "CompleteQuest"\r
+          "InteractionType": "CompleteQuest",\r
+          "AetheryteShortcut": "Yanxia - House of the Fierce",\r
+          "Fly": true\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 5abb5ca4ff6d443bacdfc16e3e517daacb8a4d89..ba83bedd15636dcb6019ce34c23f6c0bb9cc0109 100644 (file)
--- 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,\r
             "Z": 738.9486\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 614,\r
           "InteractionType": "Interact"\r
         }\r
@@ -86,42 +87,24 @@
           "TargetTerritoryId": 759\r
         },\r
         {\r
-          "DataId": 162,\r
-          "Position": {\r
-            "X": 96.269165,\r
-            "Y": -3.4332886,\r
-            "Z": 81.01013\r
-          },\r
           "TerritoryId": 759,\r
-          "InteractionType": "Interact",\r
-          "Comment": "Aethernet Attunement: [Doman Enclave] Ferry Docks"\r
+          "InteractionType": "AttuneAethernetShard",\r
+          "AethernetShard": "[Doman Enclave] Ferry Docks"\r
         },\r
         {\r
-          "DataId": 130,\r
-          "Position": {\r
-            "X": -61.57019,\r
-            "Y": 0.77819824,\r
-            "Z": 90.684326\r
-          },\r
           "TerritoryId": 759,\r
-          "InteractionType": "Interact",\r
-          "Comment": "Aethernet Attunement: [Doman Enclave] The Southern Enclave"\r
+          "InteractionType": "AttuneAethernetShard",\r
+          "AethernetShard": "[Doman Enclave] The Southern Enclave"\r
         },\r
         {\r
-          "DataId": 129,\r
-          "Position": {\r
-            "X": 8.987488,\r
-            "Y": 0.8086548,\r
-            "Z": -105.85187\r
-          },\r
           "TerritoryId": 759,\r
-          "InteractionType": "Interact",\r
-          "Comment": "Aethernet Attunement: [Doman Enclave] The Northern Enclave"\r
+          "InteractionType": "AttuneAetheryte",\r
+          "Aetheryte": "Doman Enclave"\r
         },\r
         {\r
           "TerritoryId": 759,\r
-          "InteractionType": "AttuneAetheryte",\r
-          "Aetheryte": "Doman Enclave"\r
+          "InteractionType": "AttuneAethernetShard",\r
+          "AethernetShard": "[Doman Enclave] The Northern Enclave"\r
         },\r
         {\r
           "DataId": 1024970,\r
@@ -132,6 +115,10 @@
           },\r
           "TerritoryId": 759,\r
           "InteractionType": "Interact",\r
+          "AethernetShortcut": [\r
+            "[Doman Enclave] The Northern Enclave",\r
+            "[Doman Enclave] Aetheryte Plaza"\r
+          ],\r
           "DialogueChoices": [\r
             {\r
               "Type": "List",\r
@@ -178,6 +165,7 @@
             "Y": 0.19999999,\r
             "Z": -4.837158\r
           },\r
+          "StopDistance": 7,\r
           "TerritoryId": 744,\r
           "InteractionType": "Interact"\r
         }\r
@@ -210,4 +198,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 6f89975ed3ea6a9b81e0e27b2c346b9153d4d31a..e7a12a1619d1d4b2d2f0e933dc1be1cb7d858c0c 100644 (file)
--- 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,\r
             "Z": 746.2118\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 614,\r
           "InteractionType": "Interact"\r
         }\r
@@ -93,4 +94,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 cdc7c89b2d00685cadf51d5fe87ffef110661c14..37c0320d82ece7990985d392777a4f04c23731f9 100644 (file)
--- 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 @@
           },\r
           "TerritoryId": 759,\r
           "InteractionType": "CompleteQuest",\r
-          "Comment": "AethernetShortcut: [Doman Enclave] Aetheryte Plaza -> [Doman Enclave] Ferry Docks"\r
+          "AethernetShortcut": [\r
+            "[Doman Enclave] Aetheryte Plaza",\r
+            "[Doman Enclave] Ferry Docks"\r
+          ]\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 68ab9388db0f5adc51ea9aae62de216fba61f874..dbf9f47495c2fc1ec21388712d70e8cf82ad626b 100644 (file)
--- 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,\r
           "InteractionType": "Interact",\r
           "Fly": true,\r
-          "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128"\r
+          "CompletionQuestVariablesFlags": [\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            128\r
+          ]\r
         },\r
         {\r
           "DataId": 1019303,\r
@@ -46,7 +53,15 @@
             "Z": 512.47424\r
           },\r
           "TerritoryId": 614,\r
-          "InteractionType": "Interact"\r
+          "InteractionType": "Interact",\r
+          "CompletionQuestVariablesFlags": [\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            null,\r
+            64\r
+          ]\r
         }\r
       ]\r
     },\r
@@ -115,4 +130,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 c5ac52f0166983dabaf3bc996d34a56e53a4a57b..9a5fee8f592128d06261c7ae44f988a081060c23 100644 (file)
--- 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,\r
             "Z": 44.327393\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 786,\r
           "InteractionType": "Interact"\r
         }\r
@@ -117,4 +118,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 fd75aab2ef9899fad1722819fe44a85a1538f7b2..920c183b971de6eee788dee568190fe64e730b22 100644 (file)
--- 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 @@
     {\r
       "Sequence": 2,\r
       "Steps": [\r
+        {\r
+          "Position": {\r
+            "X": 70.965355,\r
+            "Y": 26.085297,\r
+            "Z": -607.26685\r
+          },\r
+          "TerritoryId": 621,\r
+          "InteractionType": "WalkTo",\r
+          "Fly": true,\r
+          "AetheryteShortcut": "Lochs - Porta Praetoria"\r
+        },\r
         {\r
           "DataId": 1025546,\r
           "Position": {\r
@@ -48,9 +59,7 @@
             "Z": -609.43005\r
           },\r
           "TerritoryId": 621,\r
-          "InteractionType": "Interact",\r
-          "Fly": true,\r
-          "AetheryteShortcut": "Lochs - Porta Praetoria"\r
+          "InteractionType": "Interact"\r
         }\r
       ]\r
     },\r
@@ -70,4 +79,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r

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 13de679badb7fb5e0a7ff13804fddc3f3a4526b8..017506175a25aa9acc5f8a5f6ff623a02468cadd 100644 (file)
--- 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 c1703017063d44264381efcc925ad2d2f2a8423d..1173820670dc8d32db36ade6d8bced3e5831629f 100644 (file)
--- 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 efd2a9bd29f1f59aaf221ca67bc360a728fbdd74..e75b3ad0f6ce7fa90860c85c7cf5b32434f84d69 100644 (file)
--- a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs
+++ b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs
@@ -100,6 +100,13 @@ public sealed class AethernetShardConverter() : EnumConverter<EAetheryteLocation
         { EAetheryteLocation.KuganeRubyPrice, "[Kugane] The Ruby Price" },
         { EAetheryteLocation.KuganeAirship, "[Kugane] Airship Landing" },
 
+        { EAetheryteLocation.DomanEnclave, "[Doman Enclave] Aetheryte Plaza" },
+        { EAetheryteLocation.DomanEnclaveNorthern, "[Doman Enclave] The Northern Enclave" },
+        { EAetheryteLocation.DomanEnclaveSouthern, "[Doman Enclave] The Southern Enclave" },
+        { EAetheryteLocation.DomanEnclaveDocks, "[Doman Enclave] Ferry Docks" },
+        { EAetheryteLocation.DomanEnclaveOneRiver, "[Doman Enclave] The One River" },
+        { EAetheryteLocation.DomanEnclaveGangos, "[Doman Enclave] Gangos" },
+
         { EAetheryteLocation.Crystarium, "[Crystarium] Aetheryte Plaza" },
         { EAetheryteLocation.CrystariumMarkets, "[Crystarium] Musica Universalis Markets" },
         { EAetheryteLocation.CrystariumTemenosRookery, "[Crystarium] Temenos Rookery" },

diff --git a/Questionable.Model/common-schema.json b/Questionable.Model/common-schema.json
index b41b12b094e0aa1b91683409cfaf707473f179bb..d3c974ecf51cbd6b89b57e37c6928cf2472d2e5d 100644 (file)
--- a/Questionable.Model/common-schema.json
+++ b/Questionable.Model/common-schema.json
@@ -219,6 +219,12 @@
         "[Kugane] Rakuza District",
         "[Kugane] The Ruby Price",
         "[Kugane] Airship Landing",
+        "[Doman Enclave] Aetheryte Plaza",
+        "[Doman Enclave] The Northern Enclave",
+        "[Doman Enclave] The Southern Enclave",
+        "[Doman Enclave] Ferry Docks",
+        "[Doman Enclave] The One River",
+        "[Doman Enclave] Gangos",
         "[Crystarium] Aetheryte Plaza",
         "[Crystarium] Musica Universalis Markets",
         "[Crystarium] Temenos Rookery",