mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 14:50:13 -05:00
Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
6d2a6392eb | |||
89f60cb34f | |||
3ce982bb71 | |||
fcf156e048 | |||
aa559113eb |
@ -1,4 +1,4 @@
|
|||||||
## Interface: 70200
|
## Interface: 70300
|
||||||
## Author: Parnic, originally created by Iceroth
|
## Author: Parnic, originally created by Iceroth
|
||||||
## Name: IceHUD
|
## Name: IceHUD
|
||||||
## Title: IceHUD |cff7fff7f-Ace3-|r
|
## Title: IceHUD |cff7fff7f-Ace3-|r
|
||||||
@ -6,7 +6,7 @@
|
|||||||
## Version: @project-version@
|
## Version: @project-version@
|
||||||
## SavedVariables: IceCoreDB
|
## 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
|
## 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: 70100
|
## X-Compatible-With: 70200
|
||||||
## X-Category: HUDs
|
## X-Category: HUDs
|
||||||
## X-Website: https://www.wowace.com/projects/ice-hud
|
## X-Website: https://www.wowace.com/projects/ice-hud
|
||||||
## X-WoWI-ID: 8149
|
## X-WoWI-ID: 8149
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
## Interface: 70200
|
## Interface: 70300
|
||||||
## Title: IceHUD |cff7fff7f-Options-|r
|
## Title: IceHUD |cff7fff7f-Options-|r
|
||||||
## Author: Parnic
|
## Author: Parnic
|
||||||
## Version: @project-version@
|
## Version: @project-version@
|
||||||
|
@ -1,8 +1,18 @@
|
|||||||
|
v1.10.16.1:
|
||||||
|
- Added option to hide the raid icon for Info frames.
|
||||||
|
- Updated TOC for 7.3
|
||||||
|
|
||||||
|
v1.10.16:
|
||||||
|
- Updated shard texture for Warlocks.
|
||||||
|
|
||||||
|
v1.10.15.2:
|
||||||
|
- Updated shard display for Destro Warlocks (ticket #234, thanks stencil!).
|
||||||
|
|
||||||
v1.10.15.1:
|
v1.10.15.1:
|
||||||
- Fixed an error in IceHUD's usage of GetLFGProposal()'s return values exposed by the 7.2.5 Chromie quests
|
- Fixed an error in IceHUD's usage of GetLFGProposal()'s return values exposed by the 7.2.5 Chromie quests.
|
||||||
|
|
||||||
v1.10.15:
|
v1.10.15:
|
||||||
- Fixed error on 7.2 due to a CVar being removed
|
- Fixed error on 7.2 due to a CVar being removed.
|
||||||
- Updated TOC for 7.2
|
- Updated TOC for 7.2
|
||||||
|
|
||||||
v1.10.14:
|
v1.10.14:
|
||||||
|
@ -18,7 +18,7 @@ IceClassPowerCounter.prototype.requiredSpec = nil
|
|||||||
IceClassPowerCounter.prototype.shouldShowUnmodified = false
|
IceClassPowerCounter.prototype.shouldShowUnmodified = false
|
||||||
IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
|
IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
|
||||||
IceClassPowerCounter.prototype.unit = "player"
|
IceClassPowerCounter.prototype.unit = "player"
|
||||||
|
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 = nil
|
||||||
|
|
||||||
@ -501,13 +501,17 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
|
|||||||
local percentReady = self.shouldShowUnmodified and (UnitPower("player", self.unitPower, true) / self.unmodifiedMaxPerRune) or numReady
|
local percentReady = self.shouldShowUnmodified and (UnitPower("player", self.unitPower, true) / self.unmodifiedMaxPerRune) or numReady
|
||||||
|
|
||||||
if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
|
if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
|
||||||
self.frame.numeric:SetText(tostring(percentReady))
|
if self.numericFormat then
|
||||||
|
self.frame.numeric:SetText(format(self.numericFormat, percentReady))
|
||||||
|
else
|
||||||
|
self.frame.numeric:SetText(tostring(percentReady))
|
||||||
|
end
|
||||||
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
|
||||||
end
|
end
|
||||||
|
|
||||||
if self:GetRuneMode() ~= "Numeric" then
|
if self:GetRuneMode() ~= "Numeric" then
|
||||||
for i=1, self.numRunes do
|
for i=1, self.numRunes do
|
||||||
if i <= ceil(percentReady) then
|
if i <= self.round(percentReady) then
|
||||||
if self:GetRuneMode() == "Graphical" then
|
if self:GetRuneMode() == "Graphical" then
|
||||||
self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
|
self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
|
||||||
else
|
else
|
||||||
|
@ -3,14 +3,26 @@ local ShardCounter = IceCore_CreateClass(IceClassPowerCounter)
|
|||||||
|
|
||||||
local CurrentSpec = nil
|
local CurrentSpec = nil
|
||||||
|
|
||||||
local AfflictionCoords =
|
local AfflictionCoords
|
||||||
{
|
if IceHUD.WowVer < 70200 then
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
AfflictionCoords =
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
}
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
|
{0.01562500, 0.28125000, 0.00781250, 0.13281250},
|
||||||
|
}
|
||||||
|
else
|
||||||
|
AfflictionCoords =
|
||||||
|
{
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
{0, 1, 0, 1},
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
local DestructionCoords =
|
local DestructionCoords =
|
||||||
{
|
{
|
||||||
@ -36,6 +48,10 @@ function ShardCounter.prototype:init()
|
|||||||
if IceHUD.WowVer >= 70000 then
|
if IceHUD.WowVer >= 70000 then
|
||||||
self.runeHeight = 23
|
self.runeHeight = 23
|
||||||
self.runeWidth = 26
|
self.runeWidth = 26
|
||||||
|
if IceHUD.WowVer >= 70200 then
|
||||||
|
self.runeHeight = 27
|
||||||
|
self.runeWidth = 22
|
||||||
|
end
|
||||||
self.runeCoords = AfflictionCoords
|
self.runeCoords = AfflictionCoords
|
||||||
self.unitPower = SPELL_POWER_SOUL_SHARDS
|
self.unitPower = SPELL_POWER_SOUL_SHARDS
|
||||||
self.unit = "player"
|
self.unit = "player"
|
||||||
@ -45,6 +61,16 @@ end
|
|||||||
function ShardCounter.prototype:Enable(core)
|
function ShardCounter.prototype:Enable(core)
|
||||||
if IceHUD.WowVer >= 70000 then
|
if IceHUD.WowVer >= 70000 then
|
||||||
self.numRunes = UnitPowerMax(self.unit, self.unitPower)
|
self.numRunes = UnitPowerMax(self.unit, self.unitPower)
|
||||||
|
|
||||||
|
if GetSpecialization() == SPEC_WARLOCK_DESTRUCTION then
|
||||||
|
self.shouldShowUnmodified = true
|
||||||
|
self.numericFormat = "%.1f"
|
||||||
|
self.round = floor
|
||||||
|
else
|
||||||
|
self.shouldShowUnmodified = nil
|
||||||
|
self.numericFormat = nil
|
||||||
|
self.round = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
ShardCounter.super.prototype.Enable(self, core)
|
ShardCounter.super.prototype.Enable(self, core)
|
||||||
@ -205,6 +231,10 @@ function ShardCounter.prototype:GetDefaultSettings()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function ShardCounter.prototype:GetRuneTexture(rune)
|
function ShardCounter.prototype:GetRuneTexture(rune)
|
||||||
|
if IceHUD.WowVer >= 70200 then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
if not rune or rune ~= tonumber(rune) then
|
if not rune or rune ~= tonumber(rune) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -222,6 +252,10 @@ function ShardCounter.prototype:GetRuneTexture(rune)
|
|||||||
return "Interface\\PlayerFrame\\UI-WarlockShard"
|
return "Interface\\PlayerFrame\\UI-WarlockShard"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function ShardCounter.prototype:GetRuneAtlas(rune)
|
||||||
|
return "Warlock-ReadyShard"
|
||||||
|
end
|
||||||
|
|
||||||
function ShardCounter.prototype:ShowBlizz()
|
function ShardCounter.prototype:ShowBlizz()
|
||||||
WarlockPowerFrame:Show()
|
WarlockPowerFrame:Show()
|
||||||
|
|
||||||
|
@ -958,6 +958,23 @@ function IceTargetInfo.prototype:GetOptions()
|
|||||||
order = 39.3,
|
order = 39.3,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opts["showRaidIcon"] = {
|
||||||
|
type = 'toggle',
|
||||||
|
name = L['Show raid icon'],
|
||||||
|
desc = L['Whether or not to show the raid icon for this unit.'],
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.showRaidIcon
|
||||||
|
end,
|
||||||
|
set = function(info, v)
|
||||||
|
self.moduleSettings.showRaidIcon = v
|
||||||
|
self:UpdateRaidTargetIcon()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
order = 37.02,
|
||||||
|
}
|
||||||
|
|
||||||
return opts
|
return opts
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -1011,6 +1028,7 @@ function IceTargetInfo.prototype:GetDefaultSettings()
|
|||||||
["sortByExpiration"] = true,
|
["sortByExpiration"] = true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
defaults["showRaidIcon"] = true
|
||||||
|
|
||||||
return defaults
|
return defaults
|
||||||
end
|
end
|
||||||
@ -1480,7 +1498,7 @@ function IceTargetInfo.prototype:AuraChanged(event, unit)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceTargetInfo.prototype:UpdateRaidTargetIcon()
|
function IceTargetInfo.prototype:UpdateRaidTargetIcon()
|
||||||
if not (UnitExists(self.unit)) then
|
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then
|
||||||
self.frame.raidIcon:Hide()
|
self.frame.raidIcon:Hide()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user