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 a65faa63..1c8a147a 100644 --- 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 8f103b01..ab1bef2a 100644 --- 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 55b1d542..a1b454f6 100644 --- 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 331b1d61..ce92099e 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -757,6 +757,10 @@ internal sealed class QuestController : MiniTaskController 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 4f35f4d9..898ca14f 100644 --- 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;