Clean up Endwalker aether currents, make ignoreDistanceToObject not-hardcoded, shorte...
authorLiza Carvelli <liza@carvel.li>
Sat, 13 Jul 2024 20:01:06 +0000 (22:01 +0200)
committerLiza Carvelli <liza@carvel.li>
Sat, 13 Jul 2024 20:47:54 +0000 (22:47 +0200)
95 files changed:
QuestPathGenerator/QuestSourceGenerator.cs
QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3675_A Welcome Guest.json
QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3676_Good for the Soul.json
QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3764_Facing the Truth.json
QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json
QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json
QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json
QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json
QuestPaths/6.x - Endwalker/Aether Currents/Mare Lamentorum/4240_True Carrot Crimes.json
QuestPaths/6.x - Endwalker/Aether Currents/Mare Lamentorum/4241_Carrots Its Whats for Dinner.json
QuestPaths/6.x - Endwalker/Aether Currents/Mare Lamentorum/4253_Alluring Allag.json
QuestPaths/6.x - Endwalker/Aether Currents/Mare Lamentorum/4516_Name That Way.json
QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4203_Alchemist or Dancer.json
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4364_The Medial Circuit.json
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4366_A Guide of Sorts.json
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4371_House of Divinities.json
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4375_Tipping the Scale.json
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4376_The Satrap of Radz at Han.json
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json
QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4384_Tracks in the Snow.json
QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4385_How the Mighty Are Fallen.json
QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4388_The Last Bastion.json
QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4389_Personae non Gratae.json
QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4393_Strange Bedfellows.json
QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4395_Gateway of the Gods.json
QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4398_The Martyr.json
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4399_In_Shadows_Wake.json
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4401_A Harey Situation.json
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4404_Alls Vale That Endsvale.json
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4406_Setting Things Straight.json
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4407_Heart of the Matter.json
QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json
QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4412_Beyond the Depths of Despair.json
QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4413_That We Might Live.json
QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4414_When All Hope Seems Lost.json
QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4415_Warm Hearts, Rekindled Hopes.json
QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4417_Under His Wing.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4420_Hope Upon a Flower.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4424_Lives Apart.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4425_Their Greatest Contribution.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4426_Aether to Aether.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4429_Travelers at the Crossroads.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4431_Witness to the Spectacle.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4433_A Flower upon Your Return.json
QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json
QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4442_No Job Too Small.json
QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4446_Hither and Yarns.json
QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4456_Roads Paved of Sacrifice.json
QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4458_Where Knowledge Leads.json
QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json
QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4460_x.json
QuestPaths/6.x - Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json
QuestPaths/6.x - Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json
QuestPaths/6.x - Endwalker/MSQ/I-6.2/4597_The Wind Rises.json
QuestPaths/6.x - Endwalker/MSQ/J-6.3/4674_King of the Mountain.json
QuestPaths/6.x - Endwalker/MSQ/J-6.3/4677_Desires Untold.json
QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json
QuestPaths/6.x - Endwalker/MSQ/K-6.4/4742_Abyssal Dark.json
QuestPaths/6.x - Endwalker/MSQ/L-6.5/4748_Down in the Dark.json
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4564_Olfactory Warfare.json [deleted file]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4565_Ridin' Hazards.json [deleted file]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4566_Hippo Scrub.json [deleted file]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4567_Vanaspati's Blessing.json [deleted file]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4568_Hells Hath No Fury as a Hippo Scorned.json [deleted file]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4569_Tusk Trouble.json [deleted file]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4564_Olfactory Warfare.json [new file with mode: 0644]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4565_Ridin' Hazards.json [new file with mode: 0644]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4566_Hippo Scrub.json [new file with mode: 0644]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4567_Vanaspati's Blessing.json [new file with mode: 0644]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4568_Hells Hath No Fury as a Hippo Scorned.json [new file with mode: 0644]
QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4569_Tusk Trouble.json [new file with mode: 0644]
QuestPaths/7.x - Dawntrail/Aether Currents/Urqopacha/5047_An Illuminating Ritual.json
QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4891_The High Luminary.json
QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4894_The Skyruin.json
QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4909_Road to the Golden City.json
QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4913_Saddled Up.json
QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4917_On Track.json
QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4925_A Hot Commodity.json
QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4926_All Aboard.json
QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4928_A Royal Welcome.json
QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json
QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json
QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5030_An Unlikely Inspector.json
QuestPaths/quest-v1.json
Questionable.Model/V1/QuestStep.cs
Questionable/Controller/MovementController.cs
Questionable/Controller/Steps/Interactions/Jump.cs
Questionable/Controller/Steps/Shared/AetheryteShortcut.cs
Questionable/Controller/Steps/Shared/Move.cs
Questionable/Questionable.csproj
Questionable/Windows/QuestWindow.cs

index 5413660ca35f15ef0d60e9750be40dafcab639ba..595cdb8807addd4f6d78c709e193af42928214ca 100644 (file)
@@ -313,6 +313,8 @@ public class QuestSourceGenerator : ISourceGenerator
                                                 .AsSyntaxNodeOrToken(),
                                             Assignment(nameof(QuestStep.Sprint), step.Sprint, emptyStep.Sprint)
                                                 .AsSyntaxNodeOrToken(),
+                                            Assignment(nameof(QuestStep.IgnoreDistanceToObject), step.IgnoreDistanceToObject, emptyStep.IgnoreDistanceToObject)
+                                                .AsSyntaxNodeOrToken(),
                                             Assignment(nameof(QuestStep.Comment), step.Comment, emptyStep.Comment)
                                                 .AsSyntaxNodeOrToken(),
                                             Assignment(nameof(QuestStep.AetheryteShortcut), step.AetheryteShortcut,
index 06bcc2c244b498b9b7008d511e04406a93f987cf..07f18b5fd71513951eea3d1b2fbb007324607c16 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 20b2509e56880830185b9ac3cf867f0a10a8f9d6..56aeb7c20494a4a5beab984d586615dd64d24cd6 100644 (file)
@@ -83,7 +83,6 @@
           "TerritoryId": 815,
           "InteractionType": "UseItem",
           "ItemId": 2002904,
-          "$.1": "QuestVariables if done first: 1 32 0 0 0 64",
           "CompletionQuestVariablesFlags": [
             null,
             null,
           "TerritoryId": 815,
           "InteractionType": "UseItem",
           "ItemId": 2002904,
-          "$.1": "QuestVariables if done after [1]: 2 16 0 0 0 96",
           "CompletionQuestVariablesFlags": [
             null,
             null,
index dd677ee691e2ad6b66d9cded43f1e36e0a268474..8ea5283d9a9e5c4f268f8957427fd0e718d95b83 100644 (file)
@@ -68,7 +68,6 @@
           "StopDistance": 1,
           "TerritoryId": 815,
           "InteractionType": "Interact",
-          "$.1": "QuestVariables if done first: 16 16 16 0 0 32",
           "Fly": true,
           "CompletionQuestVariablesFlags": [
             null,
@@ -88,7 +87,6 @@
           },
           "TerritoryId": 815,
           "InteractionType": "Interact",
-          "$.1": "QuestVariables if done after [1]: 33 16 32 0 0 96",
           "CompletionQuestVariablesFlags": [
             null,
             null,
index c68e1792ad7ddd7cc2641f99fdc6d6f3fdbfbabf..62b9690a25f53a12458946de31ec3011d0d25ee1 100644 (file)
@@ -72,8 +72,6 @@
           "TerritoryId": 819,
           "InteractionType": "Interact",
           "Comment": "Chessamile",
-          "$.0": "[1]",
-          "$.1": "QuestVariables if done first: 1 0 0 0 0 64",
           "CompletionQuestVariablesFlags": [
             null,
             null,
@@ -93,8 +91,6 @@
           "TerritoryId": 819,
           "InteractionType": "Interact",
           "Comment": "Bragi",
-          "$.0": "[2]",
-          "$.1": "QuestVariables if done after [1]: 2 0 0 0 0 192",
           "CompletionQuestVariablesFlags": [
             null,
             null,
           "TerritoryId": 819,
           "InteractionType": "Interact",
           "Comment": "Glynard",
-          "$.0": "[3]",
-          "$.1": "QuestVariables if done after [1, 2]: 3 0 0 0 0 200",
           "CompletionQuestVariablesFlags": [
             null,
             null,
             "[Crystarium] The Pendants",
             "[Crystarium] The Crystalline Mean"
           ],
-          "$.0": "[4]",
-          "$.1": "QuestVariables if done after [1, 2, 3]: 4 0 0 0 0 216",
           "CompletionQuestVariablesFlags": [
             null,
             null,
index 49d527ab8d38bcc5162f5d243f5a8328284128c8..18bff89164b693fd27e67bf3c9e92199ea546f74 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 1e79aa220e62e161d502fefab4428c3212fb2d56..0a25f882ddac50b8910b0f9cbab6c3b87bc4b2ea 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 88067277c4ee6184e17a59dedea6da064b9be36b..00c11236eecf1cb9ddb21d3df4bb0a38949a81c2 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 1f24584a783772593f9203a2fa75d5f6f0416c93..8970eeece0ee14df4472aae0199f3bbcfd00eecc 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 3d38144b698f066f6122c25e68f38d75774aadd0..36b86bc3bc2f01aca825fc5ca5815fc5cc00d669 100644 (file)
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "Position": {
-            "X": -719.5691,
-            "Y": -152.90369,
-            "Z": -807.82135
-          },
-          "TerritoryId": 959,
-          "InteractionType": "ShouldBeAJump",
-          "Comment": "Navmesh can't jump (TODO this is super out of the way)"
-        },
-        {
-          "DataId": 2012018,
-          "Position": {
-            "X": -733.63855,
-            "Y": -139.6659,
-            "Z": -733.30286
-          },
-          "TerritoryId": 959,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818367
-        },
         {
           "DataId": 1037867,
           "Position": {
@@ -68,8 +47,7 @@
             "Z": -491.14215
           },
           "TerritoryId": 959,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow"
+          "InteractionType": "CompleteQuest"
         }
       ]
     }
index 68bb219c7352ffbef5068e0827b7f0ceebd4bfb7..34cedf2a9c4cb09135a3305b413d677501e1e176 100644 (file)
       "Steps": [
         {
           "Position": {
-            "X": -345.7338,
+            "X": -348.90564,
             "Y": -161.8501,
-            "Z": -646.97064
+            "Z": -651.4007
           },
+          "StopDistance": 1,
           "TerritoryId": 959,
-          "InteractionType": "ShouldBeAJump",
-          "Comment": "Navmesh can't jump"
+          "InteractionType": "WalkTo",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "Position": {
+            "X": -348.90564,
+            "Y": -161.8501,
+            "Z": -651.4007
+          },
+          "StopDistance": 1,
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -344.52225,
+              "Y": -160.40424,
+              "Z": -654.19385
+            }
+          },
+          "Mount": false,
+          "Comment": "Platform 1",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "Position": {
+            "X": -344.52225,
+            "Y": -160.40424,
+            "Z": -654.19385
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -342.69867,
+              "Y": -158.90424,
+              "Z": -651.2852
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 2",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "Position": {
+            "X": -342.69867,
+            "Y": -158.90424,
+            "Z": -651.2852
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -341.018,
+              "Y": -157.40425,
+              "Z": -649.38934
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 3",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "Position": {
+            "X": -341.018,
+            "Y": -157.40425,
+            "Z": -649.38934
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -338.68277,
+              "Y": -155.90424,
+              "Z": -646.8163
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 4",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "Position": {
+            "X": -338.68277,
+            "Y": -155.90424,
+            "Z": -646.8163
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -335.60294,
+              "Y": -154.40422,
+              "Z": -646.18335
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 5",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "Position": {
+            "X": -335.60294,
+            "Y": -154.40422,
+            "Z": -646.18335
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -332.4621,
+              "Y": -152.90424,
+              "Z": -645.4033
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 6",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "Position": {
+            "X": -329.84186,
+            "Y": -152.24591,
+            "Z": -649.0854
+          },
+          "TerritoryId": 959,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "DataId": 1041789,
-          "StopDistance": 3,
+          "Position": {
+            "X": -329.3355,
+            "Y": -151.26128,
+            "Z": -657.2519
+          },
+          "StopDistance": 7,
           "TerritoryId": 959,
           "InteractionType": "Say",
+          "DisableNavmesh": true,
           "ChatMessage": {
             "Key": "TEXT_AKTKZE002_04241_SYSTEM_000_010"
-          }
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1041790,
           "ChatMessage": {
             "Key": "TEXT_AKTKZE002_04241_SYSTEM_000_010"
           },
-          "$.1": "QuestVariables if done after [1]: 2 0 0 0 0 192"
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "Position": {
+            "X": -438.33246,
+            "Y": -168.00002,
+            "Z": -420.43494
+          },
+          "StopDistance": 1,
+          "TerritoryId": 959,
+          "InteractionType": "WalkTo"
         },
         {
           "Position": {
             "Y": -168.00002,
             "Z": -420.43494
           },
+          "StopDistance": 1,
           "TerritoryId": 959,
-          "InteractionType": "ShouldBeAJump",
-          "Comment": "Navmesh can't jump"
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -438.3488,
+              "Y": -166.55414,
+              "Z": -415.94168
+            },
+            "DelaySeconds": 0.25
+          },
+          "Mount": false,
+          "Comment": "Platform 1",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -32
+          ]
+        },
+        {
+          "Position": {
+            "X": -438.3488,
+            "Y": -166.55414,
+            "Z": -415.94168
+          },
+          "StopDistance": 1,
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -436.71103,
+              "Y": -165.05412,
+              "Z": -413.06158
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 2",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -32
+          ]
+        },
+        {
+          "Position": {
+            "X": -436.71103,
+            "Y": -165.05412,
+            "Z": -413.06158
+          },
+          "StopDistance": 1,
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -434.92825,
+              "Y": -163.55417,
+              "Z": -411.54132
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 3",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -32
+          ]
+        },
+        {
+          "Position": {
+            "X": -434.92825,
+            "Y": -163.55417,
+            "Z": -411.54132
+          },
+          "StopDistance": 1,
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -432.17563,
+              "Y": -162.05412,
+              "Z": -409.53986
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 4",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -32
+          ]
+        },
+        {
+          "Position": {
+            "X": -432.17563,
+            "Y": -162.05412,
+            "Z": -409.53986
+          },
+          "StopDistance": 1,
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -429.1173,
+              "Y": -160.55412,
+              "Z": -408.93143
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 5",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -32
+          ]
+        },
+        {
+          "Position": {
+            "X": -429.1173,
+            "Y": -160.55412,
+            "Z": -408.93143
+          },
+          "StopDistance": 1,
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": -425.56998,
+              "Y": -159.05414,
+              "Z": -408.56833
+            },
+            "DelaySeconds": 0.25
+          },
+          "Comment": "Platform 6",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -32
+          ]
         },
         {
           "DataId": 1041791,
+          "Position": {
+            "X": -409.87262,
+            "Y": -158.89125,
+            "Z": -426.68805
+          },
           "StopDistance": 3,
           "TerritoryId": 959,
           "InteractionType": "Say",
           "ChatMessage": {
             "Key": "TEXT_AKTKZE002_04241_SYSTEM_000_010"
-          }
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         }
       ]
     },
           },
           "TerritoryId": 959,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "DataId": 1039520,
index 5dbc0e57f3661e832ddf87f0b275a782459f086f..b9e57a20b35547d725a6a1a32a8d8dc655f26f75 100644 (file)
             "Z": -521.6602
           },
           "TerritoryId": 959,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZE014_04253_Q1_000_000",
+              "Answer": "TEXT_AKTKZE014_04253_A1_000_002"
+            }
+          ]
         }
       ]
     },
       "Sequence": 1,
       "Steps": [
         {
-          "DataId": 2012015,
           "Position": {
-            "X": 591.3633,
-            "Y": 149.33997,
-            "Z": 114.91565
+            "X": 425.62292,
+            "Y": 123.48844,
+            "Z": 89.52347
           },
-          "StopDistance": 4,
           "TerritoryId": 959,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818364,
-          "Comment": "TODO Unsure if this can be reached via navmesh directly from Bestways Burrows"
+          "InteractionType": "WalkTo"
         },
         {
           "DataId": 1041127,
           },
           "TerritoryId": 959,
           "InteractionType": "Interact",
-          "$.1": "QuestVariables if done first: 17 0 0 0 0 32"
+          "$.1": "QuestVariables if done first: 17 0 0 0 0 32",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1041125,
           "KillEnemyDataIds": [
             14050
           ],
-          "$.1": "QuestVariables if done after [1]: 33 1 0 0 0 160"
+          "$.1": "QuestVariables if done after [1]: 33 1 0 0 0 160",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1041124,
             "Z": 188.18945
           },
           "TerritoryId": 959,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "DataId": 2012016,
-          "Position": {
-            "X": 388.3573,
-            "Y": 99.90076,
-            "Z": 306.05017
-          },
-          "TerritoryId": 959,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818365
-        },
         {
           "DataId": 1041123,
           "Position": {
index 6ee39a16a8ee5dc9101baffd2023504e8236926c..56ab9f627beadf1b5be8b20e85ebfb969765695e 100644 (file)
           "TerritoryId": 959,
           "InteractionType": "Interact",
           "Comment": "Cheerful Loporrit",
-          "$.0": "[1]",
-          "$.1": "QuestVariables if done first: 1 0 0 0 0 64"
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1041746,
           "TerritoryId": 959,
           "InteractionType": "Interact",
           "Comment": "Stern Loporrit",
-          "$.0": "[2]",
-          "$.1": "QuestVariables if done after [1]: 2 0 0 0 0 96"
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1041744,
           },
           "TerritoryId": 959,
           "InteractionType": "Interact",
-          "Comment": "Easygoing Loporrit"
+          "Comment": "Easygoing Loporrit",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         }
       ]
     },
             "Z": -465.17133
           },
           "TerritoryId": 959,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZE101_04516_Q3_000_000",
+              "Answer": "TEXT_AKTKZE101_04516_A3_000_001"
+            }
+          ]
         }
       ]
     }
index 7cb6ca4cb46f7deebace96996c96d50c29fd666a..4e087048ac708bd92f702b6fe0f416bee05c58e2 100644 (file)
@@ -51,8 +51,7 @@
             null,
             null,
             128
-          ],
-          "$": "QuestVariables after: 16 1 0 0 0 128"
+          ]
         },
         {
           "Position": {
@@ -82,8 +81,7 @@
             null,
             null,
             32
-          ],
-          "$": "QuestVariables after: 32 17 0 0 0 160"
+          ]
         },
         {
           "DataId": 2011913,
index 30836e52bfad00d56cc17bcb5c5bbcf2c3d33c02..d1d4b8396943ea960231ff471c02185913c5e3da 100644 (file)
     {
       "Sequence": 6,
       "Steps": [
-        {
-          "DataId": 2011984,
-          "Position": {
-            "X": 497.09314,
-            "Y": 73.41101,
-            "Z": -267.23126
-          },
-          "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818320
-        },
         {
           "DataId": 2011843,
           "Position": {
index 4c3212f9032d212ccf7db356c2295b12ee6d45e5..bed25f821164db2d166ae1f7129933a11975d9ca 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -329.64972,
-            "Y": 77.91884,
-            "Z": -448.5044
-          },
-          "TerritoryId": 956,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "Position": {
-            "X": -327.6718,
-            "Y": 79.535736,
-            "Z": -400.00397
-          },
-          "TerritoryId": 956,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "DataId": 2011982,
-          "Position": {
-            "X": -316.30432,
-            "Y": 79.75891,
-            "Z": -395.31555
-          },
-          "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818318
-        },
-        {
-          "Position": {
-            "X": -300.80545,
-            "Y": 59.384476,
-            "Z": -409.0928
-          },
-          "TerritoryId": 956,
-          "InteractionType": "WalkTo",
-          "DisableNavmesh": true,
-          "Mount": true
-        },
-        {
-          "DataId": 2011983,
-          "Position": {
-            "X": 32.303345,
-            "Y": 72.83118,
-            "Z": -286.27454
-          },
-          "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818319
-        },
         {
           "DataId": 1038736,
           "Position": {
index cf324437dc5c767d4f2598ad4c812731ab4cddde..51e007b8084d94737d3ef3c1728ba7cfd66dcfc3 100644 (file)
     {
       "Sequence": 5,
       "Steps": [
-        {
-          "Position": {
-            "X": 232.93636,
-            "Y": 15.136732,
-            "Z": 526.6279
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "Mount": true
-        },
-        {
-          "DataId": 2011992,
-          "Position": {
-            "X": 303.91382,
-            "Y": 0.25933838,
-            "Z": 473.65527
-          },
-          "TerritoryId": 957,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818333,
-          "DisableNavmesh": true
-        },
-        {
-          "Position": {
-            "X": 201.66586,
-            "Y": 1.7700036,
-            "Z": 712.9197
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "Position": {
-            "X": 199.50157,
-            "Y": 1.769943,
-            "Z": 738.831
-          },
-          "StopDistance": 0.25,
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo"
-        },
         {
           "DataId": 1038608,
           "Position": {
             "Y": 1.769943,
             "Z": 738.9843
           },
+          "StopDistance": 0.25,
           "TerritoryId": 957,
-          "InteractionType": "Interact",
-          "Mount": false
+          "InteractionType": "Interact"
         }
       ]
     },
index be8ec5ccc8594339921775d117b7f6ad83252dc4..c75c3d4551bf691e94ab8199bbf5c54bc50613eb 100644 (file)
@@ -58,6 +58,7 @@
             "Y": 37.463673,
             "Z": 379.5985
           },
+          "StopDistance": 0.25,
           "TerritoryId": 957,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
index c0ce68170a70ab9aae2c68da10c386e55965889d..c1a86e6bf169885834436ebb9bcd5dba9e2f879f 100644 (file)
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "DataId": 2011993,
-          "Position": {
-            "X": -479.45374,
-            "Y": 72.892334,
-            "Z": -561.82196
-          },
-          "TerritoryId": 957,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818334
-        },
-        {
-          "Position": {
-            "X": -489.27457,
-            "Y": 72.74904,
-            "Z": -546.8438
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "Mount": true
-        },
-        {
-          "Position": {
-            "X": -523.7225,
-            "Y": 9.401685,
-            "Z": -554.4276
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "DisableNavmesh": true
-        },
         {
           "DataId": 1038651,
           "Position": {
index ca83a28466e9f6fb6502a9d64f023fad5c1cf9ed..0712c6a3f5fec9257cd961520be3330aae54728f 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -130.78743,
-            "Y": 86.83725,
-            "Z": -252.08578
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "DataId": 2011994,
-          "Position": {
-            "X": -114.488464,
-            "Y": 87.08313,
-            "Z": -288.3192
-          },
-          "TerritoryId": 957,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818335,
-          "DisableNavmesh": true
-        },
-        {
-          "Position": {
-            "X": -156.25183,
-            "Y": 90.34184,
-            "Z": -399.8714
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "Position": {
-            "X": -126.149765,
-            "Y": 73.745605,
-            "Z": -427.64508
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "DisableNavmesh": true
-        },
         {
           "DataId": 1038656,
           "Position": {
index 1e92d033cc49f05616fb87a7d22a4bed2aa71baf..6d2d12f537d2c41962fa45f8dc45f1d6448e82ba 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 6f71782b390d5c9d7ea917d8c7ff53b13bcebf85..8808ef845e9b1d2c258f0d842d4df5e87a75c8ba 100644 (file)
     {
       "Sequence": 6,
       "Steps": [
+        {
+          "DataId": 2012078,
+          "Position": {
+            "X": 117.81482,
+            "Y": -16.922302,
+            "Z": 390.46313
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact",
+          "SkipIf": [
+            "NotTargetable"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMB105_04384_Q1_000_116",
+              "Yes": true
+            }
+          ],
+          "Comment": "retry point"
+        },
         {
           "DataId": 1038845,
           "Position": {
           "TerritoryId": 958,
           "InteractionType": "WalkTo",
           "Mount": false,
-          "Sprint": false
+          "Sprint": false,
+          "DelaySecondsAtStart": 1
         },
         {
           "DataId": 1038845,
           "TerritoryId": 958,
           "InteractionType": "WalkTo",
           "StopDistance": 45,
+          "IgnoreDistanceToObject": true,
           "Mount": false,
           "Sprint": false
         },
index f18a55359dd9e12ad4b0265ca0befe19e61cfc5d..6ad6b5199499594089e282f27c10e2894e9779e9 100644 (file)
     {
       "Sequence": 6,
       "Steps": [
-        {
-          "Position": {
-            "X": 398.44858,
-            "Y": 5.094846,
-            "Z": 231.72844
-          },
-          "TerritoryId": 958,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "Position": {
-            "X": 394.97046,
-            "Y": 3.652959,
-            "Z": 254.77034
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "DisableNavmesh": true,
-          "JumpDestination": {
-            "Position": {
-              "X": 405.0264,
-              "Y": -2.2185562,
-              "Z": 267.40506
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "Position": {
-            "X": 405.01987,
-            "Y": -2.2185562,
-            "Z": 298.9302
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 405.01382,
-              "Y": -2.2185562,
-              "Z": 308.17484
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "Position": {
-            "X": 404.9343,
-            "Y": -2.2185562,
-            "Z": 338.46368
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 404.9452,
-              "Y": -2.2185562,
-              "Z": 347.15533
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "Position": {
-            "X": 405.0104,
-            "Y": -2.2185562,
-            "Z": 379.0302
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 404.98633,
-              "Y": -2.2185562,
-              "Z": 388.4368
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "Position": {
-            "X": 405.02594,
-            "Y": -2.2185562,
-            "Z": 419.30426
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 405.00076,
-              "Y": -2.2185562,
-              "Z": 427.6698
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "Position": {
-            "X": 405.03207,
-            "Y": -2.2185562,
-            "Z": 457.66095
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 404.94934,
-              "Y": -2.2185562,
-              "Z": 467.3867
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "Position": {
-            "X": 405.04044,
-            "Y": -2.2185562,
-            "Z": 498.37363
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 405.158,
-              "Y": -2.2185564,
-              "Z": 508.9487
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "DataId": 2012003,
-          "Position": {
-            "X": 405.2948,
-            "Y": -2.243164,
-            "Z": 520.31726
-          },
-          "TerritoryId": 958,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818347
-        },
-        {
-          "Position": {
-            "X": 379.2122,
-            "Y": -18.622318,
-            "Z": 530.3423
-          },
-          "TerritoryId": 958,
-          "InteractionType": "WalkTo",
-          "Mount": true,
-          "DisableNavmesh": true
-        },
         {
           "DataId": 2012001,
           "Position": {
index f2b4be7eaaa62d3fd96db19412c18bde137a027d..6080b865111bcaf0170338f3eef7ccc2ccf31216 100644 (file)
@@ -12,6 +12,7 @@
             "Y": 0.21427588,
             "Z": 147.8446
           },
+          "StopDistance": 5,
           "TerritoryId": 958,
           "InteractionType": "AcceptQuest"
         }
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "DataId": 2012002,
-          "Position": {
-            "X": 83.08533,
-            "Y": 1.5106201,
-            "Z": 102.00659
-          },
-          "TerritoryId": 958,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818346
-        },
         {
           "Position": {
             "X": 168.04597,
index e1d24d57180b3797d88880a030db3ee2dec99718..722caf02567a89b4356ca29e43056f91b028c28c 100644 (file)
@@ -37,9 +37,7 @@
             null,
             null,
             64
-          ],
-          "$.0": "[1]",
-          "$.1": "QuestVariables if done first: 17 0 0 0 0 64"
+          ]
         },
         {
           "DataId": 1037718,
@@ -58,9 +56,7 @@
             null,
             null,
             16
-          ],
-          "$.0": "[2]",
-          "$.2": "QuestVariables if done after [1]: 33 1 0 0 0 80"
+          ]
         },
         {
           "Position": {
@@ -96,9 +92,7 @@
             null,
             null,
             128
-          ],
-          "$.0": "[3]",
-          "$.2": "QuestVariables if done after [1, 2]: 49 1 16 0 0 206"
+          ]
         },
         {
           "DataId": 1037717,
             null,
             null,
             32
-          ],
-          "$.0": "[4]",
-          "$.2": "QuestVariables if done after [1, 2, 3]: 65 17 16 0 0 240"
+          ]
         },
         {
           "DataId": 2012062,
             null,
             null,
             8
-          ],
-          "$.0": "[5]"
+          ]
         }
       ]
     },
index f1b5bb80c5f96eaf02390253c7686b1e75d47f40..7a8dadae0a733aaccf085522de61b53d61d50684 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "DataId": 2012008,
-          "Position": {
-            "X": 134.90503,
-            "Y": 14.389221,
-            "Z": -172.25916
-          },
-          "StopDistance": 5,
-          "TerritoryId": 958,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818352
-        },
-        {
-          "Position": {
-            "X": -141.20903,
-            "Y": 11.389334,
-            "Z": -399.3773
-          },
-          "TerritoryId": 958,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "Position": {
-            "X": -153.54558,
-            "Y": 11.389343,
-            "Z": -402.64487
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Instruction",
-          "Comment": "Jump to Aether Current"
-        },
-        {
-          "DataId": 2012009,
-          "Position": {
-            "X": -144.9455,
-            "Y": 17.56311,
-            "Z": -420.52344
-          },
-          "TerritoryId": 958,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818353
-        },
-        {
-          "Position": {
-            "X": -145.6724,
-            "Y": 11.389343,
-            "Z": -398.82806
-          },
-          "StopDistance": 20,
-          "TerritoryId": 958,
-          "InteractionType": "Instruction",
-          "Comment": "Leave the Aether Current location"
-        },
-        {
-          "Position": {
-            "X": 74.8118,
-            "Y": 10.5,
-            "Z": -335.1508
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "Comment": "Jump onto the Highway",
-          "JumpDestination": {
-            "Position": {
-              "X": 77.69889,
-              "Y": 12.075623,
-              "Z": -341.72333
-            }
-          }
-        },
-        {
-          "Position": {
-            "X": 72.64196,
-            "Y": 13.914492,
-            "Z": -347.6495
-          },
-          "TerritoryId": 958,
-          "InteractionType": "Jump",
-          "Comment": "Jump onto the Highway 2",
-          "JumpDestination": {
-            "Position": {
-              "X": 72.97841,
-              "Y": 15.635607,
-              "Z": -355.94916
-            }
-          }
-        },
-        {
-          "DataId": 2012007,
-          "Position": {
-            "X": 79.9115,
-            "Y": 37.857544,
-            "Z": -518.2117
-          },
-          "TerritoryId": 958,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818351
-        },
-        {
-          "Position": {
-            "X": 76.583664,
-            "Y": 10.5,
-            "Z": -538.34607
-          },
-          "TerritoryId": 958,
-          "InteractionType": "WalkTo",
-          "Mount": true,
-          "DisableNavmesh": true
-        },
         {
           "DataId": 1039917,
           "Position": {
index c3fe182d1a3a690521d66b1567d0bb3a8bf9630b..8b28baaf98ec5c7fdd3734cdcafa29bb50b46f6b 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "DataId": 2012004,
-          "Position": {
-            "X": -516.1059,
-            "Y": 42.46582,
-            "Z": 67.826294
-          },
-          "TerritoryId": 958,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818348
-        },
         {
           "DataId": 1039942,
           "Position": {
         }
       ]
     },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index bbe681683e5b1907a9b897426bf7ae1b2d811734..e2399f1c0dba505d14d2c53fa076f6cf66a39974 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index e86369fb00b939f32a26120a0df2944fc69be0da..16c2745abbe8718379e117b8ab91502b525455d3 100644 (file)
@@ -44,6 +44,7 @@
             "Z": 548.94324
           },
           "StopDistance": 5,
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 959,
           "InteractionType": "Interact"
         }
@@ -60,6 +61,7 @@
             "Z": 593.0419
           },
           "StopDistance": 5,
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 959,
           "InteractionType": "Interact"
         }
@@ -76,6 +78,7 @@
             "Z": 594.23206
           },
           "StopDistance": 5,
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 959,
           "InteractionType": "Interact"
         }
@@ -92,6 +95,7 @@
             "Z": 566.1554
           },
           "StopDistance": 5,
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 959,
           "InteractionType": "Interact"
         }
index ff5c7c5d6d0af5c09e9355ef49f2abca0ae1fb25..c64201aaf1f5960d02be5b0df4f57736adb6feeb 100644 (file)
           "Mount": true,
           "DisableNavmesh": true
         },
-        {
-          "Position": {
-            "X": 30.28816,
-            "Y": -133.50012,
-            "Z": -394.98798
-          },
-          "StopDistance": 5,
-          "TerritoryId": 959,
-          "InteractionType": "WalkTo",
-          "DisableNavmesh": true
-        },
-        {
-          "DataId": 2012019,
-          "Position": {
-            "X": 21.7081,
-            "Y": -133.5001,
-            "Z": -385.7313
-          },
-          "TerritoryId": 959,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818368
-        },
-        {
-          "DataId": 2012019,
-          "Position": {
-            "X": 23.67959,
-            "Y": -133.50012,
-            "Z": -399.96643
-          },
-          "StopDistance": 0.5,
-          "TerritoryId": 959,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 22.27572,
-              "Y": -137,
-              "Z": -416.6249
-            },
-            "StopDistance": 5
-          }
-        },
         {
           "DataId": 1038897,
           "Position": {
@@ -80,8 +39,7 @@
             "Z": -435.47723
           },
           "TerritoryId": 959,
-          "InteractionType": "Interact",
-          "DisableNavmesh": true
+          "InteractionType": "Interact"
         }
       ]
     },
index 6b227792fb1d6919bc5da13be2c6ea873877404c..b29c06f649d68e2f03a9e12e7b14489e6e449a41 100644 (file)
           },
           "TerritoryId": 959,
           "InteractionType": "CompleteQuest",
-          "DelaySecondsAtStart": 2,
-          "Comment": "FIXME Auto-playing quests seems to get stuck here/do nothing"
+          "DelaySecondsAtStart": 2
         }
       ]
     }
index 6015221db08d3c8ba49d58480a29efb1e8fffdb8..c0a21f9cb165c9d3939f3641ff4b0a83eceb34eb 100644 (file)
     {
       "Sequence": 5,
       "Steps": [
-        {
-          "DataId": 2012017,
-          "Position": {
-            "X": 652.9487,
-            "Y": -160.72333,
-            "Z": -405.08124
-          },
-          "TerritoryId": 959,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818366
-        },
         {
           "DataId": 1038929,
           "Position": {
index fd4f73ef737a44072f7ce6e1fba20500be42da42..ea2bb109c6047266378d6a6c91685e8e7296e0f1 100644 (file)
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "DataId": 2012185,
+          "Position": {
+            "X": -5.416992,
+            "Y": -49.05786,
+            "Z": -269.24548
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Interact",
+          "SkipIf": [
+            "NotTargetable"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMC107_04405_Q1_000_043",
+              "Yes": true
+            }
+          ],
+          "Comment": "retry point"
+        },
         {
           "Position": {
             "X": -6.025082,
index 1315aa60a69c5b9f87f46dbaa6a782380008ef67..633c23326570d9a432b49e25e87cb922f574f49a 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -126.76068,
-            "Y": 61.04055,
-            "Z": -76.382324
-          },
-          "TerritoryId": 959,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "DataId": 2012014,
-          "Position": {
-            "X": -128.008,
-            "Y": 66.33093,
-            "Z": -68.2536
-          },
-          "StopDistance": 5,
-          "TerritoryId": 959,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818363
-        },
-        {
-          "Position": {
-            "X": -116.83438,
-            "Y": 63.151585,
-            "Z": -71.81973
-          },
-          "TerritoryId": 959,
-          "InteractionType": "WalkTo",
-          "Mount": true
-        },
         {
           "DataId": 2012010,
           "Position": {
index ae68e4f5ba2976e494775ce194287e5f6813dd68..b92a516ce47043332add9f9cf965bd9e8d5fc758 100644 (file)
       "Sequence": 2,
       "Steps": [
         {
-          "DataId": 13996,
           "Position": {
-            "X": 166.0768,
+            "X": 167.0076,
             "Y": -49.589592,
-            "Z": -641.8327
+            "Z": -637.9577
           },
+          "StopDistance": 3,
           "TerritoryId": 959,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
+            13995,
             13996,
             13997,
             13995
index 555953585965d658928787f18ab6eee22dfa3e3c..23203a569bcce86ba4eb487240613cfd04d1e331 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index f800c849cae699ee35bf525007c4cb7da7cccc7a..76f3be81855527a39ce4c438d147eb04ca184dca 100644 (file)
     },
     {
       "Sequence": 6,
+      "Comment": "TODO Missing completion flags",
       "Steps": [
         {
           "DataId": 1039014,
index 2ca89bf2363083584368ce199729ee1f273b77a0..5b099b9273570aad90f320280218f6b5b8ee4181 100644 (file)
           "InteractionType": "AttuneAetherCurrent",
           "AetherCurrentId": 2818331
         },
-        {
-          "DataId": 2011997,
-          "Position": {
-            "X": 93.095215,
-            "Y": 36.66736,
-            "Z": -447.8676
-          },
-          "TerritoryId": 957,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818336
-        },
         {
           "DataId": 1039023,
           "Position": {
@@ -87,6 +76,7 @@
             "Y": 21.255978,
             "Z": -224.04822
           },
+          "StopDistance": 0.25,
           "TerritoryId": 957,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
index fa2460e8cc88ce6b20f547b1243b7549972ac3e0..f8ac6ec3643df58c71cbe7d8c9bdcb42986016dc 100644 (file)
             "Y": 11.819632,
             "Z": 266.03055
           },
+          "StopDistance": 0.25,
           "TerritoryId": 957,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
             "Y": 32.12932,
             "Z": 370.01733
           },
+          "StopDistance": 0.25,
           "TerritoryId": 957,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
             "Y": 44.997604,
             "Z": 196.7378
           },
+          "StopDistance": 0.25,
           "TerritoryId": 957,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
index 6fc5e1892c94f46fb21e30bfa2aa992532bdb08b..b6d114e3d0578a3ab539c86075d643b349ae66c1 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "DataId": 2011998,
-          "Position": {
-            "X": 294.3922,
-            "Y": 4.0740967,
-            "Z": 425.10107
-          },
-          "TerritoryId": 957,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818337
-        },
-        {
-          "DataId": 2011999,
-          "Position": {
-            "X": 53.177612,
-            "Y": 11.36792,
-            "Z": 187.396
-          },
-          "TerritoryId": 957,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818338
-        },
         {
           "DataId": 2012207,
           "Position": {
index be770fa1534290a6a48410bd1f293f805574b7ee..c9c641d64f64494398ffbc98e18a6266c92fbbfd 100644 (file)
             "Z": -35.324707
           },
           "TerritoryId": 963,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Radz-at-Han] Alzadaal's Peace",
+            "[Radz-at-Han] Ruveydah Fibers"
+          ]
         }
       ]
     },
index 98df00b66ce76293da91e16e8ac7b3b2a1abcd88..0a349d9e8690d169e5fea7924dc5ff38a403f98e 100644 (file)
@@ -96,9 +96,7 @@
             null,
             null,
             16
-          ],
-          "$.0": "[1]",
-          "$.1": "QuestVariables if done first: 16 0 16 0 0 16"
+          ]
         },
         {
           "DataId": 1039993,
             null,
             null,
             128
-          ],
-          "$.0": "[2]",
-          "$": "QuestVariables after: 32 1 16 0 0 144"
+          ]
         },
         {
           "DataId": 1039994,
             null,
             null,
             64
-          ],
-          "$.0": "[3]",
-          "$.1": "QuestVariables after: 49 1 16 0 0 208"
+          ]
         },
         {
           "DataId": 1039995,
             null,
             null,
             32
-          ],
-          "$.0": "[4]",
-          "$.2": "QuestVariables if done first: 16 16 0 0 0 32"
+          ]
         }
       ]
     },
index 528ba9f21155fa52077cee2852a6245d337eb39f..d7190722fb0894d918a54fbf08cb8088693db58a 100644 (file)
@@ -68,8 +68,7 @@
             null,
             null,
             128
-          ],
-          "$": "QuestValues after: 1 16 0 0 0 128"
+          ]
         },
         {
           "DataId": 2012132,
index a9395430357700fb9abb866fc8a23c2aa266b0d5..dcb6b7d9850f3d67de6eeb51b704ba32ada3e11d 100644 (file)
     {
       "Sequence": 4,
       "Steps": [
-        {
-          "Position": {
-            "X": 339.039,
-            "Y": -14.322072,
-            "Z": -101.509995
-          },
-          "StopDistance": 0.5,
-          "TerritoryId": 961,
-          "InteractionType": "WalkTo",
-          "Mount": true,
-          "DisableNavmesh": true
-        },
-        {
-          "DataId": 2012022,
-          "Position": {
-            "X": 151.6593,
-            "Y": 7.6447144,
-            "Z": 2.5177002
-          },
-          "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818376
-        },
         {
           "DataId": 1040061,
           "Position": {
index a0205b147081edd82d2283171abe3aaf423ea482..3fcbe3ac79a4ff936e5862a8f49a498aa94ecb6b 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -137.80992,
-            "Y": -26.995626,
-            "Z": 543.8281
-          },
-          "StopDistance": 0.5,
-          "TerritoryId": 961,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": -144.54877,
-              "Y": -26.230347,
-              "Z": 551.5067
-            }
-          }
-        },
-        {
-          "DataId": 2012023,
-          "Position": {
-            "X": -144.54877,
-            "Y": -26.230347,
-            "Z": 551.5067
-          },
-          "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818377
-        },
-        {
-          "Position": {
-            "X": -139.15512,
-            "Y": -27.030453,
-            "Z": 535.6933
-          },
-          "TerritoryId": 961,
-          "InteractionType": "WalkTo",
-          "Mount": true,
-          "DisableNavmesh": true
-        },
         {
           "DataId": 1040073,
           "Position": {
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "DataId": 2012024,
-          "Position": {
-            "X": -481.40692,
-            "Y": -28.610718,
-            "Z": 490.53174
-          },
-          "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818378
-        },
         {
           "DataId": 1040080,
           "Position": {
index 7a183deb39f4cac672581694e3c17ad5c9122df9..398545e5148634f9e7985e23de3e914a3bcdd5c3 100644 (file)
     {
       "Sequence": 4,
       "Steps": [
-        {
-          "DataId": 2012029,
-          "Position": {
-            "X": -255.54291,
-            "Y": 143.05322,
-            "Z": -36.972656
-          },
-          "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818383
-        },
         {
           "DataId": 2012146,
           "Position": {
index 72e318c7a4d8bc700df93bf26a48090820bc9a1d..f56c1adb2ae14d6581755e81998e209a1b3ea270 100644 (file)
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "DataId": 2012028,
-          "Position": {
-            "X": -761.7151,
-            "Y": 159.99072,
-            "Z": -108.99524
-          },
-          "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818382
-        },
         {
           "DataId": 1040121,
           "Position": {
index f78c78a518538207a1b70baf623da5eeeb5ba83b..4afe117285a905ce94707cacedfdaa71f0e001d5 100644 (file)
     {
       "Sequence": 3,
       "Steps": [
-        {
-          "DataId": 2012027,
-          "Position": {
-            "X": -392.08063,
-            "Y": 173.72388,
-            "Z": -293.59882
-          },
-          "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818381,
-          "AetheryteShortcut": "Elpis - Poieten Oikos"
-        },
         {
           "DataId": 2012151,
           "Position": {
@@ -90,6 +78,7 @@
           },
           "TerritoryId": 961,
           "InteractionType": "Interact",
+          "AetheryteShortcut": "Elpis - Poieten Oikos",
           "DialogueChoices": [
             {
               "Type": "YesNo",
index caee3a7d68ebfa21587047336729b104477ee996..3750e4aa14fe01d92a82ceec1ae9ce2c382be22c 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 0cb2766c831e817c8c278e04e6bd3d0609d7522e..e340f5c64e12cfe30c93dddb13f03050d029aee1 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": 79.66557,
-            "Y": -29.904594,
-            "Z": 457.04776
-          },
-          "TerritoryId": 956,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "DataId": 2011989,
-          "Position": {
-            "X": 46.28064,
-            "Y": -29.800903,
-            "Z": 178.85095
-          },
-          "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818323
-        },
         {
           "DataId": 1039750,
           "Position": {
index abbc57aa45f2116237f47b4ca8c9567ed7e8d404..66a0ccc03ae22d0a2133c1ce63aa4c8ead3a6bff 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -148.48793,
-            "Y": -10.30035,
-            "Z": -247.25652
-          },
-          "TerritoryId": 956,
-          "InteractionType": "WalkTo",
-          "Comment": "Avoids Combat"
-        },
-        {
-          "DataId": 2011987,
-          "Position": {
-            "X": -176.4096,
-            "Y": -10.11676,
-            "Z": -242.26752
-          },
-          "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818321
-        },
-        {
-          "Position": {
-            "X": -198.16975,
-            "Y": -19.32426,
-            "Z": -238.2704
-          },
-          "TerritoryId": 956,
-          "InteractionType": "WalkTo",
-          "Mount": true,
-          "DisableNavmesh": true
-        },
-        {
-          "Position": {
-            "X": -480.30975,
-            "Y": -22.946651,
-            "Z": -145.08534
-          },
-          "TerritoryId": 956,
-          "InteractionType": "WalkTo",
-          "Comment": "Avoids Combat (typically)"
-        },
-        {
-          "DataId": 2011988,
-          "Position": {
-            "X": -505.14993,
-            "Y": -21.835754,
-            "Z": -122.60626
-          },
-          "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818322
-        },
         {
           "DataId": 1040444,
           "Position": {
index 7014885962418b4cb14e94001281e0be61b31c10..ad0c553e1f2bbe7801f135ad91d23af14f33f79d 100644 (file)
       "Sequence": 3,
       "Steps": [
         {
-          "DataId": 2012030,
           "Position": {
-            "X": -333.547,
-            "Y": 270.83228,
-            "Z": -361.50153
+            "X": -308.91977,
+            "Y": 262.7334,
+            "Z": -332.3608
           },
           "TerritoryId": 960,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818389
+          "InteractionType": "WalkTo"
         },
         {
-          "DataId": 2012035,
+          "DataId": 2012030,
           "Position": {
-            "X": -238.81903,
-            "Y": 320.36304,
-            "Z": -295.15533
+            "X": -333.547,
+            "Y": 270.83228,
+            "Z": -361.50153
           },
           "TerritoryId": 960,
           "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818394
+          "AetherCurrentId": 2818389
         },
         {
           "DataId": 1040317,
@@ -81,9 +79,7 @@
             "Z": -312.58112
           },
           "TerritoryId": 960,
-          "InteractionType": "Interact",
-          "Mount": true,
-          "DisableNavmesh": true
+          "InteractionType": "Interact"
         }
       ]
     },
index dbb2f464e90b4c580c4c53dafe12f371d1512565..fab6f3c67c2a3991886fd58d441887254d421cb4 100644 (file)
       "Steps": [
         {
           "Position": {
-            "X": -353.82343,
-            "Y": 263.4366,
-            "Z": -458.5238
+            "X": 48.215565,
+            "Y": 269.00882,
+            "Z": -703.63995
           },
           "TerritoryId": 960,
           "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Ultima Thule - Abode of the Ea",
           "Mount": true
         },
-        {
-          "Position": {
-            "X": -394.40567,
-            "Y": 266.7831,
-            "Z": -478.6604
-          },
-          "TerritoryId": 960,
-          "InteractionType": "WalkTo",
-          "DisableNavmesh": true
-        },
-        {
-          "Position": {
-            "X": -408.86514,
-            "Y": 266.81473,
-            "Z": -519.4911
-          },
-          "TerritoryId": 960,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "DataId": 2012036,
-          "Position": {
-            "X": -385.24457,
-            "Y": 262.50085,
-            "Z": -629.8772
-          },
-          "TerritoryId": 960,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818395
-        },
         {
           "DataId": 2012031,
           "Position": {
           },
           "TerritoryId": 960,
           "InteractionType": "AttuneAetherCurrent",
-          "AetheryteShortcut": "Ultima Thule - Abode of the Ea",
-          "AetherCurrentId": 2818390
+          "AetherCurrentId": 2818390,
+          "DisableNavmesh": true
         },
         {
           "DataId": 1039778,
index 6f697cee9c97d68e67adf89f15780f0bac3e90b6..7d723af8dbbcee091932397ac1c01ae7edb75ad9 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "DataId": 2012034,
-          "Position": {
-            "X": 424.55164,
-            "Y": 283.37524,
-            "Z": -679.7742
-          },
-          "TerritoryId": 960,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818393
-        },
-        {
-          "Position": {
-            "X": 381.60245,
-            "Y": 289.09262,
-            "Z": -387.75546
-          },
-          "TerritoryId": 960,
-          "InteractionType": "WalkTo",
-          "Comment": "Avoids combat"
-        },
         {
           "DataId": 1039787,
           "Position": {
index 6a917aef0dac0c1bd23bea7dd8a1c7431ee1df8d..764799b188d2683ea47aa9770165a72c53ec7551 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "DataId": 2012039,
-          "Position": {
-            "X": 567.46765,
-            "Y": 440.9093,
-            "Z": 402.12085
-          },
-          "TerritoryId": 960,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818398
-        },
         {
           "DataId": 2012032,
           "Position": {
     {
       "Sequence": 5,
       "Steps": [
-        {
-          "DataId": 2012037,
-          "Position": {
-            "X": 751.8578,
-            "Y": 439.96326,
-            "Z": 357.86987
-          },
-          "TerritoryId": 960,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818396
-        },
-        {
-          "DataId": 2012038,
-          "Position": {
-            "X": 645.6607,
-            "Y": 438.6276,
-            "Z": 291.0269
-          },
-          "StopDistance": 1,
-          "TerritoryId": 960,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "DataId": 2012038,
-            "Position": {
-              "X": 637.1709,
-              "Y": 439.23096,
-              "Z": 289.66187
-            },
-            "StopDistance": 3
-          }
-        },
-        {
-          "DataId": 2012038,
-          "Position": {
-            "X": 637.1709,
-            "Y": 439.23096,
-            "Z": 289.66187
-          },
-          "TerritoryId": 960,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818397,
-          "DisableNavmesh": true
-        },
         {
           "DataId": 1040349,
           "Position": {
index 088ae0e64414b3a73ed5807a488a1104abb3a761..831a8fcd9e5ce3de8ea43fe60d720b50dc83f0d8 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index a6bbc91b6dc9dbe6cf30526a99d6c8ebf763e247..4747f1b1ad53cf54aea5d7eb23122be3219c3ec0 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 6a0fd904db736421b6d328951bba7903257b46e6..73781835bca1f88cf8e4fb572aea47df052a459c 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 510517f41eea594a3b079ef4e2c98e1f190f20a0..a028798e1fc51821aa1eed53a49f3ea23eda914c 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 89783d6d1fd603761c5074637c70e916bcbf1d4a..ad524ec84fa1f594f05dce874133bae9906a0769 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 8c528d3d7a0f37f4280402173d4a2c833c3c4a4d..65d5af979b5f48f5e4db6a8bd85675a933c47ec6 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 8,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 43cd0eb7d4e4c55a63429b830715e0a2867a0d07..8fe0950413d3f84d8853c2613a96a2b23e0dc7d2 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 91db151c2d8f5c06d67632854722f6c8772f9b9a..fe2f4d7f17831606d544088c6ee8823443df9917 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4564_Olfactory Warfare.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4564_Olfactory Warfare.json
deleted file mode 100644 (file)
index 1c2b499..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-  "$schema": "https://carvel.li/questionable/quest-1.0",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "DataId": 1042302,
-          "Position": {
-            "X": -102.43384,
-            "Y": 40.00001,
-            "Z": 331.89893
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 2,
-      "Steps": [
-        {
-          "Position": {
-            "X": 86.44138,
-            "Y": 38.836067,
-            "Z": 375.43958
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "Fly": true,
-          "Land": true,
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            -128
-          ]
-        },
-        {
-          "DataId": 2012887,
-          "Position": {
-            "X": 90.71484,
-            "Y": 38.70359,
-            "Z": 377.7981
-          },
-          "StopDistance": 5,
-          "TerritoryId": 957,
-          "InteractionType": "Action",
-          "Action": "Yellow Gulal",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            128
-          ]
-        },
-        {
-          "Position": {
-            "X": -73.42284,
-            "Y": 50.283375,
-            "Z": 165.20433
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "Fly": true,
-          "Land": true,
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            -64
-          ]
-        },
-        {
-          "DataId": 2012888,
-          "Position": {
-            "X": -74.2962,
-            "Y": 50.095337,
-            "Z": 160.41797
-          },
-          "StopDistance": 5,
-          "TerritoryId": 957,
-          "InteractionType": "Action",
-          "Action": "Yellow Gulal",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            64
-          ]
-        },
-        {
-          "Position": {
-            "X": -195.75089,
-            "Y": 35.536575,
-            "Z": 98.20429
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "Fly": true,
-          "Land": true,
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            32
-          ]
-        },
-        {
-          "DataId": 2012889,
-          "Position": {
-            "X": -197.9859,
-            "Y": 36.209595,
-            "Z": 94.102295
-          },
-          "StopDistance": 5,
-          "TerritoryId": 957,
-          "InteractionType": "Action",
-          "Action": "Yellow Gulal",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            -32
-          ]
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "Position": {
-            "X": -68.59158,
-            "Y": 39.9961,
-            "Z": 320.7581
-          },
-          "TerritoryId": 957,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "CompleteQuest",
-          "Mount": false,
-          "Comment": "TODO Verify this properly unmounts"
-        }
-      ]
-    }
-  ]
-}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4565_Ridin' Hazards.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4565_Ridin' Hazards.json
deleted file mode 100644 (file)
index c2578b9..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "$schema": "https://carvel.li/questionable/quest-1.0",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "DataId": 2012855,
-          "Position": {
-            "X": -255.23767,
-            "Y": 69.13855,
-            "Z": -527.8248
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Combat",
-          "EnemySpawnType": "AfterInteraction",
-          "KillEnemyDataIds": [
-            14677
-          ],
-          "Fly": true
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Thavnair - Yedlihmad",
-          "Fly": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4566_Hippo Scrub.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4566_Hippo Scrub.json
deleted file mode 100644 (file)
index 25dd87c..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "$schema": "https://carvel.li/questionable/quest-1.0",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "DataId": 1042469,
-          "Position": {
-            "X": -578.5153,
-            "Y": -0.01527307,
-            "Z": -36.514893
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact",
-          "AetheryteShortcut": "Thavnair - Great Work",
-          "Fly": true
-        }
-      ]
-    },
-    {
-      "Sequence": 2,
-      "Steps": [
-        {
-          "DataId": 1042470,
-          "Position": {
-            "X": -579.553,
-            "Y": -0.058757372,
-            "Z": -31.23523
-          },
-          "StopDistance": 4,
-          "TerritoryId": 957,
-          "InteractionType": "UseItem",
-          "ItemId": 2003401
-        }
-      ]
-    },
-    {
-      "Sequence": 3,
-      "Steps": [
-        {
-          "DataId": 1042470,
-          "Position": {
-            "X": -579.553,
-            "Y": -0.058757372,
-            "Z": -31.23523
-          },
-          "StopDistance": 4,
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Thavnair - Yedlihmad",
-          "Fly": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4567_Vanaspati's Blessing.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4567_Vanaspati's Blessing.json
deleted file mode 100644 (file)
index 18b9b83..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "$schema": "https://carvel.li/questionable/quest-1.0",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "DataId": 2012858,
-          "Position": {
-            "X": 280.78125,
-            "Y": 0.045776367,
-            "Z": 556.7252
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact",
-          "Fly": true,
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            32
-          ]
-        },
-        {
-          "DataId": 2012857,
-          "Position": {
-            "X": 303.36462,
-            "Y": 0.015197754,
-            "Z": 530.44934
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            64
-          ]
-        },
-        {
-          "DataId": 2012856,
-          "Position": {
-            "X": 281.94092,
-            "Y": 0.015197754,
-            "Z": 510.64307
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            128
-          ]
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "CompleteQuest",
-          "Fly": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4568_Hells Hath No Fury as a Hippo Scorned.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4568_Hells Hath No Fury as a Hippo Scorned.json
deleted file mode 100644 (file)
index 0a0aaa8..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "$schema": "https://carvel.li/questionable/quest-1.0",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "DataId": 2012892,
-          "Position": {
-            "X": -120.19531,
-            "Y": 41.000854,
-            "Z": 340.41345
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 2,
-      "Steps": [
-        {
-          "DataId": 1042458,
-          "Position": {
-            "X": 416.5254,
-            "Y": 8.834262,
-            "Z": -344.38086
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact",
-          "AetheryteShortcut": "Thavnair - Palaka's Stand",
-          "Fly": true
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Thavnair - Yedlihmad",
-          "Fly": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4569_Tusk Trouble.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/4569_Tusk Trouble.json
deleted file mode 100644 (file)
index 0d01f38..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "$schema": "https://carvel.li/questionable/quest-1.0",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "DataId": 2012893,
-          "Position": {
-            "X": 267.32275,
-            "Y": 7.156433,
-            "Z": -476.34088
-          },
-          "TerritoryId": 957,
-          "InteractionType": "UseItem",
-          "ItemId": 2003403,
-          "AetheryteShortcut": "Thavnair - Palaka's Stand"
-        }
-      ]
-    },
-    {
-      "Sequence": 2,
-      "Steps": [
-        {
-          "DataId": 2012894,
-          "Position": {
-            "X": 257.09924,
-            "Y": 6.6071167,
-            "Z": -468.0705
-          },
-          "TerritoryId": 957,
-          "InteractionType": "Combat",
-          "EnemySpawnType": "AfterInteraction",
-          "KillEnemyDataIds": [
-            14678
-          ]
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1042301,
-          "Position": {
-            "X": -66.02582,
-            "Y": 39.994705,
-            "Z": 321.06494
-          },
-          "TerritoryId": 957,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Thavnair - Yedlihmad",
-          "Fly": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4564_Olfactory Warfare.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4564_Olfactory Warfare.json
new file mode 100644 (file)
index 0000000..1c2b499
--- /dev/null
@@ -0,0 +1,185 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1042302,
+          "Position": {
+            "X": -102.43384,
+            "Y": 40.00001,
+            "Z": 331.89893
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 86.44138,
+            "Y": 38.836067,
+            "Z": 375.43958
+          },
+          "TerritoryId": 957,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "Land": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
+        },
+        {
+          "DataId": 2012887,
+          "Position": {
+            "X": 90.71484,
+            "Y": 38.70359,
+            "Z": 377.7981
+          },
+          "StopDistance": 5,
+          "TerritoryId": 957,
+          "InteractionType": "Action",
+          "Action": "Yellow Gulal",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "Position": {
+            "X": -73.42284,
+            "Y": 50.283375,
+            "Z": 165.20433
+          },
+          "TerritoryId": 957,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "Land": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -64
+          ]
+        },
+        {
+          "DataId": 2012888,
+          "Position": {
+            "X": -74.2962,
+            "Y": 50.095337,
+            "Z": 160.41797
+          },
+          "StopDistance": 5,
+          "TerritoryId": 957,
+          "InteractionType": "Action",
+          "Action": "Yellow Gulal",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "Position": {
+            "X": -195.75089,
+            "Y": 35.536575,
+            "Z": 98.20429
+          },
+          "TerritoryId": 957,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "Land": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "DataId": 2012889,
+          "Position": {
+            "X": -197.9859,
+            "Y": 36.209595,
+            "Z": 94.102295
+          },
+          "StopDistance": 5,
+          "TerritoryId": 957,
+          "InteractionType": "Action",
+          "Action": "Yellow Gulal",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -32
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": -68.59158,
+            "Y": 39.9961,
+            "Z": 320.7581
+          },
+          "TerritoryId": 957,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "CompleteQuest",
+          "Mount": false,
+          "Comment": "TODO Verify this properly unmounts"
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4565_Ridin' Hazards.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4565_Ridin' Hazards.json
new file mode 100644 (file)
index 0000000..c2578b9
--- /dev/null
@@ -0,0 +1,58 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2012855,
+          "Position": {
+            "X": -255.23767,
+            "Y": 69.13855,
+            "Z": -527.8248
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            14677
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Thavnair - Yedlihmad",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4566_Hippo Scrub.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4566_Hippo Scrub.json
new file mode 100644 (file)
index 0000000..25dd87c
--- /dev/null
@@ -0,0 +1,88 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1042469,
+          "Position": {
+            "X": -578.5153,
+            "Y": -0.01527307,
+            "Z": -36.514893
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Thavnair - Great Work",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1042470,
+          "Position": {
+            "X": -579.553,
+            "Y": -0.058757372,
+            "Z": -31.23523
+          },
+          "StopDistance": 4,
+          "TerritoryId": 957,
+          "InteractionType": "UseItem",
+          "ItemId": 2003401
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1042470,
+          "Position": {
+            "X": -579.553,
+            "Y": -0.058757372,
+            "Z": -31.23523
+          },
+          "StopDistance": 4,
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Thavnair - Yedlihmad",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4567_Vanaspati's Blessing.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4567_Vanaspati's Blessing.json
new file mode 100644 (file)
index 0000000..18b9b83
--- /dev/null
@@ -0,0 +1,97 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2012858,
+          "Position": {
+            "X": 280.78125,
+            "Y": 0.045776367,
+            "Z": 556.7252
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "DataId": 2012857,
+          "Position": {
+            "X": 303.36462,
+            "Y": 0.015197754,
+            "Z": 530.44934
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "DataId": 2012856,
+          "Position": {
+            "X": 281.94092,
+            "Y": 0.015197754,
+            "Z": 510.64307
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "CompleteQuest",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4568_Hells Hath No Fury as a Hippo Scorned.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4568_Hells Hath No Fury as a Hippo Scorned.json
new file mode 100644 (file)
index 0000000..0a0aaa8
--- /dev/null
@@ -0,0 +1,70 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2012892,
+          "Position": {
+            "X": -120.19531,
+            "Y": 41.000854,
+            "Z": 340.41345
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1042458,
+          "Position": {
+            "X": 416.5254,
+            "Y": 8.834262,
+            "Z": -344.38086
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Thavnair - Palaka's Stand",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Thavnair - Yedlihmad",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4569_Tusk Trouble.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4569_Tusk Trouble.json
new file mode 100644 (file)
index 0000000..0d01f38
--- /dev/null
@@ -0,0 +1,74 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2012893,
+          "Position": {
+            "X": 267.32275,
+            "Y": 7.156433,
+            "Z": -476.34088
+          },
+          "TerritoryId": 957,
+          "InteractionType": "UseItem",
+          "ItemId": 2003403,
+          "AetheryteShortcut": "Thavnair - Palaka's Stand"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2012894,
+          "Position": {
+            "X": 257.09924,
+            "Y": 6.6071167,
+            "Z": -468.0705
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            14678
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1042301,
+          "Position": {
+            "X": -66.02582,
+            "Y": 39.994705,
+            "Z": 321.06494
+          },
+          "TerritoryId": 957,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Thavnair - Yedlihmad",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
index 782014605a8af91548a6252df3ad5ed836d9276d..053e38cd2f9ca264f228f50837cf80f6ae210e49 100644 (file)
@@ -61,6 +61,7 @@
             "Z": 640.772
           },
           "StopDistance": 3,
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 1187,
           "InteractionType": "UseItem",
           "ItemId": 2003618,
@@ -81,6 +82,7 @@
             "Z": 698.3596
           },
           "StopDistance": 3,
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 1187,
           "InteractionType": "UseItem",
           "ItemId": 2003618,
             "Z": 603.0823
           },
           "StopDistance": 3,
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 1187,
           "InteractionType": "UseItem",
           "ItemId": 2003618,
index ec151616b469d08a5554d179f59d54c304ba5d79..09ef2e6f470450f14949a7ded759051721bcef51 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 8edac85a42aa747931d15aae8003eca88aefcec3..b2a2f2f6fdd2d7ce2ad0972dd854500b68122cf1 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index bae0eff5b815f41878e8f1ba55649805110e3db6..f160cf10a43490795902f8c863e47234db3869e1 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index 20303fcfabfab8d95ccd72f9afc58b0f669a5547..7210560c175a1ae2e08acd60b6655d58ce7158dc 100644 (file)
@@ -88,7 +88,7 @@
           },
           "TerritoryId": 1190,
           "InteractionType": "WalkTo",
-          "Comment": "Sheshenewezi Springs Navmesh workaround"
+          "$": "Sheshenewezi Springs Navmesh workaround"
         },
         {
           "DataId": 1046957,
           },
           "TerritoryId": 1190,
           "InteractionType": "WalkTo",
-          "Comment": "Sheshenewezi Springs Navmesh workaround",
+          "$": "Sheshenewezi Springs Navmesh workaround",
           "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs"
         },
         {
index ab6af8eeec3eded975ab71c5dc285612d0636889..8dc4153a61dc30af42af237d00f2069bbe740990 100644 (file)
@@ -28,7 +28,7 @@
           },
           "TerritoryId": 1190,
           "InteractionType": "WalkTo",
-          "Comment": "Sheshenewezi Springs Navmesh workaround",
+          "$": "Sheshenewezi Springs Navmesh workaround",
           "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs"
         },
         {
index fb9a6199d1d3ec3b375dafff005ee7c5db05de3f..a57353a0ba0619477f44b92f04685f27e756cf9a 100644 (file)
@@ -28,7 +28,7 @@
           },
           "TerritoryId": 1190,
           "InteractionType": "WalkTo",
-          "Comment": "Sheshenewezi Springs Navmesh workaround 2"
+          "$": "Sheshenewezi Springs Navmesh workaround 2"
         },
         {
           "Position": {
index a37257edf7c9dbf4c5bdedc89ff54641418f039d..ba59dc7e184dbeec9cf2e6e25580ee932ef96056 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index ed661727482b18cbb37b69935424921bdeaca10a..cdd98121a149157abcf7d7a2a1a64d9d12972fcc 100644 (file)
@@ -44,7 +44,7 @@
           },
           "TerritoryId": 1191,
           "InteractionType": "WalkTo",
-          "Comment": "Outskirts Navmesh workaround"
+          "$": "Outskirts Navmesh workaround"
         },
         {
           "DataId": 1047397,
index 4929301829a9f50b9c5ceb5d0cc4111c8721e054..91b252d16ee38d18c94d5e93f093a947b72746ab 100644 (file)
@@ -29,7 +29,7 @@
           },
           "TerritoryId": 1191,
           "InteractionType": "WalkTo",
-          "Comment": "Farm Navmesh workaround"
+          "$": "Farm Navmesh workaround"
         },
         {
           "DataId": 1047405,
@@ -54,7 +54,7 @@
           },
           "TerritoryId": 1191,
           "InteractionType": "WalkTo",
-          "Comment": "Farm Navmesh workaround"
+          "$": "Farm Navmesh workaround"
         },
         {
           "DataId": 1047408,
           },
           "TerritoryId": 1191,
           "InteractionType": "WalkTo",
-          "Comment": "Farm Navmesh workaround"
+          "$": "Farm Navmesh workaround"
         },
         {
           "DataId": 1047406,
index 6cbdaee5ae209666828f16bdebc5f0749dbae2d7..6d7e89c04ad63a30fe261fcbffe98fe4ec5a7831 100644 (file)
         }
       ]
     },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
index a83ee8d8442f540026f768c99c2394dbb1054506..4a7f787a21bf9a344dd3d6db3f9dc6b2d612f608 100644 (file)
@@ -63,6 +63,7 @@
             "Y": -158.06824,
             "Z": -399.8932
           },
+          "IgnoreDistanceToObject": true,
           "TerritoryId": 1187,
           "InteractionType": "Interact",
           "CompletionQuestVariablesFlags": [
index 495beb496bacca1efc15d3a26316490389f60d41..65aa575392278b4375d3093013c299c90e56d9e1 100644 (file)
                   "description": "Set if pathfinding should stop closer or further away from the default stop distance",
                   "exclusiveMinimum": 0
                 },
+                "IgnoreDistanceToObject": {
+                  "type": "boolean",
+                  "description": "Most interactions with objects are checked for a Y (height) difference of 2 in-game units. If set to true, the game won't attempt to get any closer if the height difference is larger than this."
+                },
                 "TerritoryId": {
                   "type": "integer",
                   "description": "The territory id associated with the location",
index a3465d38488e669284a91ea4648a2be0eecf861f..eb5aa0ccaeb290ee418e4d2dcf3f3de6a46913e6 100644 (file)
@@ -30,6 +30,7 @@ public sealed class QuestStep
     public bool? Fly { get; set; }
     public bool? Land { get; set; }
     public bool? Sprint { get; set; }
+    public bool? IgnoreDistanceToObject { get; set; }
     public string? Comment { get; set; }
 
     public EAetheryteLocation? AetheryteShortcut { get; set; }
index 2d2a09e65209cb8cd97cd1073af9539f5026e057..0ef82568ace95b48888faaac1c24429975456fe8 100644 (file)
@@ -24,6 +24,8 @@ namespace Questionable.Controller;
 
 internal sealed class MovementController : IDisposable
 {
+    public const float DefaultVerticalInteractionDistance = 1.95f;
+
     private readonly NavmeshIpc _navmeshIpc;
     private readonly IClientState _clientState;
     private readonly GameFunctions _gameFunctions;
@@ -141,9 +143,16 @@ internal sealed class MovementController : IDisposable
                 Stop();
 
                 if (dest.UseNavmesh)
-                    NavigateTo(EMovementType.None, dest.DataId, dest.Position, false, false, dest.StopDistance);
+                {
+                    NavigateTo(EMovementType.None, dest.DataId, dest.Position, false, false, dest.StopDistance,
+                        dest.IgnoreDistanceToObject);
+                }
                 else
-                    NavigateTo(EMovementType.None, dest.DataId, [dest.Position], false, false, dest.StopDistance);
+                {
+                    NavigateTo(EMovementType.None, dest.DataId, [dest.Position], false, false, dest.StopDistance,
+                        dest.IgnoreDistanceToObject);
+                }
+
                 return;
             }
 
@@ -155,10 +164,7 @@ internal sealed class MovementController : IDisposable
             }
             else if ((localPlayerPosition - Destination.Position).Length() < Destination.StopDistance)
             {
-                if (Destination.DataId
-                    is 2012173 or 2012174 or 2012175 or 2012176
-                    or 2014133 or 2014134 or 2014135
-                    or 2014105)
+                if (Destination.IgnoreDistanceToObject)
                 {
                     Stop();
                 }
@@ -167,7 +173,8 @@ internal sealed class MovementController : IDisposable
                     IGameObject? gameObject = _gameFunctions.FindObjectByDataId(Destination.DataId.Value);
                     if (gameObject is ICharacter or IEventObj)
                     {
-                        if (Math.Abs(localPlayerPosition.Y - gameObject.Position.Y) < 1.95f)
+                        if (Math.Abs(localPlayerPosition.Y - gameObject.Position.Y) <
+                            DefaultVerticalInteractionDistance)
                             Stop();
                     }
                     else if (gameObject != null && gameObject.ObjectKind == ObjectKind.Aetheryte)
@@ -191,7 +198,8 @@ internal sealed class MovementController : IDisposable
                         else
                         {
                             // aethernet shard
-                            if (Math.Abs(localPlayerPosition.Y - gameObject.Position.Y) < 1.95f)
+                            if (Math.Abs(localPlayerPosition.Y - gameObject.Position.Y) <
+                                DefaultVerticalInteractionDistance)
                                 Stop();
                         }
                     }
@@ -237,7 +245,7 @@ internal sealed class MovementController : IDisposable
     }
 
     private void PrepareNavigation(EMovementType type, uint? dataId, Vector3 to, bool fly, bool sprint,
-        float? stopDistance, bool useNavmesh)
+        float? stopDistance, bool ignoreDistanceToObject, bool useNavmesh)
     {
         ResetPathfinding();
 
@@ -247,16 +255,17 @@ internal sealed class MovementController : IDisposable
             _chatFunctions.ExecuteCommand("/automove off");
         }
 
-        Destination = new DestinationData(type, dataId, to, stopDistance ?? (QuestStep.DefaultStopDistance - 0.2f), fly, sprint,
-            useNavmesh);
+        Destination = new DestinationData(type, dataId, to, stopDistance ?? (QuestStep.DefaultStopDistance - 0.2f), fly,
+            sprint,
+            ignoreDistanceToObject, useNavmesh);
         MovementStartedAt = DateTime.MaxValue;
     }
 
     public void NavigateTo(EMovementType type, uint? dataId, Vector3 to, bool fly, bool sprint,
-        float? stopDistance = null)
+        float? stopDistance = null, bool ignoreDistanceToObject = false)
     {
         fly |= _condition[ConditionFlag.Diving];
-        PrepareNavigation(type, dataId, to, fly, sprint, stopDistance, true);
+        PrepareNavigation(type, dataId, to, fly, sprint, stopDistance, ignoreDistanceToObject, true);
         _logger.LogInformation("Pathfinding to {Destination}", Destination);
 
         _cancellationTokenSource = new();
@@ -266,10 +275,10 @@ internal sealed class MovementController : IDisposable
     }
 
     public void NavigateTo(EMovementType type, uint? dataId, List<Vector3> to, bool fly, bool sprint,
-        float? stopDistance)
+        float? stopDistance, bool ignoreDistanceToObject = false)
     {
         fly |= _condition[ConditionFlag.Diving];
-        PrepareNavigation(type, dataId, to.Last(), fly, sprint, stopDistance, false);
+        PrepareNavigation(type, dataId, to.Last(), fly, sprint, stopDistance, ignoreDistanceToObject, false);
 
         _logger.LogInformation("Moving to {Destination}", Destination);
         _navmeshIpc.MoveTo(to, fly);
@@ -318,6 +327,7 @@ internal sealed class MovementController : IDisposable
         float StopDistance,
         bool IsFlying,
         bool CanSprint,
+        bool IgnoreDistanceToObject,
         bool UseNavmesh);
 
     public sealed class PathfindingFailedException : Exception
index 8c5c9a8eb723a60c578ba9e4579939fccfe3f409..1d25ea44f49eae219ddfe5c97f6c85ba1f12a4fe 100644 (file)
@@ -66,7 +66,7 @@ internal static class Jump
                 return ETaskResult.StillRunning;
 
             DateTime movementStartedAt = movementController.MovementStartedAt;
-            if (movementStartedAt == DateTime.MaxValue || movementStartedAt.AddSeconds(2) >= DateTime.Now)
+            if (movementStartedAt == DateTime.MaxValue || movementStartedAt.AddSeconds(1) >= DateTime.Now)
                 return ETaskResult.StillRunning;
 
             return ETaskResult.TaskComplete;
index e1fb0f2037ed07c98f6b2cb834d52ad7a706a1d0..2f645ea6091bed23aa1ff6f5f2f87a3033b441a8 100644 (file)
@@ -93,7 +93,7 @@ internal static class AetheryteShortcut
 
             if (!gameFunctions.IsAetheryteUnlocked(TargetAetheryte))
             {
-                chatGui.Print($"[Questionable] Aetheryte {TargetAetheryte} is not unlocked.");
+                chatGui.PrintError($"[Questionable] Aetheryte {TargetAetheryte} is not unlocked.");
                 throw new TaskException("Aetheryte is not unlocked");
             }
             else if (gameFunctions.TeleportAetheryte(TargetAetheryte))
index a3f4207411e41e2dd7808baa5150cd9ba6032654..914e1720f757c1f8154a25cedc4f5f9c1b04de00 100644 (file)
@@ -102,7 +102,8 @@ internal static class Move
                             m.NavigateTo(EMovementType.Quest, Step.DataId, Destination,
                                 fly: Step.Fly == true && gameFunctions.IsFlyingUnlocked(Step.TerritoryId),
                                 sprint: Step.Sprint != false,
-                                stopDistance: distance);
+                                stopDistance: distance,
+                                ignoreDistanceToObject: Step.IgnoreDistanceToObject == true);
                         });
                 }
             }
index 6b39ffc1c2b87f8a2210ed9c6349c1044719f64f..d8da0fbe4b814baedcf9782f54185a636a0aa809 100644 (file)
@@ -1,6 +1,6 @@
 <Project Sdk="Dalamud.NET.Sdk/9.0.2">
     <PropertyGroup>
-        <Version>1.4</Version>
+        <Version>1.5</Version>
         <OutputPath>dist</OutputPath>
         <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
     </PropertyGroup>
index 0f72fcabd9265333168ca8874c7707fbf96193b3..34b6c775634b9864451ba997c2b0f3a6f0fcd80e 100644 (file)
@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.Text;
 using Dalamud.Interface;
@@ -44,6 +45,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
     private readonly QuestRegistry _questRegistry;
     private readonly QuestData _questData;
     private readonly TerritoryData _territoryData;
+    private readonly ICondition _condition;
     private readonly ILogger<QuestWindow> _logger;
 
     public QuestWindow(IDalamudPluginInterface pluginInterface,
@@ -60,6 +62,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
         QuestRegistry questRegistry,
         QuestData questData,
         TerritoryData territoryData,
+        ICondition condition,
         ILogger<QuestWindow> logger)
         : base("Questionable###Questionable", ImGuiWindowFlags.AlwaysAutoResize)
     {
@@ -77,6 +80,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
         _questRegistry = questRegistry;
         _questData = questData;
         _territoryData = territoryData;
+        _condition = condition;
         _logger = logger;
 
 #if DEBUG
@@ -128,7 +132,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
             if (currentQuestType == QuestController.CurrentQuestType.Simulated)
             {
                 var simulatedQuest = _questController.SimulatedQuest ?? currentQuest;
-                using var _ = ImRaii.PushColor(ImGuiCol.Text, 0xFF0000FF);
+                using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
                 ImGui.TextUnformatted(
                     $"Simulated Quest: {simulatedQuest.Quest.Info.Name} / {simulatedQuest.Sequence} / {simulatedQuest.Step}");
             }
@@ -141,7 +145,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
                         $"Quest: {startedQuest.Quest.Info.Name} / {startedQuest.Sequence} / {startedQuest.Step}");
                 }
 
-                using var _ = ImRaii.PushColor(ImGuiCol.Text, 0xFF00FFFF);
+                using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
                 ImGui.TextUnformatted(
                     $"Next Quest: {currentQuest.Quest.Info.Name} / {currentQuest.Sequence} / {currentQuest.Step}");
             }
@@ -393,8 +397,18 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
                 $"Target: {_targetManager.Target.Name}  ({_targetManager.Target.ObjectKind}; {_targetManager.Target.DataId})"));
 
             GameObject* gameObject = (GameObject*)_targetManager.Target.Address;
-            ImGui.Text(string.Create(CultureInfo.InvariantCulture,
-                $"Distance: {(_targetManager.Target.Position - _clientState.LocalPlayer.Position).Length():F2}, Y: {_targetManager.Target.Position.Y - _clientState.LocalPlayer.Position.Y:F2} | QM: {gameObject->NamePlateIconId}"));
+            ImGui.Text(string.Create(CultureInfo.InvariantCulture, $"Distance: {(_targetManager.Target.Position - _clientState.LocalPlayer.Position).Length():F2}"));
+            ImGui.SameLine();
+
+            float verticalDistance = _targetManager.Target.Position.Y - _clientState.LocalPlayer.Position.Y;
+            string verticalDistanceText = string.Create(CultureInfo.InvariantCulture, $"Y: {verticalDistance:F2}");
+            if (Math.Abs(verticalDistance) >= MovementController.DefaultVerticalInteractionDistance)
+                ImGui.TextColored(ImGuiColors.DalamudOrange, verticalDistanceText);
+            else
+                ImGui.Text(verticalDistanceText);
+
+            ImGui.SameLine();
+            ImGui.Text($"QM: {gameObject->NamePlateIconId}");
 
             ImGui.BeginDisabled(!_movementController.IsNavmeshReady);
             if (!_movementController.IsPathfinding)
@@ -402,8 +416,9 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
                 if (ImGui.Button("Move to Target"))
                 {
                     _movementController.NavigateTo(EMovementType.DebugWindow, _targetManager.Target.DataId,
-                        _targetManager.Target.Position, _gameFunctions.IsFlyingUnlockedInCurrentZone(),
-                        true);
+                        _targetManager.Target.Position,
+                        fly: _condition[ConditionFlag.Mounted] && _gameFunctions.IsFlyingUnlockedInCurrentZone(),
+                        sprint: true);
                 }
             }
             else