Skip to content
This repository was archived by the owner on Jan 21, 2024. It is now read-only.

Commit 82cd71f

Browse files
committed
switch to global color values instead of Neuron local ones
1 parent 240db64 commit 82cd71f

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

Neuron-DB-Defaults.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ local genericStatusBtnData= {
106106

107107
bordercolor = "1;1;1;1",
108108

109-
norestColor = "1;0;1;1",
110-
restColor = "0;0;1;1",
111-
112109
castColor = "1;0.7;0;1",
113110
channelColor = "0;1;0;1",
114111
successColor = "0;1;0;1",

Objects/STATUSBTN.lua

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,9 @@ function STATUSBTN:xpstrings_Update() --handles updating all the strings for the
171171
if azeriteItemLocation then
172172
currXP, nextXP = C_AzeriteItem.GetAzeriteItemXPInfo(azeriteItemLocation)
173173
restedXP = "0".." "..L["Levels"]
174-
percentXP = string.format("%.2f", (currXP/nextXP)*100).."%" --format
175-
bubbles = tostring(math.floor(percentXP/5)).." / 20 "..L["Bubbles"]
174+
local percent = (currXP/nextXP)*100
175+
percentXP = string.format("%.2f", percent).."%" --format
176+
bubbles = tostring(math.floor(percent/5)).." / 20 "..L["Bubbles"]
176177
rank = L["Level"].." "..tostring(C_AzeriteItem.GetPowerLevel(azeriteItemLocation))
177178
end
178179

@@ -240,12 +241,11 @@ function STATUSBTN:XPBar_OnEvent(event, ...)
240241

241242

242243
if self.elements.SB.curXPType == "player_xp" and (event=="PLAYER_XP_UPDATE" or event =="PLAYER_ENTERING_WORLD" or event=="UPDATE_EXHAUSTION" or event =="changed_curXPType") then
243-
244244
currXP, nextXP, isRested = self:xpstrings_Update()
245245
if isRested or UnitLevel("player") == MAX_PLAYER_LEVEL then --don't show rested XP as exhausted if we are max level
246-
self.elements.SB:SetStatusBarColor(self.elements.SB.restColor[1], self.elements.SB.restColor[2], self.elements.SB.restColor[3], self.elements.SB.restColor[4])
246+
self.elements.SB:SetStatusBarColor(0.0, 0.39, 0.88, 1.0) --blue color
247247
else
248-
self.elements.SB:SetStatusBarColor(self.elements.SB.norestColor[1], self.elements.SB.norestColor[2], self.elements.SB.norestColor[3], self.elements.SB.norestColor[4])
248+
self.elements.SB:SetStatusBarColor(0.58, 0.0, 0.55, 1.0) --deep purple color
249249
end
250250
hasChanged = true;
251251
end
@@ -260,13 +260,13 @@ function STATUSBTN:XPBar_OnEvent(event, ...)
260260

261261
if self.elements.SB.curXPType == "azerite_xp" and (event =="AZERITE_ITEM_EXPERIENCE_CHANGED" or event =="PLAYER_ENTERING_WORLD" or event =="PLAYER_EQUIPMENT_CHANGED" or event =="changed_curXPType") then
262262
currXP, nextXP = self:xpstrings_Update()
263-
self.elements.SB:SetStatusBarColor(1, 1, 0) --set to yellow
263+
self.elements.SB:SetStatusBarColor(ARTIFACT_BAR_COLOR:GetRGB()) --set to pale yellow
264264
hasChanged = true
265265
end
266266

267267
if self.elements.SB.curXPType == "honor_points" and (event=="HONOR_XP_UPDATE" or event =="PLAYER_ENTERING_WORLD" or event =="changed_curXPType") then
268268
currXP, nextXP = self:xpstrings_Update()
269-
self.elements.SB:SetStatusBarColor(1, .4, .4) --set to red
269+
self.elements.SB:SetStatusBarColor(1.0, 0.24, 0) --set to red
270270
hasChanged = true
271271
end
272272

@@ -1777,9 +1777,6 @@ function STATUSBTN:SetData(bar)
17771777
self.elements.SB.rText:SetText(self.elements.SB.rFunc(self.elements.SB))
17781778
self.elements.SB.mText:SetText(self.elements.SB.mFunc(self.elements.SB))
17791779

1780-
self.elements.SB.norestColor = { (";"):split(self.config.norestColor) }
1781-
self.elements.SB.restColor = { (";"):split(self.config.restColor) }
1782-
17831780
self.elements.SB.castColor = { (";"):split(self.config.castColor) }
17841781
self.elements.SB.channelColor = { (";"):split(self.config.channelColor) }
17851782
self.elements.SB.successColor = { (";"):split(self.config.successColor) }

0 commit comments

Comments
 (0)