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

- minor optimization in the threat bar

Browse Source 
- fixed threat bar to display properly again
- added support for pets to the second highest threat feature
This commit is contained in:
Parnic
2010-11-06 17:32:28 +00:00
parent 3ab6ccdb18
commit 24eb568f0b
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
modules/Threat.lua
View File

@ -211,8 +211,7 @@ end
function IceThreat.prototype:CreateSecondThreatBar() function IceThreat.prototype:CreateSecondThreatBar()
self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY") self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY")
local r, g, b = self:GetColor("ThreatSecondPlace") self.secondThreatBar.bar:SetVertexColor(self:GetColor("ThreatSecondPlace", self.alpha * self.moduleSettings.secondPlaceThreatAlpha))
self.secondThreatBar.bar:SetVertexColor(r, g, b, self.alpha)
self:SetBarCoord(self.secondThreatBar) self:SetBarCoord(self.secondThreatBar)
end end
@ -247,13 +246,21 @@ function IceThreat.prototype:Update(unit)
local secondHighestThreat = 0 local secondHighestThreat = 0
local rangeMulti = 1.1 local rangeMulti = 1.1
local scaledPercentZeroToOne local scaledPercentZeroToOne
--[[
threatState = 1
scaledPercent = 1
rawPercent = 1
scaledPercentZeroToOne = 1
isTanking = 1
tankThreat = 100
threatValue = 100
]]
if not isTanking then if not isTanking then
_, _, _, _, tankThreat = UnitDetailedThreatSituation("targettarget", self.unit) -- highest threat target of target (i.e. the tank) _, _, _, _, tankThreat = UnitDetailedThreatSituation("targettarget", self.unit) -- highest threat target of target (i.e. the tank)
elseif self.moduleSettings.displaySecondPlaceThreat then elseif self.moduleSettings.displaySecondPlaceThreat then
secondHighestThreat = self:GetSecondHighestThreat() secondHighestThreat = self:GetSecondHighestThreat()
end end
--secondHighestThreat = 75
if threatValue and threatValue < 0 then if threatValue and threatValue < 0 then
threatValue = threatValue + 410065408 -- the corrected threat while under MI or Fade threatValue = threatValue + 410065408 -- the corrected threat while under MI or Fade
if isTanking then if isTanking then
@ -300,7 +307,7 @@ function IceThreat.prototype:Update(unit)
scaledPercentZeroToOne = rawPercent / 100 scaledPercentZeroToOne = rawPercent / 100
end end
IceHUD:Debug( "isTanking="..(isTanking or "nil").." threatState="..(threatState or "nil").." scaledPercent="..(scaledPercent or "nil").." rawPercent="..(rawPercent or "nil") ) IceHUD:Debug( "isTanking="..(isTanking or "nil").." threatState="..(threatState or "nil").." scaledPercent="..(scaledPercent or "nil").." rawPercent="..(rawPercent or "nil").." threatValue="..(threatValue or "nil").." secondhighest="..(secondHighestThreat or "nil"))
end end
-- set percentage text -- set percentage text
@ -327,12 +334,12 @@ function IceThreat.prototype:Update(unit)
self:UpdateBar( scaledPercentZeroToOne, self.color ) self:UpdateBar( scaledPercentZeroToOne, self.color )
-- do the aggro indicator bar stuff, but only if it has changed -- do the aggro indicator bar stuff, but only if it has changed
--if ( self.aggroBarMulti ~= rangeMulti ) then if ( self.aggroBarMulti ~= rangeMulti ) then
self.aggroBarMulti = rangeMulti self.aggroBarMulti = rangeMulti
local pos = IceHUD:Clamp(1 - (1 / rangeMulti), 0, 1) local pos = IceHUD:Clamp(1 - (1 / rangeMulti), 0, 1)
self:SetBarCoord(self.aggroBar, pos, true) self:SetBarCoord(self.aggroBar, pos, true)
--end end
self:UpdateAlpha() self:UpdateAlpha()
self:UpdateSecondHighestThreatBar(secondHighestThreat, threatValue) self:UpdateSecondHighestThreatBar(secondHighestThreat, threatValue)
@ -342,14 +349,20 @@ function IceThreat.prototype:UpdateSecondHighestThreatBar(secondHighestThreat, t
if secondHighestThreat <= 0 or not threatValue or threatValue == 0 then if secondHighestThreat <= 0 or not threatValue or threatValue == 0 then
self.secondThreatBar:Hide() self.secondThreatBar:Hide()
else else
local r, g, b = self:GetColor("ThreatSecondPlace") local secondPercent = secondHighestThreat / threatValue
self.secondThreatBar.bar:SetVertexColor(r, g, b, self.alpha * self.moduleSettings.secondPlaceThreatAlpha) if not self.lastSecondHighestThreat or self.lastSecondHighestThreat ~= secondPercent then
self.lastSecondHighestThreat = secondPercent
local pos = IceHUD:Clamp(secondHighestThreat / threatValue, 0, 1) self.secondThreatBar.bar:SetVertexColor(self:GetColor("ThreatSecondPlace", self.alpha * self.moduleSettings.secondPlaceThreatAlpha))
if self.moduleSettings.reverse then
pos = 1-pos local pos = IceHUD:Clamp(secondPercent, 0, 1)
if self.moduleSettings.reverse then
pos = 1-pos
end
self:SetBarCoord(self.secondThreatBar, pos)
self.secondThreatBar:Show()
end end
self:SetBarCoord(self.secondThreatBar, pos)
end end
end end
@ -373,7 +386,7 @@ function IceThreat.prototype:GetSecondHighestThreat()
i = i + 1 i = i + 1
end end
elseif UnitInParty("player") then else
numMembers = GetNumPartyMembers() numMembers = GetNumPartyMembers()
while numFound < numMembers and i <= MAX_NUM_PARTY_MEMBERS do while numFound < numMembers and i <= MAX_NUM_PARTY_MEMBERS do
@ -389,6 +402,13 @@ function IceThreat.prototype:GetSecondHighestThreat()
end end
end end
if UnitExists("pet") then
local _, _, _, _, temp = UnitDetailedThreatSituation("pet", self.unit)
if temp ~= nil and temp > secondHighestThreat then
secondHighestThreat = temp
end
end
return secondHighestThreat return secondHighestThreat
end end