feat: add more auto off options.

ArchiDog1998 · Mar 17, 2023 · 2c485c9 · 2c485c9
1 parent 88c805c
commit 2c485c9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -25,6 +25,8 @@ public class PluginConfiguration : IPluginConfiguration
     public int TimelineIndex = 0;
     public bool AutoBurst = true;
     public bool AutoOffBetweenArea = true;
+    public bool AutoOffCutScene = true;
+    public bool AutoOffWhenDead = true;
     public bool UseAbility = true;
     public bool UseDefenseAbility = true;
     public bool NeverReplaceIcon = false;

diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -66,15 +66,23 @@ internal static void CancelState()
 
         internal static void UpdateRotationState()
         {
-            if (Service.Player.CurrentHp == 0
-                || Service.Conditions[ConditionFlag.LoggingOut])
+            if (Service.Conditions[ConditionFlag.LoggingOut])
+            {
+                CancelState();
+            }
+            else if (Service.Config.AutoOffWhenDead 
+                && Service.Player.CurrentHp == 0)
+            {
+                CancelState();
+            }
+            else if (Service.Config.AutoOffCutScene
+                && Service.Conditions[ConditionFlag.OccupiedInCutSceneEvent])
             {
                 CancelState();
             }
             else if (Service.Config.AutoOffBetweenArea && (
                 Service.Conditions[ConditionFlag.BetweenAreas]
-                || Service.Conditions[ConditionFlag.BetweenAreas51])
-                || Service.Conditions[ConditionFlag.OccupiedInCutSceneEvent])
+                || Service.Conditions[ConditionFlag.BetweenAreas51]))
             {
                 CancelState();
             }

diff --git a/RotationSolver/Localization/Strings_Major.cs b/RotationSolver/Localization/Strings_Major.cs
@@ -106,6 +106,10 @@ internal partial class Strings
     public string ConfigWindow_Param_AddDotGCDCount { get; set; } = "Set GCD advance of DOT refresh";
     public string ConfigWindow_Param_AutoOffBetweenArea { get; set; } = "Turn off when player is between area.";
 
+    public string ConfigWindow_Param_AutoOffCutScene { get; set; } = "Turn off during cut scene.";
+
+    public string ConfigWindow_Param_AutoOffWhenDead { get; set; } = "Turn off when dead.";
+
     public string ConfigWindow_Param_UseWorkTask { get; set; } = "Use work task for acceleration.";
     public string ConfigWindow_Param_Delay { get; set; } = "Delay";
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -76,6 +76,15 @@ private void DrawParamBasic()
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_AutoOffBetweenArea,
             ref Service.Config.AutoOffBetweenArea);
 
+        DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_AutoOffCutScene,
+            ref Service.Config.AutoOffCutScene);
+
+        DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_AutoOffWhenDead,
+            ref Service.Config.AutoOffWhenDead);
+
+        DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_StartOnCountdown,
+            ref Service.Config.StartOnCountdown);
+
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseWorkTask,
             ref Service.Config.UseWorkTask);
     }
@@ -319,9 +328,6 @@ private void DrawParamCondition()
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_InterruptibleMoreCheck,
             ref Service.Config.InterruptibleMoreCheck);
 
-        DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_StartOnCountdown,
-            ref Service.Config.StartOnCountdown);
-
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_EsunaAll,
             ref Service.Config.EsunaAll);
 

diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -200,7 +200,8 @@ internal unsafe static void DoAction()
             || Service.Conditions[ConditionFlag.SufferingStatusAffliction2]
             || Service.Conditions[ConditionFlag.RolePlaying]
             || Service.Conditions[ConditionFlag.InFlight]
-            || ActionManager.Instance()->ActionQueued) return;
+            || ActionManager.Instance()->ActionQueued
+            || Service.Player.CurrentHp == 0) return;
 
         //GCD
         var canUseGCD = DataCenter.WeaponRemain <= Service.Config.ActionAhead;