fix: must use auto off when after combat.

ArchiDog1998 · Aug 23, 2023 · 20cbdf5 · 20cbdf5
1 parent f5cb4e6
commit 20cbdf5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -320,7 +320,6 @@ public enum PluginConfigBool : byte
 
     [Default(false)] AutoOpenChest,
     [Default(true)] AutoCloseChestWindow,
-    [Default(true)] AutoOffAfterCombat,
 
     [Default(true)] ShowBeneficialPositions,
     [Default(false)] HideWarning,

diff --git a/RotationSolver/Localization/ConfigTranslation.cs b/RotationSolver/Localization/ConfigTranslation.cs
@@ -136,7 +136,6 @@ internal static class ConfigTranslation
         PluginConfigBool.AutoUpdateRotations => LocalizationManager.RightLang.ConfigWindow_Rotation_AutoUpdateRotations,
         PluginConfigBool.AutoLoadCustomRotations => LocalizationManager.RightLang.ConfigWindow_Rotations_AutoLoadCustomRotations,
 
-        PluginConfigBool.AutoOffAfterCombat => LocalizationManager.RightLang.ConfigWindow_Param_AutoOffAfterCombat,
         _ => string.Empty,
     };
 

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -90,8 +90,7 @@ internal partial class Strings
     public string ConfigWindow_Param_SpecialDuration { get; set; } = "Set the duration of special windows set by commands";
     public string ConfigWindow_Param_AddDotGCDCount { get; set; } = "Set GCD advance of DOT refresh";
     public string ConfigWindow_Param_MaxPing { get; set; } = "Set the Max Ping that RS can get.";
-    public string ConfigWindow_Param_AutoOffAfterCombat { get; set; } = "Auto turn off when combat is over more than several seconds.";
-    public string ConfigWindow_Param_AutoOffAfterCombatTime { get; set; } = "seconds.";
+    public string ConfigWindow_Param_AutoOffAfterCombatTime { get; set; } = "Auto turn off when combat is over more than several seconds.";
     public string ConfigWindow_Param_AutoOffBetweenArea { get; set; } = "Auto turn off when player is between area.";
 
     public string ConfigWindow_Param_AutoOffCutScene { get; set; } = "Auto turn off during cut scene.";

diff --git a/RotationSolver/UI/RotationConfigWindow_Config.cs b/RotationSolver/UI/RotationConfigWindow_Config.cs
@@ -302,11 +302,10 @@ private static void DrawBasicAutoSwitch()
     private static readonly ISearchable[] _basicSwitchTurnOff = new ISearchable[]
     {
         // Turn off
+        new DragFloatSearchPlugin(PluginConfigFloat.AutoOffAfterCombatTime, 1f),
         new CheckBoxSearchPlugin(PluginConfigBool.AutoOffBetweenArea),
         new CheckBoxSearchPlugin(PluginConfigBool.AutoOffCutScene),
         new CheckBoxSearchPlugin(PluginConfigBool.AutoOffWhenDead),
-        new CheckBoxSearchPlugin(PluginConfigBool.AutoOffAfterCombat,
-            new DragFloatSearchPlugin(PluginConfigFloat.AutoOffAfterCombatTime, 1f)),
     };
     #endregion
 

diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -134,10 +134,8 @@ private static void UpdateCombatTime()
         else if (last && !DataCenter.InCombat)
         {
             _startCombatTime = DateTime.MinValue;
-            if (Service.Config.GetValue(PluginConfigBool.AutoOffAfterCombat))
-            {
-                _cancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombatTime));
-            }
+
+            _cancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombatTime));
         }
 
         if (_startCombatTime == DateTime.MinValue)