fix: feedback fix.

ArchiDog1998 · Jul 30, 2024 · 551925e · 551925e
1 parent 8df3f6b
commit 551925e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/ActionTimelineEx/Helpers/RotationHelper.cs b/ActionTimelineEx/Helpers/RotationHelper.cs
@@ -112,21 +112,17 @@ private static void ActionFromSelf(ActionEffectSet set)
 
         if (IsIgnored(set)) return;
 
-        ActionSetting? nextAction;
         if (IsGcd(set))
         {
-            nextAction = oGcdUsedCount == 0 ? RotationSetting.GetNextAction(GcdUsedCount, 0)
-                : RotationSetting.GetNextAction(GcdUsedCount + 1, 0);
-
             oGcdUsedCount = 0;
             GcdUsedCount++;
         }
         else
         {
-            nextAction = RotationSetting.GetNextAction(GcdUsedCount, oGcdUsedCount);
             oGcdUsedCount++;
         }
 
+        var nextAction = RotationSetting.GetNextAction(GcdUsedCount, oGcdUsedCount);
         if (nextAction == null) return;
 
         if (nextAction.IsMatched(actionId, actionSettingType))
@@ -135,7 +131,7 @@ private static void ActionFromSelf(ActionEffectSet set)
         }
         else if(Plugin.Settings.ShowWrongClick)
         {
-            Svc.Chat.PrintError($"Clicked the wrong action {set.Name}! You should Click {nextAction.DisplayName}!");
+            Svc.Chat.PrintError($"Clicked the wrong action {set.Name} ({set.Header.ActionID})! You should Click {nextAction.DisplayName} ({nextAction.ActionID})!");
         }
     }
 

diff --git a/ActionTimelineEx/Localization/Localization.json b/ActionTimelineEx/Localization/Localization.json
@@ -134,7 +134,6 @@
   "ActionTimelineEx.Configurations.ActionSettingType.Action": "Action",
   "ActionTimelineEx.Configurations.ActionSettingType.Item": "Item",
   "ActionTimelineEx.Configurations.ActionSettingName.IsLast": "Is the Last Ability during GCD",
-  "ActionTimelineEx.Configurations.ActionSettingDescription": "Heavy Swing (GCD)",
   "ActionTimelineEx.Configurations.SettingsName.Reverse": "Reverse Draw",
   "ActionTimelineEx.Configurations.SettingsName.OnlyShowRotationWhenWeaponOn": "Only Show when Weapon On",
   "ActionTimelineEx.Configurations.SettingsName.RotationFailedColor": "Rotation Failed Color",
@@ -154,13 +153,10 @@
   "ActionTimelineEx.Helpers.ActionType.SystemAction": "SystemAction",
   "ActionTimelineEx.Helpers.ActionType.LimitBreak": "LimitBreak",
   "ActionTimelineEx.Helpers.ActionType.DutyAction": "DutyAction",
-  "ActionTimelineEx.Configurations.Actions.GCDActionDescription": "Fell Cleave (GCD)",
   "ActionTimelineEx.Configurations.Actions.oGCDActionName.ActionType": "Type",
   "ActionTimelineEx.Configurations.Actions.ActionSettingType.Action": "Action",
   "ActionTimelineEx.Configurations.Actions.ActionSettingType.Item": "Item",
-  "ActionTimelineEx.Configurations.Actions.oGCDActionDescription": "Inner Release (oGCD)",
   "ActionTimelineEx.Configurations.Actions.ActionSetting": "ActionSetting",
-  "ActionTimelineEx.Configurations.Actions.ActionSettingDescription": "Rage of Halone (GCD)",
   "ActionTimelineEx.Configurations.Actions.ActionSettingName.ActionID": "Action ID",
   "ActionTimelineEx.Configurations.Actions.GCDActionName.RecastOverride": "Recast override time",
   "ActionTimelineEx.Configurations.SettingsName.GcdTime": "Gcd Time",