wow-mods/ice-hud
1
0
Fork 0
mirror of https://github.com/parnic/ice-hud.git synced 2025-06-16 14:50:13 -05:00
Code Issues Projects Releases Wiki Activity

Refactor repeated code into a function

Browse Source 
I need this for an upcoming feature, and it turns out that the "new rune just became ready" feature didn't cooperate with width-growing runes anyway, so this is also a bugfix for that (I don't know that we have any width-growing power types in the game today, but still).
This commit is contained in:
Parnic
2023-01-15 12:40:51 -06:00
parent d49884198d
commit 689df94d55
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/ClassPowerCounter.lua
View File

@ -20,7 +20,7 @@ IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
IceClassPowerCounter.prototype.unit = "player" IceClassPowerCounter.prototype.unit = "player"
IceClassPowerCounter.prototype.round = ceil IceClassPowerCounter.prototype.round = ceil
IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 } IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 }
IceClassPowerCounter.prototype.currentGrowMode = nil IceClassPowerCounter.prototype.currentGrowMode = IceClassPowerCounter.prototype.growModes["height"]
-- Constructor -- -- Constructor --
function IceClassPowerCounter.prototype:init(name) function IceClassPowerCounter.prototype:init(name)
@ -549,33 +549,14 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
end end
if i > numReady or self.numRunes == 1 then if i > numReady or self.numRunes == 1 then
local left, right, top, bottom = 0, 1, 0, 1
if self:GetRuneMode() == "Graphical" then
left, right, top, bottom = unpack(self.runeCoords[i])
end
local currPercent = percentReady - numReady local currPercent = percentReady - numReady
if self.numRunes == 1 then if self.numRunes == 1 then
currPercent = numReady / UnitPowerMax("player", self.unitPower) currPercent = numReady / UnitPowerMax("player", self.unitPower)
end end
if self.currentGrowMode == self.growModes["height"] then self:SetRuneCoords(i, currPercent)
top = bottom - (currPercent * (bottom - top))
self.frame.graphical[i].rune:SetHeight(currPercent * self.runeHeight)
elseif self.currentGrowMode == self.growModes["width"] then
right = left + (currPercent * (right - left))
self.frame.graphical[i].rune:SetWidth(currPercent * self.runeWidth)
end
self.frame.graphical[i].rune:SetTexCoord(left, right, top, bottom)
elseif i > self.lastNumReady then elseif i > self.lastNumReady then
if self.runeCoords ~= nil and #self.runeCoords >= i then self:SetRuneCoords(i, 1)
local left, right, top, bottom = 0, 1, 0, 1
if self:GetRuneMode() == "Graphical" then
left, right, top, bottom = unpack(self.runeCoords[i])
end
self.frame.graphical[i].rune:SetTexCoord(left, right, top, bottom)
self.frame.graphical[i].rune:SetHeight(self.runeHeight)
end
if self.moduleSettings.flashWhenBecomingReady then if self.moduleSettings.flashWhenBecomingReady then
local fadeInfo={ local fadeInfo={
@ -609,6 +590,27 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
end end
end end
function IceClassPowerCounter.prototype:SetRuneCoords(rune, percent)
if self.runeCoords == nil or #self.runeCoords < rune then
return
end
local left, right, top, bottom = 0, 1, 0, 1
if self:GetRuneMode() == "Graphical" then
left, right, top, bottom = unpack(self.runeCoords[rune])
end
if self.currentGrowMode == self.growModes["height"] then
top = bottom - (percent * (bottom - top))
self.frame.graphical[rune].rune:SetHeight(percent * self.runeHeight)
elseif self.currentGrowMode == self.growModes["width"] then
right = left + (percent * (right - left))
self.frame.graphical[rune].rune:SetWidth(percent * self.runeWidth)
end
self.frame.graphical[rune].rune:SetTexCoord(left, right, top, bottom)
end
function IceClassPowerCounter.prototype:HideRune(i) function IceClassPowerCounter.prototype:HideRune(i)
if self:GetRuneMode() == "Numeric" then if self:GetRuneMode() == "Numeric" then
self.frame.graphical[i].Hide() self.frame.graphical[i].Hide()

2
modules/Shards.lua
View File

@ -131,7 +131,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
self.shouldShowUnmodified = false self.shouldShowUnmodified = false
self.requiredSpec = CurrentSpec self.requiredSpec = CurrentSpec
self.currentGrowMode = nil self.currentGrowMode = self.growModes["height"]
if CurrentSpec == SPEC_WARLOCK_AFFLICTION then if CurrentSpec == SPEC_WARLOCK_AFFLICTION then
self.runeCoords = AfflictionCoords self.runeCoords = AfflictionCoords