Minor ARR updates

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3874_Moving On.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3874_Moving On.json
index a65faa630b81659fda84c3a575ec7ee69a134dae..1c8a147a7537e2e3607872fd32fedfd1775a1b56 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3874_Moving On.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3874_Moving On.json
@@ -102,7 +102,7 @@
           },
           "TerritoryId": 137,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Mount": true
         },
         {
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1457_Recruiting the Realm.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1457_Recruiting the Realm.json
index 8f103b011797d576397d74e28576d58b6d7ef71c..ab1bef2ada5e6e4007dd313c5bb2efe0bcb18467 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1457_Recruiting the Realm.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1457_Recruiting the Realm.json
@@ -120,6 +120,15 @@
             8
           ]
         },
+        {
+          "Position": {
+            "X": -140.77458,
+            "Y": 39.99999,
+            "Z": 155.4174
+          },
+          "TerritoryId": 128,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1009133,
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Misc/1162_My Feisty Little Chocobo.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Misc/1162_My Feisty Little Chocobo.json
index 55b1d5426c9cc5f63e67d4045c2d8a3b18fa3400..a1b454f61a770f293a7ccb81b9ff63c087183de5 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Misc/1162_My Feisty Little Chocobo.json
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Misc/1162_My Feisty Little Chocobo.json
@@ -80,7 +80,8 @@
           },
           "TerritoryId": 148,
           "InteractionType": "UseItem",
-          "ItemId": 4868
+          "ItemId": 4868,
+          "Fly": true
         },
         {
           "Position": {

diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs
index 331b1d61e2f1ab8b41b780b7702c38f2b02678f7..ce92099eba31b8aff1c2f58c33806526a41d1ad1 100644 (file)
--- a/Questionable/Controller/QuestController.cs
+++ b/Questionable/Controller/QuestController.cs
@@ -757,6 +757,10 @@ internal sealed class QuestController : MiniTaskController<QuestController>
         if (ManualPriorityQuests.Contains(currentQuest.Quest))
             return false;
 
+        // "ifrit bleeds, we can kill it" isn't listed as priority quest, as we accept it during the MSQ 'Moving On'
+        if (currentQuest.Quest.Id is QuestId { Value: 1048 })
+            return false;
+
         if (currentQuest.Quest.Info.AlliedSociety != EAlliedSociety.None)
             return false;
 

diff --git a/Questionable/Controller/Steps/Common/Mount.cs b/Questionable/Controller/Steps/Common/Mount.cs
index 4f35f4d97d8bf70742c06169183565af5b90040c..898ca14f3ec4185f2860f2891d81eaec01b4331b 100644 (file)
--- a/Questionable/Controller/Steps/Common/Mount.cs
+++ b/Questionable/Controller/Steps/Common/Mount.cs
@@ -37,7 +37,7 @@ internal static class Mount
         private bool _mountTriggered;
         private DateTime _retryAt = DateTime.MinValue;
 
-        public MountResult EvaluateMountState()
+        public unsafe MountResult EvaluateMountState()
         {
             if (condition[ConditionFlag.Mounted])
                 return MountResult.DontMount;
@@ -58,7 +58,7 @@ internal static class Mount
             {
                 Vector3 playerPosition = clientState.LocalPlayer?.Position ?? Vector3.Zero;
                 float distance = System.Numerics.Vector3.Distance(playerPosition, Task.Position.GetValueOrDefault());
-                if (Task.TerritoryId == clientState.TerritoryType && distance < 30f && !Conditions.IsDiving)
+                if (Task.TerritoryId == clientState.TerritoryType && distance < 30f && !Conditions.Instance()->Diving)
                 {
                     logger.LogInformation("Not using mount, as we're close to the target");
                     return MountResult.DontMount;