- added a focus threat module by request

IceHUD.toc

@@ -51,6 +51,7 @@ modules\Runes.lua
 modules\TargetOfTargetHealth.lua
 modules\TargetOfTargetMana.lua
 modules\Threat.lua
+modules\FocusThreat.lua
 modules\RangeCheck.lua
 modules\MaelstromCount.lua
 modules\HungerForBlood.lua

modules/FocusThreat.lua

@@ -0,0 +1,20 @@
+local AceOO = AceLibrary("AceOO-2.0")
+
+local IceFocusThreat = AceOO.Class(IceThreat)
+
+-- constructor
+function IceFocusThreat.prototype:init()
+	IceFocusThreat.super.prototype.init(self, "FocusThreat", "focus")
+end
+
+function IceFocusThreat.prototype:GetDefaultSettings()
+	local settings = IceFocusThreat.super.prototype.GetDefaultSettings(self)
+
+	settings["side"] = IceCore.Side.Right
+	settings["offset"] = 4
+
+	return settings
+end
+
+-- Load us up
+IceHUD.IceFocusThreat = IceFocusThreat:new()

modules/Threat.lua

@@ -1,5 +1,5 @@
 --[[
-Name: IHUD_Threat
+Name: IceThreat
 Version: 1.2
 Author: Caryna/Turalyon EU (Alliance) (updated for Threat-2.0 by 'acapela' of WoWI and merged into IceHUD by Parnic)
 Description: adds a threat bar to IceHUD
@@ -7,15 +7,19 @@ Description: adds a threat bar to IceHUD
 
 local AceOO = AceLibrary("AceOO-2.0")
 
-local IHUD_Threat = AceOO.Class(IceUnitBar)
+IceThreat = AceOO.Class(IceUnitBar)
 
-IHUD_Threat.prototype.color = nil
+IceThreat.prototype.color = nil
-IHUD_Threat.aggroBar = nil
+IceThreat.aggroBar = nil
-IHUD_Threat.aggroBarMulti = nil
+IceThreat.aggroBarMulti = nil
 
 -- constructor
-function IHUD_Threat.prototype:init()
+function IceThreat.prototype:init(name, unit)
-	IHUD_Threat.super.prototype.init(self, "Threat", "target")
+	if not name or not unit then
+		IceThreat.super.prototype.init(self, "Threat", "target")
+	else
+		IceThreat.super.prototype.init(self, name, unit)
+	end
 
 	self:SetDefaultColor("ThreatLow", 102, 204, 51)
 	self:SetDefaultColor("ThreatMedium", 0, 204, 204)
@@ -28,8 +32,8 @@ function IHUD_Threat.prototype:init()
 end
 
 -- default settings
-function IHUD_Threat.prototype:GetDefaultSettings()
+function IceThreat.prototype:GetDefaultSettings()
-	local settings = IHUD_Threat.super.prototype.GetDefaultSettings(self)
+	local settings = IceThreat.super.prototype.GetDefaultSettings(self)
 	settings["side"] = IceCore.Side.Left
 	settings["offset"] = 4
 	settings["enabled"] = false
@@ -41,8 +45,8 @@ function IHUD_Threat.prototype:GetDefaultSettings()
 end
 
 -- options stuff
-function IHUD_Threat.prototype:GetOptions()
+function IceThreat.prototype:GetOptions()
-	local opts = IHUD_Threat.super.prototype.GetOptions(self)
+	local opts = IceThreat.super.prototype.GetOptions(self)
 
 	opts["enabled"] = {
 		type = "toggle",
@@ -121,8 +125,8 @@ function IHUD_Threat.prototype:GetOptions()
 end
 
 -- enable plugin
-function IHUD_Threat.prototype:Enable(core)
+function IceThreat.prototype:Enable(core)
-	IHUD_Threat.super.prototype.Enable(self, core)
+	IceThreat.super.prototype.Enable(self, core)
 
 	self:ScheduleRepeatingEvent(self.elementName, self.Update, 0.2, self)
 
@@ -130,26 +134,26 @@ function IHUD_Threat.prototype:Enable(core)
 end
 
 -- disable plugin
-function IHUD_Threat.prototype:Disable(core)
+function IceThreat.prototype:Disable(core)
-	IHUD_Threat.super.prototype.Disable(self, core)
+	IceThreat.super.prototype.Disable(self, core)
 
 	self:CancelScheduledEvent(self.elementName)
 end
 
 -- OVERRIDE
-function IHUD_Threat.prototype:CreateFrame()
+function IceThreat.prototype:CreateFrame()
-	IHUD_Threat.super.prototype.CreateFrame(self)
+	IceThreat.super.prototype.CreateFrame(self)
 	
 	self:CreateAggroBar()
 end
 
 -- needs to be inverted for threat bar
-function IHUD_Threat.prototype:UseTargetAlpha(scale)
+function IceThreat.prototype:UseTargetAlpha(scale)
 	return (scale and (scale > 0))
 end
 
 -- create the aggro range indicator bar
-function IHUD_Threat.prototype:CreateAggroBar()
+function IceThreat.prototype:CreateAggroBar()
 	if not (self.aggroBar) then
 		self.aggroBar = CreateFrame("StatusBar", nil, self.frame)
 	end
@@ -184,8 +188,8 @@ function IHUD_Threat.prototype:CreateAggroBar()
 end
 
 -- bar stuff
-function IHUD_Threat.prototype:Update(unit)
+function IceThreat.prototype:Update(unit)
-	IHUD_Threat.super.prototype.Update(self)
+	IceThreat.super.prototype.Update(self)
 
 	if (unit and (unit ~= self.unit)) then
 		return
@@ -200,15 +204,15 @@ function IHUD_Threat.prototype:Update(unit)
 		return
 	end
 
-	if not UnitExists("target") or not UnitCanAttack("player", "target") or UnitIsDead("target")
+	if not UnitExists(self.unit) or not UnitCanAttack("player", self.unit) or UnitIsDead(self.unit)
-		or UnitIsFriend("player", "target") or UnitPlayerControlled("target") then
+		or UnitIsFriend("player", self.unit) or UnitPlayerControlled(self.unit) then
 		self:Show(false)
 		return
 	else
 		self:Show(true)
 	end
 
-	local isTanking, threatState, scaledPercent, rawPercent = UnitDetailedThreatSituation("player", "target")
+	local isTanking, threatState, scaledPercent, rawPercent = UnitDetailedThreatSituation("player", self.unit)
 	local scaledPercentZeroToOne
 
 	if not self.combat and (scaledPercent == 0 or rawPercent == 0) then
@@ -288,4 +292,4 @@ end
 
 
 -- Load us up
-IceHUD.IHUD_Threat = IHUD_Threat:new()
+IceHUD.IceThreat = IceThreat:new()