Add option to not clear rotation on combat end.

awgil · Jul 6, 2024 · 796a95e · 796a95e
1 parent 61473b0
commit 796a95e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/BossMod/Autorotation/AutorotationConfig.cs b/BossMod/Autorotation/AutorotationConfig.cs
@@ -9,6 +9,9 @@ public sealed class AutorotationConfig : ConfigNode
     [PropertyDisplay("Show positional hints in world")]
     public bool ShowPositionals = false;
 
+    [PropertyDisplay("Automatically end autorotation when exiting combat")]
+    public bool ClearPresetOnCombatEnd = false;
+
     [PropertyDisplay("Early pull threshold: if player enters combat when countdown is larger than this value, we consider it a ninja-pull and force disable autorotation")]
     [PropertySlider(0, 30, Speed = 1)]
     public float EarlyPullThreshold = 1.5f;

diff --git a/BossMod/Autorotation/RotationModuleManager.cs b/BossMod/Autorotation/RotationModuleManager.cs
@@ -137,19 +137,19 @@ private void OnCombatChanged(Actor actor)
 
         CombatStart = actor.InCombat ? WorldState.CurrentTime : default; // keep track of combat time in case rotation modules want to do something special in openers
 
-        if (!actor.InCombat)
+        if (!actor.InCombat && Config.ClearPresetOnCombatEnd)
         {
             // player exits combat => clear manual overrides
             Service.Log($"[RMM] Player exits combat => clear preset '{Preset?.Name ?? "<n/a>"}'");
             Preset = null;
         }
-        else if (WorldState.Client.CountdownRemaining > Config.EarlyPullThreshold)
+        else if (actor.InCombat && WorldState.Client.CountdownRemaining > Config.EarlyPullThreshold)
         {
             // player enters combat while countdown is in progress => force disable
             Service.Log($"[RMM] Player ninja pulled => force-disabling from '{Preset?.Name ?? "<n/a>"}'");
             Preset = ForceDisable;
         }
-        // else: player enters combat when countdown is either not active or around zero, proceed normally - if override is queued, let it run, otherwise let plan run
+        // if player enters combat when countdown is either not active or around zero, proceed normally - if override is queued, let it run, otherwise let plan run
     }
 
     private void OnDeadChanged(Actor actor)