fix: auto off when combat over fix.

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

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,3 +1,3 @@
 {
-  "ClickingCount": 6180
+  "ClickingCount": 6208
 }
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -399,7 +399,7 @@ public enum PluginConfigFloat : byte
     [Default(1f, 0.1f, 10f)] HostileIconSize,
 
     [Default(1f, 0f, 2.5f)] StateIconHeight,
-    [Default(1f, 0.5f, 10f)] StateIconSize,
+    [Default(1f, 0.7f, 10f)] StateIconSize,
 }
 
 public enum PluginConfigVector4 : byte

diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -122,10 +122,10 @@ private static void CancelState()
         static float _lastCountdownTime = 0;
         internal static void UpdateRotationState()
         {
-            if(ActionUpdater._cancelTime != DateTime.MinValue && 
+            if(ActionUpdater.AutoCancelTime != DateTime.MinValue && 
                 (!DataCenter.State || DataCenter.InCombat))
             {
-                ActionUpdater._cancelTime = DateTime.MinValue;
+                ActionUpdater.AutoCancelTime = DateTime.MinValue;
             }
 
             var target = DataCenter.AllHostileTargets.FirstOrDefault(t => t.TargetObjectId == Player.Object.ObjectId);
@@ -179,11 +179,11 @@ internal static void UpdateRotationState()
                 }
             }
             //Cancel when after combat.
-            else if (ActionUpdater._cancelTime != DateTime.MinValue
-                && DateTime.Now > ActionUpdater._cancelTime)
+            else if (ActionUpdater.AutoCancelTime != DateTime.MinValue
+                && DateTime.Now > ActionUpdater.AutoCancelTime)
             {
                 CancelState();
-                ActionUpdater._cancelTime = DateTime.MinValue;
+                ActionUpdater.AutoCancelTime = DateTime.MinValue;
             }
         }
     }

diff --git a/RotationSolver/Commands/RSCommands_StateSpecialCommand.cs b/RotationSolver/Commands/RSCommands_StateSpecialCommand.cs
@@ -29,7 +29,6 @@ private static unsafe void DoStateCommandType(StateCommandType stateType) => DoO
             var index = Service.Config.GetValue(Basic.Configuration.PluginConfigInt.TargetingIndex) + 1; 
             index %= Service.Config.GlobalConfig.TargetingTypes.Count;
             Service.Config.SetValue(Basic.Configuration.PluginConfigInt.TargetingIndex, index);
-            ActionUpdater._cancelTime = DateTime.MinValue;
         }
 
         if (Service.Config.GetValue(Basic.Configuration.PluginConfigBool.ToggleManual)
@@ -48,11 +47,13 @@ private static unsafe void DoStateCommandType(StateCommandType stateType) => DoO
             case StateCommandType.Auto:
                 DataCenter.IsManual = false;
                 DataCenter.State = true;
+                ActionUpdater.AutoCancelTime = DateTime.MinValue;
                 break;
 
             case StateCommandType.Manual:
                 DataCenter.IsManual = true;
                 DataCenter.State = true;
+                ActionUpdater.AutoCancelTime = DateTime.MinValue;
                 break;
         }
 

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -44,8 +44,7 @@
   "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_AutoOffAfterCombat": "Auto turn off when combat is over more than several seconds.",
-  "ConfigWindow_Param_AutoOffAfterCombatTime": "seconds.",
+  "ConfigWindow_Param_AutoOffAfterCombatTime": "Auto turn off when combat is over more than several seconds.",
   "ConfigWindow_Param_AutoOffBetweenArea": "Auto turn off when player is between area.",
   "ConfigWindow_Param_AutoOffCutScene": "Auto turn off during cut scene.",
   "ConfigWindow_Param_AutoOffWhenDead": "Auto turn off when dead.",
@@ -492,6 +491,8 @@
   "ConfigWindow_About_ClickingTooMuch": "Well, you must be a lazy player!",
   "ConfigWindow_Auto_AutoHealDeadTime": "Auto heal before combat end several seconds.",
   "ConfigWindow_UI_ShowHostiles": "Show the hostile targets",
-  "ConfigWindow_UI_HostileIconHeight": "Icon height from position",
-  "ConfigWindow_UI_HostileIconSize": "Icon size"
+  "ConfigWindow_UI_HostileIconHeight": "Hostile Icon height from position",
+  "ConfigWindow_UI_HostileIconSize": "Hostile Icon size",
+  "ConfigWindow_UI_StateIconHeight": "State Icon height from position",
+  "ConfigWindow_UI_StateIconSize": "State Icon size"
 }
diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -12,7 +12,7 @@ namespace RotationSolver.Updaters;
 
 internal static class ActionUpdater
 {
-    internal static DateTime _cancelTime = DateTime.MinValue;
+    internal static DateTime AutoCancelTime { get; set; } = DateTime.MinValue;
 
     static  RandomDelay _GCDDelay = new(() =>
     (Service.Config.GetValue(PluginConfigFloat.WeaponDelayMin),
@@ -135,7 +135,7 @@ private static void UpdateCombatTime()
         {
             _startCombatTime = DateTime.MinValue;
 
-            _cancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombatTime));
+            AutoCancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombatTime));
         }
 
         if (_startCombatTime == DateTime.MinValue)