Second Hildibrand pass

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json
index 32dc374c1734d9584c629dc8e9dcfb9b515024d3..c945779e05d435540dffd47a6cc7588324e44ace 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json
@@ -35,7 +35,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-          "Mount": true,
           "Fly": true,
           "DataId": 1005709,
           "Position": {
@@ -53,7 +52,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
-          "Mount": true,
           "Fly": true,
           "Position": {
             "X": -273.9414,
@@ -63,8 +61,13 @@
           "TerritoryId": 146,
           "InteractionType": "Combat",
           "EnemySpawnType": "FateEnemies",
-          "KillEnemyDataIds": [
-            2390
+          "ComplexCombatData": [
+            {
+              "DataId": 2390
+            },
+            {
+              "DataId": 2391
+            }
           ]
         }
       ]
@@ -74,7 +77,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-          "Mount": true,
           "Fly": true,
           "DataId": 1005709,
           "Position": {
@@ -92,7 +94,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
-          "Mount": true,
           "Fly": true,
           "DataId": 1005710,
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1206_After Her Own Heart.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1206_After Her Own Heart.json
index 39548b263465b56730632b54a57ee68935f8a798..9ad696265768503edac957bf1e1e9295429592f0 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1206_After Her Own Heart.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1206_After Her Own Heart.json
@@ -64,6 +64,15 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": -147.13564,
+            "Y": 11.999999,
+            "Z": -5.086131
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1005716,
           "Position": {
@@ -117,7 +126,7 @@
             "Y": 12,
             "Z": 0.99176025
           },
-          "StopDistance": 4,
+          "StopDistance": 7,
           "TerritoryId": 130,
           "InteractionType": "CompleteQuest",
           "NextQuestId": 1207

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json
index 1cad0dd09642151bb202f645d536d91d29c41c78..0ffd60e76d667e64b4423b2ce12c1ed333b85e09 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json
@@ -29,7 +29,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-          "Mount": true,
           "Fly": true,
           "DataId": 1005722,
           "Position": {
@@ -46,8 +45,28 @@
       "Sequence": 2,
       "Steps": [
         {
-          "Mount": true,
+          "Position": {
+            "X": -567.424,
+            "Y": 5.893569,
+            "Z": -221.67596
+          },
+          "TerritoryId": 145,
+          "InteractionType": "WalkTo",
           "Fly": true,
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                32
+              ]
+            }
+          }
+        },
+        {
           "DataId": 1004042,
           "Position": {
             "X": -568.4138,
@@ -108,7 +127,6 @@
       "Sequence": 3,
       "Steps": [
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1005724,
           "Position": {
@@ -126,7 +144,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-          "Mount": true,
           "Fly": true,
           "DataId": 1005727,
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json
index 92e45cfe0a982e0e8d658c5defbc0173e0822c4b..db0936c9a9eedb1be28612f926962b5f1fb050a2 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json
@@ -18,7 +18,7 @@
             "Y": 5.4049973,
             "Z": -249.25616
           },
-          "StopDistance": 4,
+          "StopDistance": 5,
           "TerritoryId": 145,
           "InteractionType": "AcceptQuest"
         }
@@ -50,7 +50,6 @@
           "TargetTerritoryId": 140
         },
         {
-          "Mount": true,
           "DataId": 1008709,
           "Position": {
             "X": -431.7846,
@@ -67,7 +66,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Western Thanalan - Horizon",
-          "Mount": true,
           "Fly": true,
           "DataId": 1008713,
           "Position": {
@@ -87,7 +85,6 @@
           ]
         },
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1002022,
           "Position": {
@@ -107,7 +104,6 @@
           ]
         },
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1008715,
           "Position": {
@@ -171,6 +167,7 @@
             "Y": 13.504211,
             "Z": 159.19727
           },
+          "StopDistance": 4.5,
           "TerritoryId": 140,
           "InteractionType": "Interact",
           "CompletionQuestVariablesFlags": [
@@ -183,12 +180,13 @@
           ]
         },
         {
-          "DataId": 2003659,
+          "DataId": 2003657,
           "Position": {
-            "X": -76.15784,
-            "Y": 13.443176,
-            "Z": 155.90137
+            "X": -80.18622,
+            "Y": 13.412659,
+            "Z": 158.12915
           },
+          "StopDistance": 4.5,
           "TerritoryId": 140,
           "InteractionType": "Interact",
           "CompletionQuestVariablesFlags": [
@@ -197,15 +195,15 @@
             null,
             null,
             null,
-            16
+            64
           ]
         },
         {
-          "DataId": 2003657,
+          "DataId": 2003659,
           "Position": {
-            "X": -80.18622,
-            "Y": 13.412659,
-            "Z": 158.12915
+            "X": -76.15784,
+            "Y": 13.443176,
+            "Z": 155.90137
           },
           "TerritoryId": 140,
           "InteractionType": "Interact",
@@ -215,7 +213,7 @@
             null,
             null,
             null,
-            64
+            16
           ]
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json
index 2d1bdd04fdc1eadf6ebf726957e92f4f4a04f067..56da32e898d86cb92eed2abdd0c621659cdb4aa3 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json
@@ -22,7 +22,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Northern Thanalan - Camp Bluefog",
-          "Mount": true,
           "Fly": true,
           "DataId": 2003664,
           "Position": {
@@ -39,7 +38,6 @@
       "Sequence": 2,
       "Steps": [
         {
-          "Mount": true,
           "DataId": 2003665,
           "Position": {
             "X": 34.50061,
@@ -56,7 +54,16 @@
       "Sequence": 255,
       "Steps": [
         {
-          "Mount": true,
+          "Position": {
+            "X": 110.67165,
+            "Y": 18.372795,
+            "Z": 122.4577
+          },
+          "TerritoryId": 147,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
           "DataId": 2003666,
           "Position": {
             "X": 111.192505,
@@ -65,7 +72,6 @@
           },
           "TerritoryId": 147,
           "InteractionType": "CompleteQuest",
-          "Fly": true,
           "NextQuestId": 1317
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1317_Manderville Men.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1317_Manderville Men.json
index 89a9660db151a86da90dd9f350ab340a1c78bf12..da8f1b2d365ebc5b2391022088d3b81c3285e25f 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1317_Manderville Men.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1317_Manderville Men.json
@@ -42,7 +42,6 @@
           "TargetTerritoryId": 140
         },
         {
-          "Mount": true,
           "DataId": 1008730,
           "Position": {
             "X": -431.26575,

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1318_The Three Collectors.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1318_The Three Collectors.json
index aca0ffc476553b1f9b99197b8e926f3736f0d029..a11c615bc8a08adfbc07a6144444f22663e9fac2 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1318_The Three Collectors.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1318_The Three Collectors.json
@@ -23,7 +23,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
-          "Mount": true,
           "Fly": true,
           "DataId": 1008739,
           "Position": {
@@ -70,7 +69,6 @@
       "Sequence": 4,
       "Steps": [
         {
-          "Mount": true,
           "DataId": 2003741,
           "Position": {
             "X": 394.7965,
@@ -87,7 +85,6 @@
       "Sequence": 5,
       "Steps": [
         {
-          "Mount": true,
           "DataId": 1008752,
           "Position": {
             "X": 487.81555,
@@ -136,7 +133,6 @@
           "TargetTerritoryId": 140
         },
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1008788,
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1438_The Business of Betrothal.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1438_The Business of Betrothal.json
index b14136e8738f448c3eb13653a0c38b48e6bc284d..8790f51dba2c5fa91007faa22d55922f2c51be17 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1438_The Business of Betrothal.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1438_The Business of Betrothal.json
@@ -28,7 +28,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
-          "Mount": true,
           "Fly": true,
           "DataId": 1009305,
           "Position": {
@@ -64,7 +63,8 @@
               "Prompt": "TEXT_CHRHDB301_01438_Q2_000_000",
               "Answer": "TEXT_CHRHDB301_01438_A2_000_030"
             }
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
@@ -72,7 +72,6 @@
       "Sequence": 3,
       "Steps": [
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1009310,
           "Position": {
@@ -97,7 +96,8 @@
             "Z": 421.01147
           },
           "TerritoryId": 137,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
@@ -119,6 +119,16 @@
     {
       "Sequence": 6,
       "Steps": [
+        {
+          "Position": {
+            "X": 582.44116,
+            "Y": 14.587065,
+            "Z": 394.23407
+          },
+          "TerritoryId": 137,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
         {
           "DataId": 1009317,
           "Position": {
@@ -143,6 +153,7 @@
           },
           "TerritoryId": 137,
           "InteractionType": "CompleteQuest",
+          "Fly": true,
           "NextQuestId": 1439
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1439_A Burst of Inspiration.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1439_A Burst of Inspiration.json
index 73d05f99023386fcbaff27e0062fc793f7af1995..ad3c659dac4ebeff9d02ec5ba37c6f11ae90c0cb 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1439_A Burst of Inspiration.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1439_A Burst of Inspiration.json
@@ -86,6 +86,7 @@
           },
           "TerritoryId": 138,
           "InteractionType": "CompleteQuest",
+          "Fly": true,
           "NextQuestId": 1440
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1440_Seeds of Rebellion.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1440_Seeds of Rebellion.json
index 45f4a820c429a4c9bec23b8c4572267741337db8..9305f383a6352fea8c78a61c71fbbbbd2218e9e4 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1440_Seeds of Rebellion.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1440_Seeds of Rebellion.json
@@ -28,8 +28,29 @@
       "Sequence": 1,
       "Steps": [
         {
-          "Mount": true,
-          "Fly": true,
+          "DataId": 1003584,
+          "Position": {
+            "X": 317.43335,
+            "Y": -36.325005,
+            "Z": 352.86487
+          },
+          "TerritoryId": 138,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 138,
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                128
+              ]
+            }
+          }
+        },
+        {
           "DataId": 2004324,
           "Position": {
             "X": -283.0091,
@@ -56,6 +77,7 @@
           },
           "TerritoryId": 138,
           "InteractionType": "Interact",
+          "Fly": true,
           "CompletionQuestVariablesFlags": [
             null,
             null,
@@ -74,6 +96,7 @@
           },
           "TerritoryId": 138,
           "InteractionType": "Interact",
+          "Fly": true,
           "CompletionQuestVariablesFlags": [
             null,
             null,
@@ -98,6 +121,7 @@
           },
           "TerritoryId": 138,
           "InteractionType": "Interact",
+          "Fly": true,
           "DialogueChoices": [
             {
               "Type": "YesNo",
@@ -158,7 +182,6 @@
       "Sequence": 4,
       "Steps": [
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1009336,
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1441_A Case of Indecency.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1441_A Case of Indecency.json
index 36c6a8664d756de70227460f3b782689c24fdd05..a29c28f2f61adbe3867bb28d722e14004630b2fd 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1441_A Case of Indecency.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1441_A Case of Indecency.json
@@ -44,7 +44,8 @@
             "Z": 375.17358
           },
           "TerritoryId": 137,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
@@ -59,7 +60,8 @@
             "Z": 350.3623
           },
           "TerritoryId": 137,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
@@ -74,7 +76,8 @@
             "Z": 447.13513
           },
           "TerritoryId": 137,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/166_Eight-armed and Dangerous.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/166_Eight-armed and Dangerous.json
index f191b9fc859f66fe64e0ec3261c024cf22039ee6..55f5271e5d0d3663d9a9001f432195da625ecfb9 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/166_Eight-armed and Dangerous.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/166_Eight-armed and Dangerous.json
@@ -18,6 +18,7 @@
             "Y": 17.44805,
             "Z": 448.69153
           },
+          "StopDistance": 7,
           "TerritoryId": 137,
           "InteractionType": "AcceptQuest"
         }
@@ -32,6 +33,15 @@
             "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Thaumaturges' Guild"
           ],
+          "Position": {
+            "X": -153.18225,
+            "Y": 14.005,
+            "Z": 43.458076
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
+        {
           "DataId": 1010160,
           "Position": {
             "X": -144.64032,
@@ -46,6 +56,15 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "Position": {
+            "X": -153.18225,
+            "Y": 14.005,
+            "Z": 43.458076
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
         {
           "AethernetShortcut": [
             "[Ul'dah] Thaumaturges' Guild",
@@ -70,6 +89,15 @@
             "[Ul'dah] Gladiators' Guild",
             "[Ul'dah] Thaumaturges' Guild"
           ],
+          "Position": {
+            "X": -153.18225,
+            "Y": 14.005,
+            "Z": 43.458076
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
+        {
           "DataId": 1010160,
           "Position": {
             "X": -144.64032,
@@ -84,6 +112,15 @@
     {
       "Sequence": 4,
       "Steps": [
+        {
+          "Position": {
+            "X": -127.24249,
+            "Y": 7.999999,
+            "Z": -55.6639
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1010188,
           "Position": {
@@ -99,15 +136,24 @@
     {
       "Sequence": 5,
       "Steps": [
+        {
+          "Position": {
+            "X": -123.05803,
+            "Y": 1.363661,
+            "Z": -142.65125
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
         {
           "AethernetShortcut": [
             "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Gladiators' Guild"
           ],
           "Position": {
-            "X": -71.1609,
-            "Y": 6.9845705,
-            "Z": 9.066199
+            "X": -72.12142,
+            "Y": 6.9845715,
+            "Z": 8.82207
           },
           "TerritoryId": 131,
           "InteractionType": "WalkTo"
@@ -119,6 +165,7 @@
             "Y": 6.9839683,
             "Z": 3.982544
           },
+          "StopDistance": 7,
           "TerritoryId": 131,
           "InteractionType": "Interact",
           "DisableNavmesh": true
@@ -133,6 +180,15 @@
             "[Ul'dah] Gladiators' Guild",
             "[Ul'dah] Thaumaturges' Guild"
           ],
+          "Position": {
+            "X": -153.18225,
+            "Y": 14.005,
+            "Z": 43.458076
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
+        {
           "DataId": 1010287,
           "Position": {
             "X": -142.71765,

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/202_What Price Victory.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/202_What Price Victory.json
index be98277af4bed743c87d26c208d5341b6f31a2de..d01258b6580ad2f7cc5c00923e7239456335ed81 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/202_What Price Victory.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/202_What Price Victory.json
@@ -49,8 +49,17 @@
       "Sequence": 2,
       "Steps": [
         {
-          "Mount": true,
           "AetheryteShortcut": "Central Thanalan - Black Brush Station",
+          "Position": {
+            "X": -60.649715,
+            "Y": -11.872707,
+            "Z": -61.934204
+          },
+          "TerritoryId": 141,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
           "DataId": 1010293,
           "Position": {
             "X": -61.387024,
@@ -66,7 +75,6 @@
       "Sequence": 3,
       "Steps": [
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1010298,
           "Position": {
@@ -83,7 +91,6 @@
       "Sequence": 4,
       "Steps": [
         {
-          "Mount": true,
           "Fly": true,
           "DataId": 1010310,
           "Position": {
@@ -110,6 +117,15 @@
             "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Thaumaturges' Guild"
           ],
+          "Position": {
+            "X": -153.18225,
+            "Y": 14.005,
+            "Z": 43.458076
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
+        {
           "DataId": 1010290,
           "Position": {
             "X": -144.73187,

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/203_The Trouble with Truffles.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/203_The Trouble with Truffles.json
index 56522def5c8d3359f389280d87df66c600d3b279..cd2b096bbd655081c53e022b14ce52e58bd627e0 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/203_The Trouble with Truffles.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/203_The Trouble with Truffles.json
@@ -48,6 +48,23 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "Position": {
+            "X": -45.67461,
+            "Y": 11.927631,
+            "Z": -16.919664
+          },
+          "StopDistance": 0.25,
+          "TerritoryId": 131,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -48.14437,
+              "Y": 9.999995,
+              "Z": -10.52473
+            }
+          }
+        },
         {
           "DataId": 1010316,
           "Position": {
@@ -55,7 +72,7 @@
             "Y": 9.999972,
             "Z": -12.64978
           },
-          "StopDistance": 6,
+          "StopDistance": 7,
           "TerritoryId": 131,
           "InteractionType": "Interact"
         }
@@ -65,10 +82,8 @@
       "Sequence": 3,
       "Steps": [
         {
-          "Comment": "This teleport is because I couldn't figure out jumping",
-          "AetheryteShortcut": "Ul'dah",
           "AethernetShortcut": [
-            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Gladiators' Guild",
             "[Ul'dah] Weavers' Guild"
           ],
           "DataId": 2004901,
@@ -90,9 +105,9 @@
         },
         {
           "Position": {
-            "X": 109.42333,
+            "X": 108.07826,
             "Y": 8,
-            "Z": 8.92655
+            "Z": 8.036793
           },
           "TerritoryId": 131,
           "InteractionType": "WalkTo"
@@ -138,6 +153,15 @@
     {
       "Sequence": 4,
       "Steps": [
+        {
+          "Position": {
+            "X": 98.252335,
+            "Y": 8.000075,
+            "Z": -38.319664
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
         {
           "AethernetShortcut": [
             "[Ul'dah] Sapphire Avenue Exchange",

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/204_The Coliseum Conundrum.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/204_The Coliseum Conundrum.json
index c74829154b0042079e240f5bb2deccd525453860..e30778134ecc4108784881fe5e7cd1fa8c02c9d9 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/204_The Coliseum Conundrum.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/204_The Coliseum Conundrum.json
@@ -26,9 +26,9 @@
             "[Ul'dah] Gladiators' Guild"
           ],
           "Position": {
-            "X": -71.1609,
-            "Y": 6.9845705,
-            "Z": 9.066199
+            "X": -72.12142,
+            "Y": 6.9845715,
+            "Z": 8.82207
           },
           "TerritoryId": 131,
           "InteractionType": "WalkTo"
@@ -74,7 +74,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-          "Mount": true,
           "Fly": true,
           "DataId": 1010161,
           "Position": {
@@ -121,6 +120,15 @@
             "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Gladiators' Guild"
           ],
+          "Position": {
+            "X": -72.12142,
+            "Y": 6.9845715,
+            "Z": 8.82207
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
+        {
           "DataId": 1010330,
           "Position": {
             "X": -69.5354,
@@ -129,6 +137,7 @@
           },
           "TerritoryId": 131,
           "InteractionType": "CompleteQuest",
+          "DisableNavmesh": true,
           "NextQuestId": 490
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/490_Shades of Sil'dih.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/490_Shades of Sil'dih.json
index 7a67a92850370b29982cd776eae1f56b31e1eaa5..c8403533fca74dccf3de97c8620c4116d4d07cd7 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/490_Shades of Sil'dih.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/490_Shades of Sil'dih.json
@@ -20,6 +20,15 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": -72.76394,
+            "Y": 6.9845715,
+            "Z": 6.476269
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
         {
           "AethernetShortcut": [
             "[Ul'dah] Gladiators' Guild",
@@ -65,6 +74,7 @@
             "Y": 40,
             "Z": 92.11865
           },
+          "StopDistance": 5,
           "TerritoryId": 131,
           "InteractionType": "Interact"
         }
@@ -78,7 +88,6 @@
             "[Ul'dah] Alchemists' Guild",
             "[Ul'dah] Gate of the Sultana (Western Thanalan)"
           ],
-          "Mount": true,
           "DataId": 1011677,
           "Position": {
             "X": 363.54602,

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/491_Sibling Strife.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/491_Sibling Strife.json
index 6faca6922a13b05a55799b7392995b42f561074c..cf1e140cd5e72b705597734346cf186ac033eae8 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/491_Sibling Strife.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/491_Sibling Strife.json
@@ -26,6 +26,15 @@
             "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Thaumaturges' Guild"
           ],
+          "Position": {
+            "X": -171.53638,
+            "Y": 17.999998,
+            "Z": 66.511505
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo"
+        },
+        {
           "DataId": 1011681,
           "Position": {
             "X": -182.29956,
@@ -33,7 +42,15 @@
             "Z": 56.90088
           },
           "TerritoryId": 130,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            16
+          ]
         },
         {
           "DataId": 1003897,
@@ -43,7 +60,15 @@
             "Z": 60.53247
           },
           "TerritoryId": 130,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1001294,
@@ -53,7 +78,15 @@
             "Z": 72.129395
           },
           "TerritoryId": 130,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1001708,
@@ -63,7 +96,15 @@
             "Z": 80.88806
           },
           "TerritoryId": 130,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         }
       ]
     },
@@ -102,14 +143,14 @@
       "Sequence": 4,
       "Steps": [
         {
-          "Mount": true,
           "Position": {
             "X": -345.65482,
             "Y": 23,
             "Z": -352.02484
           },
           "TerritoryId": 140,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Fly": true
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/492_Beneath the Mask.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/492_Beneath the Mask.json
index 8ec8a564b404c2b05fe5bc0100e56ec85987018d..a4977fd6c9548763df399c31482b160c1b7e2729 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/492_Beneath the Mask.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/492_Beneath the Mask.json
@@ -20,6 +20,15 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": 44.860275,
+            "Y": 34.02289,
+            "Z": -12.268097
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 2005164,
           "Position": {
@@ -35,6 +44,25 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "Position": {
+            "X": 45.576427,
+            "Y": 34,
+            "Z": -23.220316
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": 49.565746,
+            "Y": 33.999992,
+            "Z": -25.594622
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
         {
           "DataId": 2005165,
           "Position": {
@@ -50,6 +78,25 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": 53.15642,
+            "Y": 33.999992,
+            "Z": -25.133741
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": 62.437984,
+            "Y": 28.992012,
+            "Z": -34.336155
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
         {
           "DataId": 2005166,
           "Position": {
@@ -65,6 +112,25 @@
     {
       "Sequence": 4,
       "Steps": [
+        {
+          "Position": {
+            "X": 62.437984,
+            "Y": 28.992012,
+            "Z": -34.336155
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": 45.576427,
+            "Y": 34,
+            "Z": -23.220316
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
         {
           "DataId": 1011697,
           "Position": {
@@ -87,8 +153,17 @@
             "Y": 34,
             "Z": 29.984009
           },
+          "StopDistance": 7,
           "TerritoryId": 131,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1011694,
@@ -97,8 +172,17 @@
             "Y": 33.999992,
             "Z": 29.43457
           },
+          "StopDistance": 7,
           "TerritoryId": 131,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1011695,
@@ -107,8 +191,17 @@
             "Y": 33.999992,
             "Z": 30.044922
           },
+          "StopDistance": 7,
           "TerritoryId": 131,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/493_Truths Untold.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/493_Truths Untold.json
index b494762bd01c6d67f4e0f492bad05f7032cace7c..b86733179b303e7168bcf02e485589ddaa9aa7a2 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/493_Truths Untold.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/493_Truths Untold.json
@@ -12,6 +12,7 @@
             "Y": 34,
             "Z": 30.22815
           },
+          "StopDistance": 7,
           "TerritoryId": 131,
           "InteractionType": "AcceptQuest"
         }
@@ -27,6 +28,7 @@
             "Y": 33.99998,
             "Z": 29.343018
           },
+          "StopDistance": 7,
           "TerritoryId": 131,
           "InteractionType": "Interact"
         }
@@ -40,12 +42,22 @@
             "[Ul'dah] The Chamber of Rule",
             "[Ul'dah] Sapphire Avenue Exchange"
           ],
+          "Position": {
+            "X": 137.68585,
+            "Y": 3.9999998,
+            "Z": -58.555218
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
+        {
           "DataId": 1001679,
           "Position": {
             "X": 140.48975,
             "Y": 4.0099983,
             "Z": -59.80017
           },
+          "StopDistance": 5,
           "TerritoryId": 131,
           "InteractionType": "Interact"
         }
@@ -73,6 +85,24 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": 22.47297,
+            "Y": 33.999996,
+            "Z": -40.833565
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": 33.41606,
+            "Y": 34,
+            "Z": -32.54854
+          },
+          "TerritoryId": 131,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1011707,
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/502_Her Last Vow.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/502_Her Last Vow.json
index 156313e14230b0f0ca9f9aa4742060f1a642c847..4fb68dddc017c19158455db1392de38b8b322136 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/502_Her Last Vow.json
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/502_Her Last Vow.json
@@ -22,7 +22,6 @@
       "Steps": [
         {
           "AetheryteShortcut": "Central Thanalan - Black Brush Station",
-          "Mount": true,
           "Fly": true,
           "DataId": 1011714,
           "Position": {
@@ -46,14 +45,10 @@
             "Z": 43.9917
           },
           "TerritoryId": 141,
-          "InteractionType": "Interact"
-        },
-        {
+          "InteractionType": "Say",
           "ChatMessage": {
             "Key": "TEXT_CHRHDB505_00502_SAYTODO_000_000"
-          },
-          "TerritoryId": 141,
-          "InteractionType": "Say"
+          }
         }
       ]
     },
@@ -61,9 +56,17 @@
       "Sequence": 3,
       "Steps": [
         {
+          "Position": {
+            "X": 159.84998,
+            "Y": 37.381317,
+            "Z": 174.60776
+          },
+          "TerritoryId": 153,
+          "InteractionType": "WalkTo",
           "AetheryteShortcut": "South Shroud - Quarrymill",
-          "Mount": true,
-          "Fly": true,
+          "Fly": true
+        },
+        {
           "DataId": 1011722,
           "Position": {
             "X": 159.68555,

diff --git a/Questionable/Controller/CombatController.cs b/Questionable/Controller/CombatController.cs
index 821dcf027fe9543aa7c837f34caae9908cc639b5..26c4fa5ce0dfd90d545f8ec493348263fad82697 100644 (file)
--- a/Questionable/Controller/CombatController.cs
+++ b/Questionable/Controller/CombatController.cs
@@ -198,7 +198,8 @@ internal sealed class CombatController : IDisposable
             // but also delays killing the next enemy a little
             if (_currentFight == null ||
                 _currentFight.Data.SpawnType == EEnemySpawnType.OverworldEnemies ||
-                (_currentFight.Data.SpawnType != EEnemySpawnType.FateEnemies && _currentFight.Data.KillEnemyDataIds.Count > 0))
+                _currentFight.Data.SpawnType == EEnemySpawnType.FateEnemies ||
+                _currentFight.Data.KillEnemyDataIds.Count > 0)
             {
                 if (battleNpc.IsDead)
                     return 0;
@@ -263,13 +264,6 @@ internal sealed class CombatController : IDisposable
                 }
             }
 
-            if (_currentFight?.Data.SpawnType == EEnemySpawnType.FateEnemies)
-            {
-                var gameObjectStruct = (GameObject*)gameObject.Address;
-                if (gameObjectStruct->FateId != 0)
-                    return 15;
-            }
-
             // stuff trying to kill us
             if (battleNpc.TargetObjectId == _clientState.LocalPlayer?.GameObjectId)
                 return 10;

diff --git a/Questionable/Controller/Steps/Shared/AethernetShortcut.cs b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
index 8df6c49a9291b198827eaf6c2f8ebaddee02201f..25110ca8555a6b2e865b24ee2c7106813b37b309 100644 (file)
--- a/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
+++ b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
@@ -185,13 +185,16 @@ internal static class AethernetShortcut
         {
             logger.LogInformation("Moving to aethernet shortcut");
             _moving = true;
+            float distance = from switch
+            {
+                _ when from.IsFirmamentAetheryte() => 4.4f,
+                EAetheryteLocation.UldahChamberOfRule => 5f,
+                _ when AetheryteConverter.IsLargeAetheryte(from) => 10.9f,
+                _ => 6.9f,
+            };
             movementController.NavigateTo(EMovementType.Quest, (uint)from, aetheryteData.Locations[from],
                 false, true,
-                from.IsFirmamentAetheryte()
-                    ? 4.4f
-                    : AetheryteConverter.IsLargeAetheryte(from)
-                        ? 10.9f
-                        : 6.9f);
+                distance);
         }
 
         private void DoTeleport()

diff --git a/Questionable/Windows/DebugOverlay.cs b/Questionable/Windows/DebugOverlay.cs
index c41daf60461650040080fde3b2724749ff380646..2f5f8916a1d715fb7d0d6cd714d384d59f8ce95d 100644 (file)
--- a/Questionable/Windows/DebugOverlay.cs
+++ b/Questionable/Windows/DebugOverlay.cs
@@ -25,7 +25,8 @@ internal sealed class DebugOverlay : Window
     private readonly Configuration _configuration;
 
     public DebugOverlay(QuestController questController, QuestRegistry questRegistry, IGameGui gameGui,
-        IClientState clientState, ICondition condition, AetheryteData aetheryteData, IObjectTable objectTable, CombatController combatController, Configuration configuration)
+        IClientState clientState, ICondition condition, AetheryteData aetheryteData, IObjectTable objectTable,
+        CombatController combatController, Configuration configuration)
         : base("Questionable Debug Overlay###QuestionableDebugOverlay",
             ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoBackground |
             ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoSavedSettings, true)
@@ -136,7 +137,9 @@ internal sealed class DebugOverlay : Window
             if (!visible)
                 continue;
 
-            ImGui.GetWindowDrawList() .AddText(screenPos + new Vector2(10, -8), 0xFFFFFFFF, $"{x.Name}/{x.GameObjectId:X}, {_combatController.GetKillPriority(x)}, {Vector3.Distance(x.Position, _clientState.LocalPlayer!.Position):N2}, {x.IsTargetable}");
+            int priority = _combatController.GetKillPriority(x);
+            ImGui.GetWindowDrawList().AddText(screenPos + new Vector2(10, -8), priority > 0 ? 0xFF00FF00 : 0xFFFFFFFF,
+                $"{x.Name}/{x.GameObjectId:X}, {x.DataId}, {priority}, {Vector3.Distance(x.Position, _clientState.LocalPlayer!.Position):N2}, {x.IsTargetable}");
         }
     }