Skip to content

Commit

Permalink
Adding fixes. (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
thehamsti authored Nov 26, 2022
1 parent 9bd85a7 commit ce814ce
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 97 deletions.
45 changes: 0 additions & 45 deletions Modules/interface.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module.defaultSettings = {
hideZoom = false,
sellGrays = false,
repair = false,
dampeningDisplay = false,
}

module.optionsTable = {
Expand Down Expand Up @@ -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)
Expand All @@ -133,7 +120,6 @@ function module:XaryuSettings()
db.hideZoom = true
db.sellGrays = true
db.repair = true
db.dampeningDisplay = true
end

function module:OnLoad()
Expand Down Expand Up @@ -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()
Expand Down
88 changes: 44 additions & 44 deletions Modules/unitframes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion XarMods_Mainline.toc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Interface: 100002
## Title: |cff00c0ffXarMods|r
## Author: Stako, Hamsti
## Version: 1.2
## Version: 2.0.1
## SavedVariables: XarModsDB

XarMods.xml
7 changes: 0 additions & 7 deletions XarMods_Wrath.toc

This file was deleted.

0 comments on commit ce814ce

Please sign in to comment.