Merge pull request #950 from FFXIV-CombatReborn/mergeWIP

clean up

Author: CarnifexOptimus

BossMod/AI/AIBehaviour.cs

@@ -4,7 +4,13 @@
 
 namespace BossMod.AI;
 
-public record struct Targeting(AIHints.Enemy Target, float PreferredRange = 2.6f, Positional PreferredPosition = Positional.Any, bool PreferTanking = false);
+public struct Targeting(AIHints.Enemy target, float preferredRange = 2.6f, Positional preferredPosition = Positional.Any, bool preferTanking = false)
+{
+    public AIHints.Enemy Target = target;
+    public readonly float PreferredRange = preferredRange;
+    public Positional PreferredPosition = preferredPosition;
+    public readonly bool PreferTanking = preferTanking;
+}
 
 // constantly follow master
 sealed class AIBehaviour(AIController ctrl, RotationModuleManager autorot, Preset? aiPreset) : IDisposable
@@ -95,7 +101,7 @@ public async Task Execute(Actor player, Actor master)
                 {
                     autorot.Preset = target.Target != null ? AIPreset : null;
                 }
-                UpdateMovement(player, master, target, gazeImminent || pyreticImminent, misdirectionMode ? autorot.Hints.MisdirectionThreshold : default, !forbidTargeting ? autorot.Hints.ActionsToExecute : null);
+                UpdateMovement(player, master, gazeImminent || pyreticImminent, misdirectionMode ? autorot.Hints.MisdirectionThreshold : default, !forbidTargeting ? autorot.Hints.ActionsToExecute : null);
             }
             finally
             {
@@ -247,7 +253,7 @@ private bool TrackMasterMovement(Actor master)
         return masterIsMoving;
     }
 
-    private void UpdateMovement(Actor player, Actor master, Targeting target, bool gazeOrPyreticImminent, Angle misdirectionAngle, ActionQueue? queueForSprint)
+    private void UpdateMovement(Actor player, Actor master, bool gazeOrPyreticImminent, Angle misdirectionAngle, ActionQueue? queueForSprint)
     {
         if (gazeOrPyreticImminent)
         {

BossMod/ActionQueue/ActionDefinition.cs

@@ -122,19 +122,19 @@ public float MainReadyIn(ReadOnlySpan<Cooldown> cooldowns, ReadOnlySpan<ClientSt
         if (MainCooldownGroup < 0)
             return 0;
         var cdg = cooldowns[ActualMainCooldownGroup(dutyActions)];
-        return cdg.Total > 0 ? Math.Max(0, cdg.Total / MaxChargesAtCap() - cdg.Elapsed) : 0;
+        return cdg.Total > 0f ? Math.Max(0f, cdg.Total / MaxChargesAtCap() - cdg.Elapsed) : default;
     }
 
-    public float ExtraReadyIn(ReadOnlySpan<Cooldown> cooldowns) => ExtraCooldownGroup >= 0 ? cooldowns[ExtraCooldownGroup].Remaining : 0;
+    public float ExtraReadyIn(ReadOnlySpan<Cooldown> cooldowns) => ExtraCooldownGroup >= 0 ? cooldowns[ExtraCooldownGroup].Remaining : default;
     public float ReadyIn(ReadOnlySpan<Cooldown> cooldowns, ReadOnlySpan<ClientState.DutyAction> dutyActions) => Math.Max(MainReadyIn(cooldowns, dutyActions), ExtraReadyIn(cooldowns));
 
     // return time until charges are capped (for multi-charge abilities; for single-charge this is equivalent to remaining cooldown)
     public float ChargeCapIn(ReadOnlySpan<Cooldown> cooldowns, ReadOnlySpan<ClientState.DutyAction> dutyActions, int level)
     {
         if (MainCooldownGroup < 0)
-            return 0;
+            return default;
         var cdg = cooldowns[ActualMainCooldownGroup(dutyActions)];
-        return cdg.Total > 0 ? Math.Max(0, MaxChargesAtLevel(level) * cdg.Total / MaxChargesAtCap() - cdg.Elapsed) : 0;
+        return cdg.Total > 0f ? Math.Max(0f, MaxChargesAtLevel(level) * cdg.Total / MaxChargesAtCap() - cdg.Elapsed) : default;
     }
 
     public bool IsUnlocked(WorldState ws, Actor player)
@@ -168,29 +168,33 @@ public sealed class ActionDefinitions : IDisposable
     public const int DutyAction0CDGroup = 80;
     public const int DutyAction1CDGroup = 81;
 
-    public static readonly ActionID IDSprint = new(ActionType.Spell, 3);
-    public static readonly ActionID IDAutoAttack = new(ActionType.Spell, 7);
-    public static readonly ActionID IDAutoShot = new(ActionType.Spell, 8);
-    public static readonly ActionID IDPotionStr = new(ActionType.Item, 1045995); // hq grade 3 gemdraught of strength
-    public static readonly ActionID IDPotionDex = new(ActionType.Item, 1045996); // hq grade 3 gemdraught of dexterity
-    public static readonly ActionID IDPotionVit = new(ActionType.Item, 1045997); // hq grade 3 gemdraught of vitality
-    public static readonly ActionID IDPotionInt = new(ActionType.Item, 1045998); // hq grade 3 gemdraught of intelligence
-    public static readonly ActionID IDPotionMnd = new(ActionType.Item, 1045999); // hq grade 3 gemdraught of mind
+    public static readonly ActionID IDSprint = new(ActionType.Spell, 3u);
+    public static readonly ActionID IDAutoAttack = new(ActionType.Spell, 7u);
+    public static readonly ActionID IDAutoShot = new(ActionType.Spell, 8u);
+    public static readonly ActionID Armslength = new(ActionType.Spell, 7548u);
+    public static readonly ActionID Surecast = new(ActionType.Spell, 7559u);
+    public static readonly ActionID Esuna = new(ActionType.Spell, 7568u);
+    public static readonly ActionID WardensPaean = new(ActionType.Spell, 3561u);
+    public static readonly ActionID IDPotionStr = new(ActionType.Item, 1045995u); // hq grade 3 gemdraught of strength
+    public static readonly ActionID IDPotionDex = new(ActionType.Item, 1045996u); // hq grade 3 gemdraught of dexterity
+    public static readonly ActionID IDPotionVit = new(ActionType.Item, 1045997u); // hq grade 3 gemdraught of vitality
+    public static readonly ActionID IDPotionInt = new(ActionType.Item, 1045998u); // hq grade 3 gemdraught of intelligence
+    public static readonly ActionID IDPotionMnd = new(ActionType.Item, 1045999u); // hq grade 3 gemdraught of mind
 
     // content specific consumables
-    public static readonly ActionID IDPotionSustaining = new(ActionType.Item, 20309);
-    public static readonly ActionID IDPotionMax = new(ActionType.Item, 1013637);
-    public static readonly ActionID IDPotionEmpyrean = new(ActionType.Item, 23163);
-    public static readonly ActionID IDPotionSuper = new(ActionType.Item, 1023167);
-    public static readonly ActionID IDPotionOrthos = new(ActionType.Item, 38944);
-    public static readonly ActionID IDPotionHyper = new(ActionType.Item, 1038956);
-    public static readonly ActionID IDPotionEureka = new(ActionType.Item, 22306);
+    public static readonly ActionID IDPotionSustaining = new(ActionType.Item, 20309u);
+    public static readonly ActionID IDPotionMax = new(ActionType.Item, 1013637u);
+    public static readonly ActionID IDPotionEmpyrean = new(ActionType.Item, 23163u);
+    public static readonly ActionID IDPotionSuper = new(ActionType.Item, 1023167u);
+    public static readonly ActionID IDPotionOrthos = new(ActionType.Item, 38944u);
+    public static readonly ActionID IDPotionHyper = new(ActionType.Item, 1038956u);
+    public static readonly ActionID IDPotionEureka = new(ActionType.Item, 22306u);
 
     // special general actions that we support
-    public static readonly ActionID IDGeneralLimitBreak = new(ActionType.General, 3);
-    public static readonly ActionID IDGeneralSprint = new(ActionType.General, 4);
-    public static readonly ActionID IDGeneralDuty1 = new(ActionType.General, 26);
-    public static readonly ActionID IDGeneralDuty2 = new(ActionType.General, 27);
+    public static readonly ActionID IDGeneralLimitBreak = new(ActionType.General, 3u);
+    public static readonly ActionID IDGeneralSprint = new(ActionType.General, 4u);
+    public static readonly ActionID IDGeneralDuty1 = new(ActionType.General, 26u);
+    public static readonly ActionID IDGeneralDuty2 = new(ActionType.General, 27u);
 
     public static readonly ActionDefinitions Instance = new();
 

BossMod/ActionQueue/ActionQueue.cs

@@ -28,28 +28,28 @@ public readonly struct Entry(ActionID action, Actor? target, float priority, flo
     // note that actions with priority < 0 will never be executed; they can still be added to the queue if it's convenient for the implementation
     public static class Priority
     {
-        public const float Minimal = 0; // minimal priority for action to be still considered for execution; do not use directly
+        public const float Minimal = default; // minimal priority for action to be still considered for execution; do not use directly
         // priorities > Minimal and < VeryLow should be used for ??? (don't know good usecases)
-        public const float VeryLow = 1000; // only use this action if there is nothing else to press
+        public const float VeryLow = 1000f; // only use this action if there is nothing else to press
         // priorities > VeryLow and < Low should be used for actions that can be safely delayed without affecting dps (eg. ability with charges when there is no risk of overcapping or losing raidbuffs any time soon)
-        public const float Low = 2000; // only use this action if it won't delay dps action (eg. delay if there are any ogcds that need to be used)
+        public const float Low = 2000f; // only use this action if it won't delay dps action (eg. delay if there are any ogcds that need to be used)
         // priorities > Low and < Medium should be used for normal ogcds that are part of the rotation
-        public const float Medium = 3000; // use this action in first possible ogcd slot, unless there's some hugely important rotational ogcd; you should always have at least 1 slot per gcd to execute Medium actions
+        public const float Medium = 3000f; // use this action in first possible ogcd slot, unless there's some hugely important rotational ogcd; you should always have at least 1 slot per gcd to execute Medium actions
         // priorities > Medium and < High should be used for ogcds that can't be delayed (eg. GNB continuation); code should be careful not to queue more than one such action per gcd window
-        public const float High = 4000; // use this action asap, unless it would delay gcd (that is - in first possible ogcd slot); careless use could severely affect dps
+        public const float High = 4000f; // use this action asap, unless it would delay gcd (that is - in first possible ogcd slot); careless use could severely affect dps
         // priorities > High and < VeryHigh should be used for gcds, or any other actions that need to delay gcd
-        public const float VeryHigh = 5000; // drop everything and use this action asap, delaying gcd if needed; almost guaranteed to severely affect dps
+        public const float VeryHigh = 5000f; // drop everything and use this action asap, delaying gcd if needed; almost guaranteed to severely affect dps
         // priorities > VeryHigh should not be used by general code
 
-        public const float ManualOGCD = 4001; // manually pressed ogcd should be higher priority than any non-gcd, but lower than any gcd
-        public const float ManualGCD = 4999; // manually pressed gcd should be higher priority than any gcd; it's still lower priority than VeryHigh, since presumably that action is planned to delay gcd
-        public const float ManualEmergency = 9000; // this action should be used asap, because user is spamming it
+        public const float ManualOGCD = 4001f; // manually pressed ogcd should be higher priority than any non-gcd, but lower than any gcd
+        public const float ManualGCD = 4999f; // manually pressed gcd should be higher priority than any gcd; it's still lower priority than VeryHigh, since presumably that action is planned to delay gcd
+        public const float ManualEmergency = 9000f; // this action should be used asap, because user is spamming it
     }
 
     public readonly List<Entry> Entries = [];
 
     public void Clear() => Entries.Clear();
-    public void Push(ActionID action, Actor? target, float priority, float expire = float.MaxValue, float delay = 0, float castTime = 0, Vector3 targetPos = default, Angle? facingAngle = null, bool manual = false) => Entries.Add(new(action, target, priority, expire, delay, castTime, targetPos, facingAngle, manual));
+    public void Push(in ActionID action, Actor? target, float priority, float expire = float.MaxValue, float delay = 0, float castTime = 0, Vector3 targetPos = default, Angle? facingAngle = null, bool manual = false) => Entries.Add(new(action, target, priority, expire, delay, castTime, targetPos, facingAngle, manual));
 
     public Entry FindBest(WorldState ws, Actor player, ReadOnlySpan<Cooldown> cooldowns, float animationLock, AIHints hints, float instantAnimLockDelay, bool allowDismount)
     {