Merge pull request #70 from lichie567/develop

fix maxhitname and add color selector for limit break
lichie567 · Jul 21, 2024 · 2356548 · 2356548
2 parents 5c94a5a + 7f36253
commit 2356548
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/LMeter/ACT/DataStructures/Combatant.cs b/LMeter/ACT/DataStructures/Combatant.cs
@@ -122,6 +122,9 @@ public class Combatant : IActData<Combatant>
     [JsonProperty("maxhit")]
     public string MaxHit { get; set; } = string.Empty;
 
+    [JsonProperty("MAXHIT")]
+    private string _maxHit { get; set; } = string.Empty;
+
     [TextTag]
     public LazyString<string?> MaxHitName { get; set; }
 

diff --git a/LMeter/Config/BarColorsConfig.cs b/LMeter/Config/BarColorsConfig.cs
@@ -100,35 +100,34 @@ public void DrawConfig(Vector2 size, float padX, float padY, bool border = true)
                 DrawHelpers.DrawColorSelector("WAR", ref this.WARColor);
                 DrawHelpers.DrawColorSelector("DRK", ref this.DRKColor);
                 DrawHelpers.DrawColorSelector("GNB", ref this.GNBColor);
+
                 ImGui.NewLine();
-
                 DrawHelpers.DrawColorSelector("SCH", ref this.SCHColor);
                 DrawHelpers.DrawColorSelector("WHM", ref this.WHMColor);
                 DrawHelpers.DrawColorSelector("AST", ref this.ASTColor);
                 DrawHelpers.DrawColorSelector("SGE", ref this.SGEColor);
-                ImGui.NewLine();
 
+                ImGui.NewLine();
                 DrawHelpers.DrawColorSelector("MNK", ref this.MNKColor);
                 DrawHelpers.DrawColorSelector("NIN", ref this.NINColor);
                 DrawHelpers.DrawColorSelector("DRG", ref this.DRGColor);
                 DrawHelpers.DrawColorSelector("SAM", ref this.SAMColor);
                 DrawHelpers.DrawColorSelector("RPR", ref this.RPRColor);
                 DrawHelpers.DrawColorSelector("VPR", ref this.VPRColor);
-                ImGui.NewLine();
 
+                ImGui.NewLine();
                 DrawHelpers.DrawColorSelector("BRD", ref this.BRDColor);
                 DrawHelpers.DrawColorSelector("MCH", ref this.MCHColor);
                 DrawHelpers.DrawColorSelector("DNC", ref this.DNCColor);
-                ImGui.NewLine();
 
+                ImGui.NewLine();
                 DrawHelpers.DrawColorSelector("BLM", ref this.BLMColor);
                 DrawHelpers.DrawColorSelector("SMN", ref this.SMNColor);
                 DrawHelpers.DrawColorSelector("RDM", ref this.RDMColor);
                 DrawHelpers.DrawColorSelector("PCT", ref this.PCTColor);
                 DrawHelpers.DrawColorSelector("BLU", ref this.BLUColor);
 
                 ImGui.NewLine();
-
                 DrawHelpers.DrawColorSelector("GLA", ref this.GLAColor);
                 DrawHelpers.DrawColorSelector("MRD", ref this.MRDColor);
                 DrawHelpers.DrawColorSelector("CNJ", ref this.CNJColor);
@@ -138,6 +137,9 @@ public void DrawConfig(Vector2 size, float padX, float padY, bool border = true)
                 DrawHelpers.DrawColorSelector("ARC", ref this.ARCColor);
                 DrawHelpers.DrawColorSelector("THM", ref this.THMColor);
                 DrawHelpers.DrawColorSelector("ACN", ref this.ACNColor);
+
+                ImGui.NewLine();
+                DrawHelpers.DrawColorSelector("Limit Break", ref this.UKNColor);
             }
 
             ImGui.EndChild();

diff --git a/LMeter/LMeter.csproj b/LMeter/LMeter.csproj
@@ -10,9 +10,9 @@
     <!-- Assembly Configuration -->
     <PropertyGroup>
         <AssemblyName>LMeter</AssemblyName>
-        <AssemblyVersion>0.4.0.1</AssemblyVersion>
-        <FileVersion>0.4.0.1</FileVersion>
-        <InformationalVersion>0.4.0.1</InformationalVersion>
+        <AssemblyVersion>0.4.0.2</AssemblyVersion>
+        <FileVersion>0.4.0.2</FileVersion>
+        <InformationalVersion>0.4.0.2</InformationalVersion>
     </PropertyGroup>
 
     <!-- Build Configuration -->

diff --git a/LMeter/Plugin.cs b/LMeter/Plugin.cs
@@ -17,7 +17,7 @@ public class Plugin : IDalamudPlugin
     {
         public const string ConfigFileName = "LMeter.json";
 
-        public static string Version { get; private set; } = "0.4.0.1";
+        public static string Version { get; private set; } = "0.4.0.2";
         public static string ConfigFileDir { get; private set; } = "";
         public static string ConfigFilePath { get; private set; } = "";
         public static string AssemblyFileDir { get; private set; } = "";

diff --git a/LMeter/changelog.md b/LMeter/changelog.md
@@ -1,3 +1,7 @@
+# Version 0.4.0.2
+- Fix issue with maxhitname text tag
+- Added bar color selector for Limit Break
+
 # Version 0.4.0.1
 - Fix bug causing many numbers to show 0
 

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.0.1")]
-[assembly: AssemblyFileVersion("0.4.0.1")]
+[assembly: AssemblyVersion("0.4.0.2")]
+[assembly: AssemblyFileVersion("0.4.0.2")]