feat: add better rotatoin helper.

ArchiDog1998 · Jul 12, 2024 · fded3cd · fded3cd
1 parent befc390
commit fded3cd
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 41 deletions.
diff --git a/ActionTimelineEx/ActionTimelineEx.csproj b/ActionTimelineEx/ActionTimelineEx.csproj
@@ -51,4 +51,8 @@
 	<ItemGroup>
 	  <Folder Include="Localization\" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Using Include="Newtonsoft.Json" />
+	</ItemGroup>
 </Project>
diff --git a/ActionTimelineEx/Configurations/ActionSetting.cs b/ActionTimelineEx/Configurations/ActionSetting.cs
@@ -1,11 +1,7 @@
 using ActionTimeline.Helpers;
-using Dalamud.Plugin.Services;
 using ECommons.DalamudServices;
-using FFXIVClientStructs.FFXIV.Common.Lua;
 using ImGuiNET;
-using System.Drawing;
 using System.Numerics;
-using System.Xml.Linq;
 using XIVConfigUI.Attributes;
 
 namespace ActionTimelineEx.Configurations;
@@ -26,6 +22,12 @@ public override void OnClick(object obj)
 
         //TODO: Change the acion ID...
     }
+
+    public override string GetDescription(object obj)
+    {
+        if (obj is not ActionSetting setting) return base.GetDescription(obj);
+        return setting.DisplayName;
+    }
 }
 
 public enum ActionSettingType : byte
@@ -40,12 +42,10 @@ public class ActionSetting
     internal uint IconId { get; private set; } = 0;
     internal bool IsGCD { get; private set; } = false;
 
-    [UI("Name")]
     internal string DisplayName { get; private set; } = "";
 
     private uint _actionId;
 
-    [UI("Id")]
     public uint ActionId 
     {
         get => _actionId;
@@ -57,7 +57,8 @@ public uint ActionId
             Update();
         }
     }
-
+    [JsonIgnore, UI("Id")]
+    public int Id { get => (int)ActionId; set => ActionId = (uint) value; }
     private ActionSettingType _type;
 
     [UI("Type")]
@@ -104,7 +105,7 @@ void UpdateAction()
 
             IsGCD = action.CooldownGroup == 58 || action.AdditionalCooldownGroup == 58;
 
-            IconId = action.Icon;
+            IconId = GetActionIcon(action);
             DisplayName = $"{action.Name} ({(IsGCD ? "GCD" : "Ability")})";
         }
 
@@ -121,4 +122,15 @@ public void Draw(ImDrawListPtr drawList, Vector2 point, float size)
         drawList.DrawActionIcon(IconId, Type is ActionSettingType.Item, point, size);
         if (!string.IsNullOrEmpty(DisplayName) && DrawHelper.IsInRect(point, new Vector2(size))) ImGui.SetTooltip(DisplayName);
     }
+
+    private static uint GetActionIcon(Lumina.Excel.GeneratedSheets.Action action)
+    {
+        var isGAction = action.ActionCategory.Row is 10 or 11;
+        if (!isGAction) return action.Icon;
+
+        var gAct = Svc.Data.GetExcelSheet<Lumina.Excel.GeneratedSheets.GeneralAction>()?.FirstOrDefault(g => g.Action.Row == action.RowId);
+
+        if (gAct == null) return action.Icon;
+        return (uint)gAct.Icon;
+    }
 }
diff --git a/ActionTimelineEx/Configurations/RotationsSetting.cs b/ActionTimelineEx/Configurations/RotationsSetting.cs
@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace ActionTimelineEx.Configurations;
+namespace ActionTimelineEx.Configurations;
 
 public class RotationsSetting
 {

diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs
@@ -101,6 +101,9 @@ public string RotationName
     [UI("Icon Spacing", Parent = nameof(DrawRotation))]
     public int IconSpacing { get; set; } = 5;
 
+    [UI("Show the wrong clicking", Parent = nameof(DrawRotation))]
+    public bool ShowWrongClick { get; set; } = true;
+
     [JsonProperty]
     private Dictionary<uint, Dictionary<Job, RotationsSetting>> _rotationHelpers = [];
 

diff --git a/ActionTimelineEx/Configurations/UiString.cs b/ActionTimelineEx/Configurations/UiString.cs
@@ -31,4 +31,7 @@ internal enum UiString
 
     [Description("Rotation")]
     Rotation,
+
+    [Description("Reset Count")]
+    RotationReset,
 }
diff --git a/ActionTimelineEx/Helpers/RotationHelper.cs b/ActionTimelineEx/Helpers/RotationHelper.cs
@@ -28,40 +28,57 @@ private set
             if (_count == value) return;
             _count = value;
 
-            if (_highLight == null) return;
-            _highLight.Color = Plugin.Settings.RotationHighlightColor;
-            _highLight.HotbarIDs.Clear();
-
-            var action = ActiveActon;
-            if (action == null) return;
+            UpdateHighlight();
+        }
+    }
+    public static uint SuccessCount { get; private set; } = 0;
 
-            HotbarID? hotbar = null;
+    private static void UpdateHighlight()
+    {
+        if (_highLight == null) return;
+        _highLight.Color = Plugin.Settings.RotationHighlightColor;
+        _highLight.HotbarIDs.Clear();
 
-            switch (action.Type)
-            {
-                case ActionSettingType.Action:
-                    hotbar = new HotbarID(FFXIVClientStructs.FFXIV.Client.UI.Misc.RaptureHotbarModule.HotbarSlotType.Action, action.ActionId);
-                    break;
+        var action = ActiveActon;
+        if (action == null) return;
 
-                case ActionSettingType.Item:
-                    hotbar = new HotbarID(FFXIVClientStructs.FFXIV.Client.UI.Misc.RaptureHotbarModule.HotbarSlotType.Item, action.ActionId);
-                    break;
-            }
+        HotbarID? hotbar = null;
 
-            if (hotbar == null) return;
-            _highLight.HotbarIDs.Add(hotbar.Value);
+        switch (action.Type)
+        {
+            case ActionSettingType.Action:
+                var isGAction = Svc.Data.GetExcelSheet<Lumina.Excel.GeneratedSheets.Action>()?.GetRow(action.ActionId)?.ActionCategory.Row is 10 or 11;
+                if (isGAction)
+                {
+                    var gAct = Svc.Data.GetExcelSheet<GeneralAction>()?.FirstOrDefault(g => g.Action.Row == action.ActionId);
+                    if (gAct != null)
+                    {
+                        hotbar = new HotbarID(FFXIVClientStructs.FFXIV.Client.UI.Misc.RaptureHotbarModule.HotbarSlotType.GeneralAction, gAct.RowId);
+                        break;
+                    }
+                }
+
+                hotbar = new HotbarID(FFXIVClientStructs.FFXIV.Client.UI.Misc.RaptureHotbarModule.HotbarSlotType.Action, action.ActionId);
+                break;
+
+            case ActionSettingType.Item:
+                hotbar = new HotbarID(FFXIVClientStructs.FFXIV.Client.UI.Misc.RaptureHotbarModule.HotbarSlotType.Item, action.ActionId);
+                break;
         }
+
+        if (hotbar == null) return;
+        _highLight.HotbarIDs.Add(hotbar.Value);
     }
-    public static uint SuccessCount { get; private set; } = 0;
 
     public static void Init()
     {
         ActionEffect.ActionEffectEvent += ActionFromSelf;
         Svc.DutyState.DutyWiped += DutyState_DutyWiped;
         Svc.DutyState.DutyCompleted += DutyState_DutyWiped;
         Svc.ClientState.TerritoryChanged += ClientState_TerritoryChanged;
-
+        ClientState_TerritoryChanged(Svc.ClientState.TerritoryType);
         _highLight = new();
+        UpdateHighlight();
     }
 
     public static void Dispose()
@@ -102,9 +119,9 @@ private static void ActionFromSelf(ActionEffectSet set)
         {
             SuccessCount++;
         }
-        else
+        else if(Plugin.Settings.ShowWrongClick)
         {
-            Svc.Chat.Print("Failed to click the action!");
+            Svc.Chat.PrintError($"Clicked the wrong action {set.Name}! You should Click {action.DisplayName}!");
         }
         Count++;
     }

diff --git a/ActionTimelineEx/Localization/Localization.json b/ActionTimelineEx/Localization/Localization.json
@@ -112,5 +112,21 @@
   "ActionTimeline.SettingsName.RotationName": "Rotation Name",
   "ActionTimeline.SettingsName.RotationCount": "Rotation Count",
   "ActionTimeline.SettingsName.RotationHighlightColor": "Rotation Highlight Color",
-  "ActionTimeline.SettingsName.Position": "Rotation Position"
+  "ActionTimeline.SettingsName.Position": "Rotation Position",
+  "ActionTimeline.SettingsName.RotationLocked": "Locked",
+  "ActionTimeline.SettingsName.RotationLockedBackgroundColor": "Locked Background Color",
+  "ActionTimeline.SettingsName.RotationUnlockedBackgroundColor": "Unlocked Background Color",
+  "ActionTimeline.SettingsName.GCDIconSize": "GCD Icon Size",
+  "ActionTimeline.SettingsName.OGCDIconSize": "Off GCD Icon Size",
+  "ActionTimeline.SettingsName.IconSpacing": "Icon Spacing",
+  "ActionTimelineEx.Configurations.UiString.RotationSetting": "Rotation Setting",
+  "ActionTimelineEx.Configurations.UiString.Rotation": "Rotation",
+  "ActionTimelineEx.Windows.RotationHelperItem": "Rotation Helper",
+  "ActionTimelineEx.Configurations.ActionSetting": "ActionSetting",
+  "ActionTimelineEx.Configurations.ActionSettingType.Action": "Action",
+  "ActionTimelineEx.Configurations.ActionSettingType.Item": "Item",
+  "ActionTimelineEx.Configurations.ActionSettingName.Type": "Type",
+  "ActionTimelineEx.Configurations.ActionSettingName.Id": "Id",
+  "ActionTimelineEx.Configurations.ActionSettingDescription": "Maim (GCD)",
+  "ActionTimelineEx.Configurations.UiString.RotationReset": "Reset Count"
 }
diff --git a/ActionTimelineEx/Plugin.cs b/ActionTimelineEx/Plugin.cs
@@ -76,7 +76,6 @@ public Plugin(IDalamudPluginInterface pluginInterface)
         Svc.PluginInterface.UiBuilder.OpenMainUi += OpenConfigUi;
 
         TimelineManager.Initialize();
-        RotationHelper.Init();
 
         try
         {
@@ -87,6 +86,7 @@ public Plugin(IDalamudPluginInterface pluginInterface)
             Settings = new Settings();
         }
 
+        RotationHelper.Init();
         CreateWindows();
     }
 

diff --git a/ActionTimelineEx/Windows/RotationHelperItem.cs b/ActionTimelineEx/Windows/RotationHelperItem.cs
@@ -5,6 +5,7 @@
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility.Raii;
 using ECommons.DalamudServices;
+using ECommons.GameHelpers;
 using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
 using System.ComponentModel;
@@ -38,14 +39,23 @@ public override void Draw(ConfigWindow window)
 
         _group ??= new CollapsingHeaderGroup(new()
         {
-            { () => UiString.RotationSetting.Local(), () => window.Collection.DrawItems(1) },
+            { () => UiString.RotationSetting.Local(), () =>  DrawSetting(window) },
             { () => UiString.Rotation.Local(), () => ConditionDrawer.Draw(setting.RotationSetting.Actions) },
         });
 
         _group.Draw();
         base.Draw(window);
     }
 
+    private static void DrawSetting(ConfigWindow window)
+    {
+        if (ImGui.Button(UiString.RotationReset.Local()))
+        {
+            RotationHelper.Clear();
+        }
+        window.Collection.DrawItems(1);
+    }
+
     private static void DrawTerritoryHeader()
     {
         _territories ??= Svc.Data.GetExcelSheet<TerritoryType>()?
@@ -56,14 +66,28 @@ private static void DrawTerritoryHeader()
         var name = GetName(rightTerritory);
 
         var imFont = DrawingExtensions.GetFont(21);
-        float width = 0;
+        float width = 0, height = 0;
         using (var font = ImRaii.PushFont(imFont))
         {
             width = ImGui.CalcTextSize(name).X + (ImGui.GetStyle().ItemSpacing.X * 2);
+            height = ImGui.CalcTextSize(name).Y + (ImGui.GetStyle().ItemSpacing.Y * 2);
+        }
+
+        var HasJob = ImageLoader.GetTexture(62100 + Player.Object.ClassJob.Id, out var jobTexture);
+
+        if (HasJob)
+        {
+            width += height + ImGui.GetStyle().ItemSpacing.X;
         }
 
         ImGuiHelper.DrawItemMiddle(() =>
         {
+            if (HasJob)
+            {
+                ImGui.Image(jobTexture.ImGuiHandle, Vector2.One * height);
+                ImGui.SameLine();
+            }
+
             var territories = _territories ?? [];
             var index = Array.IndexOf(territories, rightTerritory);
             if (ImGuiHelper.SelectableCombo("##Choice the specific dungeon", [.. territories.Select(GetName)], ref index, imFont, ImGuiColors.DalamudYellow))
@@ -77,7 +101,7 @@ private static void DrawTerritoryHeader()
         static string GetName(TerritoryType? territory)
         {
             var str = territory?.ContentFinderCondition?.Value?.Name?.RawString;
-            if (string.IsNullOrEmpty(str)) str = territory?.Name?.RawString;
+            if (string.IsNullOrEmpty(str)) str = territory?.PlaceName?.Value?.Name?.RawString;
             if (string.IsNullOrEmpty(str)) return "Unnamed Territory";
             return str;
         }

diff --git a/ActionTimelineEx/Windows/RotationHelperWindow.cs b/ActionTimelineEx/Windows/RotationHelperWindow.cs
@@ -46,7 +46,7 @@ private static void DrawContent()
         var spacing = Plugin.Settings.IconSpacing;
         var drawList = ImGui.GetWindowDrawList();
 
-        var pos = ImGui.GetWindowPos() + new Vector2(0, ImGui.GetWindowSize().Y / 2 - gcdHeight / 2);
+        var pos = ImGui.GetWindowPos() + new Vector2(gcdHeight * 0.2f, ImGui.GetWindowSize().Y / 2 - gcdHeight / 2);
         var maxX = pos.X + ImGui.GetWindowSize().X;
 
         bool isFirst = true;

diff --git a/ECommons b/ECommons
diff --git a/XIVConfigUI b/XIVConfigUI
+3 −0		ECommons/GameHelpers/Player.cs
+3 −0		ECommons/Reflection/FieldPropertyUnion/IFieldPropertyUnion.cs
+3 −0		ECommons/Reflection/FieldPropertyUnion/UnionField.cs
+2 −0		ECommons/Reflection/FieldPropertyUnion/UnionProperty.cs
+3 −0		ECommons/Reflection/ReflectionHelper/Utils.cs
+21 −0		ECommons/Singletons/PriorityAttribute.cs
+47 −22		ECommons/Singletons/SingletonServiceManager.cs
+18 −0		ECommons/UIHelpers/AddonMasterImplementations/JournalDetail.cs
+10 −1		ECommons/UIHelpers/AddonMasterImplementations/MateriaAttachDialog.cs
+14 −2		ECommons/UIHelpers/AddonMasterImplementations/SalvageDialog.cs
+14 −1		ECommons/UIHelpers/AddonMasterImplementations/SelectIconString.cs
+4 −0		ECommons/UIHelpers/AddonMasterImplementations/SelectYesno.cs
+7 −0		XIVConfigUI/Attributes/ListUIAttribute.cs
+3 −4		XIVConfigUI/ConditionConfigs/ConditionDrawer.cs
+33 −12		XIVConfigUI/ImGuiHelper.cs
+19 −8		XIVConfigUI/ImageLoader.cs