Update experience bar width & add 2 new colors for exp/rested

una-xiv · Aug 10, 2024 · a91dde1 · a91dde1
1 parent 24490d3
commit a91dde1
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 14 deletions.
diff --git a/Umbra/i18n/de.json b/Umbra/i18n/de.json
diff --git a/Umbra/i18n/en.json b/Umbra/i18n/en.json
diff --git a/Umbra/i18n/fr.json b/Umbra/i18n/fr.json
diff --git a/Umbra/i18n/ja.json b/Umbra/i18n/ja.json
diff --git a/Umbra/i18n/zh.json b/Umbra/i18n/zh.json
diff --git a/Umbra/src/Toolbar/Widgets/Library/ExperienceBar/ExperienceBarWidget.Config.cs b/Umbra/src/Toolbar/Widgets/Library/ExperienceBar/ExperienceBarWidget.Config.cs
@@ -60,12 +60,18 @@ protected override IEnumerable<IWidgetConfigVariable> GetConfigVariables()
                 I18N.Translate("Widget.ExperienceBar.Config.ShowLevelSyncIcon.Description"),
                 true
             ) { Category = I18N.Translate("Widget.ConfigCategory.WidgetAppearance") },
+            new BooleanWidgetConfigVariable(
+                "ShowPreciseExperience",
+                I18N.Translate("Widget.ExperienceBar.Config.ShowPreciseExperience.Name"),
+                I18N.Translate("Widget.ExperienceBar.Config.ShowPreciseExperience.Description"),
+                true
+            ) { Category = I18N.Translate("Widget.ConfigCategory.WidgetAppearance") },
             new IntegerWidgetConfigVariable(
                 "WidgetWidth",
                 I18N.Translate("Widget.ExperienceBar.Config.WidgetWidth.Name"),
                 I18N.Translate("Widget.ExperienceBar.Config.WidgetWidth.Description"),
                 100,
-                25,
+                30,
                 500
             ) { Category = I18N.Translate("Widget.ConfigCategory.WidgetAppearance") },
             new IntegerWidgetConfigVariable(

diff --git a/Umbra/src/Toolbar/Widgets/Library/ExperienceBar/ExperienceBarWidget.Stylesheet.cs b/Umbra/src/Toolbar/Widgets/Library/ExperienceBar/ExperienceBarWidget.Stylesheet.cs
@@ -80,7 +80,7 @@ internal partial class ExperienceBarWidget : ToolbarWidget
                     Color        = new("Widget.Text"),
                     OutlineColor = new("Widget.TextOutline"),
                     OutlineSize  = 1,
-                    Size         = new(150, SafeHeight),
+                    Size         = new(0, SafeHeight),
                     TextOverflow = false,
                     WordWrap     = false,
                     Padding      = new(0, 4),
@@ -112,15 +112,14 @@ internal partial class ExperienceBarWidget : ToolbarWidget
                 ".bar.normal",
                 new() {
                     Anchor          = Anchor.MiddleLeft,
-                    BackgroundColor = new("Window.AccentColor"),
+                    BackgroundColor = new("Misc.ExperienceBar"),
                 }
             ),
             new(
                 ".bar.rested",
                 new() {
                     Anchor          = Anchor.MiddleLeft,
-                    BackgroundColor = new("Window.AccentColor"),
-                    Opacity         = 0.33f,
+                    BackgroundColor = new("Misc.ExperienceBarRested"),
                 }
             ),
             new(

diff --git a/Umbra/src/Toolbar/Widgets/Library/ExperienceBar/ExperienceBarWidget.cs b/Umbra/src/Toolbar/Widgets/Library/ExperienceBar/ExperienceBarWidget.cs
@@ -50,7 +50,10 @@ protected override void OnUpdate()
         }
 
         SanctuaryIconNode.Style.IsVisible = GetConfigValue<bool>("ShowSanctuaryIcon") && Player.IsInSanctuary;
-        SyncIconNode.Style.IsVisible      = GetConfigValue<bool>("ShowLevelSyncIcon") && Player.SyncedLevel > 0 && Player.SyncedLevel != Player.Level;
+
+        SyncIconNode.Style.IsVisible = GetConfigValue<bool>("ShowLevelSyncIcon")
+            && Player.SyncedLevel > 0
+            && Player.SyncedLevel != Player.Level;
 
         Node.Style.IsVisible     = true;
         Node.Tooltip             = GetTooltipText();
@@ -59,6 +62,15 @@ protected override void OnUpdate()
 
         LeftLabelNode.Style.TextOffset  = new(0, GetConfigValue<int>("TextYOffset"));
         RightLabelNode.Style.TextOffset = new(0, GetConfigValue<int>("TextYOffset"));
+        RightLabelNode.Style.FontSize   = GetConfigValue<bool>("ShowPreciseExperience") ? 11 : 13;
+
+        int fullWidth = GetConfigValue<int>("WidgetWidth")
+            - 12
+            - ((SyncIconNode.Style.IsVisible ?? true) || (SanctuaryIconNode.Style.IsVisible ?? true) ? 20 : 0);
+
+        int leftWidth = LeftLabelNode.InnerWidth;
+
+        RightLabelNode.Style.Size = new(fullWidth - (int)(leftWidth / Una.Drawing.Node.ScaleFactor) - 4, SafeHeight);
 
         UpdateVisualBars();
     }
@@ -77,6 +89,10 @@ private string GetExpString()
     {
         if (!GetConfigValue<bool>("ShowExperience")) return "";
 
+        if (GetConfigValue<bool>("ShowPreciseExperience")) {
+            return GetPreciseExperienceString();
+        }
+
         var xpPercent = Player.CurrentExperience / (float)Player.TotalRequiredExperience * 100;
         return $"{xpPercent:0.0}%";
     }
@@ -90,10 +106,7 @@ private void UpdateVisualBars()
         int  maxWidth    = barWidth - 8;
         int  normalWidth = (int)(maxWidth * (Player.CurrentExperience / (float)(Player.TotalRequiredExperience)));
         uint restedXp    = Math.Min(Player.RestedExperience, Player.TotalRequiredExperience);
-
-        int restedWidth = Math.Abs(
-            (int)(maxWidth * (restedXp / (float)(Player.TotalRequiredExperience))) - normalWidth
-        );
+        int  restedWidth = Math.Min(maxWidth - normalWidth, (int)(maxWidth * (restedXp / (float)(Player.TotalRequiredExperience))));
 
         Node.Style.Size = new(barWidth, SafeHeight);
 
@@ -118,14 +131,16 @@ private void UpdateVisualBars()
 
     private string? GetTooltipText()
     {
-        if (Player.IsMaxLevel) return null;
+        return Player.IsMaxLevel ? null : $"{I18N.Translate("Experience")}: {GetPreciseExperienceString()}";
+    }
 
-        // Add decimals to the values.
+    private string GetPreciseExperienceString()
+    {
         string currentXpStr = Player.CurrentExperience.ToString("N0");
         string neededXpStr  = Player.TotalRequiredExperience.ToString("N0");
         string restedXpStr  = Player.RestedExperience.ToString("N0");
         string restedStr    = Player.RestedExperience > 0 ? $" - {I18N.Translate("Rested")}: {restedXpStr}" : "";
 
-        return $"{I18N.Translate("Experience")}: {currentXpStr} / {neededXpStr}{restedStr}";
+        return $"{currentXpStr} / {neededXpStr}{restedStr}";
     }
 }
diff --git a/Umbra/src/Toolbar/Widgets/Library/GearsetSwitcher/GearsetNode.Stylesheet.cs b/Umbra/src/Toolbar/Widgets/Library/GearsetSwitcher/GearsetNode.Stylesheet.cs
@@ -135,7 +135,7 @@ internal partial class GearsetNode
                 new() {
                     Anchor          = Anchor.TopLeft,
                     Size            = new(0, 1),
-                    BackgroundColor = new("Window.AccentColor"),
+                    BackgroundColor = new("Misc.ExperienceBar"),
                     BorderRadius    = 3,
                     IsAntialiased   = false,
                 }

diff --git a/Umbra/src/Umbra.Colors.cs b/Umbra/src/Umbra.Colors.cs
@@ -373,6 +373,8 @@ public static void RegisterDefaultColors()
         Color.AssignByName("Role.MagicalRangedDps",               0xAF2E3069);
         Color.AssignByName("Role.Crafter",                        0xAFA72A5A);
         Color.AssignByName("Role.Gatherer",                       0xAF2C89A6);
+        Color.AssignByName("Misc.ExperienceBar",                  0xFF4c8eb9);
+        Color.AssignByName("Misc.ExperienceBarRested",            0xFFb98e4c);
     }
 
     private static void OnConfigProfileChanged(string _)