Add MNK quest "Appetite for Destruction"

Directory.Build.targets

@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <Version>2.17</Version>
+        <Version>2.19</Version>
     </PropertyGroup>
 </Project>

QuestPaths/3.x - Heavensward/Class Quests/MNK/2026_The Legend Continues.json

@@ -0,0 +1,154 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1013976,
+          "Position": {
+            "X": 95.87244,
+            "Y": -4.4635005,
+            "Z": -533.56226
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1013977,
+          "Position": {
+            "X": 207.53784,
+            "Y": 18.12324,
+            "Z": -608.75867
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [777],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1013977,
+          "Position": {
+            "X": 207.53784,
+            "Y": 18.12324,
+            "Z": -608.75867
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1013978,
+          "Position": {
+            "X": 205.95093,
+            "Y": -22.991264,
+            "Z": -449.24084
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [4615],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "DataId": 1013978,
+          "Position": {
+            "X": 205.95093,
+            "Y": -22.991264,
+            "Z": -449.24084
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 7,
+      "Steps": [
+        {
+          "DataId": 1014111,
+          "Position": {
+            "X": 95.87244,
+            "Y": -4.4635005,
+            "Z": -533.56226
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona",
+          "NextQuestId": 2027
+        }
+      ]
+    }
+  ]
+}

QuestPaths/3.x - Heavensward/Class Quests/MNK/2027_Let's Talk about Sects.json

@@ -0,0 +1,194 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1013982,
+          "Position": {
+            "X": -73.0755,
+            "Y": 2.668869,
+            "Z": -622.52234
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": -144.73549,
+            "Y": 1.9077771,
+            "Z": -655.4047
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 1013984,
+          "Position": {
+            "X": -142.22937,
+            "Y": 1.3916924,
+            "Z": -654.13904
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": -142.22937,
+            "Y": 1.3916924,
+            "Z": -654.13904
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [5047]
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": -222.99123,
+            "Y": 3.602174,
+            "Z": -625.4028
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 1013987,
+          "Position": {
+            "X": -223.40735,
+            "Y": 4.1458693,
+            "Z": -628.32074
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": -223.40735,
+            "Y": 4.1458693,
+            "Z": -628.32074
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [5047]
+        }
+      ]
+    },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "Position": {
+            "X": -256.7943,
+            "Y": -5.5647316,
+            "Z": -542.8478
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 1013990,
+          "Position": {
+            "X": -253.83386,
+            "Y": -5.455734,
+            "Z": -542.87024
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 7,
+      "Steps": [
+        {
+          "Position": {
+            "X": -253.83386,
+            "Y": -5.455734,
+            "Z": -542.87024
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [5043]
+        }
+      ]
+    },
+    {
+      "Sequence": 8,
+      "Steps": [
+        {
+          "DataId": 1013994,
+          "Position": {
+            "X": -402.36517,
+            "Y": -14.213073,
+            "Z": -502.06763
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona",
+          "NextQuestId": 2028
+        }
+      ]
+    }
+  ]
+}

QuestPaths/3.x - Heavensward/Class Quests/MNK/2028_Against the Shadow.json

@@ -0,0 +1,56 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1013997,
+          "Position": {
+            "X": -78.29407,
+            "Y": 68.34659,
+            "Z": -157.33582
+          },
+          "TerritoryId": 147,
+          "InteractionType": "SinglePlayerDuty",
+          "Fly": true,
+          "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona",
+          "NextQuestId": 2029
+        }
+      ]
+    }
+  ]
+}

QuestPaths/3.x - Heavensward/Class Quests/MNK/2029_Fight the Battle to Win.json

@@ -0,0 +1,90 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1013999,
+          "Position": {
+            "X": 33.89026,
+            "Y": -8.812927,
+            "Z": 126.17676
+          },
+          "TerritoryId": 154,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "North Shroud - Fallgourd Float"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2005966,
+          "Position": {
+            "X": 163.53088,
+            "Y": -27.328918,
+            "Z": 207.84314
+          },
+          "TerritoryId": 154,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [5043],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1014001,
+          "Position": {
+            "X": 404.89807,
+            "Y": -5.4588227,
+            "Z": 72.342896
+          },
+          "TerritoryId": 154,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona",
+          "NextQuestId": 2030
+        }
+      ]
+    }
+  ]
+}

QuestPaths/3.x - Heavensward/Class Quests/MNK/2030_Stop the Senseless Killing.json

@@ -0,0 +1,123 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1014005,
+          "Position": {
+            "X": -631.22,
+            "Y": 121.245285,
+            "Z": -652.39954
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2005967,
+          "Position": {
+            "X": -556.9696,
+            "Y": 116.68567,
+            "Z": -794.0032
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [4627],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1014006,
+          "Position": {
+            "X": -627.19165,
+            "Y": 121.248,
+            "Z": -648.5847
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1014007,
+          "Position": {
+            "X": -621.51526,
+            "Y": 121.248,
+            "Z": -649.13403
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1014010,
+          "Position": {
+            "X": -621.51526,
+            "Y": 121.248,
+            "Z": -649.13403
+          },
+          "TerritoryId": 397,
+          "InteractionType": "Emote",
+          "Emote": "rally",
+          "DelaySecondsAtStart": 1,
+          "$": "Delay added due to step being cancelled abruptly if started immediately"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona",
+          "NextQuestId": 2031
+        }
+      ]
+    }
+  ]
+}

QuestPaths/3.x - Heavensward/Class Quests/MNK/2031_Appetite for Destruction.json

@@ -0,0 +1,76 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1014012,
+          "Position": {
+            "X": -142.1684,
+            "Y": 26.764246,
+            "Z": -357.50366
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
+          "DialogueChoices": [
+            {
+              "Prompt": "TEXT_JOBMNK600_02031_Q1_000_000",
+              "Type": "List",
+              "Answer": "TEXT_JOBMNK600_02031_A1_000_010"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1014011,
+          "Position": {
+            "X": -143.08392,
+            "Y": 26.654997,
+            "Z": -358.114
+          },
+          "TerritoryId": 146,
+          "InteractionType": "SinglePlayerDuty"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1014112,
+          "Position": {
+            "X": -149.34009,
+            "Y": 12.685881,
+            "Z": -260.91406
+          },
+          "TerritoryId": 146,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 2426
+        }
+      ]
+    }
+  ]
+}

Questionable/Controller/Steps/Shared/MoveTo.cs

@@ -169,6 +169,8 @@ internal static class MoveTo
         private readonly Action _startAction;
         private readonly Vector3 _destination;
         private readonly MoveParams _moveParams;
+        private readonly bool _isUnderwaterInitially;
+        private bool _canRestart;
 
         public MoveInternal(MoveParams moveParams,
             MovementController movementController,
@@ -213,6 +215,7 @@ internal static class MoveTo
             }
 
             _moveParams = moveParams;
+            _canRestart = moveParams.RestartNavigation;
         }
 
         public bool Start()
@@ -231,13 +234,20 @@ internal static class MoveTo
             if (movementStartedAt == DateTime.MaxValue || movementStartedAt.AddSeconds(2) >= DateTime.Now)
                 return ETaskResult.StillRunning;
 
-            if (_moveParams.RestartNavigation &&
+            if (_canRestart &&
                 Vector3.Distance(_clientState.LocalPlayer!.Position, _destination) >
                 (_moveParams.StopDistance ?? QuestStep.DefaultStopDistance) + 5f)
             {
-                _logger.LogInformation("Looks like movement was interrupted, re-attempting to move");
-                _startAction();
-                return ETaskResult.StillRunning;
+                _canRestart = false;
+                if (_clientState.TerritoryType == _moveParams.TerritoryId)
+                {
+                    _logger.LogInformation("Looks like movement was interrupted, re-attempting to move");
+                    _startAction();
+                    return ETaskResult.StillRunning;
+                }
+                else
+                    _logger.LogInformation(
+                        "Looks like movement was interrupted, do nothing since we're in a different territory now");
             }
 
             return ETaskResult.TaskComplete;