Minor DRG updates

diff --git a/QuestPaths/3.x - Heavensward/Class Quests/DRG/1693_Dragoon's Errand.json b/QuestPaths/3.x - Heavensward/Class Quests/DRG/1693_Dragoon's Errand.json
index bf8e87a2b275450f1b2afad76e123241dbf49f31..0dc34715042a3d241e864ef2ac990b8e351b318c 100644 (file)
--- a/QuestPaths/3.x - Heavensward/Class Quests/DRG/1693_Dragoon's Errand.json
+++ b/QuestPaths/3.x - Heavensward/Class Quests/DRG/1693_Dragoon's Errand.json
@@ -1,158 +1,165 @@
 {
-    "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-    "Author": "AnimaMachinae",
-    "QuestSequence": [
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "AnimaMachinae",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
         {
-            "Sequence": 0,
-            "Steps": [
-                {
-                    "Position": {
-                        "X": 215.65454,
-                        "Y": 222.1,
-                        "Z": 345.1806
-                    },
-                    "TerritoryId": 155,
-                    "InteractionType": "WalkTo",
-                    "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
-                    "Land": true,
-                    "Fly": true,
-                    "SkipConditions": {
-                        "AetheryteShortcutIf": {
-                            "InSameTerritory": true
-                        }
-                    },
-                    "$": "Alberic"
-                },
-                {
-                    "DataId": 1006748,
-                    "Position": {
-                        "X": 217.88354,
-                        "Y": 222,
-                        "Z": 345.3269
-                    },
-                    "TerritoryId": 155,
-                    "InteractionType": "AcceptQuest"
-                }
-            ]
+          "Position": {
+            "X": 215.65454,
+            "Y": 222.1,
+            "Z": 345.1806
+          },
+          "TerritoryId": 155,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
+          "Land": true,
+          "Fly": true,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          },
+          "$": "Alberic"
         },
         {
-            "Sequence": 1,
-            "Steps": [
-                {
-                    "Position": {
-                        "X": -48.009445,
-                        "Y": 98.00955,
-                        "Z": 106.47891
-                    },
-                    "TerritoryId": 397,
-                    "InteractionType": "WalkTo",
-                    "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
-                    "Fly": true,
-                    "Land": true
-                },
-                {
-                    "DataId": 1013467,
-                    "Position": {
-                        "X": -51.10254,
-                        "Y": 98.63026,
-                        "Z": 105.1499
-                    },
-                    "TerritoryId": 397,
-                    "InteractionType": "Interact"
-                }
-            ]
+          "DataId": 1006748,
+          "Position": {
+            "X": 217.88354,
+            "Y": 222,
+            "Z": 345.3269
+          },
+          "TerritoryId": 155,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": -48.009445,
+            "Y": 98.00955,
+            "Z": 106.47891
+          },
+          "TerritoryId": 397,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
+          "Fly": true,
+          "Land": true
         },
         {
-            "Sequence": 2,
-            "Steps": [
-                {
-                    "DataId": 1013466,
-                    "Position": {
-                        "X": -155.5047,
-                        "Y": 175.79733,
-                        "Z": 693.26306
-                    },
-                    "TerritoryId": 397,
-                    "InteractionType": "Combat",
-                    "Fly": true,
-                    "Land": true,
-                    "EnemySpawnType": "AutoOnEnterArea",
-                    "KillEnemyDataIds": [
-                        4482,
-                        5049
-                    ],
-                    "CompletionQuestVariablesFlags": [
-                        2,
-                        null,
-                        null,
-                        null,
-                        null,
-                        null
-                    ]
-                },
-                {
-                    "DataId": 1013466,
-                    "Position": {
-                        "X": -155.5047,
-                        "Y": 175.79733,
-                        "Z": 693.26306
-                    },
-                    "TerritoryId": 397,
-                    "InteractionType": "Interact"
-                }
-            ]
+          "DataId": 1013467,
+          "Position": {
+            "X": -51.10254,
+            "Y": 98.63026,
+            "Z": 105.1499
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1013466,
+          "Position": {
+            "X": -155.5047,
+            "Y": 175.79733,
+            "Z": 693.26306
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Combat",
+          "Fly": true,
+          "Land": true,
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [
+            4482,
+            5049
+          ],
+          "CompletionQuestVariablesFlags": [
+            2,
+            null,
+            null,
+            null,
+            null,
+            null
+          ]
         },
         {
-            "Sequence": 3,
-            "Steps": [
-                {
-                    "DataId": 1012163,
-                    "Position": {
-                        "X": 128.25195,
-                        "Y": 24.458832,
-                        "Z": -0.6867676
-                    },
-                    "TerritoryId": 418,
-                    "InteractionType": "Interact",
-                    "AetheryteShortcut": "Ishgard",
-                    "AethernetShortcut": [
-                        "[Ishgard] Aetheryte Plaza",
-                        "[Ishgard] The Forgotten Knight"
-                    ],
-                    "SkipConditions": {
-                        "AetheryteShortcutIf": {
-                            "InSameTerritory": true
-                        }
-                    }
-                }
-            ]
+          "DataId": 1013466,
+          "Position": {
+            "X": -155.5047,
+            "Y": 175.79733,
+            "Z": 693.26306
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1012163,
+          "Position": {
+            "X": 128.25195,
+            "Y": 24.458832,
+            "Z": -0.6867676
+          },
+          "TerritoryId": 418,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Ishgard",
+          "AethernetShortcut": [
+            "[Ishgard] Aetheryte Plaza",
+            "[Ishgard] The Forgotten Knight"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 215.65454,
+            "Y": 222.1,
+            "Z": 345.1806
+          },
+          "TerritoryId": 155,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
+          "Land": true,
+          "Fly": true
         },
         {
-            "Sequence": 255,
-            "Steps": [
-                {
-                    "Position": {
-                        "X": 215.65454,
-                        "Y": 222.1,
-                        "Z": 345.1806
-                    },
-                    "TerritoryId": 155,
-                    "InteractionType": "WalkTo",
-                    "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
-                    "Land": true,
-                    "Fly": true
-                },
-                {
-                    "DataId": 1013470,
-                    "Position": {
-                        "X": 218.00562,
-                        "Y": 222,
-                        "Z": 346.45605
-                    },
-                    "TerritoryId": 155,
-                    "InteractionType": "CompleteQuest"
-                }
-            ]
+          "DataId": 1013470,
+          "Position": {
+            "X": 218.00562,
+            "Y": 222,
+            "Z": 346.45605
+          },
+          "TerritoryId": 155,
+          "InteractionType": "CompleteQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_JOBDRG560_01693_Q1_000_000",
+              "Answer": "TEXT_JOBDRG560_01693_A1_000_002"
+            }
+          ]
         }
-    ]
-}
\ No newline at end of file
+      ]
+    }
+  ]
+}

diff --git a/Questionable/Controller/Steps/Shared/MoveTo.cs b/Questionable/Controller/Steps/Shared/MoveTo.cs
index bd62ea1392622e59763f346ed9c148b45918499e..89b7170a0ad9ac593de185f3a7f380cf1fb67048 100644 (file)
--- a/Questionable/Controller/Steps/Shared/MoveTo.cs
+++ b/Questionable/Controller/Steps/Shared/MoveTo.cs
@@ -325,6 +325,7 @@ internal static class MoveTo
     internal sealed class LandTask : ITask
     {
         public bool ShouldRedoOnInterrupt() => true;
+        public override string ToString() => "Land";
     }
 
     internal sealed class LandExecutor(IClientState clientState, ICondition condition, ILogger<LandExecutor> logger) : TaskExecutor<LandTask>