diff --git a/IceCore.lua b/IceCore.lua index b5659c8..4b432d1 100644 --- a/IceCore.lua +++ b/IceCore.lua @@ -825,5 +825,16 @@ function IceCore.prototype:LoadPresets() barBlendMode = "BLEND", barBgBlendMode = "BLEND", } + + self.presets["DHUD"] = { + barTexture = "DHUD", + barWidth = 128, + barHeight = 256, + barProportion = 0.14, + barSpace = 1, + barBlendMode = "BLEND", + barBgBlendMode = "BLEND", + } + end diff --git a/IceHUD.lua b/IceHUD.lua index 23884f4..f64a678 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -17,7 +17,7 @@ IceHUD.debugging = false IceHUD.WowVer = select(4, GetBuildInfo()) -IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc", "BloodGlaives", "ArcHUD", "FangRune" } +IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc", "BloodGlaives", "ArcHUD", "FangRune", "DHUD" } IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Ability cooldown bar", Health="Health bar", Mana="Mana bar"} local function deepcopy(object) diff --git a/modules/TargetHealth.lua b/modules/TargetHealth.lua index e5b475e..42c6f48 100644 --- a/modules/TargetHealth.lua +++ b/modules/TargetHealth.lua @@ -62,6 +62,7 @@ function IceTargetHealth.prototype:GetDefaultSettings() settings["showPartyRoleIcon"] = false settings["PartyRoleIconOffset"] = {x=33, y=-8} settings["PartyRoleIconScale"] = 0.9 + settings["EliteTextureSet"] = 1 return settings end @@ -456,6 +457,24 @@ end order = 60.1 }, + classIconSet = { + type = "select", + name = L["Icon set"], + desc = L["Which icon set to use for elite/rare elite/rare textures. This simply changes the look of the classification icon."], + get = function() + return self.moduleSettings.EliteTextureSet + end, + set = function(info, value) + self.moduleSettings.EliteTextureSet = value + self:Redraw() + end, + disabled = function() + return not self.moduleSettings.enabled or not self.moduleSettings.showClassificationIcon + end, + values = {"Blizzard", "DHUD"}, + order = 60.2 + }, + classIconXOffset = { type = "range", name = L["Elite Icon X Offset"], @@ -640,6 +659,13 @@ function IceTargetHealth.prototype:Disable(core) end end +function IceTargetHealth.prototype:GetEliteTextures() + if self.moduleSettings.EliteTextureSet == 1 then + return IceElement.TexturePath .. "Elite", IceElement.TexturePath .. "RareElite", IceElement.TexturePath .. "Rare" + else + return IceElement.TexturePath .. "Elite2", IceElement.TexturePath .. "RareElite2", IceElement.TexturePath .. "Rare2" + end +end function IceTargetHealth.prototype:CreateBackground(redraw) IceTargetHealth.super.prototype.CreateBackground(self) @@ -749,12 +775,13 @@ function IceTargetHealth.prototype:Update(unit) self.barFrame.classIcon:Show() self.barFrame.classIcon:SetAlpha(self.alpha == 0 and 0 or math.min(1, self.alpha + 0.2)) + local elite, rareelite, rare = self:GetEliteTextures() if self.configMode or IceHUD.IceCore:IsInConfigMode() or classification == "worldboss" or classification == "elite" then - self.barFrame.classIcon:SetTexture(self.EliteTexture) + self.barFrame.classIcon:SetTexture(elite) elseif classification == "rareelite" then - self.barFrame.classIcon:SetTexture(self.RareEliteTexture) + self.barFrame.classIcon:SetTexture(rareelite) elseif classification == "rare" then - self.barFrame.classIcon:SetTexture(self.RareTexture) + self.barFrame.classIcon:SetTexture(rare) else self:DestroyTexFrame(self.barFrame.classIcon) self.barFrame.classIcon:Hide() diff --git a/textures/DHUD.blp b/textures/DHUD.blp new file mode 100644 index 0000000..cfd7f4b Binary files /dev/null and b/textures/DHUD.blp differ diff --git a/textures/DHUDBG.blp b/textures/DHUDBG.blp new file mode 100644 index 0000000..6ec2d12 Binary files /dev/null and b/textures/DHUDBG.blp differ diff --git a/textures/Elite2.blp b/textures/Elite2.blp new file mode 100644 index 0000000..2daf202 Binary files /dev/null and b/textures/Elite2.blp differ diff --git a/textures/Rare2.blp b/textures/Rare2.blp new file mode 100644 index 0000000..32e2f0d Binary files /dev/null and b/textures/Rare2.blp differ diff --git a/textures/RareElite2.blp b/textures/RareElite2.blp new file mode 100644 index 0000000..32e2f0d Binary files /dev/null and b/textures/RareElite2.blp differ