mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 14:50:13 -05:00
Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
dd3371c22c | |||
7e65e506c5 | |||
ce1558a18e | |||
49f8a6c6b2 | |||
d9bd5e3f36 | |||
151e54746f | |||
d7505b73b1 | |||
f10a647590 | |||
54bd441f16 | |||
4a7212fc00 | |||
e6f87b52bb | |||
d38c32cf34 |
@ -6,9 +6,9 @@
|
||||
## Version: @project-version@
|
||||
## SavedVariables: IceCoreDB
|
||||
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
|
||||
## X-Compatible-With: 60200
|
||||
## X-Compatible-With: 70000
|
||||
## X-Category: HUDs
|
||||
## X-Website: http://www.wowace.com/addons/ice-hud/
|
||||
## X-Website: https://www.wowace.com/projects/ice-hud
|
||||
## X-WoWI-ID: 8149
|
||||
|
||||
#@no-lib-strip@
|
||||
|
@ -1,4 +1,4 @@
|
||||
## Interface: 70000
|
||||
## Interface: 70100
|
||||
## Title: IceHUD |cff7fff7f-Options-|r
|
||||
## Author: Parnic
|
||||
## Version: @project-version@
|
||||
|
@ -112,7 +112,7 @@ function IceStackCounter_GetMaxCount(frame)
|
||||
local _, max = GetSpellCharges(frame.moduleSettings.auraName)
|
||||
return max or 1
|
||||
else
|
||||
return frame.moduleSettings.maxCount
|
||||
return tonumber(frame.moduleSettings.maxCount)
|
||||
end
|
||||
end
|
||||
|
||||
@ -130,7 +130,6 @@ function IceStackCounter_Enable(frame)
|
||||
frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
|
||||
frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
|
||||
frame:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
|
||||
frame:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateCustomCount")
|
||||
frame:RegisterEvent("PLAYER_DEAD", "UpdateCustomCount")
|
||||
frame:RegisterEvent("SPELL_UPDATE_CHARGES", "UpdateCustomCount")
|
||||
|
||||
@ -171,5 +170,9 @@ function IceStackCounter_GetCount(frame)
|
||||
end
|
||||
|
||||
function IceStackCounter_UseTargetAlpha(frame)
|
||||
return frame.lastPoints ~= nil and frame.lastPoints > 0
|
||||
if frame.moduleSettings.auraType == "charges" then
|
||||
return IceStackCounter_GetCount(frame) ~= IceStackCounter_GetMaxCount(frame) or frame.target or frame.combat
|
||||
else
|
||||
return frame.lastPoints ~= nil and frame.lastPoints > 0
|
||||
end
|
||||
end
|
||||
|
@ -1,3 +1,19 @@
|
||||
v1.10.13:
|
||||
- Fixed alpha settings for spell charges on custom counter bars and stack counters to treat "full" the same way a Mana or Health bar would. Previously these treated "full" as "empty" for charges because that's how buff/debuff stacking should work (ticket #231).
|
||||
- Fixed custom counters in numeric mode not hiding the count properly.
|
||||
|
||||
v1.10.12:
|
||||
- Tweaked a few Druid CCs in the CC modules. If you've got a more up-to-date list of any of the CCs, please send them along to icehud@parnic.com
|
||||
- Fixed a problem that could cause a custom counter to loop forever and cause framerate problems. (ticket #230)
|
||||
- Updated default text values for Health and Mana modules to show values in shortened form so they're more readable. Anyone who has customized their text will not be affected by this change and the shortened form only kicks in once values reach 10,000.
|
||||
|
||||
v1.10.11:
|
||||
- Updated TOC for IceHUD_Options module
|
||||
- Fixed custom stack counters in graphical mode tracking spell charges failing to update when the maximum number of charges changes (such as with a talented 2-charge Demon Hunter Throw Glaive)
|
||||
|
||||
v1.10.10.1:
|
||||
- Fixed the old energy ticker showing up in 7.1.
|
||||
|
||||
v1.10.10:
|
||||
- Updated TOC for 7.1
|
||||
- Re-enabled PlayerAbsorb by default by popular demand.
|
||||
|
@ -296,6 +296,11 @@ function IceCustomCount.prototype:Enable(core)
|
||||
self:UpdateCustomCount()
|
||||
end
|
||||
|
||||
function IceCustomCount.prototype:TargetChanged()
|
||||
IceCustomCount.super.prototype.TargetChanged(self)
|
||||
self:UpdateCustomCount()
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- 'Protected' methods --------------------------------------------------------
|
||||
@ -324,7 +329,7 @@ end
|
||||
|
||||
function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
|
||||
-- create numeric counts
|
||||
self.frame.numeric = self:FontFactory(self.moduleSettings.countFontSize, nil, self.frame.numeric)
|
||||
self.frame.numeric = self:FontFactory(self.moduleSettings.countFontSize, self.frame, self.frame.numeric)
|
||||
|
||||
self.frame.numeric:SetWidth(50)
|
||||
self.frame.numeric:SetJustifyH("CENTER")
|
||||
@ -421,6 +426,9 @@ function IceCustomCount.prototype:GetGradientColor(curr)
|
||||
local r, g, b = self:GetCustomColor()
|
||||
local mr, mg, mb = self:GetCustomMinColor()
|
||||
local scale = max > 1 and ((curr-1)/(max-1)) or 1
|
||||
if self.moduleSettings.countMode == "Numeric" then
|
||||
scale = max > 1 and (curr/max) or 1
|
||||
end
|
||||
|
||||
r = r * scale + mr * (1-scale)
|
||||
g = g * scale + mg * (1-scale)
|
||||
@ -435,7 +443,13 @@ function IceCustomCount.prototype:UpdateCustomCount()
|
||||
return
|
||||
end
|
||||
|
||||
local points = IceStackCounter_GetCount(self)
|
||||
local points = IceStackCounter_GetCount(self) or 0
|
||||
local max = IceStackCounter_GetMaxCount(self)
|
||||
|
||||
if max > #self.frame.graphical then
|
||||
self:Redraw()
|
||||
return
|
||||
end
|
||||
|
||||
if (self.moduleSettings.countMode == "Numeric") then
|
||||
local r, g, b = self:GetCustomColor()
|
||||
|
@ -250,6 +250,11 @@ function IceCustomCounterBar.prototype:Enable(core)
|
||||
IceStackCounter_Enable(self)
|
||||
end
|
||||
|
||||
function IceCustomCounterBar.prototype:TargetChanged()
|
||||
IceCustomCount.super.prototype.TargetChanged(self)
|
||||
self:UpdateCustomCount()
|
||||
end
|
||||
|
||||
function IceCustomCounterBar.prototype:Redraw()
|
||||
IceCustomCounterBar.super.prototype.Redraw(self)
|
||||
|
||||
@ -319,7 +324,7 @@ function IceCustomCounterBar.prototype:UpdateCustomCount()
|
||||
self.barFrame.icon:Show()
|
||||
end
|
||||
|
||||
if points == nil or points == 0 then
|
||||
if (points == nil or points == 0) and self.moduleSettings.auraType ~= "charges" then
|
||||
self:Show(false)
|
||||
self:UpdateBar(0, "undef")
|
||||
else
|
||||
@ -343,3 +348,7 @@ end
|
||||
function IceCustomCounterBar.prototype:Update()
|
||||
self:UpdateCustomCount()
|
||||
end
|
||||
|
||||
function IceCustomCounterBar.prototype:UseTargetAlpha(scale)
|
||||
return IceStackCounter_UseTargetAlpha(self)
|
||||
end
|
||||
|
@ -29,7 +29,7 @@ function PlayerHealth.prototype:GetDefaultSettings()
|
||||
settings["hideBlizz"] = false
|
||||
settings["hideBlizzParty"] = false
|
||||
settings["upperText"] = "[PercentHP:Round]"
|
||||
settings["lowerText"] = "[FractionalHP:HPColor:Bracket]"
|
||||
settings["lowerText"] = "[FractionalHP:Short:HPColor:Bracket]"
|
||||
settings["allowMouseInteraction"] = false
|
||||
settings["allowMouseInteractionCombat"] = false
|
||||
settings["healAlpha"] = 0.6
|
||||
|
@ -34,7 +34,7 @@ function PlayerMana.prototype:GetDefaultSettings()
|
||||
settings["tickerEnabled"] = true
|
||||
settings["tickerAlpha"] = 0.5
|
||||
settings["upperText"] = "[PercentMP:Round]"
|
||||
settings["lowerText"] = "[FractionalMP:PowerColor]"
|
||||
settings["lowerText"] = "[FractionalMP:Short:PowerColor]"
|
||||
|
||||
return settings
|
||||
end
|
||||
|
@ -35,9 +35,9 @@ local StunCCList = {
|
||||
-- bash
|
||||
5211,
|
||||
-- Maim
|
||||
22570,
|
||||
-- pounce
|
||||
9005,
|
||||
203123,
|
||||
-- Rake
|
||||
163505,
|
||||
-- war stomp
|
||||
20549,
|
||||
-- deep freeze
|
||||
|
@ -43,7 +43,7 @@ function IceTargetHealth.prototype:GetDefaultSettings()
|
||||
settings["classColor"] = false
|
||||
settings["hideBlizz"] = false
|
||||
settings["upperText"] = "[PercentHP:Round]"
|
||||
settings["lowerText"] = "[(HP:Round \"/\" MaxHP:Round):HPColor:Bracket]"
|
||||
settings["lowerText"] = "[FractionalHP:Short:HPColor:Bracket]"
|
||||
settings["raidIconOnTop"] = true
|
||||
settings["showRaidIcon"] = true
|
||||
settings["raidIconXOffset"] = 12
|
||||
|
@ -33,7 +33,7 @@ function IceTargetMana.prototype:GetDefaultSettings()
|
||||
settings["side"] = IceCore.Side.Right
|
||||
settings["offset"] = 2
|
||||
settings["upperText"] = "[PercentMP:Round]"
|
||||
settings["lowerText"] = "[FractionalMP:PowerColor]"
|
||||
settings["lowerText"] = "[FractionalMP:Short:PowerColor]"
|
||||
settings["onlyShowMana"] = false
|
||||
|
||||
return settings
|
||||
|
@ -24,7 +24,7 @@ function TargetTargetHealth.prototype:GetDefaultSettings()
|
||||
settings["selfColor"] = { r = 0, g = 0, b = 1 }
|
||||
settings["selfDisplayMode"] = "Color as SelfColor"
|
||||
settings["upperText"] = "[PercentHP:Round]"
|
||||
settings["lowerText"] = "[(HP:Round \"/\" MaxHP:Round):HPColor:Bracket]"
|
||||
settings["lowerText"] = "[FractionalHP:Short:HPColor:Bracket]"
|
||||
settings["barVerticalOffset"] = 35
|
||||
settings["scale"] = 0.7
|
||||
settings["enabled"] = false
|
||||
|
@ -21,7 +21,7 @@ function TargetTargetMana.prototype:GetDefaultSettings()
|
||||
settings["side"] = IceCore.Side.Right
|
||||
settings["offset"] = 11
|
||||
settings["upperText"] = "[PercentMP:Round]"
|
||||
settings["lowerText"] = "[FractionalMP:PowerColor]"
|
||||
settings["lowerText"] = "[FractionalMP:Short:PowerColor]"
|
||||
settings["barVerticalOffset"] = 35
|
||||
settings["scale"] = 0.7
|
||||
settings["enabled"] = false
|
||||
|
Reference in New Issue
Block a user