From 673dc72b3b849b76eb30a1134acb3488b0080ab4 Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Sat, 22 May 2021 13:42:47 +0200 Subject: [PATCH] minor bugfixes --- Modules/Auras.lua | 21 +++++++++++++-------- Modules/Classicon.lua | 5 +++++ Modules/Pets.lua | 11 ++++++----- Modules/TotemPlates.lua | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Modules/Auras.lua b/Modules/Auras.lua index 3f470c5..ffd8966 100644 --- a/Modules/Auras.lua +++ b/Modules/Auras.lua @@ -151,14 +151,12 @@ function Auras:Test(unit) self:AURA_FADE(unit,AURA_TYPE_DEBUFF) self:AURA_GAIN(unit,AURA_TYPE_DEBUFF, 6770, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration) elseif (unit == "arena3") then - spellName, _, icon = GetSpellInfo(17) - self:AURA_FADE(unit, AURA_TYPE_BUFF) - self:AURA_GAIN(unit,AURA_TYPE_BUFF, 17, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration) - self:AURA_FADE(unit,AURA_TYPE_DEBUFF) - spellName, _, icon = GetSpellInfo(6770) + spellName, _, icon = GetSpellInfo(31224) self:AURA_FADE(unit, AURA_TYPE_BUFF) + self:AURA_GAIN(unit,AURA_TYPE_BUFF, 31224, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration) + spellName, _, icon = GetSpellInfo(18425) self:AURA_FADE(unit, AURA_TYPE_DEBUFF) - self:AURA_GAIN(unit,AURA_TYPE_DEBUFF, 6770, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration) + self:AURA_GAIN(unit,AURA_TYPE_DEBUFF, 18425, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration) end end @@ -267,6 +265,13 @@ function Auras:GetOptions() step = 0.1, order = 4, }), + } + }, + font = { + type = "group", + name = L["Font"], + order = 2, + args = { auraFont = Gladdy:option({ type = "select", name = L["Font"], @@ -291,12 +296,12 @@ function Auras:GetOptions() order = 7, hasAlpha = true, }), - } + }, }, border = { type = "group", name = "Border", - order = 2, + order = 3, args = { headerAuras = { type = "header", diff --git a/Modules/Classicon.lua b/Modules/Classicon.lua index 480989a..2648e4e 100644 --- a/Modules/Classicon.lua +++ b/Modules/Classicon.lua @@ -203,6 +203,11 @@ function Classicon:GetOptions() name = L["Icon size"], order = 1, args = { + header = { + type = "header", + name = L["Icon size"], + order = 1, + }, classIconSize = Gladdy:option({ type = "range", name = L["Icon size"], diff --git a/Modules/Pets.lua b/Modules/Pets.lua index d7590b0..3041bf6 100644 --- a/Modules/Pets.lua +++ b/Modules/Pets.lua @@ -1,12 +1,12 @@ local string_gsub, floor, pairs = string.gsub, math.floor, pairs -local CreateFrame = CreateFrame +local CreateFrame, SetPortraitTexture = CreateFrame, SetPortraitTexture local UnitHealthMax, UnitHealth, UnitGUID = UnitHealthMax, UnitHealth, UnitGUID local Gladdy = LibStub("Gladdy") local L = Gladdy.L local Pets = Gladdy:NewModule("Pets", nil, { petEnabled = true, - petWidth = 100, + petWidth = 128, petHeight = 20, petPortraitEnabled = true, petPortraitBorderStyle = "Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp", @@ -21,8 +21,8 @@ local Pets = Gladdy:NewModule("Pets", nil, { petHealthBarFontColor = { r = 1, g = 1, b = 1, a = 1 }, petHealthBarFontSize = 12, petHealthPercentage = true, - petXOffset = 50, - petYOffset = 0, + petXOffset = 1, + petYOffset = -62, }) function Pets:Initialize() @@ -124,6 +124,7 @@ function Pets:Test(unitId) petFrame.healthBar.hp:SetMinMaxValues(0, 6200) petFrame.healthBar.hp:SetValue(2000) Pets:SetHealthText(petFrame.healthBar, 2000, 6200) + SetPortraitTexture(petFrame.healthBar.portrait, "player") end end @@ -374,7 +375,7 @@ function Pets:GetOptions() desc = L["Width of the bar"], order = 4, min = 10, - max = 100, + max = 300, step = 1, }), petHealthBarTexture = option({ diff --git a/Modules/TotemPlates.lua b/Modules/TotemPlates.lua index 5e49d94..67cca14 100644 --- a/Modules/TotemPlates.lua +++ b/Modules/TotemPlates.lua @@ -451,7 +451,7 @@ function TotemPlates:GetOptions() args = { header = { type = "header", - name = L["Icon"], + name = L["Font"], order = 1, }, npTremorFont = Gladdy:option({