Merge pull request #253 from FFXIV-CombatReborn/the-final-countdown

Fixed longstanding bug with countdowns, you can now do combat during countdown if some leadbrick decides to pull early. RSR will no longer respect countdown timer above all else

Author: LTS-FFXIV

RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs

@@ -158,7 +158,7 @@ private void UpdateActions(JobRole role)
         IBaseAction.IgnoreClipping = true;
 
         var countDown = Service.CountDownTime;
-        if (countDown > 0)
+        if (countDown > 0 && !DataCenter.InCombat)
         {
             gcdAction = null;
             return CountDownAction(countDown);

RotationSolver/Commands/RSCommands_Actions.cs

@@ -184,12 +184,14 @@ internal static void UpdateRotationState()
         {
             CancelState();
         }
-        //Cancel when pull
-        else if (Service.CountDownTime == 0 && _lastCountdownTime > 0.2f)
+
+        //Holds state if countdown is running and setting is enabled
+        else if (Service.Config.StartOnCountdown && Service.CountDownTime == 0 && _lastCountdownTime > 0.2f)
         {
             _lastCountdownTime = 0;
             CancelState();
         }
+
         //Auto manual on being attacked by someone.
         else if (Service.Config.StartOnAttackedBySomeone
             && target != null
@@ -200,7 +202,8 @@ internal static void UpdateRotationState()
                 DoStateCommandType(StateCommandType.Manual);
             }
         }
-        //Auto start at count Down.
+
+        //Auto start at count down.
         else if (Service.Config.StartOnCountdown
             && Service.CountDownTime > 0)
         {
@@ -213,6 +216,7 @@ internal static void UpdateRotationState()
                     DoStateCommandType(StateCommandType.Auto);
             }
         }
+
         //Cancel when after combat.
         else if (ActionUpdater.AutoCancelTime != DateTime.MinValue
             && DateTime.Now > ActionUpdater.AutoCancelTime)