From ce814cea62b17c91c986c7fa51f83d95992cb08a Mon Sep 17 00:00:00 2001 From: John Cummings Date: Fri, 25 Nov 2022 20:16:10 -0700 Subject: [PATCH] Adding fixes. (#2) --- Modules/interface.lua | 45 --------------------- Modules/unitframes.lua | 88 +++++++++++++++++++++--------------------- XarMods_Mainline.toc | 2 +- XarMods_Wrath.toc | 7 ---- 4 files changed, 45 insertions(+), 97 deletions(-) delete mode 100644 XarMods_Wrath.toc diff --git a/Modules/interface.lua b/Modules/interface.lua index 4e66c5e..863a915 100644 --- a/Modules/interface.lua +++ b/Modules/interface.lua @@ -11,7 +11,6 @@ module.defaultSettings = { hideZoom = false, sellGrays = false, repair = false, - dampeningDisplay = false, } module.optionsTable = { @@ -104,18 +103,6 @@ module.optionsTable = { name = "Auto Repair", width = "full", }, - header_arena = { - order = 15, - type = "header", - name = "Arena", - } - -- dampeningDisplay = { - -- order = 16, - -- type = "toggle", - -- name = "Dampening Display", - -- desc = "Text at the top of the screen to indicate dampening severity in arenas", - -- width = "full", - -- }, } local eventHandler = CreateFrame("Frame", nil , UIParent) @@ -133,7 +120,6 @@ function module:XaryuSettings() db.hideZoom = true db.sellGrays = true db.repair = true - db.dampeningDisplay = true end function module:OnLoad() @@ -199,37 +185,6 @@ function module:OnLoad() SetCVar("ffxDeath", db.hideEffects and 0 or 1) SetCVar("ffxNether", db.hideEffects and 0 or 1) - if db.dampeningDisplay then - local dampeningText = GetSpellInfo(110310) - - local dampeningFrame = CreateFrame("Frame", nil , UIParent) - dampeningFrame:SetSize(200, 12) - dampeningFrame:SetPoint("TOP", UIWidgetTopCenterContainerFrame, "BOTTOM", 0, -2) - dampeningFrame.text = dampeningFrame:CreateFontString(nil, "BACKGROUND") - dampeningFrame.text:SetFontObject(GameFontNormalSmall) - dampeningFrame.text:SetAllPoints() - - local function DampeningDisplay_Update() - dampeningFrame.text:SetText(dampeningText..": "..C_Commentator.GetDampeningPercent().."%") - end - - local dampeningTicker - - dampeningFrame:SetScript("OnEvent", function(self) - if dampeningTicker then - dampeningTicker:Cancel() - end - - if select(2, IsInInstance()) == "arena" then - dampeningFrame:Show() - dampeningTicker = C_Timer.NewTicker(5, DampeningDisplay_Update) - else - dampeningFrame:Hide() - end - end) - - dampeningFrame:RegisterEvent("PLAYER_ENTERING_WORLD") - end end function eventHandler:MERCHANT_SHOW() diff --git a/Modules/unitframes.lua b/Modules/unitframes.lua index 936afb3..eb82c3b 100644 --- a/Modules/unitframes.lua +++ b/Modules/unitframes.lua @@ -43,50 +43,50 @@ module.optionsTable = { desc = "Icons indicating if a player if flagged for PvP and/or prestige badge", width = "full", }, - header_classColors = { - order = 4, - type = "header", - name = "Class Colors", - }, - classColorsPlayer = { - order = 5, - type = "toggle", - name = "Player", - width = "full", - }, - classColorsOthers = { - order = 6, - type = "toggle", - name = "Others", - desc = "Target, Target-of-Target, Focus, etc.", - width = "full", - }, - header_playerChain = { - order = 7, - type = "header", - name = "Player Chain", - }, - enablePlayerChain = { - order = 8, - type = "toggle", - name = "Enable", - desc = "Shows a rare, elite or rare elite chain around the player frame", - width = "half", - }, - chainStyle = { - order = 9, - type = "select", - name = "Style", - values = { - "Rare", - "Elite", - "Rare Elite", - }, - set = function(info, val) - module.db[info[#info]] = val - module.SetChainStyle() - end, - }, + -- header_classColors = { + -- order = 4, + -- type = "header", + -- name = "Class Colors", + -- }, + -- classColorsPlayer = { + -- order = 5, + -- type = "toggle", + -- name = "Player", + -- width = "full", + -- }, + -- classColorsOthers = { + -- order = 6, + -- type = "toggle", + -- name = "Others", + -- desc = "Target, Target-of-Target, Focus, etc.", + -- width = "full", + -- }, + -- header_playerChain = { + -- order = 7, + -- type = "header", + -- name = "Player Chain", + -- }, + -- enablePlayerChain = { + -- order = 8, + -- type = "toggle", + -- name = "Enable", + -- desc = "Shows a rare, elite or rare elite chain around the player frame", + -- width = "half", + -- }, + -- chainStyle = { + -- order = 9, + -- type = "select", + -- name = "Style", + -- values = { + -- "Rare", + -- "Elite", + -- "Rare Elite", + -- }, + -- set = function(info, val) + -- module.db[info[#info]] = val + -- module.SetChainStyle() + -- end, + -- }, header_miscellaneous = { order = 10, type = "header", diff --git a/XarMods_Mainline.toc b/XarMods_Mainline.toc index 0b15f4f..e95b9e9 100644 --- a/XarMods_Mainline.toc +++ b/XarMods_Mainline.toc @@ -1,7 +1,7 @@ ## Interface: 100002 ## Title: |cff00c0ffXarMods|r ## Author: Stako, Hamsti -## Version: 1.2 +## Version: 2.0.1 ## SavedVariables: XarModsDB XarMods.xml diff --git a/XarMods_Wrath.toc b/XarMods_Wrath.toc deleted file mode 100644 index 0b15f4f..0000000 --- a/XarMods_Wrath.toc +++ /dev/null @@ -1,7 +0,0 @@ -## Interface: 100002 -## Title: |cff00c0ffXarMods|r -## Author: Stako, Hamsti -## Version: 1.2 -## SavedVariables: XarModsDB - -XarMods.xml