diff --git a/IceBarElement.lua b/IceBarElement.lua index 33cbb13..8a2c0c5 100644 --- a/IceBarElement.lua +++ b/IceBarElement.lua @@ -55,7 +55,7 @@ end function IceBarElement.prototype:RegisterFontStrings() - if DogTag ~= nil then + if DogTag ~= nil and self.moduleSettings.usesDogTagStrings then if self.frame.bottomUpperText and self.moduleSettings.upperText then DogTag:AddFontString(self.frame.bottomUpperText, self.frame, self.moduleSettings.upperText, "Unit", { unit = self.unit }) end @@ -86,6 +86,7 @@ function IceBarElement.prototype:GetDefaultSettings() settings["barVisible"] = {bg = true, bar = true} settings["myTagVersion"] = 2 settings["widthModifier"] = 0 + settings["usesDogTagStrings"] = true return settings end @@ -710,7 +711,7 @@ function IceBarElement.prototype:UpdateBar(scale, color, alpha) self.barFrame:Show() end - if DogTag ~= nil then + if DogTag ~= nil and self.moduleSettings.usesDogTagStrings then DogTag:UpdateAllForFrame(self.frame) self:SetTextAlpha() end @@ -746,7 +747,7 @@ function IceBarElement.prototype:SetBottomText1(text, color) if (self.moduleSettings.lockUpperTextAlpha and (self.alpha > 0)) then alpha = 1 end - + self.frame.bottomUpperText:SetText(text) end diff --git a/IceElement.lua b/IceElement.lua index 675126c..5df75c3 100644 --- a/IceElement.lua +++ b/IceElement.lua @@ -254,7 +254,7 @@ function IceElement.prototype:FontFactory(size, frame, font, flags) fontString = font end - fontString:SetFont(SML:Fetch(SML.MediaType.FONT, self.settings.fontFamily), size, flags) + fontString:SetFont(SML:Fetch('font', self.settings.fontFamily), size, flags) if not (flags) then fontString:SetShadowColor(0, 0, 0, 1) fontString:SetShadowOffset(1, -1) diff --git a/IceHUD.lua b/IceHUD.lua index 4e28576..2e74093 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -265,7 +265,7 @@ IceHUD.options = set = function(value) IceHUD.IceCore:SetFontFamily(value) end, - validate = SML:List(SML.MediaType.FONT), + validate = SML:List('font'), }, barSettings = { diff --git a/modules/CastBar.lua b/modules/CastBar.lua index d40f1d4..882f521 100644 --- a/modules/CastBar.lua +++ b/modules/CastBar.lua @@ -27,6 +27,7 @@ function CastBar.prototype:GetDefaultSettings() settings["lagAlpha"] = 0.7 settings["showBlizzCast"] = false settings["shouldAnimate"] = false + settings["usesDogTagStrings"] = false return settings end diff --git a/modules/ComboPoints.lua b/modules/ComboPoints.lua index fa3d391..81c6d5e 100644 --- a/modules/ComboPoints.lua +++ b/modules/ComboPoints.lua @@ -107,6 +107,7 @@ function ComboPoints.prototype:GetDefaultSettings() defaults["comboFontSize"] = 20 defaults["comboMode"] = "Numeric" defaults["gradient"] = false + defaults["usesDogTagStrings"] = false return defaults end diff --git a/modules/FocusCC.lua b/modules/FocusCC.lua index 834ffd9..edee93a 100644 --- a/modules/FocusCC.lua +++ b/modules/FocusCC.lua @@ -84,6 +84,7 @@ function FocusCC.prototype:GetDefaultSettings() settings["lowThreshold"] = 0 settings["side"] = IceCore.Side.Left settings["offset"] = 4 + settings["usesDogTagStrings"] = false return settings end diff --git a/modules/GlobalCoolDown.lua b/modules/GlobalCoolDown.lua index 74318b4..7d2dde4 100644 --- a/modules/GlobalCoolDown.lua +++ b/modules/GlobalCoolDown.lua @@ -65,6 +65,7 @@ function GlobalCoolDown.prototype:GetDefaultSettings() settings["desiredLerpTime"] = nil settings["lowThreshold"] = 0 settings["barVisible"]["bg"] = false + settings["usesDogTagStrings"] = false return settings end diff --git a/modules/LacerateCount.lua b/modules/LacerateCount.lua index dd40c9f..5f64385 100644 --- a/modules/LacerateCount.lua +++ b/modules/LacerateCount.lua @@ -108,6 +108,7 @@ function LacerateCount.prototype:GetDefaultSettings() defaults["lacerateFontSize"] = 20 defaults["lacerateMode"] = "Numeric" defaults["gradient"] = false + defaults["usesDogTagStrings"] = false return defaults end diff --git a/modules/MirrorBar.lua b/modules/MirrorBar.lua index af8f9f0..bcdf6d2 100644 --- a/modules/MirrorBar.lua +++ b/modules/MirrorBar.lua @@ -186,6 +186,7 @@ function MirrorBarHandler.prototype:GetDefaultSettings() settings["textVisible"] = {upper = true, lower = true} settings["barVisible"] = {bg = true, bar = true} settings["myTagVersion"] = 2 + settings["usesDogTagStrings"] = false return settings end diff --git a/modules/SliceAndDice.lua b/modules/SliceAndDice.lua index 8c93c32..1ba1877 100644 --- a/modules/SliceAndDice.lua +++ b/modules/SliceAndDice.lua @@ -65,6 +65,7 @@ function SliceAndDice.prototype:GetDefaultSettings() settings["upperText"]="SnD:" settings["showAsPercentOfMax"] = true settings["durationAlpha"] = 0.6 + settings["usesDogTagStrings"] = false return settings end diff --git a/modules/SunderCount.lua b/modules/SunderCount.lua index 9972224..43543db 100644 --- a/modules/SunderCount.lua +++ b/modules/SunderCount.lua @@ -108,6 +108,7 @@ function SunderCount.prototype:GetDefaultSettings() defaults["sunderFontSize"] = 20 defaults["sunderMode"] = "Numeric" defaults["gradient"] = false + defaults["usesDogTagStrings"] = false return defaults end diff --git a/modules/TargetCC.lua b/modules/TargetCC.lua index c2c0903..83600ea 100644 --- a/modules/TargetCC.lua +++ b/modules/TargetCC.lua @@ -90,6 +90,7 @@ function TargetCC.prototype:GetDefaultSettings() settings["lowThreshold"] = 0 settings["side"] = IceCore.Side.Left settings["offset"] = 3 + settings["usesDogTagStrings"] = false return settings end diff --git a/modules/TargetCast.lua b/modules/TargetCast.lua index 0590892..4c4159f 100644 --- a/modules/TargetCast.lua +++ b/modules/TargetCast.lua @@ -21,6 +21,7 @@ function TargetCast.prototype:GetDefaultSettings() settings["flashInstants"] = "Never" settings["flashFailures"] = "Never" settings["shouldAnimate"] = false + settings["usesDogTagStrings"] = false return settings end