From 6e9ca1f29fdcc3ebc80b8e5b70ca42f1e77050a9 Mon Sep 17 00:00:00 2001
From: ewew ukek <ewewukek@gmail.com>
Date: Fri, 5 Apr 2024 00:07:00 +0000
Subject: Rename hp bar color identifiers for clarity

Continuation of https://git.themanaworld.org/mana/plus/-/merge_requests/68#note_12819

I've renamed `*_HP2` to `*_HP_BG` and updated their descriptions. I didn't touch configuration keys intentionally.

"Renamed *_HP -> *_HP_FG. Also decided to keep descriptions as is or else they become unreadable."

See merge request mana/plus!71
---
 src/gui/userpalette.cpp | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'src/gui/userpalette.cpp')

diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index ca86fbb28..8ad436a60 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -284,65 +284,66 @@ UserPalette::UserPalette() :
     addLabel(UserColorId::LABEL_HP,
         // TRANSLATORS: palette label
         _("Hp bars"));
-    addColor(UserColorId::PLAYER_HP,
+    addColor(UserColorId::PLAYER_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Player HP bar"), 50);
-    addColor(UserColorId::PLAYER_HP2,
+        _("Player HP bar"),
+        50);
+    addColor(UserColorId::PLAYER_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Player HP bar (second color)"),
+        _("Player HP bar (background)"),
         50);
-    addColor(UserColorId::MONSTER_HP,
+    addColor(UserColorId::MONSTER_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Monster HP bar"),
         50);
-    addColor(UserColorId::MONSTER_HP2,
+    addColor(UserColorId::MONSTER_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Monster HP bar (second color)"),
+        _("Monster HP bar (background)"),
         50);
-    addColor(UserColorId::HOMUN_HP,
+    addColor(UserColorId::HOMUN_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Homunculus HP bar"),
         50);
-    addColor(UserColorId::HOMUN_HP2,
+    addColor(UserColorId::HOMUN_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Homunculus HP bar (second color)"),
+        _("Homunculus HP bar (background)"),
         50);
-    addColor(UserColorId::MERC_HP,
+    addColor(UserColorId::MERC_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Mercenary HP bar"),
         50);
-    addColor(UserColorId::MERC_HP2,
+    addColor(UserColorId::MERC_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Mercenary HP bar (second color)"),
+        _("Mercenary HP bar (background)"),
         50);
 
-    addColor(UserColorId::ELEMENTAL_HP,
+    addColor(UserColorId::ELEMENTAL_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Elemental HP bar"),
         50);
-    addColor(UserColorId::ELEMENTAL_HP2,
+    addColor(UserColorId::ELEMENTAL_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Elemental HP bar (second color)"),
+        _("Elemental HP bar (background)"),
         50);
     addLabel(UserColorId::LABEL_HITS,
         // TRANSLATORS: palette label
-- 
cgit v1.2.3-70-g09d2