fix: fixed nextaction macro.

ArchiDog1998 · Jul 25, 2023 · 2b1e750 · 2b1e750
1 parent cc532b7
commit 2b1e750
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Data/RSCommandType.cs b/RotationSolver.Basic/Data/RSCommandType.cs
@@ -121,6 +121,11 @@ public enum OtherCommandType : byte
     /// 
     /// </summary>
     ToggleActions,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    NextAction,
 }
 
 /// <summary>

diff --git a/RotationSolver/Commands/RSCommands_OtherCommand.cs b/RotationSolver/Commands/RSCommands_OtherCommand.cs
@@ -28,6 +28,10 @@ private static void DoOtherCommand(OtherCommandType otherType, string str)
                 case OtherCommandType.Settings:
                     DoSettingCommand(str);
                     break;
+
+                case OtherCommandType.NextAction:
+                    DoAction();
+                    break;
             }
         }
 

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -36,6 +36,8 @@ internal partial class Strings
     public string ConfigWindow_HelpItem_AttackManual { get; set; }
         = "Start the addon in manual mode. You need to choose the target manually. This will bypass any  engage settings that you have set up and will start attacking immediately once something is targeted.";
 
+    public string ConfigWindow_HelpItem_NextAction { get; set; } = "Do the next action";
+
     public string ConfigWindow_HelpItem_AttackCancel { get; set; }
         = "Stop the addon. Always remember to turn it off when not in use!";
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Help.cs b/RotationSolver/UI/RotationConfigWindow_Help.cs
@@ -56,6 +56,8 @@ private static void DrawHelpTab()
 
             StateCommandType.Cancel.DisplayCommandHelp(getHelp: EnumTranslations.ToHelp);
 
+            OtherCommandType.NextAction.DisplayCommandHelp(getHelp: i => LocalizationManager.RightLang.ConfigWindow_HelpItem_NextAction);
+
             ImGui.Separator();
 
             SpecialCommandType.EndSpecial.DisplayCommandHelp(getHelp: EnumTranslations.ToHelp);

diff --git a/RotationSolver/Updaters/InputUpdater.cs b/RotationSolver/Updaters/InputUpdater.cs
@@ -130,7 +130,7 @@ private static void KeyDown(KeyRecord key)
         }
         else if(OtherConfiguration.InputConfig.KeyDoAction == key)
         {
-            RSCommands.DoAction();
+            Svc.Commands.ProcessCommand(OtherCommandType.NextAction.GetCommandStr());
         }
     }
 

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -92,8 +92,6 @@ private unsafe static void FrameworkUpdate(Framework framework)
             }
 
             MacroUpdater.UpdateMacro();
-
-            InputUpdater.UpdateCommand();
         }
         catch (Exception ex)
         {
@@ -157,6 +155,8 @@ private static void UpdateWork()
             ActionUpdater.UpdateNextAction();
 
             RSCommands.UpdateRotationState();
+
+            InputUpdater.UpdateCommand();
         }
         catch (Exception ex)
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -130,7 +130,7 @@ private static void KeyDown(KeyRecord key) @@
             }
             else if(OtherConfiguration.InputConfig.KeyDoAction == key)
             {
-                RSCommands.DoAction();
+                Svc.Commands.ProcessCommand(OtherCommandType.NextAction.GetCommandStr());
             }
         }
@@ Expand Down @@