fix: fixed some bugs.

.github/workflows/release-please.yml

@@ -43,20 +43,12 @@ jobs:
                                
       - name: Build Plugin
         run: |
-          invoke-expression 'dotnet build --no-restore --configuration Release RotationSolver'
+          invoke-expression 'dotnet build --no-restore --configuration Release ActionTimelineEx'
            
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
-          path: .\RotationSolver\bin\Release\net7.0-windows\RotationSolver\
-
-      - name: publish on version change
-        id: publish_nuget
-        uses: alirezanet/[email protected]
-        with:
-          PROJECT_FILE_PATH: RotationSolver.Basic/RotationSolver.Basic.csproj
-          VERSION_FILE_PATH: Directory.Build.props
-          NUGET_KEY: ${{secrets.nuget_api_key}}
+          path: .\ActionTimelineEx\bin\Release\net7.0-windows\ActionTimelineEx\
 
   release:
     name: release

ActionTimelineEx/Configurations/DrawingSettings.cs

@@ -41,6 +41,9 @@ public class DrawingSettings
     public Vector4 BackgroundColor = new Vector4(0.5f, 0.5f, 0.5f, 0.5f);
     public Vector4 GCDBorderColor = new Vector4(0.9f, 0.9f, 0.9f, 1f);
     public float GCDThickness = 1.5f;
+    public float GCDHeightLow = 0.5f;
+    public float GCDHeightHigh = 0.8f;
+    public float GCDRound = 2;
 
     public Vector4 CastInProgressColor = new Vector4(0.2f, 0.8f, 0.2f, 1f);
     public Vector4 CastFinishedColor = new Vector4(0.5f, 0.5f, 0.5f, 1f);
@@ -50,7 +53,7 @@ public class DrawingSettings
     public Vector4 AnimationLockColor = new Vector4(0.8f, 0.7f, 0.6f, 1f);
 
     public bool ShowStatusLine = true;
-    public float StatusLineSize = 24;
+    public float StatusLineSize = 18;
 
     public bool ShowGrid = true;
     public bool ShowGridCenterLine = false;
@@ -59,9 +62,11 @@ public class DrawingSettings
     public bool GridSubdivideSeconds = true;
     public int GridSubdivisionCount = 2;
     public float GridLineWidth = 1;
+    public float GridCenterLineWidth = 0.1f;
     public float GridStartLineWidth = 3;
     public float GridSubdivisionLineWidth = 1;
     public Vector4 GridLineColor = new Vector4(0.3f, 0.3f, 0.3f, 1f);
+    public Vector4 GridCenterLineColor = new Vector4(0.5f, 0.5f, 0.5f, 0.3f);
     public Vector4 GridStartLineColor = new Vector4(0.3f, 0.5f, 0.2f, 1f);
     public Vector4 GridSubdivisionLineColor = new Vector4(0.3f, 0.3f, 0.3f, 0.2f);
 

ActionTimelineEx/Configurations/Settings.cs

@@ -9,9 +9,9 @@ public class Settings : IPluginConfiguration
 {
     public bool ShowTimelineOnlyInDuty = false;
     public bool ShowTimelineOnlyInCombat = false;
-    public float StatusCheckDelay = 0.1f;
+    //public float StatusCheckDelay = 0.1f;
     public DrawingSettings TimelineSetting = new DrawingSettings();
-
+    public HashSet<ushort> HideStatusIds = new HashSet<ushort>();
     public int Version { get; set; } = 6;
 
     public void Save()

ActionTimelineEx/Plugin.cs

@@ -19,6 +19,8 @@ public class Plugin : IDalamudPlugin
 
         { 10155, 1 }, //PLD Fight or Flight.
 
+        { 12556, 1 }, //WAR Inner Strength.
+
         { 17926, 1 }, //DRK Blood Weapon.
 
         { 13601, 1 }, //GNB No mercy.
@@ -93,9 +95,33 @@ public void Dispose()
     }
 
     [Cmd("/atl", "Opens the ActionTimeline configuration window.")]
+    [SubCmd("lock", "Lock all windows")]
+    [SubCmd("unlock", "Unlock all windows")]
     private void PluginCommand(string command, string arguments)
     {
-        _settingsWindow.IsOpen = !_settingsWindow.IsOpen;
+        var sub = arguments.Split(' ').FirstOrDefault();
+        if(string.Equals("unlock", sub, StringComparison.OrdinalIgnoreCase))
+        {
+            foreach (var window in _windowSystem.Windows)
+            {
+                if (window is not TimelineWindow tWindow) continue;
+
+                tWindow.Setting.Locked = false;
+            }
+        }
+        else if (string.Equals("lock", sub, StringComparison.OrdinalIgnoreCase))
+        {
+            foreach (var window in _windowSystem.Windows)
+            {
+                if (window is not TimelineWindow tWindow) continue;
+
+                tWindow.Setting.Locked = true;
+            }
+        }
+        else
+        {
+            _settingsWindow.IsOpen = !_settingsWindow.IsOpen;
+        }
     }
 
     private void CreateWindows()

ActionTimelineEx/Timeline/ActionControlCategory.cs

@@ -0,0 +1,21 @@
+namespace ActionTimelineEx.Timeline;
+
+/// <summary>
+/// From https://github.com/Kouzukii/ffxiv-deathrecap/blob/master/Game/ActorControlCategory.cs
+/// </summary>
+public enum ActorControlCategory : ushort
+{
+    Death = 0x6,
+    CancelAbility = 0xF,
+    GainEffect = 0x14,
+    LoseEffect = 0x15,
+    UpdateEffect = 0x16,
+    TargetIcon = 0x22,
+    Tether = 0x23,
+    Targetable = 0x36,
+    DirectorUpdate = 0x6D,
+    SetTargetSign = 0x1F6,
+    LimitBreak = 0x1F9,
+    HoT = 0x603,
+    DoT = 0x604
+}

ActionTimelineEx/Timeline/StatusLineItem.cs

@@ -34,7 +34,7 @@ public void DrawItemWithCenter(Vector2 centerPos, Vector2 windowPos, DrawingSett
 
         var statusHeight = setting.StatusLineSize;
         var flag = ImDrawFlags.RoundCornersAll;
-        var rounding = 2;
+        var rounding = setting.GCDRound;
 
         TextureWrap? texture = DrawHelper.GetTextureFromIconId(Icon);
         if (texture == null) return;

ActionTimelineEx/Timeline/TimelineItem.cs

@@ -127,9 +127,9 @@ private void DrawItemWithCenter(ImDrawListPtr drawList, Vector2 centerPos, Vecto
 
             case TimelineLayer.General:
                 //Get Info.
-                float highPos = 0.5f;
-                float lowPos = 0.8f;
-                float rounding = 2f;
+                float highPos = setting.GCDHeightLow;
+                float lowPos = setting.GCDHeightHigh;
+                float rounding = setting.GCDRound;
 
                 var leftTop = new Vector2(centerPos.X, centerPos.Y - iconSize / 2 + highPos * iconSize);
                 var leftBottom = new Vector2(centerPos.X, centerPos.Y - iconSize / 2 + lowPos * iconSize);