Add jumping as a possibility to get vnav unstuck

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json
index a9844776c0e53baa82a16f71d80e0e156177b6f5..62b3364863c503f9d16bcc061b6d0f47907c647f 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json
@@ -70,6 +70,9 @@
         }
       ]
     },
+    {
+      "Sequence": 4
+    },
     {
       "Sequence": 255,
       "Steps": [

diff --git a/Questionable/Controller/MovementController.cs b/Questionable/Controller/MovementController.cs
index 0bb7abf7b38b92ac55566847b66df57069b6cebb..3124d64e3dfbe9eb6f8a5d713a92b4e82ec431e5 100644 (file)
--- a/Questionable/Controller/MovementController.cs
+++ b/Questionable/Controller/MovementController.cs
@@ -238,6 +238,7 @@ internal sealed class MovementController : IDisposable
                     if (Destination.ShouldRecalculateNavmesh())
                     {
                         RecalculateNavmesh(navPoints, start.Value);
+                        return;
                     }
 
                     if (!Destination.IsFlying && !_condition[ConditionFlag.Mounted] &&
@@ -383,8 +384,23 @@ internal sealed class MovementController : IDisposable
                 if (Math.Abs(distance - Destination.LastWaypoint.Distance2DAtLastUpdate) < 0.5f)
                 {
                     int calculations = Destination.NavmeshCalculations;
-                    _logger.LogWarning("Recalculating navmesh (n = {Calculations})", calculations);
-                    Restart(Destination);
+                    if (calculations % 6 == 1)
+                    {
+                        _logger.LogWarning("Jumping to try and resolve navmesh problem (n = {Calculations})",
+                            calculations);
+                        unsafe
+                        {
+                            ActionManager.Instance()->UseAction(ActionType.GeneralAction, 2);
+                            Destination.NavmeshCalculations++;
+                            Destination.LastWaypoint.UpdatedAt = Environment.TickCount64;
+                        }
+                    }
+                    else
+                    {
+                        _logger.LogWarning("Recalculating navmesh (n = {Calculations})", calculations);
+                        Restart(Destination);
+                    }
+
                     Destination.NavmeshCalculations = calculations + 1;
                 }
                 else