fix: increase the up limit about AutoOffAfterCombatTime. Find back …

…the option about that.
ArchiDog1998 · Aug 26, 2023 · 43ebc37 · 43ebc37
1 parent 1e07d84
commit 43ebc37
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,3 +1,3 @@
 {
-  "ClickingCount": 9806
+  "ClickingCount": 10201
 }
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -320,6 +320,7 @@ public enum PluginConfigBool : byte
 
     [Default(true)] RecordCastingArea,
 
+    [Default(true)] AutoOffAfterCombat,
     [Default(false)] AutoOpenChest,
     [Default(true)] AutoCloseChestWindow,
 
@@ -330,7 +331,7 @@ public enum PluginConfigBool : byte
 
 public enum PluginConfigFloat : byte
 {
-    [Default(8f, 0f, 60f)] AutoOffAfterCombatTime,
+    [Default(8f, 0f, 600f)] AutoOffAfterCombatTime,
     [Default(3f, 0f, 8f)] DrawingHeight,
     [Default(0.2f, 0.005f, 0.05f)] SampleLength,
     [Default(0.1f)] KeyBoardNoiseTimeMin,

diff --git a/RotationSolver/Localization/ConfigTranslation.cs b/RotationSolver/Localization/ConfigTranslation.cs
@@ -137,6 +137,7 @@ internal static class ConfigTranslation
         PluginConfigBool.DownloadRotations => LocalizationManager.RightLang.ConfigWindow_Rotation_DownloadRotations,
         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/Localization.json b/RotationSolver/Localization/Localization.json
@@ -44,8 +44,9 @@
   "ConfigWindow_Param_SpecialDuration": "Set the duration of special windows set by commands",
   "ConfigWindow_Param_AddDotGCDCount": "Set GCD advance of DOT refresh",
   "ConfigWindow_Param_MaxPing": "Set the Max Ping that RS can get.",
-  "ConfigWindow_Param_AutoOffAfterCombatTime": "Auto turn off when combat is over more than several seconds.",
   "ConfigWindow_Param_AutoOffBetweenArea": "Auto turn off when player is moving between areas.",
+  "ConfigWindow_Param_AutoOffAfterCombat": "Auto turn off when combat is over more than several seconds.",
+  "ConfigWindow_Param_AutoOffAfterCombatTime": "seconds.",
   "ConfigWindow_Param_AutoOffCutScene": "Auto turn off during cutscenes.",
   "ConfigWindow_Param_AutoOffWhenDead": "Auto turn off when dead.",
   "ConfigWindow_Param_UseWorkTask": "Use work task for acceleration.",

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -90,9 +90,9 @@ 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_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 moving between areas.";
-
+    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_AutoOffCutScene { get; set; } = "Auto turn off during cutscenes.";
 
     public string ConfigWindow_Param_AutoOffWhenDead { get; set; } = "Auto turn off when dead.";

diff --git a/RotationSolver/UI/RotationConfigWindow_Config.cs b/RotationSolver/UI/RotationConfigWindow_Config.cs
@@ -302,10 +302,11 @@ 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
@@ -135,7 +135,10 @@ private static void UpdateCombatTime()
         {
             _startCombatTime = DateTime.MinValue;
 
-            AutoCancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombatTime));
+            if (Service.Config.GetValue(PluginConfigBool.AutoOffAfterCombat))
+            {
+                AutoCancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombatTime));
+            }
         }
 
         if (_startCombatTime == DateTime.MinValue)