From 048fbb55e771e46dd53c8e41de6832c093cd1c85 Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Sun, 7 Aug 2022 06:07:59 +0200 Subject: [PATCH] cleanup --- Modules/Auras.lua | 2 -- Modules/Cooldowns.lua | 14 ++------------ Modules/Diminishings.lua | 1 - Modules/Healthbar.lua | 1 - Modules/RangeCheck.lua | 2 -- Modules/ShadowsightTimer.lua | 3 --- 6 files changed, 2 insertions(+), 21 deletions(-) diff --git a/Modules/Auras.lua b/Modules/Auras.lua index 7261642..fea6135 100644 --- a/Modules/Auras.lua +++ b/Modules/Auras.lua @@ -554,8 +554,6 @@ function Auras:Test(unit) self:AURA_GAIN(unit,v.value.track, spellid, spellName, icon, duration, GetTime() + duration) end end - -- /run LibStub("Gladdy").modules["Auras"]:Test("arena1") - -- /run LibStub("Gladdy"):JoinedArena() --Interrupts if (unit == "arena1" or unit == "arena3") then diff --git a/Modules/Cooldowns.lua b/Modules/Cooldowns.lua index de51655..72781b9 100644 --- a/Modules/Cooldowns.lua +++ b/Modules/Cooldowns.lua @@ -115,7 +115,6 @@ end function Cooldowns:CreateFrame(unit) local button = Gladdy.buttons[unit] - -- Cooldown frame local spellCooldownFrame = CreateFrame("Frame", nil, button) spellCooldownFrame:EnableMouse(false) spellCooldownFrame:SetMovable(true) @@ -126,7 +125,7 @@ function Cooldowns:CreateFrame(unit) self.frames[unit] = spellCooldownFrame end -function Cooldowns:CreateIcon() -- returns iconFrame +function Cooldowns:CreateIcon() local icon if (#self.iconCache > 0) then icon = tremove(self.iconCache, #self.iconCache) @@ -264,7 +263,6 @@ end function Cooldowns:UpdateFrame(unit) local button = Gladdy.buttons[unit] - -- Cooldown frame local testAgain = false if (Gladdy.db.cooldown) then button.spellCooldownFrame:SetHeight(Gladdy.db.cooldownSize) @@ -359,7 +357,7 @@ function Cooldowns:Test(unit) if Gladdy.frame.testing then self:UpdateTestCooldowns(unit) end - Cooldowns:AURA_GAIN(_, AURA_TYPE_BUFF, "22812", "Barkskin", _, 20, _, _, _, _, unit, true) -- unit, auraType, spellID, spellName, texture, duration, expirationTime + Cooldowns:AURA_GAIN(_, AURA_TYPE_BUFF, "22812", "Barkskin", _, 20, _, _, _, _, unit, true) end function Cooldowns:UpdateTestCooldowns(unit) @@ -403,10 +401,6 @@ function Cooldowns:UNIT_DESTROYED(unit) self:ResetUnit(unit) end ---[[ - /run local a=LibStub("Gladdy").modules["Cooldowns"] a:AURA_GAIN("arena1",22812) - /run local a=LibStub("Gladdy").modules["Cooldowns"] a:AURA_FADE("arena1",22812) ---]] function Cooldowns:AURA_GAIN(_, auraType, spellID, spellName, _, duration, _, _, _, _, unitCaster, test) local arenaUnit = test and unitCaster or Gladdy:GetArenaUnit(unitCaster, true) if not Gladdy.db.cooldownIconGlow or not arenaUnit or not Gladdy.buttons[arenaUnit] or auraType ~= AURA_TYPE_BUFF then @@ -450,7 +444,6 @@ end --------------------- function Cooldowns:CooldownStart(button, spellId, duration, start) - -- starts timer frame if not duration or duration == nil or type(duration) ~= "number" then return end @@ -526,13 +519,11 @@ function Cooldowns:CooldownUsed(unit, unitClass, spellId, expirationTimeInSecond if not button then return end - -- if (self.db.cooldownList[spellId] == false) then return end local cooldown = Gladdy:GetCooldownList()[unitClass][spellId] local cd = cooldown if (type(cooldown) == "table") then -- return if the spec doesn't have a cooldown for this spell - --if (arenaSpecs[unit] ~= nil and cooldown.notSpec ~= nil and arenaSpecs[unit] == cooldown.notSpec) then return end if (button.spec ~= nil and cooldown.notSpec ~= nil and button.spec == cooldown.notSpec) then return end @@ -545,7 +536,6 @@ function Cooldowns:CooldownUsed(unit, unitClass, spellId, expirationTimeInSecond end -- check if there is a special cooldown for the units spec - --if (arenaSpecs[unit] ~= nil and cooldown[arenaSpecs[unit]] ~= nil) then if (button.spec ~= nil and cooldown[button.spec] ~= nil) then cd = cooldown[button.spec] else diff --git a/Modules/Diminishings.lua b/Modules/Diminishings.lua index b47ff3c..12a3dd8 100644 --- a/Modules/Diminishings.lua +++ b/Modules/Diminishings.lua @@ -7,7 +7,6 @@ local CreateFrame = CreateFrame local GetTime = GetTime local Gladdy = LibStub("Gladdy") ---local DRData = LibStub("DRData-1.0-BCC") local DRData = LibStub("DRList-1.0") local L = Gladdy.L local function defaultCategories() diff --git a/Modules/Healthbar.lua b/Modules/Healthbar.lua index 8a0d289..8d7cf78 100644 --- a/Modules/Healthbar.lua +++ b/Modules/Healthbar.lua @@ -146,7 +146,6 @@ local function getGradient(start, ending, percentage, factor) return start * abs(-2 * percentage + 1) + ending * factor end --- /run LibStub("Gladdy").modules["Health Bar"]:SetHealthStatusBarColor("arena1", 51, 100) local rMax, gMax, bMax, rMid, gMid, bMid, rMin, gMin, bMin, rNow, gNow, bNow, percentage, factor, stealthAlpha function Healthbar:SetHealthStatusBarColor(unit, health, healthMax) local button = Gladdy.buttons[unit] diff --git a/Modules/RangeCheck.lua b/Modules/RangeCheck.lua index 023cda9..37f5b9b 100644 --- a/Modules/RangeCheck.lua +++ b/Modules/RangeCheck.lua @@ -357,8 +357,6 @@ function RangeCheck:GetSpells() end, set = function(_, value) Gladdy.db.rangeCheckDefaultSpells[class].min = tonumber(value) - --Gladdy.options.args["Range Check"].args.oorSpells.args[class].args.min.name = GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min) and format("|T%s:20|t %s", select(3, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(1, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min))) - -- or "nil" Gladdy.options.args["Range Check"].args.oorSpells.args[class].args.headerMin.name = GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min) and format("|T%s:20|t %s - %d" .. L["yds"], select(3, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(1, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(6, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min))) or "nil" end diff --git a/Modules/ShadowsightTimer.lua b/Modules/ShadowsightTimer.lua index 9606f86..b7f9da2 100644 --- a/Modules/ShadowsightTimer.lua +++ b/Modules/ShadowsightTimer.lua @@ -25,9 +25,6 @@ local ShadowsightTimer = Gladdy:NewModule("Shadowsight Timer", nil, { shadowsightTimerFrameLevel = 20, }) --- /run LibStub("Gladdy").modules["Shadowsight Timer"]:AURA_GAIN(nil, nil, 34709) --- /run LibStub("Gladdy").modules["Shadowsight Timer"].timerFrame1:SetAlpha(0) - function ShadowsightTimer:OnEvent(event, ...) self[event](self, ...) end