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

- fixed custom bars not monitoring weapon enchants/poisons correctly

Browse Source 
- fixed custom bars and cooldown bars drawing at full alpha at all times
This commit is contained in:
Parnic
2010-12-24 08:13:43 +00:00
parent 8d68276ade
commit 74869ce924
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/CustomBar.lua
View File

@ -536,7 +536,7 @@ function IceCustomBar.prototype:GetOptions()
end end
function IceCustomBar.prototype:GetBarColor() function IceCustomBar.prototype:GetBarColor()
return self.moduleSettings.barColor.r, self.moduleSettings.barColor.g, self.moduleSettings.barColor.b, 1 return self.moduleSettings.barColor.r, self.moduleSettings.barColor.g, self.moduleSettings.barColor.b, self.alpha
end end
-- 'Protected' methods -------------------------------------------------------- -- 'Protected' methods --------------------------------------------------------
@ -547,11 +547,19 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
= GetWeaponEnchantInfo() = GetWeaponEnchantInfo()
if unitName == "main hand weapon" and hasMainHandEnchant then if unitName == "main hand weapon" and hasMainHandEnchant then
local duration =
(self.auraDuration == nil or (mainHandExpiration/1000) > self.auraDuration) and (mainHandExpiration/1000)
or self.auraDuration
local slotId, mainHandTexture = GetInventorySlotInfo("MainHandSlot") local slotId, mainHandTexture = GetInventorySlotInfo("MainHandSlot")
return mainHandExpiration/1000, mainHandExpiration/1000, mainHandCharges, GetInventoryItemTexture("player", slotId) return duration, mainHandExpiration/1000, mainHandCharges, GetInventoryItemTexture("player", slotId)
elseif unitName == "off hand weapon" and hasOffHandEnchant then elseif unitName == "off hand weapon" and hasOffHandEnchant then
local duration =
(self.auraDuration == nil or (offHandExpiration/1000) > self.auraDuration) and (offHandExpiration/1000)
or self.auraDuration
local slotId, offHandTexture = GetInventorySlotInfo("SecondaryHandSlot") local slotId, offHandTexture = GetInventorySlotInfo("SecondaryHandSlot")
return offHandExpiration/1000, offHandExpiration/1000, offHandCharges, GetInventoryItemTexture("player", slotId) return duration, offHandExpiration/1000, offHandCharges, GetInventoryItemTexture("player", slotId)
end end
return nil return nil

2
modules/CustomCDBar.lua
View File

@ -397,7 +397,7 @@ function IceCustomCDBar.prototype:GetOptions()
name = L["Upper Text Color"], name = L["Upper Text Color"],
get = function() get = function()
self:FixupTextColors() self:FixupTextColors()
return self.moduleSettings.upperTextColor.r, self.moduleSettings.upperTextColor.g, self.moduleSettings.upperTextColor.b, 1 return self.moduleSettings.upperTextColor.r, self.moduleSettings.upperTextColor.g, self.moduleSettings.upperTextColor.b, self.alpha
end, end,
set = function(info, r,g,b) set = function(info, r,g,b)
self.moduleSettings.upperTextColor.r = r self.moduleSettings.upperTextColor.r = r