Merge pull request #772 from FFXIV-CombatReborn/tankhotfix

hotfix i hate floats

Author: LTS-FFXIV

BasicRotations/Tank/PLD_Default.cs

@@ -304,7 +304,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
             return true;
         }
 
-        if (CircleOfScornPvE.CanUse(out act, skipAoeCheck: true) && FightOrFlightPvE.Cooldown.IsCoolingDown && (ImperatorPvE.EnoughLevel && ImperatorPvE.IsInCooldown || !ImperatorPvE.EnoughLevel))
+        if (CircleOfScornPvE.CanUse(out act, skipAoeCheck: true, skipTTKCheck: true) && FightOrFlightPvE.Cooldown.IsCoolingDown && (ImperatorPvE.EnoughLevel && ImperatorPvE.IsInCooldown || !ImperatorPvE.EnoughLevel))
         {
             return true;
         }

RotationSolver.Basic/Actions/ActionBasicInfo.cs

@@ -247,7 +247,7 @@ private bool IsRotationCheckValid()
 
     private bool NeedsCasting(bool skipCastingCheck)
     {
-        return CastTime > 0 && !Player.Object.HasStatus(true, new[] { StatusID.Swiftcast, StatusID.Triplecast, StatusID.Dualcast }) && !ActionsNoNeedCasting.Contains(ID) &&
+        return CastTime > 0 && !Player.Object.HasStatus(true, [StatusID.Swiftcast, StatusID.Triplecast, StatusID.Dualcast]) && !ActionsNoNeedCasting.Contains(ID) &&
                (DataCenter.SpecialType == SpecialCommandType.NoCasting || (DateTime.Now > DataCenter.KnockbackStart && DateTime.Now < DataCenter.KnockbackFinished) ||
                 (DataCenter.NoPoslock && DataCenter.IsMoving && !skipCastingCheck));
     }

RotationSolver.Basic/Actions/ActionTargetInfo.cs

@@ -985,6 +985,9 @@ private readonly bool CanGetTarget(IBattleChara target, IBattleChara subTarget)
         Vector3 dir = target.Position - pPos;
         Vector3 tdir = subTarget.Position - pPos;
 
+        float dirLen = dir.Length();
+        _ = tdir.Length();
+
         switch (action.Action.CastType)
         {
             case 2: // Circle
@@ -995,17 +998,23 @@ private readonly bool CanGetTarget(IBattleChara target, IBattleChara subTarget)
                 {
                     return false;
                 }
-
-                tdir += dir / dir.Length() * target.HitboxRadius / (float)Math.Sin(_alpha);
-                return Vector3.Dot(dir, tdir) / (dir.Length() * tdir.Length()) >= Math.Cos(_alpha);
+                if (dirLen == 0)
+                    return false;
+                tdir += dir / dirLen * target.HitboxRadius / (float)Math.Sin(_alpha);
+                dirLen = dir.Length();
+                float tdirLen = tdir.Length();
+                if (dirLen == 0 || tdirLen == 0)
+                    return false;
+                return Vector3.Dot(dir, tdir) / (dirLen * tdirLen) >= Math.Cos(_alpha);
 
             case 4: // Line
                 if (subTarget.DistanceToPlayer() > EffectRange)
                 {
                     return false;
                 }
-
-                return Vector3.Cross(dir, tdir).Length() / dir.Length() <= 2 + target.HitboxRadius
+                if (dirLen == 0)
+                    return false;
+                return Vector3.Cross(dir, tdir).Length() / dirLen <= 2 + target.HitboxRadius
                     && Vector3.Dot(dir, tdir) >= 0;
 
             case 10: // Donut

RotationSolver.Basic/DataCenter.cs

@@ -250,11 +250,11 @@ public static TargetingType TargetingType
 
     public static bool IsMoving { get; internal set; }
 
-    internal static int StopMovingRaw { get; set; }
+    internal static float StopMovingRaw { get; set; }
 
-    internal static int MovingRaw { get; set; }
-    internal static int DeadTimeRaw { get; set; }
-    internal static int AliveTimeRaw { get; set; }
+    internal static float MovingRaw { get; set; }
+    internal static float DeadTimeRaw { get; set; }
+    internal static float AliveTimeRaw { get; set; }
 
     public static unsafe ushort PlayerFateId
     {
@@ -355,7 +355,7 @@ internal static SpecialCommandType SpecialType
     /// </summary>
     public static bool NotInCombatDelay => _notInCombatDelay.Delay(!InCombat);
 
-    internal static int CombatTimeRaw { get; set; }
+    internal static float CombatTimeRaw { get; set; }
     private static DateTime _startRaidTime = DateTime.MinValue;
 
     internal static int RaidTimeRaw

RotationSolver/Updaters/ActionUpdater.cs

@@ -118,7 +118,7 @@ private static void UpdateCombatTime(DateTime now)
 
         DataCenter.CombatTimeRaw = _startCombatTime == DateTime.MinValue
             ? 0
-            : (int)(now - _startCombatTime).TotalSeconds;
+            : (float)(now - _startCombatTime).TotalSeconds;
     }
 
     private static unsafe void UpdateSlots()
@@ -151,10 +151,10 @@ private static void UpdateMoving(DateTime now)
 
         DataCenter.StopMovingRaw = DataCenter.IsMoving
             ? 0
-            : Math.Min(10, (int)(now - _stopMovingTime).TotalSeconds);
+            : Math.Min(10, (float)(now - _stopMovingTime).TotalSeconds);
 
         DataCenter.MovingRaw = DataCenter.IsMoving
-            ? Math.Min(10, (int)(now - _startMovingTime).TotalSeconds)
+            ? Math.Min(10, (float)(now - _startMovingTime).TotalSeconds)
             : 0;
     }
 
@@ -181,18 +181,18 @@ public static void UpdateLifetime(DateTime now)
         }
 
         DataCenter.DeadTimeRaw = Player.Object.IsDead
-            ? Math.Min(10, (int)(now - _startDeadTime).TotalSeconds)
+            ? Math.Min(10, (float)(now - _startDeadTime).TotalSeconds)
             : 0;
 
         DataCenter.AliveTimeRaw = Player.Object.IsDead
             ? 0
-            : Math.Min(10, (int)(now - _startAliveTime).TotalSeconds);
+            : Math.Min(10, (float)(now - _startAliveTime).TotalSeconds);
     }
 
     private static uint _lastMP = 0;
     private static DateTime _lastMPUpdate = DateTime.Now;
 
-    internal static int MPUpdateElapsed => (int)((DateTime.Now - _lastMPUpdate).TotalSeconds % 3);
+    internal static float MPUpdateElapsed => (float)((DateTime.Now - _lastMPUpdate).TotalSeconds % 3);
 
     private static void UpdateMPTimer(DateTime now)
     {

RotationSolver/Updaters/StateUpdater.cs

@@ -269,7 +269,11 @@ private static bool ShouldAddDefenseSingle()
 
         if (DataCenter.Role == JobRole.Tank)
         {
-            bool movingHere = DataCenter.NumberOfHostilesInRange / DataCenter.NumberOfHostilesInMaxRange > 0.3f;
+            bool movingHere = false;
+            if (DataCenter.NumberOfHostilesInMaxRange != 0)
+            {
+                movingHere = DataCenter.NumberOfHostilesInRange / DataCenter.NumberOfHostilesInMaxRange > 0.3f;
+            }
 
             int tarOnMeCount = 0;
             int attackedCount = 0;
@@ -285,7 +289,11 @@ private static bool ShouldAddDefenseSingle()
                 }
             }
 
-            bool attacked = attackedCount / tarOnMeCount > 0.7f;
+            bool attacked = false;
+            if (tarOnMeCount != 0)
+            {
+                attacked = attackedCount / tarOnMeCount > 0.7f;
+            }
 
             if (tarOnMeCount >= Service.Config.AutoDefenseNumber
                 && Player.Object.GetHealthRatio() <= Service.Config.HealthForAutoDefense