Restored Shaman color checkbox

rgd87 · Nov 29, 2023 · 149f579 · 149f579
1 parent 21540ba
commit 149f579
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/Aptechka.lua b/Aptechka.lua
@@ -190,6 +190,7 @@ local defaults = {
         debuffTooltip_bindCtrl = true,
         useDebuffOrdering = true, -- On always?
         customDebuffHighlights = {},
+        forceShamanColor = true,
         borderWidth = 1,
         enableProfileSwitching = true,
         profileSelection = {
@@ -319,6 +320,16 @@ function Aptechka.PLAYER_LOGIN(self,event,arg1)
     self.db = LibStub("AceDB-3.0"):New("AptechkaDB_Global", defaults, "Default") -- Create a DB using defaults and using a shared default profile
     AptechkaDB = self.db
 
+    if apiLevel == 1 and self.db.global.forceShamanColor and not CUSTOM_CLASS_COLORS then
+        customColors = {
+            SHAMAN = {
+                b=0.86666476726532,
+                g=0.4392147064209,
+                r=0,
+            }
+        }
+    end
+
     -- CUSTOM_CLASS_COLORS is from phanx's ClassColors addons
     colors = setmetatable(customColors or {},{ __index = function(t,k) return (CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[k] end })
 
@@ -342,7 +353,6 @@ function Aptechka.PLAYER_LOGIN(self,event,arg1)
     self.db.RegisterCallback(self, "OnProfileCopied", "Reconfigure")
     self.db.RegisterCallback(self, "OnProfileReset", "Reconfigure")
 
-
     local customBlacklist = AptechkaDB.global.customBlacklist
     blacklist = setmetatable({}, {
         __index = function(t,k)

diff --git a/Options/GlobalSettings.lua b/Options/GlobalSettings.lua
@@ -58,7 +58,7 @@ function ns.MakeGlobalSettings()
                         order = 8.3,
                     },
                     singleHeaderMode = {
-                        name = L"Merge Groups"..newFeatureIcon,
+                        name = L"Merge Groups",
                         desc = L"Lose distinction between groups, but sorting will work across the whole raid",
                         width = "full",
                         type = "toggle",
@@ -243,8 +243,22 @@ function ns.MakeGlobalSettings()
                             Aptechka:UpdateDebuffScanningMethod()
                         end
                     },
+                    forceShamanColor = {
+                        name = "Retail Shaman Color",
+                        desc = "Use the usual blue color for shamans. Overriden by ClassColors addon if present",
+                        type = "toggle",
+                        disabled = APILevel > 1,
+                        confirm = true,
+						confirmText = "Warning: Requires UI reloading.",
+                        get = function(info) return Aptechka.db.global.forceShamanColor end,
+                        set = function(info, v)
+                            Aptechka.db.global.forceShamanColor = not Aptechka.db.global.forceShamanColor
+                            ReloadUI()
+                        end,
+                        order = 15.8,
+                    },
                     enableRoles = {
-                        name = L"Display Roles"..newFeatureIcon,
+                        name = L"Display Roles",
                         desc = L"Disable role icons for WotLK",
                         type = "toggle",
                         width = "full",
@@ -255,8 +269,9 @@ function ns.MakeGlobalSettings()
                             Aptechka:PrintReloadUIWarning()
                         end
                     },
+                    --[[
                     useHealComm = {
-                        name = L"Use LibHealComm"..newFeatureIcon,
+                        name = L"Use LibHealComm",
                         desc = L"Gives hots in incoming healing, may cause errors",
                         type = "toggle",
                         disabled = not isClassic,
@@ -267,7 +282,7 @@ function ns.MakeGlobalSettings()
                             Aptechka.db.global.useHealComm = not Aptechka.db.global.useHealComm
                             Aptechka:PrintReloadUIWarning()
                         end
-                    },
+                    },]]
                     useCLH = {
                         name = L"Use LibCLHealth",
                         desc = L"More frequent health updates based combat log",