xiconfjs/Gladdy-TBC
1
0
Fork 0
Code Issues 36 Pull Requests 2 Packages Projects Releases 30 Wiki Activity

Merge branch 'release/v2.1-Release-new' into main

Browse Source
This commit is contained in:
Sumsebrum
2022-03-26 00:47:40 +01:00
parent 7c145752f7 80eee574a9
commit 45eacbde7f
38 changed files with 3435 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Constants.lua
+407 -13
View File
@@ -1,4 +1,4 @@
local tbl_sort, select = table.sort, select
local tbl_sort, select, string_lower = table.sort, select, string.lower
local GetSpellInfo = GetSpellInfo
local GetItemInfo = GetItemInfo
@@ -13,6 +13,34 @@ tbl_sort(Gladdy.CLASSES)
Gladdy.RACES = {"Scourge", "BloodElf", "Tauren", "Orc", "Troll", "NightElf", "Draenei", "Human", "Gnome", "Dwarf"}
tbl_sort(Gladdy.RACES)
local RACE_ICON_TCOORDS = {
["HUMAN_MALE"] = {0, 0.125, 0, 0.25},
["DWARF_MALE"] = {0.125, 0.25, 0, 0.25},
["GNOME_MALE"] = {0.25, 0.375, 0, 0.25},
["NIGHTELF_MALE"] = {0.375, 0.5, 0, 0.25},
["TAUREN_MALE"] = {0, 0.125, 0.25, 0.5},
["SCOURGE_MALE"] = {0.125, 0.25, 0.25, 0.5},
["TROLL_MALE"] = {0.25, 0.375, 0.25, 0.5},
["ORC_MALE"] = {0.375, 0.5, 0.25, 0.5},
["HUMAN_FEMALE"] = {0, 0.125, 0.5, 0.75},
["DWARF_FEMALE"] = {0.125, 0.25, 0.5, 0.75},
["GNOME_FEMALE"] = {0.25, 0.375, 0.5, 0.75},
["NIGHTELF_FEMALE"] = {0.375, 0.5, 0.5, 0.75},
["TAUREN_FEMALE"] = {0, 0.125, 0.75, 1.0},
["SCOURGE_FEMALE"] = {0.125, 0.25, 0.75, 1.0},
["TROLL_FEMALE"] = {0.25, 0.375, 0.75, 1.0},
["ORC_FEMALE"] = {0.375, 0.5, 0.75, 1.0},
["BLOODELF_MALE"] = {0.5, 0.625, 0.25, 0.5},
["BLOODELF_FEMALE"] = {0.5, 0.625, 0.75, 1.0},
["DRAENEI_MALE"] = {0.5, 0.625, 0, 0.25},
["DRAENEI_FEMALE"] = {0.5, 0.625, 0.5, 0.75},
}
local specBuffs = {
-- DRUID
[GetSpellInfo(45283)] = L["Restoration"], -- Natural Perfection
@@ -20,6 +48,7 @@ local specBuffs = {
[GetSpellInfo(24858)] = L["Restoration"], -- Moonkin Form; Dreamstate spec in TBC equals Restoration
[GetSpellInfo(17007)] = L["Feral"], -- Leader of the Pack
[GetSpellInfo(16188)] = L["Restoration"], -- Nature's Swiftness
[GetSpellInfo(33891)] = L["Restoration"], -- Tree of Life
-- HUNTER
[GetSpellInfo(34692)] = L["Beast Mastery"], -- The Beast Within
@@ -97,6 +126,7 @@ local specSpells = {
[GetSpellInfo(33987)] = L["Feral"], -- Mangle (Bear)
[GetSpellInfo(18562)] = L["Restoration"], -- Swiftmend
[GetSpellInfo(16188)] = L["Restoration"], -- Nature's Swiftness
[GetSpellInfo(33891)] = L["Restoration"], -- Tree of Life
-- HUNTER
[GetSpellInfo(19577)] = L["Beast Mastery"], -- Intimidation
@@ -549,7 +579,13 @@ local importantAuras = {
priority = 10,
spellID = 26669,
},
-- Riposte
[GetSpellInfo(14251)] = {
track = AURA_TYPE_DEBUFF,
duration = 6,
priority = 20,
spellID = 14251,
},
-- Fear
[GetSpellInfo(5782)] = {
@@ -678,6 +714,13 @@ local importantAuras = {
spellSchool = "magic",
spellID = 12292,
},
--Disarm
[GetSpellInfo(676)] = {
track = AURA_TYPE_DEBUFF,
duration = 10,
priority = 20,
spellID = 676,
},
-- Grounding Totem Effect
[GetSpellInfo(8178)] = {
@@ -775,6 +818,13 @@ local importantAuras = {
spellID = 5024,
altName = select(1, GetSpellInfo(5024)) .. " - " .. (select(1, GetItemInfo(4984)) or "Skull of Impending Doom"),
},
-- Will of the Forsaken
[GetSpellInfo(7744)] = {
track = AURA_TYPE_BUFF,
duration = 5,
priority = 15,
spellID = 7744,
},
}
function Gladdy:GetImportantAuras()
return importantAuras
@@ -922,6 +972,7 @@ local cooldownList = {
[27277] = 8, -- Devour Magic
[30414] = { cd = 20, spec = L["Destruction"], }, -- Shadowfury
[17877] = { cd = 15, spec = L["Destruction"], }, -- Shadowburn
[30912] = { cd = 10, spec = L["Destruction"], }, -- Conflagrate
[18708] = { cd = 900, spec = L["Demonology"], }, -- Feldom
},
@@ -955,23 +1006,28 @@ local cooldownList = {
[19503] = 30, -- Scatter Shot
[14327] = 30, -- Scare Beast
[19263] = 300, -- Deterrence; not on BM but can't do 2 specs
[14311] = { cd = 30, -- Freezing Trap
sharedCD = {
[13809] = true, -- Frost Trap
[34600] = true, -- Snake Trap
},
},
[13809] = { cd = 30, -- Frost Trap
sharedCD = {
[14311] = true, -- Freezing Trap
[34600] = true, -- Snake Trap
},
icon = select(3, GetSpellInfo(14311)),
},
[14311] = { cd = 30, -- Freezing Trap
sharedCD = {
[13809] = true, -- Frost Trap
[34600] = true, -- Snake Trap
},
icon = select(3, GetSpellInfo(14311)),
},
[34600] = { cd = 30, -- Snake Trap
sharedCD = {
[14311] = true, -- Freezing Trap
[13809] = true, -- Frost Trap
},
icon = select(3, GetSpellInfo(14311)),
},
[34490] = { cd = 20, spec = L["Marksmanship"], }, -- Silencing Shot
[19386] = { cd = 60, spec = L["Survival"], }, -- Wyvern Sting
@@ -1021,19 +1077,19 @@ local cooldownList = {
},
["NightElf"] = {
[2651] = { cd = 180, spec = L["Discipline"], }, -- Elune's Grace
[10797] = { cd = 30, spec = L["Discipline"], }, -- Star Shards
[2651] = { cd = 180, spec = L["Discipline"], class = "PRIEST"}, -- Elune's Grace
[10797] = { cd = 30, spec = L["Discipline"], class = "PRIEST"}, -- Star Shards
},
["Draenei"] = {
[32548] = { cd = 300, spec = L["Discipline"], }, -- Hymn of Hope
[32548] = { cd = 300, spec = L["Discipline"], class = "PRIEST"}, -- Hymn of Hope
},
["Human"] = {
[13908] = { cd = 600, spec = L["Discipline"], }, -- Desperate Prayer
[13908] = { cd = 600, spec = L["Discipline"], class = "PRIEST"}, -- Desperate Prayer
},
["Gnome"] = {
},
["Dwarf"] = {
[13908] = { cd = 600, spec = L["Discipline"], }, -- Desperate Prayer
[13908] = { cd = 600, spec = L["Discipline"], class = "PRIEST"}, -- Desperate Prayer
},
}
function Gladdy:GetCooldownList()
@@ -1257,3 +1313,341 @@ Gladdy.frameStrataSorting = {
[7] = "FULLSCREEN_DIALOG",
[8] = "TOOLTIP",
}
---------------------
-- TOTEM STUFF
---------------------
local totemData = {
-- Fire
[string_lower("Searing Totem")] = {id = 3599,texture = select(3, GetSpellInfo(3599)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Flametongue Totem")] = {id = 8227,texture = select(3, GetSpellInfo(8227)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Magma Totem")] = {id = 8190,texture = select(3, GetSpellInfo(8190)), color = {r = 0, g = 0, b = 0, a = 1}, pulse = 2},
[string_lower("Fire Nova Totem")] = {id = 1535,texture = select(3, GetSpellInfo(1535)), color = {r = 0, g = 0, b = 0, a = 1}, pulse = { cd = 4, once = true }},
[string_lower("Totem of Wrath")] = {id = 30706,texture = select(3, GetSpellInfo(30706)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Fire Elemental Totem")] = {id = 32982,texture = select(3, GetSpellInfo(32982)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Frost Resistance Totem")] = {id = 8181,texture = select(3, GetSpellInfo(8181)), color = {r = 0, g = 0, b = 0, a = 1}},
-- Water
[string_lower("Fire Resistance Totem")] = {id = 8184,texture = select(3, GetSpellInfo(8184)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Poison Cleansing Totem")] = {id = 8166,texture = select(3, GetSpellInfo(8166)), color = {r = 0, g = 0, b = 0, a = 1}, pulse = 4},
[string_lower("Disease Cleansing Totem")] = {id = 8170,texture = select(3, GetSpellInfo(8170)), color = {r = 0, g = 0, b = 0, a = 1}, pulse = 4},
[string_lower("Healing Stream Totem")] = {id = 5394,texture = select(3, GetSpellInfo(5394)), color = {r = 0, g = 0, b = 0, a = 1}, pulse = 2},
[string_lower("Mana Tide Totem")] = {id = 16190,texture = select(3, GetSpellInfo(16190)), color = {r = 0.078, g = 0.9, b = 0.16, a = 1}},
[string_lower("Mana Spring Totem")] = {id = 5675,texture = select(3, GetSpellInfo(5675)), color = {r = 0, g = 0, b = 0, a = 1}, pulse = 2},
-- Earth
[string_lower("Earthbind Totem")] = {id = 2484,texture = select(3, GetSpellInfo(2484)), color = {r = 0.5, g = 0.5, b = 0.5, a = 1}, pulse = 3},
[string_lower("Stoneclaw Totem")] = {id = 5730,texture = select(3, GetSpellInfo(5730)), color = {r = 0, g = 0, b = 0, a = 1}, pulse = 2},
[string_lower("Stoneskin Totem")] = {id = 8071,texture = select(3, GetSpellInfo(8071)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Strength of Earth Totem")] = {id = 8075,texture = select(3, GetSpellInfo(8075)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Earth Elemental Totem")] = {id = 33663,texture = select(3, GetSpellInfo(33663)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Tremor Totem")] = {id = 8143,texture = select(3, GetSpellInfo(8143)), color = {r = 1, g = 0.9, b = 0.1, a = 1}, pulse = 3},
-- Air
[string_lower("Grounding Totem")] = {id = 8177,texture = select(3, GetSpellInfo(8177)), color = {r = 0, g = 0.53, b = 0.92, a = 1}},
[string_lower("Grace of Air Totem")] = {id = 8835,texture = select(3, GetSpellInfo(8835)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Nature Resistance Totem")] = {id = 10595,texture = select(3, GetSpellInfo(10595)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Windfury Totem")] = {id = 8512,texture = select(3, GetSpellInfo(8512)), color = {r = 0.96, g = 0, b = 0.07, a = 1}},
[string_lower("Sentry Totem")] = {id = 6495, texture = select(3, GetSpellInfo(6495)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Windwall Totem")] = {id = 15107,texture = select(3, GetSpellInfo(15107)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Wrath of Air Totem")] = {id = 3738,texture = select(3, GetSpellInfo(3738)), color = {r = 0, g = 0, b = 0, a = 1}},
[string_lower("Tranquil Air Totem")] = {id = 25908,texture = select(3, GetSpellInfo(25908)), color = {r = 0, g = 0, b = 0, a = 1}},
}
local totemSpellIdToPulse = {
[GetSpellInfo(totemData[string_lower("Earthbind Totem")].id)] = totemData[string_lower("Earthbind Totem")].pulse,
[2484] = totemData[string_lower("Earthbind Totem")].pulse,
[GetSpellInfo(totemData[string_lower("Tremor Totem")].id)] = totemData[string_lower("Tremor Totem")].pulse,
[8143] = totemData[string_lower("Tremor Totem")].pulse,
[GetSpellInfo(totemData[string_lower("Poison Cleansing Totem")].id)] = totemData[string_lower("Poison Cleansing Totem")].pulse,
[8166] = totemData[string_lower("Poison Cleansing Totem")].pulse,
[GetSpellInfo(totemData[string_lower("Disease Cleansing Totem")].id)] = totemData[string_lower("Disease Cleansing Totem")].pulse,
[8170] = totemData[string_lower("Disease Cleansing Totem")].pulse,
[GetSpellInfo(totemData[string_lower("Fire Nova Totem")].id)] = totemData[string_lower("Fire Nova Totem")].pulse,
[1535] = totemData[string_lower("Fire Nova Totem")].pulse, -- Rank 1
[8498] = totemData[string_lower("Fire Nova Totem")].pulse, -- Rank 2
[8499] = totemData[string_lower("Fire Nova Totem")].pulse, -- Rank 3
[11314] = totemData[string_lower("Fire Nova Totem")].pulse, -- Rank 4
[11315] = totemData[string_lower("Fire Nova Totem")].pulse, -- Rank 5
[25546] = totemData[string_lower("Fire Nova Totem")].pulse, -- Rank 6
[25547] = totemData[string_lower("Fire Nova Totem")].pulse, -- Rank 7
[GetSpellInfo(totemData[string_lower("Magma Totem")].id)] = totemData[string_lower("Magma Totem")].pulse,
[8190] = totemData[string_lower("Magma Totem")].pulse, -- Rank 1
[10585] = totemData[string_lower("Magma Totem")].pulse, -- Rank 2
[10586] = totemData[string_lower("Magma Totem")].pulse, -- Rank 3
[10587] = totemData[string_lower("Magma Totem")].pulse, -- Rank 4
[25552] = totemData[string_lower("Magma Totem")].pulse, -- Rank 5
[GetSpellInfo(totemData[string_lower("Healing Stream Totem")].id)] = totemData[string_lower("Healing Stream Totem")].pulse,
[5394] = totemData[string_lower("Healing Stream Totem")].pulse, -- Rank 1
[6375] = totemData[string_lower("Healing Stream Totem")].pulse, -- Rank 2
[6377] = totemData[string_lower("Healing Stream Totem")].pulse, -- Rank 3
[10462] = totemData[string_lower("Healing Stream Totem")].pulse, -- Rank 4
[10463] = totemData[string_lower("Healing Stream Totem")].pulse, -- Rank 5
[25567] = totemData[string_lower("Healing Stream Totem")].pulse, -- Rank 6
[GetSpellInfo(totemData[string_lower("Mana Spring Totem")].id)] = totemData[string_lower("Mana Spring Totem")].pulse,
[5675] = totemData[string_lower("Mana Spring Totem")].pulse, -- Rank 1
[10495] = totemData[string_lower("Mana Spring Totem")].pulse, -- Rank 2
[10496] = totemData[string_lower("Mana Spring Totem")].pulse, -- Rank 3
[10497] = totemData[string_lower("Mana Spring Totem")].pulse, -- Rank 4
[25570] = totemData[string_lower("Mana Spring Totem")].pulse, -- Rank 5
[GetSpellInfo(totemData[string_lower("Stoneclaw Totem")].id)] = totemData[string_lower("Stoneclaw Totem")].pulse,
[5730] = totemData[string_lower("Stoneclaw Totem")].pulse, -- Rank 1
[6390] = totemData[string_lower("Stoneclaw Totem")].pulse, -- Rank 2
[6391] = totemData[string_lower("Stoneclaw Totem")].pulse, -- Rank 3
[6392] = totemData[string_lower("Stoneclaw Totem")].pulse, -- Rank 4
[10427] = totemData[string_lower("Stoneclaw Totem")].pulse, -- Rank 5
[10428] = totemData[string_lower("Stoneclaw Totem")].pulse, -- Rank 6
[25525] = totemData[string_lower("Stoneclaw Totem")].pulse, -- Rank 7
}
local totemNpcIdsToTotemData = {
--fire
[2523] = totemData[string_lower("Searing Totem")],
[3902] = totemData[string_lower("Searing Totem")],
[3903] = totemData[string_lower("Searing Totem")],
[3904] = totemData[string_lower("Searing Totem")],
[7400] = totemData[string_lower("Searing Totem")],
[7402] = totemData[string_lower("Searing Totem")],
[15480] = totemData[string_lower("Searing Totem")],
[31162] = totemData[string_lower("Searing Totem")],
[31164] = totemData[string_lower("Searing Totem")],
[31165] = totemData[string_lower("Searing Totem")],
[21995] = totemData[string_lower("Searing Totem")],
[22209] = totemData[string_lower("Searing Totem")],
[22895] = totemData[string_lower("Searing Totem")],
[22896] = totemData[string_lower("Searing Totem")],
[34687] = totemData[string_lower("Searing Totem")],
[36532] = totemData[string_lower("Searing Totem")],
[43423] = totemData[string_lower("Searing Totem")],
[67380] = totemData[string_lower("Searing Totem")],
[73477] = totemData[string_lower("Searing Totem")],
[79238] = totemData[string_lower("Searing Totem")],
[22896] = totemData[string_lower("Searing Totem")],
[84519] = totemData[string_lower("Searing Totem")],
[110730] = totemData[string_lower("Searing Totem")],
[132178] = totemData[string_lower("Searing Totem")],
[5950] = totemData[string_lower("Flametongue Totem")],
[6012] = totemData[string_lower("Flametongue Totem")],
[7423] = totemData[string_lower("Flametongue Totem")],
[10557] = totemData[string_lower("Flametongue Totem")],
[15485] = totemData[string_lower("Flametongue Totem")],
[31132] = totemData[string_lower("Flametongue Totem")],
[31133] = totemData[string_lower("Flametongue Totem")],
[31158] = totemData[string_lower("Flametongue Totem")],
[42605] = totemData[string_lower("Flametongue Totem")],
[5929] = totemData[string_lower("Magma Totem")],
[7464] = totemData[string_lower("Magma Totem")],
[7465] = totemData[string_lower("Magma Totem")],
[7466] = totemData[string_lower("Magma Totem")],
[15484] = totemData[string_lower("Magma Totem")],
[31166] = totemData[string_lower("Magma Totem")],
[31167] = totemData[string_lower("Magma Totem")],
[32887] = totemData[string_lower("Magma Totem")],
[42211] = totemData[string_lower("Magma Totem")],
[71335] = totemData[string_lower("Magma Totem")],
[71925] = totemData[string_lower("Magma Totem")],
[73085] = totemData[string_lower("Magma Totem")],
[73093] = totemData[string_lower("Magma Totem")],
[73268] = totemData[string_lower("Magma Totem")],
[88971] = totemData[string_lower("Magma Totem")],
[97369] = totemData[string_lower("Magma Totem")],
[98676] = totemData[string_lower("Magma Totem")],
[5879] = totemData[string_lower("Fire Nova Totem")],
[6110] = totemData[string_lower("Fire Nova Totem")],
[6111] = totemData[string_lower("Fire Nova Totem")],
[7844] = totemData[string_lower("Fire Nova Totem")],
[7845] = totemData[string_lower("Fire Nova Totem")],
[14662] = totemData[string_lower("Fire Nova Totem")],
[15482] = totemData[string_lower("Fire Nova Totem")],
[15483] = totemData[string_lower("Fire Nova Totem")],
[24320] = totemData[string_lower("Fire Nova Totem")],
[32775] = totemData[string_lower("Fire Nova Totem")],
[32776] = totemData[string_lower("Fire Nova Totem")],
[17539] = totemData[string_lower("Totem of Wrath")],
[22970] = totemData[string_lower("Totem of Wrath")],
[22971] = totemData[string_lower("Totem of Wrath")],
[30652] = totemData[string_lower("Totem of Wrath")],
[30653] = totemData[string_lower("Totem of Wrath")],
[30654] = totemData[string_lower("Totem of Wrath")],
[15439] = totemData[string_lower("Fire Elemental Totem")],
[40830] = totemData[string_lower("Fire Elemental Totem")],
[41337] = totemData[string_lower("Fire Elemental Totem")],
[41346] = totemData[string_lower("Fire Elemental Totem")],
[72301] = totemData[string_lower("Fire Elemental Totem")],
[5926] = totemData[string_lower("Frost Resistance Totem")],
[7412] = totemData[string_lower("Frost Resistance Totem")],
[7413] = totemData[string_lower("Frost Resistance Totem")],
[15486] = totemData[string_lower("Frost Resistance Totem")],
[31171] = totemData[string_lower("Frost Resistance Totem")],
[31172] = totemData[string_lower("Frost Resistance Totem")],
-- Water
[5927] = totemData[string_lower("Fire Resistance Totem")],
[7424] = totemData[string_lower("Fire Resistance Totem")],
[7425] = totemData[string_lower("Fire Resistance Totem")],
[15487] = totemData[string_lower("Fire Resistance Totem")],
[31169] = totemData[string_lower("Fire Resistance Totem")],
[31170] = totemData[string_lower("Fire Resistance Totem")],
[5923] = totemData[string_lower("Poison Cleansing Totem")],
[22487] = totemData[string_lower("Poison Cleansing Totem")],
[5924] = totemData[string_lower("Disease Cleansing Totem")],
[3527] = totemData[string_lower("Healing Stream Totem")],
[3906] = totemData[string_lower("Healing Stream Totem")],
[3907] = totemData[string_lower("Healing Stream Totem")],
[3908] = totemData[string_lower("Healing Stream Totem")],
[3909] = totemData[string_lower("Healing Stream Totem")],
[14664] = totemData[string_lower("Healing Stream Totem")],
[15488] = totemData[string_lower("Healing Stream Totem")],
[18235] = totemData[string_lower("Healing Stream Totem")],
[31181] = totemData[string_lower("Healing Stream Totem")],
[31182] = totemData[string_lower("Healing Stream Totem")],
[31185] = totemData[string_lower("Healing Stream Totem")],
[34686] = totemData[string_lower("Healing Stream Totem")],
[36542] = totemData[string_lower("Healing Stream Totem")],
[37810] = totemData[string_lower("Healing Stream Totem")],
[38428] = totemData[string_lower("Healing Stream Totem")],
[47077] = totemData[string_lower("Healing Stream Totem")],
[72309] = totemData[string_lower("Healing Stream Totem")],
[72457] = totemData[string_lower("Healing Stream Totem")],
[73890] = totemData[string_lower("Healing Stream Totem")],
[74433] = totemData[string_lower("Healing Stream Totem")],
[97508] = totemData[string_lower("Healing Stream Totem")],
[112567] = totemData[string_lower("Healing Stream Totem")],
[120357] = totemData[string_lower("Healing Stream Totem")],
[128539] = totemData[string_lower("Healing Stream Totem")],
[132049] = totemData[string_lower("Healing Stream Totem")],
[10467] = totemData[string_lower("Mana Tide Totem")],
[11100] = totemData[string_lower("Mana Tide Totem")],
[11101] = totemData[string_lower("Mana Tide Totem")],
[17061] = totemData[string_lower("Mana Tide Totem")],
[3573] = totemData[string_lower("Mana Spring Totem")],
[7414] = totemData[string_lower("Mana Spring Totem")],
[7415] = totemData[string_lower("Mana Spring Totem")],
[7416] = totemData[string_lower("Mana Spring Totem")],
[15304] = totemData[string_lower("Mana Spring Totem")],
[15489] = totemData[string_lower("Mana Spring Totem")],
[31186] = totemData[string_lower("Mana Spring Totem")],
[31189] = totemData[string_lower("Mana Spring Totem")],
[31190] = totemData[string_lower("Mana Spring Totem")],
-- Earth
[2630] = totemData[string_lower("Earthbind Totem")],
[22486] = totemData[string_lower("Earthbind Totem")],
[40233] = totemData[string_lower("Earthbind Totem")],
[74737] = totemData[string_lower("Earthbind Totem")],
[79155] = totemData[string_lower("Earthbind Totem")],
[3579] = totemData[string_lower("Stoneclaw Totem")],
[3911] = totemData[string_lower("Stoneclaw Totem")],
[3912] = totemData[string_lower("Stoneclaw Totem")],
[3913] = totemData[string_lower("Stoneclaw Totem")],
[7398] = totemData[string_lower("Stoneclaw Totem")],
[7399] = totemData[string_lower("Stoneclaw Totem")],
[14870] = totemData[string_lower("Stoneclaw Totem")],
[15478] = totemData[string_lower("Stoneclaw Totem")],
[31120] = totemData[string_lower("Stoneclaw Totem")],
[31121] = totemData[string_lower("Stoneclaw Totem")],
[31122] = totemData[string_lower("Stoneclaw Totem")],
[40258] = totemData[string_lower("Stoneclaw Totem")],
[102402] = totemData[string_lower("Stoneclaw Totem")],
[5873] = totemData[string_lower("Stoneskin Totem")],
[5919] = totemData[string_lower("Stoneskin Totem")],
[5920] = totemData[string_lower("Stoneskin Totem")],
[7366] = totemData[string_lower("Stoneskin Totem")],
[7367] = totemData[string_lower("Stoneskin Totem")],
[7368] = totemData[string_lower("Stoneskin Totem")],
[14663] = totemData[string_lower("Stoneskin Totem")],
[15470] = totemData[string_lower("Stoneskin Totem")],
[15474] = totemData[string_lower("Stoneskin Totem")],
[18177] = totemData[string_lower("Stoneskin Totem")],
[21994] = totemData[string_lower("Stoneskin Totem")],
[31175] = totemData[string_lower("Stoneskin Totem")],
[31176] = totemData[string_lower("Stoneskin Totem")],
[36550] = totemData[string_lower("Stoneskin Totem")],
[40267] = totemData[string_lower("Stoneskin Totem")],
[41967] = totemData[string_lower("Stoneskin Totem")],
[5874] = totemData[string_lower("Strength of Earth Totem")],
[5921] = totemData[string_lower("Strength of Earth Totem")],
[5922] = totemData[string_lower("Strength of Earth Totem")],
[7403] = totemData[string_lower("Strength of Earth Totem")],
[15464] = totemData[string_lower("Strength of Earth Totem")],
[15479] = totemData[string_lower("Strength of Earth Totem")],
[21992] = totemData[string_lower("Strength of Earth Totem")],
[30647] = totemData[string_lower("Strength of Earth Totem")],
[31129] = totemData[string_lower("Strength of Earth Totem")],
[40266] = totemData[string_lower("Strength of Earth Totem")],
[15430] = totemData[string_lower("Earth Elemental Totem")],
[24649] = totemData[string_lower("Earth Elemental Totem")],
[39387] = totemData[string_lower("Earth Elemental Totem")],
[40247] = totemData[string_lower("Earth Elemental Totem")],
[72307] = totemData[string_lower("Earth Elemental Totem")],
[5913] = totemData[string_lower("Tremor Totem")],
[41938] = totemData[string_lower("Tremor Totem")],
[41939] = totemData[string_lower("Tremor Totem")],
-- Air
[5925] = totemData[string_lower("Grounding Totem")],
[128537] = totemData[string_lower("Grounding Totem")],
[136251] = totemData[string_lower("Grounding Totem")],
[7486] = totemData[string_lower("Grace of Air Totem")],
[7487] = totemData[string_lower("Grace of Air Totem")],
[15463] = totemData[string_lower("Grace of Air Totem")],
[7467] = totemData[string_lower("Nature Resistance Totem")],
[7468] = totemData[string_lower("Nature Resistance Totem")],
[7469] = totemData[string_lower("Nature Resistance Totem")],
[15490] = totemData[string_lower("Nature Resistance Totem")],
[31173] = totemData[string_lower("Nature Resistance Totem")],
[31174] = totemData[string_lower("Nature Resistance Totem")],
[6112] = totemData[string_lower("Windfury Totem")],
[7483] = totemData[string_lower("Windfury Totem")],
[7484] = totemData[string_lower("Windfury Totem")],
[14666] = totemData[string_lower("Windfury Totem")],
[15496] = totemData[string_lower("Windfury Totem")],
[15497] = totemData[string_lower("Windfury Totem")],
[22897] = totemData[string_lower("Windfury Totem")],
[41940] = totemData[string_lower("Windfury Totem")],
[41941] = totemData[string_lower("Windfury Totem")],
[80703] = totemData[string_lower("Windfury Totem")],
[105690] = totemData[string_lower("Windfury Totem")],
[133684] = totemData[string_lower("Windfury Totem")],
[3968] = totemData[string_lower("Sentry Totem")],
[28938] = totemData[string_lower("Sentry Totem")],
[40187] = totemData[string_lower("Sentry Totem")],
[69505] = totemData[string_lower("Sentry Totem")],
[70413] = totemData[string_lower("Sentry Totem")],
[71145] = totemData[string_lower("Sentry Totem")],
[147410] = totemData[string_lower("Sentry Totem")],
[9687] = totemData[string_lower("Windwall Totem")],
[9688] = totemData[string_lower("Windwall Totem")],
[9689] = totemData[string_lower("Windwall Totem")],
[15492] = totemData[string_lower("Windwall Totem")],
[15447] = totemData[string_lower("Wrath of Air Totem")],
[36556] = totemData[string_lower("Wrath of Air Totem")],
[15803] = totemData[string_lower("Tranquil Air Totem")],
}
function Gladdy:GetTotemData()
return totemData, totemNpcIdsToTotemData, totemSpellIdToPulse
end
EventListener.lua
+78 -23
View File
@@ -1,4 +1,4 @@
local select, string_gsub, tostring, pairs = select, string.gsub, tostring, pairs
local select, string_gsub, tostring, pairs, ipairs = select, string.gsub, tostring, pairs, ipairs
local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo
local AURA_TYPE_DEBUFF = AURA_TYPE_DEBUFF
@@ -11,10 +11,11 @@ local FindAuraByName = AuraUtil.FindAuraByName
local GetTime = GetTime
local Gladdy = LibStub("Gladdy")
local L = Gladdy.L
local Cooldowns = Gladdy.modules["Cooldowns"]
local Diminishings = Gladdy.modules["Diminishings"]
local EventListener = Gladdy:NewModule("EventListener", nil, {
local EventListener = Gladdy:NewModule("EventListener", 101, {
test = true,
})
@@ -51,12 +52,6 @@ function EventListener:Reset()
self:SetScript("OnEvent", nil)
end
function Gladdy:DetectSpec(unit, spec)
if spec then
self.modules["Cooldowns"]:DetectSpec(unit, spec)
end
end
function Gladdy:SpotEnemy(unit, auraScan)
local button = self.buttons[unit]
if not unit or not button then
@@ -78,18 +73,21 @@ function Gladdy:SpotEnemy(unit, auraScan)
if ( not spellName ) then
break
end
if Gladdy.cooldownBuffs[spellName] then -- Check for auras that detect used CDs (like Fear Ward)
if Gladdy.cooldownBuffs[spellName] and unitCaster then -- Check for auras that detect used CDs (like Fear Ward)
for arenaUnit,v in pairs(self.buttons) do
if (UnitIsUnit(arenaUnit, unitCaster)) then
Cooldowns:CooldownUsed(arenaUnit, v.class, Gladdy.cooldownBuffs[spellName].spellId, expirationTime - GetTime())
Cooldowns:CooldownUsed(arenaUnit, v.class, Gladdy.cooldownBuffs[spellName].spellId, Gladdy.cooldownBuffs[spellName].cd(expirationTime - GetTime()))
-- /run LibStub("Gladdy").modules["Cooldowns"]:CooldownUsed("arena5", "PRIEST", 6346, 10)
end
end
end
if Gladdy.specBuffs[spellName] then -- Check for auras that detect a spec
if Gladdy.cooldownBuffs.racials[spellName] and Gladdy.cooldownBuffs.racials[spellName] then
Gladdy:SendMessage("RACIAL_USED", unit, spellName, Gladdy.cooldownBuffs.racials[spellName].cd(expirationTime - GetTime()), spellName)
end
if Gladdy.specBuffs[spellName] and unitCaster then -- Check for auras that detect a spec
local unitPet = string_gsub(unit, "%d$", "pet%1")
if UnitIsUnit(unit, unitCaster) or UnitIsUnit(unitPet, unitCaster) then
Gladdy:DetectSpec(unit, Gladdy.specBuffs[spellName])
EventListener:DetectSpec(unit, Gladdy.specBuffs[spellName])
end
end
end
@@ -141,7 +139,7 @@ function EventListener:COMBAT_LOG_EVENT_UNFILTERED()
unitClass = Gladdy.buttons[srcUnit].race
end
Cooldowns:CooldownUsed(srcUnit, unitClass, spellId)
Gladdy:DetectSpec(srcUnit, Gladdy.specSpells[spellName])
self:DetectSpec(srcUnit, Gladdy.specSpells[spellName])
end
end
@@ -154,7 +152,7 @@ function EventListener:COMBAT_LOG_EVENT_UNFILTERED()
Gladdy:SpotEnemy(srcUnit, true)
end
if not Gladdy.buttons[srcUnit].spec then
Gladdy:DetectSpec(srcUnit, Gladdy.specSpells[spellName])
self:DetectSpec(srcUnit, Gladdy.specSpells[spellName])
end
end
end
@@ -215,7 +213,23 @@ Gladdy.exceptionNames = { -- TODO MOVE ME TO CLASSBUFFS LIB
}
Gladdy.cooldownBuffs = {
[GetSpellInfo(6346)] = { cd = 180, spellId = 6346 }, -- Fear Ward
[GetSpellInfo(6346)] = { cd = function(expTime) -- 180s uptime == cd
return expTime
end, spellId = 6346 }, -- Fear Ward
[GetSpellInfo(11305)] = { cd = function(expTime) -- 15s uptime
return 180 - (15 - expTime)
end, spellId = 11305 }, -- Sprint
[GetSpellInfo(36554)] = { cd = function(expTime) -- 3s uptime
return 30 - (3 - expTime)
end, spellId = 36554 }, -- Shadowstep
[GetSpellInfo(26889)] = { cd = function(expTime) -- 3s uptime
return 180 - (10 - expTime)
end, spellId = 26889 }, -- Vanish
racials = {
[GetSpellInfo(20600)] = { cd = function(expTime) -- 20s uptime
return GetTime() - (20 - expTime)
end, spellId = 20600 }, -- Perception
}
}
function EventListener:UNIT_AURA(unit)
@@ -236,24 +250,26 @@ function EventListener:UNIT_AURA(unit)
Gladdy:SendMessage("AURA_GAIN_LIMIT", unit, auraType, n - 1)
break
end
if Gladdy.cooldownBuffs[spellName] then -- Check for auras that hint used CDs (like Fear Ward)
if Gladdy.cooldownBuffs[spellName] and unitCaster then -- Check for auras that hint used CDs (like Fear Ward)
for arenaUnit,v in pairs(Gladdy.buttons) do
if (UnitIsUnit(arenaUnit, unitCaster)) then
Cooldowns:CooldownUsed(arenaUnit, v.class, Gladdy.cooldownBuffs[spellName].spellId, expirationTime - GetTime())
Cooldowns:CooldownUsed(arenaUnit, v.class, Gladdy.cooldownBuffs[spellName].spellId, Gladdy.cooldownBuffs[spellName].cd(expirationTime - GetTime()))
end
end
end
if not button.spec and Gladdy.specBuffs[spellName] then
if Gladdy.cooldownBuffs.racials[spellName] and Gladdy.cooldownBuffs.racials[spellName] then
Gladdy:SendMessage("RACIAL_USED", unit, spellName, Gladdy.cooldownBuffs.racials[spellName].cd(expirationTime - GetTime()), spellName)
end
if not button.spec and Gladdy.specBuffs[spellName] and unitCaster then
local unitPet = string_gsub(unit, "%d$", "pet%1")
if unitCaster and (UnitIsUnit(unit, unitCaster) or UnitIsUnit(unitPet, unitCaster)) then
Gladdy:DetectSpec(unit, Gladdy.specBuffs[spellName])
self:DetectSpec(unit, Gladdy.specBuffs[spellName])
end
end
if Gladdy.exceptionNames[spellID] then
spellName = Gladdy.exceptionNames[spellID]
end
Gladdy:SendMessage("AURA_GAIN", unit, auraType, spellID, spellName, texture, duration, expirationTime, count, debuffType, i)
Gladdy:Call("Announcements", "CheckDrink", unit, spellName)
end
end
end
@@ -262,7 +278,7 @@ function EventListener:UNIT_SPELLCAST_START(unit)
if Gladdy.buttons[unit] then
local spellName = UnitCastingInfo(unit)
if Gladdy.specSpells[spellName] and not Gladdy.buttons[unit].spec then
Gladdy:DetectSpec(unit, Gladdy.specSpells[spellName])
self:DetectSpec(unit, Gladdy.specSpells[spellName])
end
end
end
@@ -271,7 +287,7 @@ function EventListener:UNIT_SPELLCAST_CHANNEL_START(unit)
if Gladdy.buttons[unit] then
local spellName = UnitChannelInfo(unit)
if Gladdy.specSpells[spellName] and not Gladdy.buttons[unit].spec then
Gladdy:DetectSpec(unit, Gladdy.specSpells[spellName])
self:DetectSpec(unit, Gladdy.specSpells[spellName])
end
end
end
@@ -280,7 +296,46 @@ function EventListener:UNIT_SPELLCAST_SUCCEEDED(unit)
if Gladdy.buttons[unit] then
local spellName = UnitCastingInfo(unit)
if Gladdy.specSpells[spellName] and not Gladdy.buttons[unit].spec then
Gladdy:DetectSpec(unit, Gladdy.specSpells[spellName])
self:DetectSpec(unit, Gladdy.specSpells[spellName])
end
end
end
local function notIn(spec, list)
for _,v in ipairs(list) do
if spec == v then
return false
end
end
return true
end
function EventListener:DetectSpec(unit, spec)
local button = Gladdy.buttons[unit]
if (not button or not spec or button.spec) then
return
end
if button.class == "PALADIN" and notIn(spec, {L["Holy"], L["Retribution"], L["Protection"]})
or button.class == "SHAMAN" and notIn(spec, {L["Restoration"], L["Enhancement"], L["Elemental"]})
or button.class == "ROGUE" and notIn(spec, {L["Subtlety"], L["Assassination"], L["Combat"]})
or button.class == "WARLOCK" and notIn(spec, {L["Demonology"], L["Destruction"], L["Affliction"]})
or button.class == "PRIEST" and notIn(spec, {L["Shadow"], L["Discipline"], L["Holy"]})
or button.class == "MAGE" and notIn(spec, {L["Frost"], L["Fire"], L["Arcane"]})
or button.class == "DRUID" and notIn(spec, {L["Restoration"], L["Feral"], L["Balance"]})
or button.class == "HUNTER" and notIn(spec, {L["Beast Mastery"], L["Marksmanship"], L["Survival"]})
or button.class == "WARRIOR" and notIn(spec, {L["Arms"], L["Protection"], L["Fury"]}) then
return
end
if not button.spec then
button.spec = spec
Gladdy:SendMessage("UNIT_SPEC", unit, spec)
end
end
function EventListener:Test(unit)
local button = Gladdy.buttons[unit]
if (Gladdy.testData[unit].testSpec) then
button.spec = nil
self:DetectSpec(unit, button.testSpec)
end
end
Frame.lua
+11 -2
View File
@@ -134,6 +134,8 @@ function Gladdy:UpdateFrame()
local height = (self.db.healthBarHeight + powerBarHeight) * teamSize
+ (self.db.highlightInset and 0 or self.db.highlightBorderSize * 2 * teamSize)
+ self.db.bottomMargin * (teamSize - 1)
local singleFrameHeight = self.db.healthBarHeight + powerBarHeight +
(self.db.highlightInset and 0 or self.db.highlightBorderSize * 2) + self.db.bottomMargin
-- Highlight
margin = margin + highlightBorderSize
@@ -155,10 +157,13 @@ function Gladdy:UpdateFrame()
self.frame:SetPoint("CENTER")
else
local scale = self.frame:GetEffectiveScale()
local growMiddle = self.db.growMiddle and teamSize > 0 and teamSize / 2 >= 1 and (teamSize - 1) * (singleFrameHeight / 2) or 0
if (self.db.growDirection == "TOP") then
self.frame:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", self.db.x / scale, self.db.y / scale)
self.frame:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", self.db.x / scale, (self.db.y / scale) - growMiddle)
elseif self.db.growDirection == "BOTTOM" then
self.frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", self.db.x / scale, (self.db.y / scale) + growMiddle)
else
self.frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", self.db.x / scale, self.db.y / scale)
self.frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", self.db.x / scale, (self.db.y / scale))
end
end
@@ -368,6 +373,10 @@ function Gladdy:SetPosition(frame, unit, xOffsetDB, yOffsetDB, newLayout, module
if (not newLayout) then
--Gladdy:Debug("INFO", name, "old X/Y:", frame:GetCenter())
local xOffset, yOffset = frame:GetLeft(), frame:GetTop()
if not xOffset or not yOffset then
xOffset = frame:GetCenter()-- - frame:GetWidth()/2
yOffset = select(2, frame:GetCenter())-- + frame:GetHeight()/2
end
local x,y = button.healthBar:GetLeft(), button.healthBar:GetTop()
local newXOffset = math_abs(x - xOffset) * (x > xOffset and -1 or 1)
local newYOffset = math_abs(y - yOffset) * (y > yOffset and -1 or 1)
Gladdy.lua
+25 -9
View File
@@ -17,7 +17,7 @@ local IsActiveBattlefieldArena = IsActiveBattlefieldArena
local IsInInstance = IsInInstance
local GetNumArenaOpponents = GetNumArenaOpponents
local RELEASE_TYPES = { alpha = "Alpha", beta = "Beta", release = "Release"}
local PREFIX = "TBC-Classic_v"
local PREFIX = "Gladdy v"
local VERSION_REGEX = PREFIX .. "(%d+%.%d+)%-(%a)"
local LibStub = LibStub
@@ -27,14 +27,14 @@ local LibStub = LibStub
---------------------------
local MAJOR, MINOR = "Gladdy", 5
local MAJOR, MINOR = "Gladdy", 6
local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
local L
Gladdy.version_major_num = 2
Gladdy.version_minor_num = 0.00
Gladdy.version_minor_num = 0.10
Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
Gladdy.version_releaseType = RELEASE_TYPES.release
Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType
Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType
Gladdy.VERSION_REGEX = VERSION_REGEX
Gladdy.debug = false
@@ -187,6 +187,12 @@ function Gladdy:NewModule(name, priority, defaults)
module.defaults = defaults or {}
module.messages = {}
module.RegisterMessages = function(self, ...)
for _,message in pairs({...}) do
self.messages[message] = message
end
end
module.RegisterMessage = function(self, message, func)
self.messages[message] = func or message
end
@@ -195,6 +201,12 @@ function Gladdy:NewModule(name, priority, defaults)
self.messages[message] = nil
end
module.UnregisterMessages = function(self, ...)
for _,message in pairs({...}) do
self.messages[message] = nil
end
end
module.UnregisterAllMessages = function(self)
for msg,_ in pairs(self.messages) do
self.messages[msg] = nil
@@ -268,6 +280,7 @@ function Gladdy:OnInitialize()
self.LSM:Register("statusbar", "Smooth", "Interface\\AddOns\\Gladdy\\Images\\Smooth")
self.LSM:Register("statusbar", "Minimalist", "Interface\\AddOns\\Gladdy\\Images\\Minimalist")
self.LSM:Register("statusbar", "LiteStep", "Interface\\AddOns\\Gladdy\\Images\\LiteStep.tga")
self.LSM:Register("statusbar", "Flat", "Interface\\AddOns\\Gladdy\\Images\\UI-StatusBar")
self.LSM:Register("border", "Gladdy Tooltip round", "Interface\\AddOns\\Gladdy\\Images\\UI-Tooltip-Border_round_selfmade")
self.LSM:Register("border", "Gladdy Tooltip squared", "Interface\\AddOns\\Gladdy\\Images\\UI-Tooltip-Border_square_selfmade")
self.LSM:Register("font", "DorisPP", "Interface\\AddOns\\Gladdy\\Images\\DorisPP.TTF")
@@ -276,11 +289,11 @@ function Gladdy:OnInitialize()
L = self.L
self.testData = {
["arena1"] = { name = "Swift", raceLoc = L["NightElf"], classLoc = L["Warrior"], class = "WARRIOR", health = 9635, healthMax = 14207, power = 76, powerMax = 100, powerType = 1, testSpec = L["Arms"], race = "NightElf" },
["arena2"] = { name = "Vilden", raceLoc = L["Undead"], classLoc = L["Mage"], class = "MAGE", health = 10969, healthMax = 11023, power = 7833, powerMax = 10460, powerType = 0, testSpec = L["Frost"], race = "Scourge" },
["arena3"] = { name = "Krymu", raceLoc = L["Human"], classLoc = L["Rogue"], class = "ROGUE", health = 1592, healthMax = 11740, power = 45, powerMax = 110, powerType = 3, testSpec = L["Subtlety"], race = "Human" },
["arena4"] = { name = "Talmon", raceLoc = L["Human"], classLoc = L["Warlock"], class = "WARLOCK", health = 10221, healthMax = 14960, power = 9855, powerMax = 9855, powerType = 0, testSpec = L["Demonology"], race = "Human" },
["arena5"] = { name = "Hydra", raceLoc = L["Undead"], classLoc = L["Priest"], class = "PRIEST", health = 11960, healthMax = 11960, power = 2515, powerMax = 10240, powerType = 0, testSpec = L["Discipline"], race = "Human" },
["arena1"] = { name = "Swift", raceLoc = L["NightElf"], classLoc = L["Hunter"], class = "HUNTER", health = 67, healthMax = 100, power = 76, powerMax = 100, powerType = 1, testSpec = L["Marksmanship"], race = "NightElf" },
["arena2"] = { name = "Vilden", raceLoc = L["Undead"], classLoc = L["Mage"], class = "MAGE", health = 99, healthMax = 100, power = 7833, powerMax = 10460, powerType = 0, testSpec = L["Frost"], race = "Scourge" },
["arena3"] = { name = "Krymu", raceLoc = L["Human"], classLoc = L["Rogue"], class = "ROGUE", health = 13, healthMax = 100, power = 45, powerMax = 110, powerType = 3, testSpec = L["Subtlety"], race = "Human" },
["arena4"] = { name = "Talmon", raceLoc = L["Human"], classLoc = L["Warlock"], class = "WARLOCK", health = 68, healthMax = 100, power = 9855, powerMax = 9855, powerType = 0, testSpec = L["Demonology"], race = "Human" },
["arena5"] = { name = "Hydra", raceLoc = L["Undead"], classLoc = L["Priest"], class = "PRIEST", health = 100, healthMax = 100, power = 2515, powerMax = 10240, powerType = 0, testSpec = L["Discipline"], race = "Human" },
}
self.cooldownSpellIds = {}
@@ -394,6 +407,9 @@ function Gladdy:Test()
button:SetAlpha(1)
end
for _, module in self:IterModules() do
self:Call(module, "TestOnce")
end
end
end
Gladdy.toc
+5 -3
View File
@@ -1,7 +1,7 @@
## Interface: 20503
## Interface: 20504
## Title: Gladdy - TBC
## Version: 2.00-Release
## Notes: The most powerful arena AddOn for WoW 2.5.3
## Version: 2.10-Release
## Notes: The most powerful arena AddOn for WoW 2.5.4
## Author: XiconQoo, DnB_Junkee, Knall
## X-Email: contact me on discord Knall#1751
## SavedVariables: GladdyXZ
@@ -15,6 +15,7 @@ Frame.lua
Options.lua
Constants.lua
ImportStrings.lua
Util.lua
Modules\Announcements.lua
Modules\Healthbar.lua
@@ -26,6 +27,7 @@ Modules\Clicks.lua
Modules\Diminishings.lua
Modules\Highlight.lua
Modules\TotemPlates.lua
Modules\TotemPulse.lua
Modules\Trinket.lua
Modules\Racial.lua
Modules\Cooldowns.lua
Images/Classes/INV_Hammer_01.blp
BIN
View File
Binary file not shown.
Images/Classes/INV_Sword_27.blp
BIN
View File
Binary file not shown.
Images/Classes/INV_ThrowingKnife_04.blp
BIN
View File
Binary file not shown.
Images/Classes/Spell_Nature_Drowsy.blp
BIN
View File
Binary file not shown.
Images/UI-StatusBar.blp
BIN
View File
Binary file not shown.
Images/downarrow.blp
BIN
View File
Binary file not shown.
Images/uparrow.blp
BIN
View File
Binary file not shown.
ImportStrings.lua
+2 -2
View File
File diff suppressed because one or more lines are too long
Lang.lua
+381
View File
@@ -28,6 +28,34 @@ L["Troll"] = C_CreatureInfo.GetRaceInfo(8).raceName
L["Blood Elf"] = C_CreatureInfo.GetRaceInfo(10).raceName
L["Draenei"] = C_CreatureInfo.GetRaceInfo(11).raceName
--Specs
--[[
L["Balance"] = BALANCE
L["Combat"] = COMBAT_LABEL
L["Fire"] = STRING_SCHOOL_FIRE
L["Arcane"] = STRING_SCHOOL_ARCANE
L["Shadow"] = STRING_SCHOOL_SHADOW
L["Holy"] = STRING_SCHOOL_HOLY
L["Elemental"] = STRING_SCHOOL_ELEMENTAL
--Modules
--L["Announcements"] = CHAT_ANNOUNCE
L["Auras"] = COMBAT_TEXT_SHOW_AURAS_TEXT
L["Cast Bar"] = SHOW_ENEMY_CAST
L["Buffs and Debuffs"] = BUFFOPTIONS_LABEL
--L["Class Icon"] = CLASS .. " " .. EMBLEM_SYMBOL
--L["Clicks"] =
L["Cooldowns"] = CAPACITANCE_SHIPMENT_COOLDOWN:gsub(": %%s", "")
--L["Export Import"] =
--L["Healthbar"]
L["Highlight"] = HIGHLIGHTING:gsub(":", "")
L["Pet"] = PET_TYPE_PET
--L["Racial"] = RACE .. " " .. ABILITIES
--L["Range Check"] =
L["Trinket"] = TRINKET0SLOT
--]]
if (GetLocale() == "ruRU") then
-- Specs
L["Balance"] = "Баланс"
@@ -1413,6 +1441,359 @@ elseif GetLocale() == "zhCN" then
L["Background Color of the frame"] = "框架的背景顏色"
L["Gladdy"] = "Gladdy框架" --Line 210, 709, 727
elseif GetLocale() == "frFR" then
-- Announcements.lua
L["Announcements"] = "ANNONCE"
L["RESURRECTING: %s (%s)"] = "EN TRAIN DE RESSUSCITER: %s (%s)"
L["SPEC DETECTED: %s - %s (%s)"] = "SPEC DETECTÉ: %s - %s (%s)"
L["LOW HEALTH: %s (%s)"] = "VIE BASSE: %s (%s)"
L["TRINKET USED: %s (%s)"] = "TRINKET UTILISÉ: %s (%s)"
L["TRINKET READY: %s (%s)"] = "TRINKET PRÊT: %s (%s)"
L["DRINKING: %s (%s)"] = "EN TRAIN DE BOIRE: %s (%s)"
L["Self"] = "Soi"
L["Party"] = "Groupe"
L["Raid Warning"] = "Avertissement de raid"
L["Blizzard's Floating Combat Text"] = "Texte de combat flottant de Blizzard"
L["Trinket used"] = "Trinket utilisé"
L["Announce when an enemy's trinket is used"] = "Annonce quand un trinket ennemie est utilisé"
L["Trinket ready"] = "Trinket prêt"
L["Announce when an enemy's trinket is ready again"] = "Annonce quand un trinket ennemie est prêt de nouveau"
L["Drinking"] = "En train de boire"
L["Announces when enemies sit down to drink"] = "Annonce quand les ennemies s'assoient pour boire"
L["Resurrection"] = "Resurrection"
L["Announces when an enemy tries to resurrect a teammate"] = "Annonce quand un ennemie essaie de ressusciter un membre de son groupe"
L["New enemies"] = "Nouveaux ennemis"
L["Announces when new enemies are discovered"] = "Annonce quand les ennemies sont découverts"
L["Spec Detection"] = "Détection des SPEC"
L["Announces when the spec of an enemy was detected"] = "Annonce quand une spec d'un ennemie est détecté"
L["Low health"] = "Vie Basse"
L["Announces when an enemy drops below a certain health threshold"] = "Annonce quand un ennemie tombe en dessous d'un certain seuil de points de vie"
L["Low health threshold"] = "Seuil de points de vie bas"
L["Choose how low an enemy must be before low health is announced"] = "Choisissez à quel point un ennemi doit être bas avant d'annoncer une santé faible"
L["Destination"] = "Destination"
L["Choose how your announcements are displayed"] = "Choisissez comment vos annonces sont affichées"
-- ArenaCountDown.lua
L["Arena Countdown"] = "Compte à rebours de l'arène"
L["Turn on/off"] = "Activer / désactiver"
L["Turns countdown before the start of an arena match on/off."] = "Active / désactive le compte à rebours avant le début d'un match d'arène"
L["Size"] = "Taille"
-- Auras.lua
L["Auras"] = "Auras"
L["Frame"] = "Cadre"
L["Cooldown"] = "Temps de recharge"
L["No Cooldown Circle"] = "Pas de Balayage du temps de recharge"
L["Cooldown circle alpha"] = "Alpha du Balayage du temps de recharge"
L["Font"] = "Police de caractère"
L["Font of the cooldown"] = "Police du temps de recharge"
L["Font scale"] = "Échelle de police"
L["Scale of the text"] = "Échelle du texte"
L["Font color"] = "Couleur de la police"
L["Color of the text"] = "Couleur du texte"
L["Border"] = "Bordure"
L["Border style"] = "Style de bordure"
L["Buff color"] = "Couleur des buff"
L["Debuff color"] = "Couleur des Debuff"
L["Check All"] = "Vérifie tout"
L["Uncheck All"] = "Décocher tout"
L["Enabled"] = "Activé"
L["Priority"] = "Priorité"
-- BuffsDebuffs.lua
L["Buffs and Debuffs"] = "Buffs et Debuffs"
L["Enable"] = "Activé"
L["Enabled Buffs and Debuffs module"] = "Module de buffs et debuffs activés"
L["Show CC"] = "Montrer les CC"
L["Shows all debuffs, which are displayed on the ClassIcon as well"] = "Montrer tout les debuffs, qui sont affichés sur l'icone de classe aussi"
L["Buffs"] = "Buffs"
L["Size & Padding"] = "Taille et remplissage"
L["Icon Size"] = "Taille de l'icône"
L["Size of the DR Icons"] = "Taille des icones de DR"
L["Icon Width Factor"] = "Facteur de largeur d'icône"
L["Stretches the icon"] = "Étire l'icône"
L["Icon Padding"] = "Remplissage d'icônes"
L["Space between Icons"] = "Espace entre les icônes"
L["Position"] = "Position"
L["Aura Position"] = "Position de l'aura"
L["Position of the aura icons"] = "Position de l'icône de l'aura"
L["Top"] = "Haut"
L["Bottom"] = "Bas"
L["Left"] = "Gauche"
L["Right"] = "Droite"
L["Grow Direction"] = "Direction de croissance"
L["Grow Direction of the aura icons"] = "Direction de croissance de l'icônr de l'aura"
L["Horizontal offset"] = "Décalage horizontal"
L["Vertical offset"] = "Décalage verticale"
L["Alpha"] = "Alpha"
L["Debuffs"] = "Debuffs"
L["Dynamic Timer Color"] = "Couleur de la minuterie dynamique"
L["Show dynamic color on cooldown numbers"] = "Afficher la couleur dynamique sur les numéros de recharge"
L["Color of the cooldown timer and stacks"] = "Couleur du temps de recharge et des piles"
L["Spell School Colors"] = "Couleurs de l'école de sorts"
L["Spell School Colors Enabled"] = "Couleurs de l'école de sorts"
L["Show border colors by spell school"] = "Afficher les couleurs des bordures par école de sorts"
L["Curse"] = "Malédiction"
L["Color of the border"] = "Couleur de la bordure"
L["Magic"] = "Magique"
L["Poison"] = "Poison"
L["Physical"] = "Physique"
L["Immune"] = "Immunisé"
L["Disease"] = "Maladie"
L["Aura"] = "Aura"
L["Form"] = "Forme"
-- Castbar.lua
L["Cast Bar"] = "Barre d'incantation"
L["Bar"] = "Barre"
L["Bar Size"] = "Taille de la barre"
L["Bar height"] = "Hauteur de la barre"
L["Height of the bar"] = "Hauteur de la barre"
L["Bar width"] = "Largeur de la barre"
L["Width of the bars"] = "Largeur de la barre"
L["Texture"] = "Texture"
L["Bar texture"] = "Texture de la barre"
L["Texture of the bar"] = "Texture de la barre"
L["Bar color"] = "Couleur de la barre"
L["Color of the cast bar"] = "Couleur de la barre d'incantation"
L["Background color"] = "Couleur de l'Arrière plan"
L["Color of the cast bar background"] = "Couleur de l'Arrière plan de la barre d'incantation"
L["Border size"] = "taille de la bordure"
L["Status Bar border"] = "Bordure de la barre de statut"
L["Status Bar border color"] = "Couleur de la bordure de la barre de statut"
L["Icon"] = "Icone"
L["Icon size"] = "Taille de l'icone"
L["Icon border"] = "Bordure de l'icone"
L["Icon border color"] = "Couleur de la bordure de l'icone"
L["Spark"] = "Etincelle"
L["Spark enabled"] = "Etincelle activé"
L["Spark color"] = "Couleur de l'étincelle"
L["Color of the cast bar spark"] = "Couleur de l'étincelle de la barre d'incantation"
L["Font of the castbar"] = "Police de la barre d'incantation"
L["Font size"] = "Taille de la police"
L["Size of the text"] = "Taille du texte"
L["Format"] = "Format"
L["Timer Format"] = "Format du timer"
L["Remaining"] = "Restant"
L["Total"] = "Total"
L["Both"] = "Les deux"
L["Castbar position"] = "Position de la barre d'incantation"
L["Icon position"] = "Position de l'icone"
L["Offsets"] = "Décalage"
-- Classicon.lua
L["Class Icon"] = "Icone de la classe"
L["Balance"] = "Equilibre"
L["Feral"] = "Combat farouche"
L["Restoration"] = "Restauration"
L["Beast Mastery"] = "Maîtrise des bêtes"
L["Marksmanship"] = "Précision"
L["Survival"] = "Survie"
L["Arcane"] = "Arcane"
L["Fire"] = "Feu"
L["Frost"] = "Givre"
L["Holy"] = "Sacré"
L["Retribution"] = "Vindicte"
L["Protection"] = "Protection"
L["Discipline"] = "Discipline"
L["Shadow"] = "Ombre"
L["Assassination"] = "Assassinat"
L["Combat"] = "Combat"
L["Subtlety"] = "Finesse"
L["Elemental"] = "Elementaire"
L["Enhancement"] = "Amélioration"
L["Affliction"] = "Affliction"
L["Demonology"] = "Démonologie"
L["Destruction"] = "Destruction"
L["Arms"] = "Armes"
L["Fury"] = "Fureur"
L["Show Spec Icon"] = "Afficher l'icone des spécialisations"
L["Shows Spec Icon once spec is detected"] = "Afficher l'icone des spécialisations une fois que les spé sont détectés"
L["Icon width factor"] = "Facteur de largeur d'icône"
L["This changes positions with trinket"] = "Cela change de position avec le trinket"
L["Border color"] = "Couleur de la bordure"
--CombatIndicator.lua
L["Combat Indicator"] = "Indicateur de combat"
L["Enable Combat Indicator icon"] = "Activer l'icone de l'indicateur de combat"
L["Anchor"] = "Ancre"
L["This changes the anchor of the ci icon"] = "Cela change l'ancre de l'icône de l'indicateur de combat"
L["This changes position relative to its anchor of the ci icon"] = "Cela change la position par rapport à son ancre de l'icône de l'indicateur de combat"
-- Cooldowns.lua
L["Cooldowns"] = "Temps de recharge (CD)"
L["COOLDOWN USED: %s (%s) used %s - %s sec. cooldown"] = "CD utilisé : %s (%s) utilisé %s - %s sec. cd"
L["Enabled cooldown module"] = "Module du temps de recharge activé"
L["Cooldown size"] = "Taille du temps de recharge"
L["Size of each cd icon"] = "Taille de chaque icone de CD"
L["Max Icons per row"] = "Nombre maximal d'icônes par ligne"
L["Scale of the font"] = "Échelle de la police"
L["Anchor of the cooldown icons"] = "Ancre de l'icone du temps de recharge"
L["Grow Direction of the cooldown icons"] = "Direction de croissance des icônes de temps de recharge"
L["Offset"] = "Décalage"
-- Diminishings.lua
L["Diminishings"] = "Rendements décroissants (DR)"
L["Enabled DR module"] = "Activer le module DR"
L["DR Cooldown position"] = "Position du temps de recharge des DR"
L["Position of the cooldown icons"] = "Position des icones de temps de recharge"
L["DR Border Colors"] = "Couleur de la bordure des DR"
L["Dr Border Colors Enabled"] = "Couleur de la bordure des DR activé"
L["Colors borders of DRs in respective DR-color below"] = "Couleurs des bordures des DR dans la couleur DR respective ci-dessous"
L["Half"] = "Demi"
L["Quarter"] = "Quart"
L["Categories"] = "Catégories"
L["Force Icon"] = "Forcer les icones"
L["Icon of the DR"] = "Icones des DR"
-- ExportImport.lua
L["Export Import"] = "Exporter Importer"
L["Profile Export Import"] = "Profile de l'Exporter Importer"
-- Healthbar.lua
L["Health Bar"] = "Barre de vie"
L["DEAD"] = "MORT"
L["LEAVE"] = "QUITTER"
L["General"] = "Général"
L["Color of the status bar background"] = "Couleur de l'arrière-plan de la barre d'état"
L["Font of the bar"] = "Police de la barre"
L["Name font size"] = "Taille de la police du nom"
L["Size of the name text"] = "Taille du texte du nom"
L["Health font size"] = "Taille de la police de la santé"
L["Size of the health text"] = "Taille du texte de la santé"
L["Size of the border"] = "Taille de la bordure"
L["Health Bar Text"] = "Texte de la barre de santé"
L["Show name text"] = "Afficher le texte du nom"
L["Show the units name"] = "Afficher le nom des unités"
L["Show ArenaX"] = "Afficher ArenaX"
L["Show Arena1-5 as name instead"] = "Afficher Arena1-5 comme nom à la place"
L["Show the actual health"] = "Afficher la santé réelle"
L["Show the actual health on the health bar"] = "Afficher la santé réelle sur la barre de santé"
L["Show max health"] = "Afficher la santé maximale"
L["Show max health on the health bar"] = "Afficher la santé maximale sur la barre de santé"
L["Show health percentage"] = "Afficher le pourcentage de santé"
L["Show health percentage on the health bar"] = "Afficher le pourcentage de santé sur la barre de santé"
-- Highlight.lua
L["Highlight"] = "Surbrillance"
L["Show Inside"] = "Afficher dedans"
L["Show Highlight border inside of frame"] = "Afficher la bordure de surbrillance à l'intérieur du cadre"
L["Colors"] = "Couleurs"
L["Target border color"] = "Couleur de la bordure cible"
L["Color of the selected targets border"] = "Couleur de la bordure des cibles sélectionnées"
L["Focus border color"] = "Couleur de la bordure du Focus"
L["Color of the focus border"] = "Couleur de la bordure du Focus"
L["Highlight target"] = "Mettre la cible en surbrillance"
L["Toggle if the selected target should be highlighted"] = "Basculer si la cible sélectionnée doit être mise en surbrillance"
L["Show border around target"] = "Afficher la bordure autour de la cible"
L["Toggle if a border should be shown around the selected target"] = "Basculer si une bordure doit être affichée autour de la cible sélectionnée"
L["Show border around focus"] = "Afficher la bordure autour du focus"
L["Toggle of a border should be shown around the current focus"] = "La bascule d'une bordure doit être affichée autour du focus actuel"
-- Pets.lua
L["Pets"] = "Familier"
L["Enables Pets module"] = "Activer le module familier (pet)"
L["Width of the bar"] = "Largeur de la barre"
L["Health color"] = "Couleur de la santé"
L["Color of the status bar"] = "Couleur de la barre d'état"
L["Portrait"] = "Portrait"
L["Health Values"] = "Valeurs de santé"
-- Powerbar.lua
L["Power Bar"] = "Barre de puissance"
L["Power Bar Text"] = "Texte de la barre de puissance"
L["Power Texts"] = "Textes de puissance"
L["Show race"] = "Afficher la race"
L["Show spec"] = "Afficher la spé"
L["Show the actual power"] = "Afficher la puissance actuelle"
L["Show the actual power on the power bar"] = "Afficher la puissance actuelle sur la barre de puissance"
L["Show max power"] = "Afficher la puissance maximale"
L["Show max power on the power bar"] = "Afficher la puissance maximale sur la barre de puissance"
L["Show power percentage"] = "Afficher le pourcentage de puissance"
L["Show power percentage on the power bar"] = "Afficher le pourcentage de puissance sur la barre de puissance"
-- Racial.lua
L["Racial"] = "Raciale"
L["Enable racial icon"] = "Activer l'icone du raciale"
L["This changes the anchor of the racial icon"] = "Cela change l'ancre de l'icône du raciale"
L["This changes position relative to its anchor of the racial icon"] = "Cela change de position par rapport à son ancre de l'icône du raciale"
-- TotemPlates.lua
L["Totem Plates"] = "Totem Plates"
L["Customize Totems"] = "Personnaliser les totems"
L["Custom totem name"] = "Personnaliser le nom des totems"
L["Totem General"] = "Totem Général"
L["Turns totem icons instead of nameplates on or off. (Requires reload)"] = "Active ou désactive les icônes totem au lieu des nameplates. (Nécessite un rechargement)"
L["Show friendly"] = "Montrer les amis"
L["Show enemy"] = "Montrer les ennemies"
L["Totem size"] = "Taille du totem"
L["Size of totem icons"] = "Taille de l'icone du totem"
L["Font of the custom totem name"] = "Police du nom du totem personnalisé"
L["Apply alpha when no target"] = "Appliquer l'alpha en l'absence de cible"
L["Always applies alpha, even when you don't have a target. Else it is 1."] = "Applique toujours l'alpha, même lorsque vous n'avez pas de cible. Sinon c'est 1."
L["Apply alpha when targeted"] = "Appliquer l'alpha lorsque ciblé"
L["Always applies alpha, even when you target the totem. Else it is 1."] = "Applique toujours l'alpha, même lorsque vous ciblez le totem. Sinon c'est 1."
L["All totem border alphas (configurable per totem)"] = "Tous les alphas de bordure de totem (configurables par totem)"
L["Totem icon border style"] = "Style de bordure d'icône totem"
L["All totem border color"] = "Toutes les couleurs de bordure de totem"
-- Trinket.lua
L["Trinket"] = "Trinket (Bijoux PvP)"
L["Enable trinket icon"] = "Activer l'icone du trinket"
L["This changes positions of the trinket"] = "Cela change les positions du trinket"
-- XiconProfiles.lua
L["Profile"] = "Profile"
-- Frame.lua
L["Gladdy - drag to move"] = "Gladdy - faites glisser pour déplacer"
-- Gladdy.lua
L["Welcome to Gladdy!"] = "Bienvenue chez Gladdy !"
L["First run has been detected, displaying test frame."] = "La première exécution a été détectée, affichant la trame de test."
L["Valid slash commands are:"] = "Les commandes de slash valides sont :"
L["If this is not your first run please lock or move the frame to prevent this from happening."] = "S'il ne s'agit pas de votre première utilisation, veuillez verrouiller ou déplacer le cadre pour éviter que cela ne se produise."
-- Options.lua
L["settings"] = "paramètres"
L["Reset module"] = "Réinitialiser le module"
L["Reset module to defaults"] = "Réinitialiser le module"
L["No settings"] = "Pas de paramètres"
L["Module has no settings"] = "Le module n'a pas de paramètres"
L["General settings"] = "Paramètres général"
L["Lock frame"] = "Verouiller le cadre"
L["Toggle if frame can be moved"] = "Cliquez si le cadre peut être bougé"
L["Grow frame upwards"] = "Agrandir le cadre vers le haut"
L["If enabled the frame will grow upwards instead of downwards"] = "Si activé, le cadre grandira vers le haut au lieu de vers le bas"
L["Down"] = "Vers la bas"
L["Up"] = "Vers le haut"
L["Frame General"] = "Cadre général"
L["Frame scale"] = "Taille du cadre"
L["Scale of the frame"] = "Taille du cadre"
L["Frame padding"] = "Remplissage du cadre"
L["Padding of the frame"] = "Remplissage du cadre"
L["Frame width"] = "Largeur du cadre"
L["Margin"] = "Marge"
L["Margin between each button"] = "Marge entre chaque bouton"
L["Cooldown General"] = "Temps de recharge Général"
L["Font General"] = "Police Général"
L["General Font"] = "Police Général"
L["Font color text"] = "Texte de la couleur de la police"
L["Font color timer"] = "Texte de la couleur de la police"
L["Color of the timers"] = "Couleur des minuteurs"
L["Icons General"] = "Icônes Général"
L["Icon border style"] = "Style de bordure d'icône"
L["This changes the border style of all icons"] = "Cela change le style de bordure de toutes les icônes"
L["This changes the border color of all icons"] = "Cela change la couleur de bordure de toutes les icônes"
L["Statusbar General"] = "Barre d'état Général"
L["Statusbar texture"] = "Texture de la Barre d'état"
L["This changes the texture of all statusbar frames"] = "Cela change la texture de tous les cadres de la barre d'état"
L["Statusbar border style"] = "Style de bordure de la barre d'état"
L["This changes the border style of all statusbar frames"] = "Cela modifie le style de bordure de tous les cadres de la barre d'état"
L["Statusbar border offset divider (smaller is higher offset)"] = "Diviseur de décalage de bordure de barre d'état (le plus petit est le décalage le plus élevé)"
L["Offset of border to statusbar (in case statusbar shows beyond the border)"] = "Décalage de la bordure par rapport à la barre d'état (au cas où la barre d'état s'afficherait au-delà de la bordure)"
L["Statusbar border color"] = "Couleur de la bordure de la barre d'état"
L["This changes the border color of all statusbar frames"] = "Cela change la couleur de la bordure de tous les cadres de la barre d'état"
end
Libs/DRData-1.0/DRData-1.0.lua
+13 -2
View File
@@ -183,6 +183,12 @@ Data.spells = {
-- Improved Hamstring
[23694] = "rndroot",
-- Entrapment (Hunter Talent)
[19185] = "rndroot",
-- Improved Wingclip
[19229] = "rndroot",
-- Frostbite
[12494] = "rndroot",
@@ -244,7 +250,11 @@ Data.spells = {
[10912] = "charm",
-- Counterattack
[19306] = "counterattack"
[19306] = "counterattack",
-- Disarm
[676] = "disarm",
[14251] = "disarm",
}
-- DR Category names
@@ -267,7 +277,8 @@ Data.typeNames = {
["repentance"] = "Repentance",
["dragonsbreath"] = "Dragon's Breath",
["ua"] = "Unstable Affliction Silence",
["counterattack"] = "Counterattack Immobilize"
["counterattack"] = "Counterattack Immobilize",
["disarm"] = "Disarm"
}
-- Categories that have DR in PvE as well as PvP
Modules/Announcements.lua
+30 -20
View File
@@ -16,7 +16,7 @@ local UnitName = UnitName
local Gladdy = LibStub("Gladdy")
local L = Gladdy.L
local Announcements = Gladdy:NewModule("Announcements", nil, {
local Announcements = Gladdy:NewModule("Announcements", 101, {
announcements = {
drinks = true,
resurrections = true,
@@ -42,18 +42,20 @@ function Announcements:Initialize()
[GetSpellInfo(20777)] = true,
}
self:RegisterMessage("CAST_START")
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_SPEC")
self:RegisterMessage("UNIT_HEALTH")
self:RegisterMessage("TRINKET_USED")
self:RegisterMessage("TRINKET_READY")
self:RegisterMessage("SHADOWSIGHT")
self:RegisterMessage("SPELL_INTERRUPT")
self:RegisterMessage("JOINED_ARENA")
end
function Announcements:Reset()
self:UnregisterAllMessages()
self:UnregisterMessages(
"CAST_START",
"ENEMY_SPOTTED",
"UNIT_SPEC",
"AURA_GAIN",
"UNIT_HEALTH",
"TRINKET_USED",
"TRINKET_READY",
"SHADOWSIGHT",
"SPELL_INTERRUPT")
self.enemy = {}
self.throttled = {}
end
@@ -63,17 +65,25 @@ function Announcements:Test(unit)
if (not button) then
return
end
if (unit == "arena1") then
self:UNIT_SPEC(unit, button.testSpec)
elseif (unit == "arena2") then
self:CheckDrink(unit, self.DRINK_AURA)
elseif (unit == "arena3") then
self:UNIT_HEALTH(unit, button.health, button.healthMax)
self:ENEMY_SPOTTED(unit)
self:JOINED_ARENA()
if unit == "arena1" then
self:AURA_GAIN(unit, nil, nil, self.DRINK_AURA)
end
end
function Announcements:JOINED_ARENA()
self:RegisterMessages(
"CAST_START",
"ENEMY_SPOTTED",
"UNIT_SPEC",
"AURA_GAIN",
"UNIT_HEALTH",
"TRINKET_USED",
"TRINKET_READY",
"SHADOWSIGHT",
"SPELL_INTERRUPT")
end
function Announcements:CAST_START(unit, spell)
local button = Gladdy.buttons[unit]
if (not button or not Gladdy.db.announcements.resurrections) then
@@ -149,13 +159,13 @@ function Announcements:SPELL_INTERRUPT(destUnit,spellID,spellName,spellSchool,ex
self:Send(L["INTERRUPTED: %s (%s)"]:format(extraSpellName, button.name or ""), nil, RAID_CLASS_COLORS[button.class])
end
function Announcements:CheckDrink(unit, aura)
function Announcements:AURA_GAIN(unit, auraType, spellID, spellName)
local button = Gladdy.buttons[unit]
if (not button or not Gladdy.db.announcements.drinks) then
return
end
if (aura == self.DRINK_AURA) then
if (spellName == self.DRINK_AURA) then
self:Send(L["DRINKING: %s (%s)"]:format(button.name, button.classLoc), 3, RAID_CLASS_COLORS[button.class])
end
end
Modules/ArenaCountDown.lua
+45 -35
View File
@@ -22,46 +22,71 @@ function ACDFrame:Initialize()
self.texturePath = "Interface\\AddOns\\Gladdy\\Images\\Countdown\\";
local ACDNumFrame = CreateFrame("Frame", "ACDNumFrame", UIParent)
ACDNumFrame:EnableMouse(false)
ACDNumFrame:SetHeight(512)
ACDNumFrame:SetWidth(512)
ACDNumFrame:SetPoint("CENTER", 0, 256)
ACDNumFrame:Show()
self.ACDNumFrame = ACDNumFrame
self.ACDNumFrame:EnableMouse(false)
self.ACDNumFrame:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumFrame:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumFrame:SetPoint("CENTER", 0, 128)
self.ACDNumFrame:Hide()
local ACDNumTens = ACDNumFrame:CreateTexture("ACDNumTens", "HIGH")
ACDNumTens:SetWidth(256)
ACDNumTens:SetHeight(256)
ACDNumTens:SetPoint("CENTER", ACDNumFrame, "CENTER", -50, 0)
self.ACDNumTens = ACDNumTens
self.ACDNumTens:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumTens:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumTens:SetPoint("CENTER", self.ACDNumFrame, "CENTER", -(Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
local ACDNumOnes = ACDNumFrame:CreateTexture("ACDNumOnes", "HIGH")
ACDNumOnes:SetWidth(256)
ACDNumOnes:SetHeight(256)
ACDNumOnes:SetPoint("CENTER", ACDNumFrame, "CENTER", 50, 0)
self.ACDNumOnes = ACDNumOnes
self.ACDNumOnes:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumOnes:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumOnes:SetPoint("CENTER", self.ACDNumFrame, "CENTER", (Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
local ACDNumOne = ACDNumFrame:CreateTexture("ACDNumOne", "HIGH")
ACDNumOne:SetWidth(256)
ACDNumOne:SetHeight(256)
ACDNumOne:SetPoint("CENTER", ACDNumFrame, "CENTER", 0, 0)
self.ACDNumOne = ACDNumOne
self.ACDNumOne:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumOne:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumOne:SetPoint("CENTER", self.ACDNumFrame, "CENTER", 0, 0)
if Gladdy.db.countdown then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_SPEC")
end
self.faction = UnitFactionGroup("player")
end
function ACDFrame:UpdateFrameOnce()
if Gladdy.db.countdown then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_SPEC")
else
self:UnregisterAllMessages()
end
self.ACDNumFrame:SetFrameStrata(Gladdy.db.arenaCountdownFrameStrata)
self.ACDNumFrame:SetFrameLevel(Gladdy.db.arenaCountdownFrameLevel)
self.ACDNumFrame:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumFrame:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumFrame:SetPoint("CENTER", 0, 128)
self.ACDNumTens:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumTens:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumTens:SetPoint("CENTER", self.ACDNumFrame, "CENTER", -(Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
self.ACDNumOnes:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumOnes:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumOnes:SetPoint("CENTER", self.ACDNumFrame, "CENTER", (Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
self.ACDNumOne:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumOne:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumOne:SetPoint("CENTER", self.ACDNumFrame, "CENTER", 0, 0)
end
function ACDFrame.OnUpdate(self, elapse)
if (self.countdown > 0 and Gladdy.db.countdown) then
self.hidden = false;
self.ACDNumFrame:Show()
if ((floor(self.countdown) ~= floor(self.countdown - elapse)) and (floor(self.countdown - elapse) >= 0)) then
local str = tostring(floor(self.countdown - elapse));
@@ -88,6 +113,7 @@ function ACDFrame.OnUpdate(self, elapse)
self.countdown = self.countdown - elapse;
else
self.hidden = true;
self.ACDNumFrame:Hide()
self.ACDNumTens:Hide();
self.ACDNumOnes:Hide();
self.ACDNumOne:Hide();
@@ -99,7 +125,6 @@ end
function ACDFrame:JOINED_ARENA()
if Gladdy.db.countdown then
self.ACDNumFrame:Show()
self:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
self:SetScript("OnEvent", ACDFrame.OnEvent)
self.endTime = GetTime() + 70
@@ -131,25 +156,7 @@ function ACDFrame:CHAT_MSG_BG_SYSTEM_NEUTRAL(msg)
end
end
function ACDFrame:UpdateFrame()
self.ACDNumFrame:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumFrame:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumFrame:SetPoint("CENTER", 0, 128)
self.ACDNumTens:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumTens:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumTens:SetPoint("CENTER", self.ACDNumFrame, "CENTER", -(Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
self.ACDNumOnes:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumOnes:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumOnes:SetPoint("CENTER", self.ACDNumFrame, "CENTER", (Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
self.ACDNumOne:SetWidth(Gladdy.db.arenaCountdownSize)
self.ACDNumOne:SetHeight(Gladdy.db.arenaCountdownSize)
self.ACDNumOne:SetPoint("CENTER", self.ACDNumFrame, "CENTER", 0, 0)
end
function ACDFrame:Test()
function ACDFrame:TestOnce()
self.countdown = 30
self:JOINED_ARENA()
end
@@ -188,6 +195,7 @@ function ACDFrame:GetOptions()
max = 512,
step = 16,
width = "full",
disabled = function() return not Gladdy.db.countdown end,
}),
headerAuraLevel = {
type = "header",
@@ -200,6 +208,7 @@ function ACDFrame:GetOptions()
order = 6,
values = Gladdy.frameStrata,
sorting = Gladdy.frameStrataSorting,
disabled = function() return not Gladdy.db.countdown end,
}),
arenaCountdownFrameLevel = Gladdy:option({
type = "range",
@@ -209,6 +218,7 @@ function ACDFrame:GetOptions()
step = 1,
order = 7,
width = "full",
disabled = function() return not Gladdy.db.countdown end,
}),
}
end
Modules/Auras.lua
+95 -4
View File
@@ -1,5 +1,5 @@
local pairs, ipairs, select, tinsert, tbl_sort, tostring, tonumber, rand = pairs, ipairs, select, tinsert, table.sort, tostring, tonumber, math.random
local str_gsub = string.gsub
local GetSpellInfo = GetSpellInfo
local GetSpellDescription = GetSpellDescription
local CreateFrame, GetTime = CreateFrame, GetTime
@@ -56,6 +56,10 @@ local Auras = Gladdy:NewModule("Auras", nil, {
auraFrameLevel = 5,
auraInterruptFrameStrata = "MEDIUM",
auraInterruptFrameLevel = 5,
auraGroup = false,
auraGroupDirection = "DOWN",
auraInterruptGroup = false,
auraInterruptGroupDirection = "DOWN",
})
function Auras:Initialize()
@@ -239,6 +243,23 @@ function Auras:UpdateFrame(unit)
auraFrame:ClearAllPoints()
Gladdy:SetPosition(auraFrame, unit, "auraXOffset", "auraYOffset", true, Auras)
if (Gladdy.db.auraGroup) then
if (unit ~= "arena1") then
local previousUnit = "arena" .. str_gsub(unit, "arena", "") - 1
self.frames[unit]:ClearAllPoints()
if Gladdy.db.auraGroupDirection == "RIGHT" then
self.frames[unit]:SetPoint("LEFT", self.frames[previousUnit], "RIGHT", 0, 0)
elseif Gladdy.db.auraGroupDirection == "LEFT" then
self.frames[unit]:SetPoint("RIGHT", self.frames[previousUnit], "LEFT", 0, 0)
elseif Gladdy.db.auraGroupDirection == "UP" then
self.frames[unit]:SetPoint("BOTTOM", self.frames[previousUnit], "TOP", 0, 0)
elseif Gladdy.db.auraGroupDirection == "DOWN" then
self.frames[unit]:SetPoint("TOP", self.frames[previousUnit], "BOTTOM", 0, 0)
end
end
end
if (unit == "arena1") then
Gladdy:CreateMover(auraFrame, "auraXOffset", "auraYOffset", L["Auras"],
{"TOPLEFT", "TOPLEFT"},
@@ -321,6 +342,23 @@ function Auras:UpdateInterruptFrame(unit)
interruptFrame:ClearAllPoints()
Gladdy:SetPosition(interruptFrame, unit, "auraInterruptXOffset", "auraInterruptYOffset", true, Auras)
if (Gladdy.db.auraInterruptGroup) then
if (unit ~= "arena1") then
local previousUnit = "arena" .. str_gsub(unit, "arena", "") - 1
self.frames[unit].interruptFrame:ClearAllPoints()
if Gladdy.db.auraInterruptGroupDirection == "RIGHT" then
self.frames[unit].interruptFrame:SetPoint("LEFT", self.frames[previousUnit].interruptFrame, "RIGHT", 0, 0)
elseif Gladdy.db.auraInterruptGroupDirection == "LEFT" then
self.frames[unit].interruptFrame:SetPoint("RIGHT", self.frames[previousUnit].interruptFrame, "LEFT", 0, 0)
elseif Gladdy.db.auraInterruptGroupDirection == "UP" then
self.frames[unit].interruptFrame:SetPoint("BOTTOM", self.frames[previousUnit].interruptFrame, "TOP", 0, 0)
elseif Gladdy.db.auraInterruptGroupDirection == "DOWN" then
self.frames[unit].interruptFrame:SetPoint("TOP", self.frames[previousUnit].interruptFrame, "BOTTOM", 0, 0)
end
end
end
if (unit == "arena1") then
Gladdy:CreateMover(interruptFrame, "auraInterruptXOffset", "auraInterruptYOffset", L["Interrupts"],
{"TOPLEFT", "TOPLEFT"},
@@ -472,7 +510,7 @@ function Auras:Test(unit)
local extraSpellSchool = spellSchools[rand(1, #spellSchools)]
spellid = tonumber(enabledInterrupts[rand(1, #enabledInterrupts)])
spellName = select(1, GetSpellInfo(spellid))
self:SPELL_INTERRUPT(unit,spellid, spellName, "physical", spellid, spellName, extraSpellSchool)
Gladdy:SendMessage("SPELL_INTERRUPT", unit,spellid, spellName, "physical", spellid, spellName, extraSpellSchool)
end
end
end
@@ -682,10 +720,63 @@ function Auras:GetOptions()
name = L["Frame"],
order = 3,
args = {
groupOptions = {
type = "group",
name = L["Group"],
order = 4,
args = {
headerAuras = {
type = "header",
name = L["Auras"],
order = 1,
},
auraGroup = Gladdy:option({
type = "toggle",
name = L["Group"] .. " " .. L["Auras"],
order = 2,
disabled = function() return not Gladdy.db.auraDetached end,
}),
auraGroupDirection = Gladdy:option({
type = "select",
name = L["Group direction"],
order = 3,
values = {
["RIGHT"] = L["Right"],
["LEFT"] = L["Left"],
["UP"] = L["Up"],
["DOWN"] = L["Down"],
},
disabled = function() return not Gladdy.db.auraGroup or not Gladdy.db.auraDetached end,
}),
headerInterrupts = {
type = "header",
name = L["Interrupts"],
order = 4,
},
auraInterruptGroup = Gladdy:option({
type = "toggle",
name = L["Group"] .. " " .. L["Interrupts"],
order = 5,
disabled = function() return not Gladdy.db.auraInterruptDetached end,
}),
auraInterruptGroupDirection = Gladdy:option({
type = "select",
name = L["Group direction"],
order = 6,
values = {
["RIGHT"] = L["Right"],
["LEFT"] = L["Left"],
["UP"] = L["Up"],
["DOWN"] = L["Down"],
},
disabled = function() return not Gladdy.db.auraInterruptGroup or not Gladdy.db.auraInterruptDetached end,
}),
}
},
detachedAuraMode = {
type = "group",
name = L["Detached Aura"],
order = 4,
order = 5,
args = {
headerDetachedMode = {
type = "header",
@@ -789,7 +880,7 @@ function Auras:GetOptions()
detachedInterruptMode = {
type = "group",
name = L["Detached Interrupt"],
order = 5,
order = 6,
args = {
headerDetachedMode = {
type = "header",
Modules/BuffsDebuffs.lua
+29 -6
View File
@@ -76,13 +76,16 @@ function BuffsDebuffs:Initialize()
self.icons = {}
self.trackedCC = {}
self.framePool = {}
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("UNIT_DESTROYED")
self:RegisterMessage("UNIT_DEATH")
self:RegisterMessage("AURA_FADE")
self:RegisterMessage("AURA_GAIN")
self:RegisterMessage("AURA_GAIN_LIMIT")
if Gladdy.db.buffsEnabled then
self:RegisterMessages(
"JOINED_ARENA",
"UNIT_DESTROYED",
"UNIT_DEATH",
"AURA_FADE",
"AURA_GAIN",
"AURA_GAIN_LIMIT")
self:SetScript("OnEvent", BuffsDebuffs.OnEvent)
end
spellSchoolToOptionValueTable = {
curse = Gladdy.db.buffsBorderColorCurse,
magic = Gladdy.db.buffsBorderColorMagic,
@@ -290,6 +293,22 @@ local function styleIcon(aura, auraType)
aura.stacks:SetTextColor(Gladdy.db.buffsFontColor.r, Gladdy.db.buffsFontColor.g, Gladdy.db.buffsFontColor.b, 1)
end
function BuffsDebuffs:UpdateFrameOnce()
if Gladdy.db.buffsEnabled then
self:RegisterMessages(
"JOINED_ARENA",
"UNIT_DESTROYED",
"UNIT_DEATH",
"AURA_FADE",
"AURA_GAIN",
"AURA_GAIN_LIMIT")
self:SetScript("OnEvent", BuffsDebuffs.OnEvent)
else
self:UnregisterAllMessages()
self:SetScript("OnEvent", nil)
end
end
function BuffsDebuffs:UpdateFrame(unit)
--DEBUFFS
self.frames[unit].debuffFrame:SetHeight(Gladdy.db.buffsIconSize)
@@ -485,12 +504,14 @@ function BuffsDebuffs:GetOptions()
name = L["Show CC"],
desc = L["Shows all debuffs, which are displayed on the ClassIcon as well"],
order = 4,
disabled = function() return not Gladdy.db.buffsEnabled end,
}),
group = {
type = "group",
childGroups = "tree",
name = L["Frame"],
order = 5,
disabled = function() return not Gladdy.db.buffsEnabled end,
args = {
buffs = {
type = "group",
@@ -919,6 +940,7 @@ function BuffsDebuffs:GetOptions()
name = L["Debuff Lists"],
type = "group",
order = 11,
disabled = function() return not Gladdy.db.buffsEnabled end,
childGroups = "tree",
args = select(1, Gladdy:GetAuras(AURA_TYPE_DEBUFF)),
set = function(info, state)
@@ -934,6 +956,7 @@ function BuffsDebuffs:GetOptions()
name = L["Buff Lists"],
type = "group",
order = 12,
disabled = function() return not Gladdy.db.buffsEnabled end,
childGroups = "tree",
args = select(1, Gladdy:GetAuras(AURA_TYPE_BUFF)),
set = function(info, state)
Modules/Castbar.lua
+29 -4
View File
@@ -25,6 +25,7 @@ local Castbar = Gladdy:NewModule("Cast Bar", 70, {
castBarIconSize = 22,
castBarBorderSize = 8,
castBarFontSize = 12,
castBarFontOutline = false,
castBarTexture = "Smooth",
castBarIconStyle = "Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp",
castBarBorderStyle = "Gladdy Tooltip round",
@@ -48,9 +49,11 @@ local Castbar = Gladdy:NewModule("Cast Bar", 70, {
function Castbar:Initialize()
self.frames = {}
if Gladdy.db.castBarEnabled then
self:RegisterMessage("UNIT_DEATH")
self:RegisterMessage("JOINED_ARENA")
end
end
---------------------------
@@ -113,7 +116,7 @@ function Castbar:CreateFrame(unit)
end
castBar.spellText = castBar:CreateFontString(nil, "LOW")
castBar.spellText:SetFont(Gladdy:SMFetch("font", "auraFont"), Gladdy.db.castBarFontSize)
castBar.spellText:SetFont(Gladdy:SMFetch("font", "auraFont"), Gladdy.db.castBarFontSize, Gladdy.db.castBarFontOutline and "OUTLINE")
castBar.spellText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
castBar.spellText:SetShadowOffset(1, -1)
castBar.spellText:SetShadowColor(0, 0, 0, 1)
@@ -121,7 +124,7 @@ function Castbar:CreateFrame(unit)
castBar.spellText:SetPoint("LEFT", 7, 0) -- Text of the spell
castBar.timeText = castBar:CreateFontString(nil, "LOW")
castBar.timeText:SetFont(Gladdy:SMFetch("font", "auraFont"), Gladdy.db.castBarFontSize)
castBar.timeText:SetFont(Gladdy:SMFetch("font", "auraFont"), Gladdy.db.castBarFontSize, Gladdy.db.castBarFontOutline and "OUTLINE")
castBar.timeText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
castBar.timeText:SetShadowOffset(1, -1)
castBar.timeText:SetShadowColor(0, 0, 0, 1)
@@ -133,6 +136,15 @@ function Castbar:CreateFrame(unit)
self:ResetUnit(unit)
end
function Castbar:UpdateFrameOnce()
if Gladdy.db.castBarEnabled then
self:RegisterMessage("UNIT_DEATH")
self:RegisterMessage("JOINED_ARENA")
else
self:UnregisterAllMessages()
end
end
function Castbar:UpdateFrame(unit)
local castBar = self.frames[unit]
if (not castBar) then
@@ -192,10 +204,10 @@ function Castbar:UpdateFrame(unit)
Gladdy:SetPosition(castBar, unit, "castBarXOffset", "castBarYOffset", Castbar:LegacySetPosition(castBar, unit, leftMargin, rightMargin), Castbar)
castBar.spellText:SetFont(Gladdy:SMFetch("font", "castBarFont"), Gladdy.db.castBarFontSize)
castBar.spellText:SetFont(Gladdy:SMFetch("font", "castBarFont"), Gladdy.db.castBarFontSize, Gladdy.db.castBarFontOutline and "OUTLINE")
castBar.spellText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
castBar.timeText:SetFont(Gladdy:SMFetch("font", "castBarFont"), Gladdy.db.castBarFontSize)
castBar.timeText:SetFont(Gladdy:SMFetch("font", "castBarFont"), Gladdy.db.castBarFontSize, Gladdy.db.castBarFontOutline and "OUTLINE")
castBar.timeText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
castBar.icon.texture.overlay:SetTexture(Gladdy.db.castBarIconStyle)
@@ -584,6 +596,7 @@ function Castbar:GetOptions()
childGroups = "tree",
name = L["Frame"],
order = 4,
disabled = function() return not Gladdy.db.castBarEnabled end,
args = {
barFrame = {
type = "group",
@@ -773,6 +786,12 @@ function Castbar:GetOptions()
max = 20,
width = "full",
}),
castBarFontOutline = option({
type = "toggle",
name = L["Outline"],
order = 5,
width = "full",
}),
headerFormat = {
type = "header",
name = L["Format"],
@@ -879,6 +898,12 @@ function Castbar:LegacySetPosition(castBar, unit, leftMargin, rightMargin)
return Gladdy.db.newLayout
end
castBar:ClearAllPoints()
if Gladdy.db.castBarWidth <= 0 then
castBar:SetWidth(0.1)
end
if Gladdy.db.castBarHeight <= 0 then
castBar:SetHeight(0.1)
end
local horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize) + Gladdy.db.padding
if (Gladdy.db.castBarPos == "LEFT") then
local anchor = Gladdy:GetAnchor(unit, "LEFT")
Modules/Classicon.lua
+54 -2
View File
@@ -1,4 +1,4 @@
local select = select
local select, str_gsub = select, string.gsub
local Gladdy = LibStub("Gladdy")
local CreateFrame = CreateFrame
@@ -15,6 +15,8 @@ local Classicon = Gladdy:NewModule("Class Icon", 81, {
classIconYOffset = 0,
classIconFrameStrata = "MEDIUM",
classIconFrameLevel = 5,
classIconGroup = false,
classIconGroupDirection = "DOWN"
})
local classIconPath = "Interface\\Addons\\Gladdy\\Images\\Classes\\"
@@ -82,10 +84,22 @@ local specIcons = {
function Classicon:Initialize()
self.frames = {}
if Gladdy.db.classIconEnabled then
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_DEATH")
self:RegisterMessage("UNIT_SPEC")
end
end
function Classicon:UpdateFrameOnce()
if Gladdy.db.classIconEnabled then
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_DEATH")
self:RegisterMessage("UNIT_SPEC")
else
self:UnregisterAllMessages()
end
end
function Classicon:CreateFrame(unit)
local classIcon = CreateFrame("Frame", nil, Gladdy.buttons[unit])
@@ -121,6 +135,22 @@ function Classicon:UpdateFrame(unit)
Gladdy:SetPosition(classIcon, unit, "classIconXOffset", "classIconYOffset", Classicon:LegacySetPosition(classIcon, unit), Classicon)
if (Gladdy.db.classIconGroup) then
if (unit ~= "arena1") then
local previousUnit = "arena" .. str_gsub(unit, "arena", "") - 1
self.frames[unit]:ClearAllPoints()
if Gladdy.db.classIconGroupDirection == "RIGHT" then
self.frames[unit]:SetPoint("LEFT", self.frames[previousUnit], "RIGHT", 0, 0)
elseif Gladdy.db.classIconGroupDirection == "LEFT" then
self.frames[unit]:SetPoint("RIGHT", self.frames[previousUnit], "LEFT", 0, 0)
elseif Gladdy.db.classIconGroupDirection == "UP" then
self.frames[unit]:SetPoint("BOTTOM", self.frames[previousUnit], "TOP", 0, 0)
elseif Gladdy.db.classIconGroupDirection == "DOWN" then
self.frames[unit]:SetPoint("TOP", self.frames[previousUnit], "BOTTOM", 0, 0)
end
end
end
if (unit == "arena1") then
Gladdy:CreateMover(classIcon, "classIconXOffset", "classIconYOffset", L["Class Icon"],
{"TOPLEFT", "TOPLEFT"},
@@ -191,6 +221,7 @@ function Classicon:GetOptions()
name = L["Show Spec Icon"],
desc = L["Shows Spec Icon once spec is detected"],
order = 4,
disabled = function() return not Gladdy.db.classIconEnabled end,
get = function() return Gladdy.db.classIconSpecIcon end,
set = function(_, value)
Gladdy.db.classIconSpecIcon = value
@@ -205,11 +236,32 @@ function Classicon:GetOptions()
end
end
},
classIconGroup = Gladdy:option({
type = "toggle",
name = L["Group"] .. " " .. L["Class Icon"],
order = 5,
disabled = function() return not Gladdy.db.classIconEnabled end,
}),
classIconGroupDirection = Gladdy:option({
type = "select",
name = L["Group direction"],
order = 6,
values = {
["RIGHT"] = L["Right"],
["LEFT"] = L["Left"],
["UP"] = L["Up"],
["DOWN"] = L["Down"],
},
disabled = function()
return not Gladdy.db.classIconGroup or not Gladdy.db.classIconEnabled
end,
}),
group = {
type = "group",
childGroups = "tree",
name = L["Frame"],
order = 4,
order = 7,
disabled = function() return not Gladdy.db.classIconEnabled end,
args = {
size = {
type = "group",
Modules/CombatIndicator.lua
+11
View File
@@ -20,7 +20,9 @@ local CombatIndicator = Gladdy:NewModule("Combat Indicator", nil, {
function CombatIndicator:Initialize()
self.frames = {}
if Gladdy.db.ciEnabled then
self:RegisterMessage("JOINED_ARENA")
end
self.updateInterval = 0.05
self.combatIndicatorIcon = select(3, GetSpellInfo(674))
end
@@ -57,6 +59,14 @@ function CombatIndicator:CreateFrame(unit)
button.ciFrame = ciFrame
end
function CombatIndicator:UpdateFrameOnce()
if Gladdy.db.ciEnabled then
self:RegisterMessage("JOINED_ARENA")
else
self:UnregisterAllMessages()
end
end
function CombatIndicator:UpdateFrame(unit)
local button = Gladdy.buttons[unit]
local ciFrame = self.frames[unit]
@@ -133,6 +143,7 @@ function CombatIndicator:GetOptions()
childGroups = "tree",
name = L["Frame"],
order = 4,
disabled = function() return not Gladdy.db.ciEnabled end,
args = {
general = {
type = "group",
Modules/Cooldowns.lua
+439 -350
View File
File diff suppressed because it is too large Load Diff
Modules/Diminishings.lua
+4 -1
View File
@@ -79,7 +79,7 @@ end
function Diminishings:Initialize()
self.frames = {}
self:RegisterMessage("UNIT_DEATH", "ResetUnit", "AURA_FADE", "UNIT_DESTROYED")
self:RegisterMessage("UNIT_DESTROYED")
end
function Diminishings:CreateFrame(unit)
@@ -434,6 +434,7 @@ function Diminishings:GetOptions()
name = L["DR Duration"],
desc = L["Change the DR Duration in seconds (DR is dynamic between 15-20s)"],
order = 4,
disabled = function() return not Gladdy.db.drEnabled end,
min = 15,
max = 20,
step = .1,
@@ -443,6 +444,7 @@ function Diminishings:GetOptions()
childGroups = "tree",
name = L["Frame"],
order = 5,
disabled = function() return not Gladdy.db.drEnabled end,
args = {
icon = {
type = "group",
@@ -781,6 +783,7 @@ function Diminishings:GetOptions()
type = "group",
name = L["Categories"],
order = 6,
disabled = function() return not Gladdy.db.drEnabled end,
args = Diminishings:CategoryOptions(),
},
}
Modules/ExportImport.lua
+1
View File
@@ -111,6 +111,7 @@ local deletedOptions = { -- backwards compatibility
trinketPos = true,
padding = true,
growUp = true,
powerBarFontSize = true,
}
local function checkIsDeletedOption(k, str, msg, errorFound, errorMsg)
Modules/Healthbar.lua
+155 -64
View File
@@ -1,5 +1,6 @@
local pairs = pairs
local pairs, ipairs = pairs, ipairs
local floor = math.floor
local str_find, str_gsub, str_sub, tinsert = string.find, string.gsub, string.sub, table.insert
local UnitHealth, UnitHealthMax, UnitName, UnitExists, UnitIsDeadOrGhost = UnitHealth, UnitHealthMax, UnitName, UnitExists, UnitIsDeadOrGhost
local CreateFrame = CreateFrame
@@ -26,12 +27,22 @@ local Healthbar = Gladdy:NewModule("Health Bar", 100, {
healthPercentage = true,
healthFrameStrata = "MEDIUM",
healthFrameLevel = 1,
healthCustomTagsEnabled = false,
healthTextLeft = "[name]",
healthTextRight = "[percent|status]",
healthTextLeftOutline = false,
healthTextRightOutline = false,
healthTextLeftVOffset = 0,
healthTextLeftHOffset = 5,
healthTextRightVOffset = 0,
healthTextRightHOffset = -5,
})
function Healthbar:Initialize()
self.frames = {}
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_SPEC")
self:RegisterMessage("UNIT_DESTROYED")
self:RegisterMessage("UNIT_DEATH")
end
@@ -65,34 +76,34 @@ function Healthbar:CreateFrame(unit)
healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarNameFont"), 1)
healthBar.nameText:Hide()
else
healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarNameFontSize)
healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarNameFontSize, Gladdy.db.healthTextLeftOutline and "OUTLINE")
healthBar.nameText:Show()
end
healthBar.nameText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
healthBar.nameText:SetShadowOffset(1, -1)
healthBar.nameText:SetShadowColor(0, 0, 0, 1)
healthBar.nameText:SetJustifyH("CENTER")
healthBar.nameText:SetPoint("LEFT", 5, 0)
healthBar.nameText:SetPoint("LEFT", Gladdy.db.healthTextLeftHOffset, Gladdy.db.healthTextLeftVOffset)
healthBar.healthText = healthBar:CreateFontString(nil, "LOW")
if (Gladdy.db.healthBarHealthFontSize < 1) then
healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), 1)
healthBar.healthText:Hide()
else
healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarHealthFontSize)
healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarHealthFontSize, Gladdy.db.healthTextRightOutline and "OUTLINE")
healthBar.healthText:Hide()
end
healthBar.healthText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
healthBar.healthText:SetShadowOffset(1, -1)
healthBar.healthText:SetShadowColor(0, 0, 0, 1)
healthBar.healthText:SetJustifyH("CENTER")
healthBar.healthText:SetPoint("RIGHT", -5, 0)
healthBar.healthText:SetPoint("RIGHT", Gladdy.db.healthTextRightHOffset, Gladdy.db.healthTextRightVOffset)
healthBar.unit = unit
self.frames[unit] = healthBar
button.healthBar = healthBar
self:ResetUnit(unit)
healthBar:RegisterUnitEvent("UNIT_HEALTH", unit)
healthBar:RegisterUnitEvent("UNIT_HEALTH_FREQUENT", unit)
healthBar:RegisterUnitEvent("UNIT_MAXHEALTH", unit)
healthBar:RegisterUnitEvent("UNIT_NAME_UPDATE", unit)
healthBar:SetScript("OnEvent", Healthbar.OnEvent)
@@ -100,17 +111,7 @@ end
function Healthbar.OnEvent(self, event, unit)
local isDead = UnitExists(unit) and UnitIsDeadOrGhost(unit)
if event == "UNIT_HEALTH" then
if isDead then
Gladdy:SendMessage("UNIT_DEATH", unit)
return
end
local health = UnitHealth(unit)
local healthMax = UnitHealthMax(unit)
self.hp:SetMinMaxValues(0, healthMax)
self.hp:SetValue(UnitHealth(unit))
Healthbar:SetHealthText(self, health, healthMax)
elseif event == "UNIT_MAXHEALTH" then
if event == "UNIT_HEALTH_FREQUENT" or event == "UNIT_MAXHEALTH" then
if isDead then
Gladdy:SendMessage("UNIT_DEATH", unit)
return
@@ -119,13 +120,14 @@ function Healthbar.OnEvent(self, event, unit)
local healthMax = UnitHealthMax(unit)
self.hp:SetMinMaxValues(0, healthMax)
self.hp:SetValue(health)
Healthbar:SetHealthText(self, health, healthMax)
self.hp.current = health
self.hp.max = healthMax
Healthbar:SetText(unit, health, healthMax)
--Healthbar:SetHealthText(self, health, healthMax)
elseif event == "UNIT_NAME_UPDATE" then
local name = UnitName(unit)
Gladdy.buttons[unit].name = name
if Gladdy.db.healthName and not Gladdy.db.healthNameToArenaId then
self.nameText:SetText(name)
end
Healthbar:SetText(unit, self.hp.current, self.hp.max)
end
if not Gladdy.buttons[unit].class then
Gladdy:SpotEnemy(unit, true)
@@ -134,20 +136,42 @@ end
function Healthbar:SetHealthText(healthBar, health, healthMax)
local healthText = ""
local healthPercentage = floor(health * 100 / healthMax)
local healthPercentage = health and healthMax and floor(health * 100 / healthMax)
if health == 0 and UnitExists(healthBar.unit) and UnitIsDeadOrGhost(healthBar.unit) then
self:UNIT_DEATH(healthBar.unit)
return
end
if (Gladdy.db.healthPercentage) then
if (Gladdy.db.healthPercentage and healthPercentage) then
healthText = ("%d%%"):format(healthPercentage)
end
healthBar.healthText:SetText(healthText)
end
function Healthbar:SetText(unit, health, healthMax, status)
local button = Gladdy.buttons[unit]
if not Gladdy.buttons[unit] then
return
end
if Gladdy.db.healthCustomTagsEnabled then
button.healthBar.nameText:SetText(Gladdy:SetTag(unit, Gladdy.db.healthTextLeft, health, healthMax, status))
button.healthBar.healthText:SetText(Gladdy:SetTag(unit, Gladdy.db.healthTextRight, health, healthMax, status))
else
if Gladdy.db.healthName then
if Gladdy.db.healthNameToArenaId then
button.healthBar.nameText:SetText(str_gsub(unit, "arena", ""))
else
button.healthBar.nameText:SetText(Gladdy.buttons[unit].name)
end
end
if status then
button.healthBar.healthText:SetText(status)
else
Healthbar:SetHealthText(button.healthBar, health, healthMax)
end
end
end
function Healthbar:UpdateFrame(unit)
local healthBar = self.frames[unit]
if (not healthBar) then
@@ -178,14 +202,14 @@ function Healthbar:UpdateFrame(unit)
healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), 1)
healthBar.healthText:Hide()
else
healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarHealthFontSize)
healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarHealthFontSize, Gladdy.db.healthTextRightOutline and "OUTLINE")
healthBar.healthText:Show()
end
if (Gladdy.db.healthBarNameFontSize < 1) then
healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarNameFont"), 1)
healthBar.nameText:Hide()
else
healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarNameFontSize)
healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarNameFontSize, Gladdy.db.healthTextLeftOutline and "OUTLINE")
if Gladdy.db.healthName then
healthBar.nameText:Show()
else
@@ -194,6 +218,8 @@ function Healthbar:UpdateFrame(unit)
end
healthBar.nameText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
healthBar.healthText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
healthBar.nameText:SetPoint("LEFT", Gladdy.db.healthTextLeftHOffset, Gladdy.db.healthTextLeftVOffset)
healthBar.healthText:SetPoint("RIGHT", Gladdy.db.healthTextRightHOffset, Gladdy.db.healthTextRightVOffset)
end
function Healthbar:ResetUnit(unit)
@@ -206,6 +232,7 @@ function Healthbar:ResetUnit(unit)
healthBar.nameText:SetText("")
healthBar.healthText:SetText("")
healthBar.hp:SetValue(0)
healthBar.hp.current = 0
end
function Healthbar:Test(unit)
@@ -215,17 +242,31 @@ function Healthbar:Test(unit)
return
end
self:JOINED_ARENA()
--self:JOINED_ARENA()
Gladdy:SendMessage("UNIT_HEALTH", unit, button.health, button.healthMax)
healthBar.hp.current = button.health
healthBar.hp.max = button.healthMax
self:ENEMY_SPOTTED(unit)
self:UNIT_HEALTH(unit, button.health, button.healthMax)
self:SetText(unit, button.health, button.healthMax)
healthBar.hp:SetValue(button.health)
if unit == "arena1" then
self:UNIT_DEATH(unit)
--self:SetText(unit, button.health, button.healthMax, L["DEAD"])
end
end
function Healthbar:UNIT_SPEC(unit)
local button = Gladdy.buttons[unit]
if not button then
return
end
self:SetText(unit, button.healthBar.hp.current, button.healthBar.hp.max)
--button.healthBar.nameText:SetText(Gladdy:SetTag(unit, Gladdy.db.healthTextLeft, button.health, button.healthMax))
end
function Healthbar:JOINED_ARENA()
if Gladdy.db.healthNameToArenaId and Gladdy.db.healthName then
for i=1,Gladdy.curBracket do
local healthBar = self.frames["arena" .. i]
healthBar.nameText:SetText(i)
end
self:SetText("arena" .. i, nil, nil)
end
end
@@ -241,10 +282,10 @@ function Healthbar:ENEMY_SPOTTED(unit)
local healthMax = UnitHealthMax(unit)
healthBar.hp:SetMinMaxValues(0, healthMax)
healthBar.hp:SetValue(health)
Healthbar:SetHealthText(healthBar, health, healthMax)
end
if button.name and Gladdy.db.healthName and not Gladdy.db.healthNameToArenaId then
healthBar.nameText:SetText(button.name)
healthBar.hp.current = health
healthBar.hp.max = healthMax
Healthbar:SetText(unit, health, healthMax)
--Healthbar:SetHealthText(healthBar, health, healthMax)
end
if button.class then
@@ -252,27 +293,6 @@ function Healthbar:ENEMY_SPOTTED(unit)
end
end
function Healthbar:UNIT_HEALTH(unit, health, healthMax)
local healthBar = self.frames[unit]
if (not healthBar) then
return
end
if not Gladdy.buttons[unit].class then
Gladdy:SpotEnemy(unit, true)
end
Gladdy:SendMessage("UNIT_HEALTH", unit, health, healthMax)
local healthPercentage = floor(health * 100 / healthMax)
local healthText = ""
if (Gladdy.db.healthPercentage) then
healthText = ("%d%%"):format(healthPercentage)
end
healthBar.healthText:SetText(healthText)
healthBar.hp:SetValue(healthPercentage)
end
function Healthbar:UNIT_DEATH(unit)
local healthBar = self.frames[unit]
if (not healthBar) then
@@ -280,7 +300,8 @@ function Healthbar:UNIT_DEATH(unit)
end
healthBar.hp:SetValue(0)
healthBar.healthText:SetText(L["DEAD"])
healthBar.hp.current = 0
Healthbar:SetText(unit, 0, 100, L["DEAD"])
end
function Healthbar:UNIT_DESTROYED(unit)
@@ -290,8 +311,8 @@ function Healthbar:UNIT_DESTROYED(unit)
end
healthBar.hp:SetValue(0)
healthBar.healthText:SetText(L["LEAVE"])
healthBar.nameText:SetText("")
healthBar.hp.current = 0
Healthbar:SetText(unit, 0, 100, L["LEAVE"])
end
local function option(params)
@@ -307,9 +328,11 @@ local function option(params)
if Gladdy.db.healthBarBorderSize > Gladdy.db.healthBarHeight/2 then
Gladdy.db.healthBarBorderSize = Gladdy.db.healthBarHeight/2
end
if Gladdy.frame.testing then
for i=1,Gladdy.curBracket do
Healthbar:Test("arena" .. i)
end
end
Gladdy:UpdateFrame()
end,
}
@@ -396,11 +419,28 @@ function Healthbar:GetOptions()
order = 12,
hasAlpha = true,
}),
healthTextLeftOutline = option({
type = "toggle",
name = L["Left Font Outline"],
order = 13,
width = "full",
}),
healthTextRightOutline = option({
type = "toggle",
name = L["Right Font Outline"],
order = 14,
width = "full",
}),
headerSize = {
type = "header",
name = L["Size"],
order = 20,
},
healthBarNameFontSize = option({
type = "range",
name = L["Name font size"],
desc = L["Size of the name text"],
order = 13,
order = 21,
step = 0.1,
min = 0,
max = 20,
@@ -410,12 +450,53 @@ function Healthbar:GetOptions()
type = "range",
name = L["Health font size"],
desc = L["Size of the health text"],
order = 14,
order = 22,
step = 0.1,
min = 0,
max = 20,
width = "full",
}),
headerOffsets = {
type = "header",
name = L["Offsets"],
order = 30,
},
healthTextLeftVOffset = option({
type = "range",
name = L["Left Text Vertical Offset"],
order = 31,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
healthTextLeftHOffset = option({
type = "range",
name = L["Left Text Horizontal Offset"],
order = 32,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
healthTextRightVOffset = option({
type = "range",
name = L["Right Text Vertical Offset"],
order = 33,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
healthTextRightHOffset = option({
type = "range",
name = L["Right Text Horizontal Offset"],
order = 34,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
},
},
border = {
@@ -499,6 +580,7 @@ function Healthbar:GetOptions()
desc = L["Show the units name"],
order = 2,
width = "full",
disabled = function() return Gladdy.db.healthCustomTagsEnabled end,
}),
healthNameToArenaId = option({
type = "toggle",
@@ -506,7 +588,7 @@ function Healthbar:GetOptions()
desc = L["Show 1-5 as name instead"],
order = 3,
width = "full",
disabled = function() return not Gladdy.db.healthName end
disabled = function() return not Gladdy.db.healthName or Gladdy.db.healthCustomTagsEnabled end,
}),
healthPercentage = option({
type = "toggle",
@@ -514,7 +596,16 @@ function Healthbar:GetOptions()
desc = L["Show health percentage on the health bar"],
order = 6,
width = "full",
disabled = function() return Gladdy.db.healthCustomTagsEnabled end,
}),
header = {
type = "header",
name = L["Custom Tags"],
order = 10,
},
healthCustomTagsEnabled = Gladdy:GetTagOption(L["Custom Tags Enabled"], 11, nil, option, true),
healthTextLeft = Gladdy:GetTagOption(L["Left Text"], 12, "healthCustomTagsEnabled", option),
healthTextRight = Gladdy:GetTagOption(L["Right Text"], 13, "healthCustomTagsEnabled", option),
},
},
},
Modules/Pets.lua
+21 -6
View File
@@ -31,12 +31,26 @@ local Pets = Gladdy:NewModule("Pets", nil, {
function Pets:Initialize()
self.frames = {}
if Gladdy.db.petEnabled then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("PET_SPOTTED")
self:RegisterMessage("PET_DESTROYED")
self:RegisterMessage("PET_STEALTH")
self:RegisterMessage("ENEMY_SPOTTED")
end
end
function Pets:UpdateFrameOnce()
if Gladdy.db.petEnabled then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("PET_SPOTTED")
self:RegisterMessage("PET_DESTROYED")
self:RegisterMessage("PET_STEALTH")
self:RegisterMessage("ENEMY_SPOTTED")
else
self:UnregisterAllMessages()
end
end
function Pets:JOINED_ARENA()
for _,v in pairs(self.frames) do
@@ -219,7 +233,7 @@ function Pets:CreateFrame(unitId)
healthBar.unit = unit
button.healthBar = healthBar
healthBar:RegisterUnitEvent("UNIT_HEALTH", unit)
healthBar:RegisterUnitEvent("UNIT_HEALTH_FREQUENT", unit)
healthBar:RegisterUnitEvent("UNIT_MAXHEALTH", unit)
healthBar:RegisterUnitEvent("UNIT_PORTRAIT_UPDATE", unit)
healthBar:RegisterUnitEvent("UNIT_NAME_UPDATE", unit)
@@ -375,11 +389,17 @@ function Pets:GetOptions()
desc = L["Enables Pets module"],
order = 3,
}),
petGroup = option({
type = "toggle",
name = L["Group Pets"],
order = 4,
}),
group = {
type = "group",
childGroups = "tree",
name = L["Frame"],
order = 3,
disabled = function() return not Gladdy.db.petEnabled end,
args = {
general = {
type = "group",
@@ -411,11 +431,6 @@ function Pets:GetOptions()
step = 1,
width = "full",
}),
petGroup = option({
type = "toggle",
name = L["Group Pets"],
order = 5,
}),
petMargin = option({
type = "range",
name = L["Margin"],
Modules/Powerbar.lua
+222 -125
View File
@@ -16,7 +16,8 @@ local Powerbar = Gladdy:NewModule("Power Bar", 90, {
powerBarBorderColor = { r = 0, g = 0, b = 0, a = 1 },
powerBarFontColor = { r = 1, g = 1, b = 1, a = 1 },
powerBarBgColor = { r = 0.3, g = 0.3, b = 0.3, a = 0.7 },
powerBarFontSize = 10,
powerBarRaceFontSize = 10,
powerBarPowerFontSize = 10,
powerShowSpec = true,
powerShowRace = true,
powerActual = true,
@@ -24,16 +25,38 @@ local Powerbar = Gladdy:NewModule("Power Bar", 90, {
powerPercentage = false,
powerFrameStrata = "MEDIUM",
powerFrameLevel = 1,
powerCustomTagsEnabled = false,
powerTextLeft = "[spec] [race]",
powerTextRight = "[current]/[max]",
powerTextLeftOutline = false,
powerTextRightOutline = false,
powerTextLeftVOffset = 1,
powerTextLeftHOffset = 5,
powerTextRightVOffset = 1,
powerTextRightHOffset = -5,
})
function Powerbar:Initialize()
self.frames = {}
if Gladdy.db.powerBarEnabled then
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_SPEC")
self:RegisterMessage("UNIT_DEATH")
self:RegisterMessage("UNIT_DESTROYED")
end
end
function Powerbar:UpdateFrameOnce()
if Gladdy.db.powerBarEnabled then
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_SPEC")
self:RegisterMessage("UNIT_DEATH")
self:RegisterMessage("UNIT_DESTROYED")
else
self:UnregisterAllMessages()
end
end
function Powerbar:CreateFrame(unit)
local button = Gladdy.buttons[unit]
@@ -59,85 +82,31 @@ function Powerbar:CreateFrame(unit)
powerBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.powerBarBgColor))
powerBar.raceText = powerBar:CreateFontString(nil, "LOW")
powerBar.raceText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
powerBar.raceText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarRaceFontSize, Gladdy.db.powerTextLeftOutline and "OUTLINE")
powerBar.raceText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
powerBar.raceText:SetShadowOffset(1, -1)
powerBar.raceText:SetShadowColor(0, 0, 0, 1)
powerBar.raceText:SetJustifyH("CENTER")
powerBar.raceText:SetPoint("LEFT", 5, 1)
powerBar.raceText:SetPoint("LEFT", Gladdy.db.powerTextLeftHOffset, Gladdy.db.powerTextLeftVOffset)
powerBar.powerText = powerBar:CreateFontString(nil, "LOW")
powerBar.powerText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
powerBar.powerText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarPowerFontSize, Gladdy.db.powerTextRightOutline and "OUTLINE")
powerBar.powerText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
powerBar.powerText:SetShadowOffset(1, -1)
powerBar.powerText:SetShadowColor(0, 0, 0, 1)
powerBar.powerText:SetJustifyH("CENTER")
powerBar.powerText:SetPoint("RIGHT", -5, 1)
powerBar.powerText:SetPoint("RIGHT", Gladdy.db.powerTextRightHOffset, Gladdy.db.powerTextRightVOffset)
button.powerBar = powerBar
self.frames[unit] = powerBar
self:ResetUnit(unit)
powerBar.unit = unit
powerBar:RegisterUnitEvent("UNIT_POWER_UPDATE", unit)
powerBar:RegisterUnitEvent("UNIT_MAXPOWER", unit)
powerBar:RegisterUnitEvent("UNIT_DISPLAYPOWER", unit)
powerBar:SetScript("OnEvent", Powerbar.OnEvent)
end
function Powerbar.OnEvent(powerBar, event, unit)
if event == "UNIT_POWER_UPDATE" then
Powerbar:SetPower(powerBar, UnitPower(unit, UnitPowerType(unit), true), UnitPowerMax(unit, UnitPowerType(unit), true), UnitPowerType(unit))
elseif event == "UNIT_MAXPOWER" then
Powerbar:SetPower(powerBar, UnitPower(unit, UnitPowerType(unit), true), UnitPowerMax(unit, UnitPowerType(unit), true), UnitPowerType(unit))
elseif event == "UNIT_DISPLAYPOWER" then
Powerbar:SetPower(powerBar, UnitPower(unit, UnitPowerType(unit), true), UnitPowerMax(unit, UnitPowerType(unit), true), UnitPowerType(unit))
end
end
function Powerbar:SetPower(powerBar, power, powerMax, powerType)
local powerPercentage = floor(power * 100 / powerMax)
local powerText
if (Gladdy.db.powerActual) then
powerText = powerMax > 999 and ("%.1fk"):format(power / 1000) or power
end
if (Gladdy.db.powerMax) then
local text = powerMax > 999 and ("%.1fk"):format(powerMax / 1000) or powerMax
if (powerText) then
powerText = ("%s/%s"):format(powerText, text)
else
powerText = text
end
end
if (Gladdy.db.powerPercentage) then
if (powerText) then
powerText = ("%s (%d%%)"):format(powerText, powerPercentage)
else
powerText = ("%d%%"):format(powerPercentage)
end
end
if (powerType == 1 and powerBar.powerType ~= powerType) then
powerBar.energy:SetStatusBarColor(1, 0, 0, 1)
powerBar.powerColor = {r = 1, g = 0, b = 0}
powerBar.powerType = powerType
elseif (powerType == 3 and powerBar.powerType ~= powerType) then
powerBar.energy:SetStatusBarColor(1, 1, 0, 1)
powerBar.powerColor = {r = 1, g = 1, b = 0}
powerBar.powerType = powerType
elseif powerBar.powerType ~= powerType then
powerBar.energy:SetStatusBarColor(.18, .44, .75, 1)
powerBar.powerColor = {r = .18, g = .44, b = .75}
powerBar.powerType = powerType
end
powerBar.powerText:SetText(powerText)
powerBar.energy:SetMinMaxValues(0, powerMax)
powerBar.energy:SetValue(power)
end
function Powerbar:UpdateFrame(unit)
local powerBar = self.frames[unit]
if (not powerBar) then
@@ -147,8 +116,16 @@ function Powerbar:UpdateFrame(unit)
if not Gladdy.db.powerBarEnabled then
powerBar:Hide()
powerBar:UnregisterEvent("UNIT_POWER_UPDATE")
powerBar:UnregisterEvent("UNIT_MAXPOWER")
powerBar:UnregisterEvent("UNIT_DISPLAYPOWER")
powerBar:SetScript("OnEvent", nil)
return
else
powerBar:RegisterUnitEvent("UNIT_POWER_UPDATE", unit)
powerBar:RegisterUnitEvent("UNIT_MAXPOWER", unit)
powerBar:RegisterUnitEvent("UNIT_DISPLAYPOWER", unit)
powerBar:SetScript("OnEvent", Powerbar.OnEvent)
powerBar:Show()
end
powerBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "powerBarTexture"))
@@ -169,10 +146,13 @@ function Powerbar:UpdateFrame(unit)
powerBar.energy:SetPoint("TOPLEFT", powerBar, "TOPLEFT", (Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset), -(Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset))
powerBar.energy:SetPoint("BOTTOMRIGHT", powerBar, "BOTTOMRIGHT", -(Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset), (Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset))
powerBar.raceText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
powerBar.raceText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarRaceFontSize, Gladdy.db.powerTextLeftOutline and "OUTLINE")
powerBar.raceText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
powerBar.powerText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
powerBar.raceText:SetPoint("LEFT", Gladdy.db.powerTextLeftHOffset, Gladdy.db.powerTextLeftVOffset)
powerBar.powerText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarPowerFontSize, Gladdy.db.powerTextRightOutline and "OUTLINE")
powerBar.powerText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
powerBar.powerText:SetPoint("RIGHT", Gladdy.db.powerTextRightHOffset, Gladdy.db.powerTextRightVOffset)
powerBar:SetFrameStrata(Gladdy.db.powerFrameStrata)
powerBar:SetFrameLevel(Gladdy.db.powerFrameLevel)
@@ -180,6 +160,83 @@ function Powerbar:UpdateFrame(unit)
powerBar.energy:SetFrameLevel(Gladdy.db.powerFrameLevel - 1)
end
function Powerbar.OnEvent(powerBar, event, unit)
if event == "UNIT_POWER_UPDATE" then
Powerbar:SetPower(powerBar, unit, UnitPower(unit, UnitPowerType(unit), true), UnitPowerMax(unit, UnitPowerType(unit), true), UnitPowerType(unit))
elseif event == "UNIT_MAXPOWER" then
Powerbar:SetPower(powerBar, unit, UnitPower(unit, UnitPowerType(unit), true), UnitPowerMax(unit, UnitPowerType(unit), true), UnitPowerType(unit))
elseif event == "UNIT_DISPLAYPOWER" then
Powerbar:SetPower(powerBar, unit, UnitPower(unit, UnitPowerType(unit), true), UnitPowerMax(unit, UnitPowerType(unit), true), UnitPowerType(unit))
end
end
function Powerbar:SetText(unit, power, powerMax, status)
local button = Gladdy.buttons[unit]
if not Gladdy.buttons[unit] then
return
end
local powerBar = button.powerBar
if Gladdy.db.powerCustomTagsEnabled then
powerBar.powerText:SetText(Gladdy:SetTag(unit, Gladdy.db.powerTextRight, power, powerMax, status))
powerBar.raceText:SetText(Gladdy:SetTag(unit, Gladdy.db.powerTextLeft, power, powerMax, status))
else
if power then
local powerPercentage = floor(power * 100 / powerMax)
local powerText
if (Gladdy.db.powerActual) then
powerText = powerMax > 999 and ("%.1fk"):format(power / 1000) or power
end
if (Gladdy.db.powerMax) then
local text = powerMax > 999 and ("%.1fk"):format(powerMax / 1000) or powerMax
if (powerText) then
powerText = ("%s/%s"):format(powerText, text)
else
powerText = text
end
end
if (Gladdy.db.powerPercentage) then
if (powerText) then
powerText = ("%s (%d%%)"):format(powerText, powerPercentage)
else
powerText = ("%d%%"):format(powerPercentage)
end
end
powerBar.powerText:SetText(powerText)
end
local raceText = Gladdy.db.powerShowRace and button.raceLoc or ""
if (button.spec and Gladdy.db.powerShowSpec) then
raceText = button.spec .. " " .. raceText
end
powerBar.raceText:SetText(raceText)
end
end
function Powerbar:SetPower(powerBar, unit, power, powerMax, powerType, status)
Powerbar:SetText(unit, power, powerMax, status)
powerBar.energy.current = power
powerBar.energy.max = powerMax
powerBar.energy.powerType = powerType
if (powerType == 1 and powerBar.powerType ~= powerType) then
powerBar.energy:SetStatusBarColor(1, 0, 0, 1)
powerBar.powerColor = {r = 1, g = 0, b = 0}
powerBar.powerType = powerType
elseif (powerType == 3 and powerBar.powerType ~= powerType) then
powerBar.energy:SetStatusBarColor(1, 1, 0, 1)
powerBar.powerColor = {r = 1, g = 1, b = 0}
powerBar.powerType = powerType
elseif powerBar.powerType ~= powerType then
powerBar.energy:SetStatusBarColor(.18, .44, .75, 1)
powerBar.powerColor = {r = .18, g = .44, b = .75}
powerBar.powerType = powerType
end
powerBar.energy:SetMinMaxValues(0, powerMax)
powerBar.energy:SetValue(power)
end
function Powerbar:ResetUnit(unit)
local powerBar = self.frames[unit]
if (not powerBar) then
@@ -201,8 +258,14 @@ function Powerbar:Test(unit)
return
end
powerBar.energy.current = button.power
powerBar.energy.max = button.powerMax
powerBar.energy.powerType = button.powerType
self:ENEMY_SPOTTED(unit)
self:UNIT_POWER(unit, button.power, button.powerMax, button.powerType)
if unit == "arena1" then
self:UNIT_DEATH(unit)
end
end
function Powerbar:ENEMY_SPOTTED(unit)
@@ -212,13 +275,6 @@ function Powerbar:ENEMY_SPOTTED(unit)
return
end
local raceText = Gladdy.db.powerShowRace and button.raceLoc or ""
if (button.spec and Gladdy.db.powerShowSpec) then
raceText = button.spec .. " " .. raceText
end
powerBar.raceText:SetText(raceText)
if UnitExists(unit) then
Powerbar:SetPower(powerBar, UnitPower(unit, UnitPowerType(unit), true), UnitPowerMax(unit, UnitPowerType(unit), true), UnitPowerType(unit))
end
@@ -230,13 +286,10 @@ function Powerbar:UNIT_SPEC(unit, spec)
if (not powerBar or not button) then
return
end
local raceText = Gladdy.db.powerShowRace and button.raceLoc or ""
if (button.spec and Gladdy.db.powerShowSpec) then
raceText = spec .. " " .. raceText
if UnitExists(unit) then
Powerbar:SetPower(powerBar, unit, powerBar.energy.current, powerBar.energy.max, powerBar.energy.powerType)
end
powerBar.raceText:SetText(raceText)
end
function Powerbar:UNIT_POWER(unit, power, powerMax, powerType)
@@ -248,44 +301,7 @@ function Powerbar:UNIT_POWER(unit, power, powerMax, powerType)
if not Gladdy.buttons[unit].class then
Gladdy:SpotEnemy(unit, true)
end
local powerPercentage = floor(power * 100 / powerMax)
local powerText
if (Gladdy.db.powerActual) then
powerText = powerMax > 999 and ("%.1fk"):format(power / 1000) or power
end
if (Gladdy.db.powerMax) then
local text = powerMax > 999 and ("%.1fk"):format(powerMax / 1000) or powerMax
if (powerText) then
powerText = ("%s/%s"):format(powerText, text)
else
powerText = text
end
end
if (Gladdy.db.powerPercentage) then
if (powerText) then
powerText = ("%s (%d%%)"):format(powerText, powerPercentage)
else
powerText = ("%d%%"):format(powerPercentage)
end
end
if (powerType == 1) then
powerBar.energy:SetStatusBarColor(1, 0, 0, 1)
powerBar.powerColor = {r = 1, g = 0, b = 0}
elseif (powerType == 3) then
powerBar.energy:SetStatusBarColor(1, 1, 0, 1)
powerBar.powerColor = {r = 1, g = 1, b = 0}
else
powerBar.energy:SetStatusBarColor(.18, .44, .75, 1)
powerBar.powerColor = {r = .18, g = .44, b = .75}
end
powerBar.powerText:SetText(powerText)
powerBar.energy:SetValue(powerPercentage)
Powerbar:SetPower(powerBar, unit, power, powerMax, powerType)
end
function Powerbar:UNIT_DEATH(unit)
@@ -293,9 +309,7 @@ function Powerbar:UNIT_DEATH(unit)
if (not powerBar) then
return
end
powerBar.energy:SetValue(0)
powerBar.powerText:SetText("0%")
Powerbar:SetPower(powerBar, unit, 0, powerBar.energy.max, powerBar.energy.powerType, L["DEAD"])
end
function Powerbar:UNIT_DESTROYED(unit)
@@ -303,8 +317,7 @@ function Powerbar:UNIT_DESTROYED(unit)
if (not powerBar) then
return
end
powerBar.energy:SetValue(0)
powerBar.powerText:SetText("0%")
Powerbar:SetPower(powerBar, unit, 0, powerBar.energy.max, powerBar.energy.powerType, L["LEAVE"])
end
local function option(params)
@@ -320,9 +333,11 @@ local function option(params)
if Gladdy.db.powerBarBorderSize > Gladdy.db.powerBarHeight/2 then
Gladdy.db.powerBarBorderSize = Gladdy.db.powerBarHeight/2
end
if Gladdy.frame.testing then
for i=1,Gladdy.curBracket do
Powerbar:Test("arena" .. i)
end
end
Gladdy:UpdateFrame()
end,
}
@@ -351,6 +366,7 @@ function Powerbar:GetOptions()
childGroups = "tree",
name = L["Frame"],
order = 4,
disabled = function() return not Gladdy.db.powerBarEnabled end,
args = {
general = {
type = "group",
@@ -414,16 +430,84 @@ function Powerbar:GetOptions()
order = 12,
hasAlpha = true,
}),
powerBarFontSize = option({
type = "range",
name = L["Font size"],
desc = L["Size of the text"],
powerTextLeftOutline = option({
type = "toggle",
name = L["Left Font Outline"],
order = 13,
width = "full",
}),
powerTextRightOutline = option({
type = "toggle",
name = L["Right Font Outline"],
order = 14,
width = "full",
}),
headerSize = {
type = "header",
name = L["Size"],
order = 20,
},
powerBarRaceFontSize = option({
type = "range",
name = L["Race font size"],
desc = L["Size of the race text"],
order = 21,
step = 0.1,
min = 1,
min = 0,
max = 20,
width = "full",
}),
powerBarPowerFontSize = option({
type = "range",
name = L["Power font size"],
desc = L["Size of the power text"],
order = 22,
step = 0.1,
min = 0,
max = 20,
width = "full",
}),
headerOffsets = {
type = "header",
name = L["Offsets"],
order = 30,
},
powerTextLeftVOffset = option({
type = "range",
name = L["Left Text Vertical Offset"],
order = 31,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
powerTextLeftHOffset = option({
type = "range",
name = L["Left Text Horizontal Offset"],
order = 32,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
powerTextRightVOffset = option({
type = "range",
name = L["Right Text Vertical Offset"],
order = 33,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
powerTextRightHOffset = option({
type = "range",
name = L["Right Text Horizontal Offset"],
order = 34,
step = 0.1,
min = -200,
max = 200,
width = "full",
}),
},
},
border = {
@@ -506,31 +590,44 @@ function Powerbar:GetOptions()
name = L["Show race"],
desc = L["Show race"],
order = 2,
disabled = function() return Gladdy.db.powerCustomTagsEnabled end,
}),
powerShowSpec= option({
type = "toggle",
name = L["Show spec"],
desc = L["Show spec"],
order = 3,
disabled = function() return Gladdy.db.powerCustomTagsEnabled end,
}),
powerActual = option({
type = "toggle",
name = L["Show the actual power"],
desc = L["Show the actual power on the power bar"],
order = 31,
order = 4,
disabled = function() return Gladdy.db.powerCustomTagsEnabled end,
}),
powerMax = option({
type = "toggle",
name = L["Show max power"],
desc = L["Show max power on the power bar"],
order = 32,
order = 5,
disabled = function() return Gladdy.db.powerCustomTagsEnabled end,
}),
powerPercentage = option({
type = "toggle",
name = L["Show power percentage"],
desc = L["Show power percentage on the power bar"],
order = 33,
order = 6,
disabled = function() return Gladdy.db.powerCustomTagsEnabled end,
}),
header = {
type = "header",
name = L["Custom Tags"],
order = 10,
},
powerCustomTagsEnabled = Gladdy:GetTagOption(L["Custom Tags Enabled"], 11, nil, option, true),
powerTextLeft = Gladdy:GetTagOption(L["Left Text"], 12, "powerCustomTagsEnabled", option),
powerTextRight = Gladdy:GetTagOption(L["Right Text"], 13, "powerCustomTagsEnabled", option),
},
},
},
Modules/Racial.lua
+59 -5
View File
@@ -1,4 +1,4 @@
local ceil = ceil
local ceil, str_gsub = ceil, string.gsub
local CreateFrame = CreateFrame
local GetTime = GetTime
@@ -20,16 +20,30 @@ local Racial = Gladdy:NewModule("Racial", 79, {
racialCooldownNumberAlpha = 1,
racialFrameStrata = "MEDIUM",
racialFrameLevel = 5,
racialGroup = false,
racialGroupDirection = "DOWN",
})
function Racial:Initialize()
self.frames = {}
if Gladdy.db.racialEnabled then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("RACIAL_USED")
end
end
function Racial:UpdateFrameOnce()
if Gladdy.db.racialEnabled then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("RACIAL_USED")
else
self:UnregisterAllMessages()
end
end
local function iconTimer(self,elapsed)
if (self.active) then
@@ -141,6 +155,22 @@ function Racial:UpdateFrame(unit)
Gladdy:SetPosition(racial, unit, "racialXOffset", "racialYOffset", Racial:LegacySetPosition(racial, unit), Racial)
if (Gladdy.db.racialGroup) then
if (unit ~= "arena1") then
local previousUnit = "arena" .. str_gsub(unit, "arena", "") - 1
self.frames[unit]:ClearAllPoints()
if Gladdy.db.racialGroupDirection == "RIGHT" then
self.frames[unit]:SetPoint("LEFT", self.frames[previousUnit], "RIGHT", 0, 0)
elseif Gladdy.db.racialGroupDirection == "LEFT" then
self.frames[unit]:SetPoint("RIGHT", self.frames[previousUnit], "LEFT", 0, 0)
elseif Gladdy.db.racialGroupDirection == "UP" then
self.frames[unit]:SetPoint("BOTTOM", self.frames[previousUnit], "TOP", 0, 0)
elseif Gladdy.db.racialGroupDirection == "DOWN" then
self.frames[unit]:SetPoint("TOP", self.frames[previousUnit], "BOTTOM", 0, 0)
end
end
end
if (unit == "arena1") then
Gladdy:CreateMover(racial,"racialXOffset", "racialYOffset", L["Racial"],
{"TOPLEFT", "TOPLEFT"},
@@ -157,7 +187,6 @@ function Racial:UpdateFrame(unit)
end
function Racial:JOINED_ARENA()
self:RegisterEvent("ARENA_COOLDOWNS_UPDATE")
self:SetScript("OnEvent", function(self, event, ...)
if self[event] then
self[event](self, ...)
@@ -165,13 +194,17 @@ function Racial:JOINED_ARENA()
end)
end
function Racial:RACIAL_USED(unit)
function Racial:RACIAL_USED(unit, expirationTime, spellName)
local racial = self.frames[unit]
local button = Gladdy.buttons[unit]
if (not racial or not button or not button.race) then
return
end
Racial:Used(unit, GetTime(), Gladdy:Racials()[button.race].duration)
if expirationTime and Gladdy:Racials()[button.race].spellName ~= spellName then
return
end
local startTime = expirationTime or GetTime()
Racial:Used(unit, startTime, Gladdy:Racials()[button.race].duration)
end
function Racial:Used(unit, startTime, duration)
@@ -226,11 +259,32 @@ function Racial:GetOptions()
desc = L["Enable racial icon"],
order = 3,
}),
racialGroup = Gladdy:option({
type = "toggle",
name = L["Group"] .. " " .. L["Racial"],
order = 4,
disabled = function() return not Gladdy.db.racialEnabled end,
}),
racialGroupDirection = Gladdy:option({
type = "select",
name = L["Group direction"],
order = 5,
values = {
["RIGHT"] = L["Right"],
["LEFT"] = L["Left"],
["UP"] = L["Up"],
["DOWN"] = L["Down"],
},
disabled = function()
return not Gladdy.db.racialGroup or not Gladdy.db.racialEnabled
end,
}),
group = {
type = "group",
childGroups = "tree",
name = L["Frame"],
order = 4,
order = 6,
disabled = function() return not Gladdy.db.racialEnabled end,
args = {
general = {
type = "group",
Modules/RangeCheck.lua
+14
View File
@@ -52,12 +52,24 @@ local RangeCheck = Gladdy:NewModule("Range Check", nil, {
})
function RangeCheck:Initialize()
if Gladdy.db.rangeCheckEnabled then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_STEALTH")
self:RegisterMessage("ENEMY_SPOTTED")
end
self.playerClass = select(2, UnitClass("player"))
end
function RangeCheck:UpdateFrameOnce()
if Gladdy.db.rangeCheckEnabled then
self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_STEALTH")
self:RegisterMessage("ENEMY_SPOTTED")
else
self:UnregisterAllMessages()
end
end
function RangeCheck:Reset()
self.test = nil
end
@@ -268,6 +280,7 @@ function RangeCheck:GetOptions()
childGroups = "tree",
name = L["General"],
order = 5,
disabled = function() return not Gladdy.db.rangeCheckEnabled end,
args = {
general = {
type = "group",
@@ -340,6 +353,7 @@ function RangeCheck:GetOptions()
childGroups = "tree",
name = L["Spells"],
order = 5,
disabled = function() return not Gladdy.db.rangeCheckEnabled end,
args = RangeCheck:GetSpells(),
},
}
Modules/ShadowsightTimer.lua
+15 -1
View File
@@ -34,8 +34,10 @@ end
function ShadowsightTimer:Initialize()
self.locale = Gladdy:GetArenaTimer()
self:RegisterMessage("JOINED_ARENA")
self:CreateAnchor()
if Gladdy.db.shadowsightTimerEnabled then
self:RegisterMessage("JOINED_ARENA")
end
end
function ShadowsightTimer:Reset()
@@ -106,6 +108,12 @@ function ShadowsightTimer:CreateAnchor()
end
function ShadowsightTimer:UpdateFrameOnce()
if Gladdy.db.shadowsightTimerEnabled then
self:RegisterMessage("JOINED_ARENA")
else
self:UnregisterAllMessages()
end
self.anchor:EnableMouse(not Gladdy.db.shadowsightTimerLocked)
self.anchor:SetFrameStrata(Gladdy.db.shadowsightTimerFrameStrata)
@@ -148,6 +156,7 @@ end
---------------------------
function ShadowsightTimer:JOINED_ARENA()
if Gladdy.db.shadowsightTimerEnabled then
self:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
self:SetScript("OnEvent", ShadowsightTimer.OnEvent)
for i=1,2 do
@@ -156,6 +165,7 @@ function ShadowsightTimer:JOINED_ARENA()
end
self.anchor:Show()
end
end
function ShadowsightTimer:AURA_GAIN(unit, auraType, spellID)
if (spellID == 34709 and Gladdy.db.shadowsightTimerEnabled) then
@@ -297,23 +307,27 @@ function ShadowsightTimer:GetOptions()
name = L["Locked"],
--desc = L["Turns countdown before the start of an arena match on/off."],
order = 4,
disabled = function() return not Gladdy.db.shadowsightTimerEnabled end,
}),
shadowsightTimerShowTwoTimer = Gladdy:option({
type = "toggle",
name = L["Show two timers"],
order = 5,
disabled = function() return not Gladdy.db.shadowsightTimerEnabled end,
}),
shadowsightAnnounce = Gladdy:option({
type = "toggle",
name = L["Announce"],
--desc = L["Turns countdown before the start of an arena match on/off."],
order = 6,
disabled = function() return not Gladdy.db.shadowsightTimerEnabled end,
}),
group = {
type = "group",
childGroups = "tree",
name = L["Frame"],
order = 7,
disabled = function() return not Gladdy.db.shadowsightTimerEnabled end,
args = {
general = {
type = "group",
Modules/TotemPlates.lua
+173 -131
View File
@@ -1,103 +1,41 @@
local select, pairs, string_lower, tremove, tinsert, format, string_gsub, ipairs = select, pairs, string.lower, tremove, tinsert, format, string.gsub, ipairs
local UnitExists, UnitIsUnit, UnitName, UnitIsEnemy = UnitExists, UnitIsUnit, UnitName, UnitIsEnemy
local select, pairs, tremove, tinsert, format, strsplit, tonumber, ipairs = select, pairs, tremove, tinsert, format, strsplit, tonumber, ipairs
local UnitExists, UnitIsUnit, UnitIsEnemy, UnitGUID = UnitExists, UnitIsUnit, UnitIsEnemy, UnitGUID
local C_NamePlate = C_NamePlate
local Gladdy = LibStub("Gladdy")
local L = Gladdy.L
local GetSpellInfo, CreateFrame = GetSpellInfo, CreateFrame
local totemData, npcIdToTotemData = Gladdy:GetTotemData()
---------------------------------------------------
-- Constants
-- Option Helpers
---------------------------------------------------
local totemData = {
-- Fire
[string_lower("Searing Totem")] = {id = 3599,texture = select(3, GetSpellInfo(3599)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Searing Totem
[string_lower("Flametongue Totem")] = {id = 8227,texture = select(3, GetSpellInfo(8227)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Flametongue Totem
[string_lower("Magma Totem")] = {id = 8190,texture = select(3, GetSpellInfo(8190)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Magma Totem
[string_lower("Fire Nova Totem")] = {id = 1535,texture = select(3, GetSpellInfo(1535)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Fire Nova Totem
[string_lower("Totem of Wrath")] = {id = 30706,texture = select(3, GetSpellInfo(30706)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 1}, -- Totem of Wrath
[string_lower("Fire Elemental Totem")] = {id = 32982,texture = select(3, GetSpellInfo(32982)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Fire Elemental Totem
[string_lower("Frost Resistance Totem")] = {id = 8181,texture = select(3, GetSpellInfo(8181)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Frost Resistance Totem
-- Water
[string_lower("Fire Resistance Totem")] = {id = 8184,texture = select(3, GetSpellInfo(8184)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Fire Resistance Totem
[string_lower("Poison Cleansing Totem")] = {id = 8166,texture = select(3, GetSpellInfo(8166)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Poison Cleansing Totem
[string_lower("Disease Cleansing Totem")] = {id = 8170,texture = select(3, GetSpellInfo(8170)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Disease Cleansing Totem
[string_lower("Healing Stream Totem")] = {id = 5394,texture = select(3, GetSpellInfo(5394)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Healing Stream Totem
[string_lower("Mana Tide Totem")] = {id = 16190,texture = select(3, GetSpellInfo(16190)), color = {r = 0.078, g = 0.9, b = 0.16, a = 1}, enabled = true, priority = 3}, -- Mana Tide Totem
[string_lower("Mana Spring Totem")] = {id = 5675,texture = select(3, GetSpellInfo(5675)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 1}, -- Mana Spring Totem
-- Earth
[string_lower("Earthbind Totem")] = {id = 2484,texture = select(3, GetSpellInfo(2484)), color = {r = 0.5, g = 0.5, b = 0.5, a = 1}, enabled = true, priority = 1}, -- Earthbind Totem
[string_lower("Stoneclaw Totem")] = {id = 5730,texture = select(3, GetSpellInfo(5730)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Stoneclaw Totem
[string_lower("Stoneskin Totem")] = {id = 8071,texture = select(3, GetSpellInfo(8071)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Stoneskin Totem
[string_lower("Strength of Earth Totem")] = {id = 8075,texture = select(3, GetSpellInfo(8075)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Strength of Earth Totem
[string_lower("Earth Elemental Totem")] = {id = 33663,texture = select(3, GetSpellInfo(33663)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Earth Elemental Totem
[string_lower("Tremor Totem")] = {id = 8143,texture = select(3, GetSpellInfo(8143)), color = {r = 1, g = 0.9, b = 0.1, a = 1}, enabled = true, priority = 3}, -- Tremor Totem
-- Air
[string_lower("Grounding Totem")] = {id = 8177,texture = select(3, GetSpellInfo(8177)), color = {r = 0, g = 0.53, b = 0.92, a = 1}, enabled = true, priority = 3}, -- Grounding Totem
[string_lower("Grace of Air Totem")] = {id = 8835,texture = select(3, GetSpellInfo(8835)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Grace of Air Totem
[string_lower("Nature Resistance Totem")] = {id = 10595,texture = select(3, GetSpellInfo(10595)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Nature Resistance Totem
[string_lower("Windfury Totem")] = {id = 8512,texture = select(3, GetSpellInfo(8512)), color = {r = 0.96, g = 0, b = 0.07, a = 1}, enabled = true, priority = 2}, -- Windfury Totem
[string_lower("Sentry Totem")] = {id = 6495, texture = select(3, GetSpellInfo(6495)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Sentry Totem
[string_lower("Windwall Totem")] = {id = 15107,texture = select(3, GetSpellInfo(15107)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Windwall Totem
[string_lower("Wrath of Air Totem")] = {id = 3738,texture = select(3, GetSpellInfo(3738)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Wrath of Air Totem
[string_lower("Tranquil Air Totem")] = {id = 25908,texture = select(3, GetSpellInfo(25908)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Tranquil Air Totem
}
local localizedTotemData = {
["default"] = {
[string_lower(select(1, GetSpellInfo(3599)))] = totemData[string_lower("Searing Totem")], -- Searing Totem
[string_lower(select(1, GetSpellInfo(8227)))] = totemData[string_lower("Flametongue Totem")], -- Flametongue Totem
[string_lower(select(1, GetSpellInfo(8190)))] = totemData[string_lower("Magma Totem")], -- Magma Totem
[string_lower(select(1, GetSpellInfo(1535)))] = totemData[string_lower("Fire Nova Totem")], -- Fire Nova Totem
[string_lower(select(1, GetSpellInfo(30706)))] = totemData[string_lower("Totem of Wrath")], -- Totem of Wrath
[string_lower(select(1, GetSpellInfo(32982)))] = totemData[string_lower("Fire Elemental Totem")], -- Fire Elemental Totem
[string_lower(select(1, GetSpellInfo(8181)))] = totemData[string_lower("Frost Resistance Totem")], -- Frost Resistance Totem
-- Water
[string_lower(select(1, GetSpellInfo(8184)))] = totemData[string_lower("Fire Resistance Totem")], -- Fire Resistance Totem
[string_lower(select(1, GetSpellInfo(8166)))] = totemData[string_lower("Poison Cleansing Totem")], -- Poison Cleansing Totem
[string_lower(select(1, GetSpellInfo(8170)))] = totemData[string_lower("Disease Cleansing Totem")], -- Disease Cleansing Totem
[string_lower(select(1, GetSpellInfo(5394)))] = totemData[string_lower("Healing Stream Totem")], -- Healing Stream Totem
[string_lower(select(1, GetSpellInfo(16190)))] = totemData[string_lower("Mana Tide Totem")], -- Mana Tide Totem
[string_lower(select(1, GetSpellInfo(5675)))] = totemData[string_lower("Mana Spring Totem")], -- Mana Spring Totem
-- Earth
[string_lower(select(1, GetSpellInfo(2484)))] = totemData[string_lower("Earthbind Totem")], -- Earthbind Totem
[string_lower(select(1, GetSpellInfo(5730)))] = totemData[string_lower("Stoneclaw Totem")], -- Stoneclaw Totem
[string_lower(select(1, GetSpellInfo(8071)))] = totemData[string_lower("Stoneskin Totem")], -- Stoneskin Totem
[string_lower(select(1, GetSpellInfo(8075)))] = totemData[string_lower("Strength of Earth Totem")], -- Strength of Earth Totem
[string_lower(select(1, GetSpellInfo(33663)))] = totemData[string_lower("Earth Elemental Totem")], -- Earth Elemental Totem
[string_lower(select(1, GetSpellInfo(8143)))] = totemData[string_lower("Tremor Totem")], -- Tremor Totem
-- Air
[string_lower(select(1, GetSpellInfo(8177)))] = totemData[string_lower("Grounding Totem")], -- Grounding Totem
[string_lower(select(1, GetSpellInfo(8835)))] = totemData[string_lower("Grace of Air Totem")], -- Grace of Air Totem
[string_lower(select(1, GetSpellInfo(10595)))] = totemData[string_lower("Nature Resistance Totem")], -- Nature Resistance Totem
[string_lower(select(1, GetSpellInfo(8512)))] = totemData[string_lower("Windfury Totem")], -- Windfury Totem
[string_lower(select(1, GetSpellInfo(6495)))] = totemData[string_lower("Sentry Totem")], -- Sentry Totem
[string_lower(select(1, GetSpellInfo(15107)))] = totemData[string_lower("Windwall Totem")], -- Windwall Totem
[string_lower(select(1, GetSpellInfo(3738)))] = totemData[string_lower("Wrath of Air Totem")], -- Wrath of Air Totem
[string_lower(select(1, GetSpellInfo(25908)))] = totemData[string_lower("Tranquil Air Totem")], -- Tranquil Air Totem
},
["frFR"] = {
[string_lower("Totem d'\195\169lementaire de terre")] = totemData[string_lower("Earth Elemental Totem")], -- Earth Elemental Totem
[string_lower("Totem d'\195\169lementaire de feu")] = totemData[string_lower("Fire Elemental Totem")], -- Fire Elemental Totem
},
["ruRU"] = {
[string_lower("")] = totemData[string_lower("Sentry Totem")], -- Sentry Totem
}
}
local function GetTotemColorDefaultOptions()
local defaultDB = {}
local options = {}
local indexedList = {}
for k,v in pairs(totemData) do
tinsert(indexedList, {name = k, id = v.id, color = v.color, texture = v.texture, enabled = v.enabled})
tinsert(indexedList, {name = k, id = v.id, color = v.color, texture = v.texture})
end
table.sort(indexedList, function (a, b)
return a.name < b.name
end)
for i=1,#indexedList do
defaultDB["totem" .. indexedList[i].id] = {color = indexedList[i].color, enabled = indexedList[i].enabled, alpha = 0.6, customText = ""}
defaultDB["totem" .. indexedList[i].id] = {color = indexedList[i].color, enabled = true, alpha = 0.6, customText = ""}
options["npTotemsHideDisabledTotems"] = {
order = 1,
name = L["Hide Disabled Totem Plates"],
desc = L["Hide Disabled Totem Plates"],
type = "toggle",
width = "full",
get = function() return Gladdy.dbi.profile.npTotemsHideDisabledTotems end,
set = function(_, value)
Gladdy.dbi.profile.npTotemsHideDisabledTotems = value
Gladdy:UpdateFrame()
end
}
options["totem" .. indexedList[i].id] = {
order = i+1,
name = select(1, GetSpellInfo(indexedList[i].id)),
@@ -174,17 +112,13 @@ local function GetTotemColorDefaultOptions()
return defaultDB, options, indexedList
end
function Gladdy:GetTotemColors()
return GetTotemColorDefaultOptions()
end
---------------------------------------------------
-- Core
---------------------------------------------------
local TotemPlates = Gladdy:NewModule("Totem Plates", nil, {
local TotemPlates = Gladdy:NewModule("Totem Plates", 2, {
npTotems = true,
npTotemsShowFriendly = true,
npTotemsShowEnemy = true,
@@ -198,12 +132,10 @@ local TotemPlates = Gladdy:NewModule("Totem Plates", nil, {
npTotemPlatesAlpha = 0.6,
npTotemPlatesAlphaAlways = false,
npTotemPlatesAlphaAlwaysTargeted = false,
npTotemColors = select(1, GetTotemColorDefaultOptions())
npTotemColors = select(1, GetTotemColorDefaultOptions()),
npTotemsHideDisabledTotems = false,
})
LibStub("AceHook-3.0"):Embed(TotemPlates)
LibStub("AceTimer-3.0"):Embed(TotemPlates)
function TotemPlates.OnEvent(self, event, ...)
TotemPlates[event](self, ...)
end
@@ -212,19 +144,18 @@ function TotemPlates:Initialize()
self.numChildren = 0
self.activeTotemNameplates = {}
self.totemPlateCache = {}
if Gladdy.db.npTotems then
self:RegisterEvent("PLAYER_ENTERING_WORLD")
self:RegisterEvent("NAME_PLATE_UNIT_ADDED")
self:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
self:RegisterEvent("PLAYER_TARGET_CHANGED")
self:RegisterEvent("UNIT_NAME_UPDATE")
self:SetScript("OnEvent", TotemPlates.OnEvent)
end
if Gladdy.db.npTotems and Gladdy.db.npTotemsShowEnemy then
--GetCVar("nameplateShowEnemyTotems")
--SetCVar("nameplateShowEnemyTotems", true);
SetCVar("nameplateShowEnemyTotems", true);
end
if Gladdy.db.npTotems and Gladdy.db.npTotemsShowFriendly then
--GetCVar("nameplateShowFriendlyTotems")
--SetCVar("nameplateShowFriendlyTotems", true);
SetCVar("nameplateShowFriendlyTotems", true);
end
self.addon = "Blizzard"
if (IsAddOnLoaded("Plater")) then
@@ -248,17 +179,67 @@ function TotemPlates:Initialize()
end
end
---------------------------------------------------
-- Events
---------------------------------------------------
function TotemPlates:PLAYER_ENTERING_WORLD()
self.numChildren = 0
self.activeTotemNameplates = {}
end
function TotemPlates:Reset()
--self:CancelAllTimers()
--self:UnhookAll()
function TotemPlates:PLAYER_TARGET_CHANGED()
for k,nameplate in pairs(self.activeTotemNameplates) do
TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, k)
end
end
function TotemPlates:NAME_PLATE_UNIT_ADDED(unitID)
self:OnUnitEvent(unitID)
end
function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID)
local nameplate = C_NamePlate.GetNamePlateForUnit(unitID)
self.activeTotemNameplates[unitID] = nil
--self:ToggleAddon(nameplate, true)
if nameplate.gladdyTotemFrame then
nameplate.gladdyTotemFrame:Hide()
nameplate.gladdyTotemFrame:SetParent(nil)
tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame)
nameplate.gladdyTotemFrame = nil
end
end
---------------------------------------------------
-- Gladdy Call
---------------------------------------------------
function TotemPlates:UpdateFrameOnce()
if Gladdy.db.npTotems then
self:RegisterEvent("PLAYER_ENTERING_WORLD")
self:RegisterEvent("NAME_PLATE_UNIT_ADDED")
self:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
self:RegisterEvent("PLAYER_TARGET_CHANGED")
self:SetScript("OnEvent", TotemPlates.OnEvent)
else
self:UnregisterEvent("PLAYER_ENTERING_WORLD")
self:UnregisterEvent("NAME_PLATE_UNIT_ADDED")
self:UnregisterEvent("NAME_PLATE_UNIT_REMOVED")
self:UnregisterEvent("PLAYER_TARGET_CHANGED")
self:SetScript("OnEvent", nil)
end
if Gladdy.db.npTotems and Gladdy.db.npTotemsShowEnemy then
SetCVar("nameplateShowEnemyTotems", true);
end
if Gladdy.db.npTotems and Gladdy.db.npTotemsShowFriendly then
SetCVar("nameplateShowFriendlyTotems", true);
end
for k,nameplate in pairs(self.activeTotemNameplates) do
local totemDataEntry = nameplate.gladdyTotemFrame.totemDataEntry
nameplate.gladdyTotemFrame:SetWidth(Gladdy.db.npTotemPlatesSize * Gladdy.db.npTotemPlatesWidthFactor)
@@ -295,6 +276,18 @@ function TotemPlates:UpdateFrameOnce()
nameplate.gladdyTotemFrame:Hide()
self:ToggleAddon(nameplate, true)
end
if Gladdy.db.npTotems and Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled then
nameplate.gladdyTotemFrame:Show()
self:ToggleAddon(nameplate)
end
if Gladdy.db.npTotems and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled then
nameplate.gladdyTotemFrame:Hide()
self:ToggleAddon(nameplate, true)
end
if Gladdy.db.npTotems and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled and Gladdy.db.npTotemsHideDisabledTotems then
nameplate.gladdyTotemFrame:Hide()
self:ToggleAddon(nameplate)
end
end
for _,gladdyTotemFrame in ipairs(self.totemPlateCache) do
gladdyTotemFrame:SetWidth(Gladdy.db.npTotemPlatesSize * Gladdy.db.npTotemPlatesWidthFactor)
@@ -313,6 +306,7 @@ end
function TotemPlates:CreateTotemFrame(nameplate)
nameplate.gladdyTotemFrame = CreateFrame("Frame")
nameplate.gladdyTotemFrame:SetFrameLevel(1)
nameplate.gladdyTotemFrame:SetIgnoreParentAlpha(true)
nameplate.gladdyTotemFrame:SetWidth(Gladdy.db.npTotemPlatesSize * Gladdy.db.npTotemPlatesWidthFactor)
nameplate.gladdyTotemFrame:SetHeight(Gladdy.db.npTotemPlatesSize)
@@ -373,11 +367,7 @@ function TotemPlates:GetAddonFrame(nameplate)
end
end
function TotemPlates:PLAYER_TARGET_CHANGED()
for k,nameplate in pairs(self.activeTotemNameplates) do
TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, k)
end
end
function TotemPlates:ToggleAddon(nameplate, show)
local addonFrames = { self:GetAddonFrame(nameplate) }
@@ -395,7 +385,7 @@ function TotemPlates:ToggleAddon(nameplate, show)
end
function TotemPlates.OnUpdate(self)
if (UnitIsUnit("mouseover", self.unitID) or UnitIsUnit("target", self.unitID)) then
if (UnitIsUnit("mouseover", self.unitID) or UnitIsUnit("target", self.unitID)) and Gladdy.db.npTotemColors["totem" .. self.totemDataEntry.id].alpha > 0 then
self.selectionHighlight:SetAlpha(.25)
else
self.selectionHighlight:SetAlpha(0)
@@ -423,12 +413,14 @@ function TotemPlates:OnUnitEvent(unitID)
self:ToggleAddon(nameplate, true)
return
end
local nameplateName = UnitName(unitID)
local totemName = string_gsub(nameplateName, "^%s+", "") --trim
totemName = string_gsub(totemName, "%s+$", "") --trim
totemName = string_gsub(totemName, "%s+[I,V,X]+$", "") --trim rank
totemName = string_lower(totemName)
local totemDataEntry = localizedTotemData["default"][totemName] or localizedTotemData["frFR"][totemName] or localizedTotemData["ruRU"][totemName]
local npcType, _, _, _, _, npcId = strsplit("-", UnitGUID(unitID))
if npcType ~= "Creature" then
return
end
local totemDataEntry = npcIdToTotemData[tonumber(npcId)]
if not totemDataEntry then
return
end
if totemDataEntry and Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled then-- modify this nameplates
if #self.totemPlateCache > 0 then
nameplate.gladdyTotemFrame = tremove(self.totemPlateCache, #self.totemPlateCache)
@@ -452,30 +444,17 @@ function TotemPlates:OnUnitEvent(unitID)
TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID)
self:ToggleAddon(nameplate)
self.activeTotemNameplates[unitID] = nameplate
else
self:ToggleAddon(nameplate, true)
end
end
function TotemPlates:NAME_PLATE_UNIT_ADDED(...)
self:OnUnitEvent(...)
end
function TotemPlates:UNIT_NAME_UPDATE(...)
self:OnUnitEvent(...)
end
function TotemPlates:NAME_PLATE_UNIT_REMOVED(...)
local unitID = ...
local nameplate = C_NamePlate.GetNamePlateForUnit(unitID)
self.activeTotemNameplates[unitID] = nil
--self:ToggleAddon(nameplate, true)
elseif totemDataEntry and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled and Gladdy.db.npTotemsHideDisabledTotems then
if nameplate.gladdyTotemFrame then
nameplate.gladdyTotemFrame:Hide()
nameplate.gladdyTotemFrame:SetParent(nil)
tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame)
nameplate.gladdyTotemFrame = nil
end
self:ToggleAddon(nameplate)
else
self:ToggleAddon(nameplate, true)
end
end
function TotemPlates:SetTotemAlpha(gladdyTotemFrame, unitID)
@@ -502,6 +481,65 @@ end
---------------------------------------------------
-- Test
---------------------------------------------------
function TotemPlates:TestOnce()
if not self.testFrame then
self.testFrame = CreateFrame("Frame", nil, UIParent)
self.testFrame:SetWidth(1)
self.testFrame:SetHeight(32)
self.testFrame:SetPoint("CENTER", UIParent, "CENTER", 0, -140)
self.testFrame:SetIgnoreParentScale(true)
end
local totemDataEntry = npcIdToTotemData[5913]
self.testFrame:Show()
if not self.testFrame.gladdyTotemFrame then
if #self.totemPlateCache > 0 then
self.testFrame.gladdyTotemFrame = tremove(self.totemPlateCache, #self.totemPlateCache)
else
self:CreateTotemFrame(self.testFrame)
self.testFrame.gladdyTotemFrame:SetScript("OnHide", nil)
self.testFrame.gladdyTotemFrame:SetScript("OnUpdate", nil)
end
end
if Gladdy.db.npTotems then
self.testFrame.gladdyTotemFrame.unitID = "player"
self.testFrame.gladdyTotemFrame.totemDataEntry = totemDataEntry
self.testFrame.gladdyTotemFrame.parent = self.testFrame
self.testFrame.gladdyTotemFrame:SetParent(self.testFrame)
self.testFrame.gladdyTotemFrame:ClearAllPoints()
self.testFrame.gladdyTotemFrame:SetPoint("CENTER", self.testFrame, "CENTER", 0, 0)
self.testFrame.gladdyTotemFrame.totemIcon:SetTexture(totemDataEntry.texture)
self.testFrame.gladdyTotemFrame.totemBorder:SetVertexColor(Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.r,
Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.g,
Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.b,
Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.a)
self.testFrame.gladdyTotemFrame.totemName:SetText(Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].customText or "")
self.testFrame.gladdyTotemFrame.parent = self.testFrame
self.testFrame.gladdyTotemFrame:Show()
self.activeTotemNameplates["player"] = self.testFrame
else
self.testFrame.gladdyTotemFrame:Hide()
end
end
function TotemPlates:Reset()
if self.testFrame then
if self.testFrame.gladdyTotemFrame then
self.testFrame.gladdyTotemFrame:Hide()
self.testFrame.gladdyTotemFrame:SetParent(nil)
tinsert(self.totemPlateCache, self.testFrame.gladdyTotemFrame)
self.testFrame.gladdyTotemFrame = nil
end
self.testFrame:Hide()
self.activeTotemNameplates["player"] = nil
end
end
---------------------------------------------------
-- Interface options
---------------------------------------------------
@@ -516,21 +554,23 @@ function TotemPlates:GetOptions()
npTotems = Gladdy:option({
type = "toggle",
name = L["Enabled"],
desc = L["Turns totem icons instead of nameplates on or off. (Requires reload)"],
desc = L["Turns totem icons instead of nameplates on or off."],
order = 3,
width = 0.9,
}),
npTotemsShowFriendly = Gladdy:option({
type = "toggle",
name = L["Show friendly"],
desc = L["Turns totem icons instead of nameplates on or off. (Requires reload)"],
desc = L["Turns totem icons instead of nameplates on or off."],
disabled = function() return not Gladdy.db.npTotems end,
order = 4,
width = 0.65,
}),
npTotemsShowEnemy = Gladdy:option({
type = "toggle",
name = L["Show enemy"],
desc = L["Turns totem icons instead of nameplates on or off. (Requires reload)"],
desc = L["Turns totem icons instead of nameplates on or off."],
disabled = function() return not Gladdy.db.npTotems end,
order = 5,
width = 0.6,
}),
@@ -538,6 +578,7 @@ function TotemPlates:GetOptions()
type = "group",
childGroups = "tree",
name = L["Frame"],
disabled = function() return not Gladdy.db.npTotems end,
order = 4,
args = {
icon = {
@@ -732,7 +773,8 @@ function TotemPlates:GetOptions()
name = L["Customize Totems"],
type = "group",
childGroups = "tree",
args = select(2, Gladdy:GetTotemColors())
disabled = function() return not Gladdy.db.npTotems end,
args = select(2, GetTotemColorDefaultOptions())
},
}
end
Modules/TotemPulse.lua
+783
View File
@@ -0,0 +1,783 @@
local select, pairs, tremove, tinsert, format, strsplit, tonumber = select, pairs, tremove, tinsert, format, strsplit, tonumber
local type = type
local C_NamePlate = C_NamePlate
local Gladdy = LibStub("Gladdy")
local L = Gladdy.L
local GetSpellInfo, CreateFrame = GetSpellInfo, CreateFrame
local GetTime, UnitIsEnemy, UnitGUID = GetTime, UnitIsEnemy, UnitGUID
local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo
local UIParent = UIParent
---------------------------------------------------
-- Helper
---------------------------------------------------
local totemData, npcIdToTotemData, cooldowns = Gladdy:GetTotemData()
local ninetyDegreeInRad = 90 * math.pi / 180
local function TotemOptions()
local defaultDB = {}
local options = {}
local indexedList = {}
for k,v in pairs(totemData) do
if v.pulse then
tinsert(indexedList, {name = k, id = v.id, color = v.color, texture = v.texture})
end
end
table.sort(indexedList, function (a, b)
return a.name < b.name
end)
for i=1,#indexedList do
defaultDB["totem" .. indexedList[i].id] = {enabled = true, attachToGladdyTotemFrame = true, style = "COOLDOWN", reverse = false}
options["totem" .. indexedList[i].id] = {
order = i+1,
name = select(1, GetSpellInfo(indexedList[i].id)),
--inline = true,
width = "3.0",
type = "group",
icon = indexedList[i].texture,
args = {
headerTotemConfig = {
type = "header",
name = format("|T%s:20|t %s", indexedList[i].texture, select(1, GetSpellInfo(indexedList[i].id))),
order = 1,
},
enabled = {
order = 2,
name = L["Enabled"],
desc = "Enable " .. format("|T%s:20|t %s", indexedList[i].texture, select(1, GetSpellInfo(indexedList[i].id))),
type = "toggle",
width = "full",
get = function() return Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].enabled end,
set = function(_, value)
Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].enabled = value
Gladdy:UpdateFrame()
end
},
attachToGladdyTotemFrame = {
order = 3,
disabled = function() return not Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].enabled end,
name = L["Attach To TotemPlate"],
desc = "Attach " .. format("|T%s:20|t %s", indexedList[i].texture, select(1, GetSpellInfo(indexedList[i].id))) .. " To TotemPlate",
type = "toggle",
width = "full",
get = function() return Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].attachToGladdyTotemFrame end,
set = function(_, value)
Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].attachToGladdyTotemFrame = value
Gladdy:UpdateFrame()
end
},
style = {
type = "select",
name = L["Style"],
order = 4,
values = {
COOLDOWN = L["Cooldown"],
Vertical = L["Bar vertical"],
Horizontal = L["Bar horizontal"]
},
get = function() return Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].style end,
set = function(_, value)
Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].style = value
Gladdy:UpdateFrame()
end
},
reverse = {
order = 5,
disabled = function() return not Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].enabled end,
name = L["Reverse"],
type = "toggle",
width = "full",
get = function() return Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].reverse end,
set = function(_, value)
Gladdy.dbi.profile.totemPulseTotems["totem" .. indexedList[i].id].reverse = value
Gladdy:UpdateFrame()
end
},
}
}
end
return options,defaultDB
end
---------------------------------------------------
-- Core
---------------------------------------------------
local TotemPulse = Gladdy:NewModule("Totem Pulse", 1, {
totemPulseEnabled = true,
totemPulseEnabledShowFriendly = true,
totemPulseEnabledShowEnemy = true,
totemPulseStyle = "", -- "COOLDOWN", "COOLDOWNREVERSE", "BARVERTICAL", "BARHORIZONTAL"
--text
totemPulseTextColor = { r = 1, g = 1, b = 1, a = 1 },
totemPulseTextSize = 14,
totemPulseTextFont = "DorisPP",
--bar
totemPulseBarWidth = 40,
totemPulseBarHeight = 20,
totemPulseBarColor = { r = 1, g = 0, b = 0, a = .5 },
totemPulseBarBgColor = { r = 0, g = 1, b = 0, a = .5 },
totemPulseBarBorderColor = { r = 0, g = 0, b = 0, a = 1 },
totemPulseBarBorderSize = 4,
totemPulseBarBorderStyle = "Gladdy Tooltip squared",
totemPulseBarTexture = "Flat",
totemPulseBarReverse = false,
--cooldown
totemPulseCooldownWidth = 40,
totemPulseCooldownHeight = 20,
totemPulseCooldownAlpha = 1,
totemPulseCooldownReverse = true,
--totems
totemPulseTotems = select(2, TotemOptions())
})
function TotemPulse.OnEvent(self, event, ...)
TotemPulse[event](self, ...)
end
function TotemPulse:Initialize()
self.timeStamps = {}
self.cooldownCache = {}
self.barCache = {}
self.activeFrames = { bars = {}, cooldowns = {} }
if Gladdy.db.totemPulseEnabled then
self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
self:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
self:RegisterEvent("NAME_PLATE_UNIT_ADDED")
self:RegisterEvent("UNIT_NAME_UPDATE")
self:SetScript("OnEvent", self.OnEvent)
end
self:RegisterEvent("PLAYER_ENTERING_WORLD")
end
---------------------------------------------------
-- EVENTS
---------------------------------------------------
function TotemPulse:PLAYER_ENTERING_WORLD()
self.timeStamps = {}
end
function TotemPulse:COMBAT_LOG_EVENT_UNFILTERED()
local _,eventType,_,sourceGUID,_,_,_,destGUID,_,_,_,spellID,spellName = CombatLogGetCurrentEventInfo()
local pulse = cooldowns[spellID] or cooldowns[spellName]
local npcId = tonumber(select(6, strsplit("-", destGUID)), 10)
if eventType == "UNIT_DESTROYED" and self.timeStamps[destGUID] then
self.timeStamps[destGUID] = nil
end
if (eventType == "SWING_DAMAGE" or eventType == "SPELL_DAMAGE") and self.timeStamps[destGUID] and npcIdToTotemData[npcId] then
self.timeStamps[destGUID] = nil
end
if not pulse then
return
end
if eventType == "SPELL_CAST_SUCCESS" then
self.timeStamps[sourceGUID] = { timeStamp = GetTime(), pulse = pulse }
end
if eventType == "SPELL_SUMMON" then
if not npcIdToTotemData[npcId] then
return
end
if not Gladdy.dbi.profile.totemPulseTotems["totem" .. npcIdToTotemData[npcId].id].enabled then
return
end
if self.timeStamps[sourceGUID] then
self.timeStamps[destGUID] = self.timeStamps[sourceGUID]
self.timeStamps[destGUID].id = npcIdToTotemData[npcId].id
self.timeStamps[sourceGUID] = nil
else
self.timeStamps[destGUID] = { timeStamp = GetTime(), pulse = pulse, id = npcIdToTotemData[npcId].id }
end
end
end
function TotemPulse:NAME_PLATE_UNIT_REMOVED(unitId)
local nameplate = C_NamePlate.GetNamePlateForUnit(unitId)
if nameplate.totemTick then
nameplate.totemTick:SetScript("OnUpdate", nil)
nameplate.totemTick:Hide()
nameplate.totemTick:SetParent(nil)
tinsert(nameplate.totemTick.bar and self.barCache or self.cooldownCache, nameplate.totemTick)
self.activeFrames.bars[nameplate.totemTick] = nil
self.activeFrames.cooldowns[nameplate.totemTick] = nil
nameplate.totemTick = nil
end
end
function TotemPulse:NAME_PLATE_UNIT_ADDED(unitId)
self:OnUnitAdded(unitId, "NAME_PLATE_UNIT_ADDED")
end
function TotemPulse:UNIT_NAME_UPDATE(unitId)
self:OnUnitAdded(unitId, "UNIT_NAME_UPDATE")
end
function TotemPulse:OnUnitAdded(unitId)
local isEnemy = UnitIsEnemy("player", unitId)
local guid = UnitGUID(unitId)
if strsplit("-", guid) ~= "Creature" then
return
end
local nameplate = C_NamePlate.GetNamePlateForUnit(unitId)
if nameplate and (isEnemy and Gladdy.db.totemPulseEnabledShowEnemy or not isEnemy and Gladdy.db.totemPulseEnabledShowFriendly) then
if self.timeStamps[guid] and strsplit("-", guid) then
self:AddTimerFrame(nameplate, self.timeStamps[guid])
else
if nameplate.totemTick then
nameplate.totemTick:SetScript("OnUpdate", nil)
nameplate.totemTick:Hide()
nameplate.totemTick:SetParent(nil)
tinsert(nameplate.totemTick.bar and self.barCache or self.cooldownCache, nameplate.totemTick)
self.activeFrames.bars[nameplate.totemTick] = nil
self.activeFrames.cooldowns[nameplate.totemTick] = nil
nameplate.totemTick = nil
end
end
end
end
---------------------------------------------------
-- FRAMES
---------------------------------------------------
function TotemPulse:CreateCooldownFrame(style)
local totemTick
if style == "COOLDOWN" then
if #self.cooldownCache > 0 then
totemTick = tremove(self.cooldownCache, #self.cooldownCache)
else
totemTick = CreateFrame("Frame")
totemTick:SetWidth(Gladdy.db.totemPulseCooldownWidth)
totemTick:SetHeight(Gladdy.db.totemPulseCooldownHeight)
totemTick.cd = CreateFrame("Cooldown", nil, totemTick, "CooldownFrameTemplate")
totemTick.cd:SetAllPoints(totemTick)
totemTick.cd.noCooldownCount = true
totemTick:SetFrameStrata("MEDIUM")
totemTick:SetFrameLevel(4)
totemTick.cd:SetReverse(Gladdy.db.totemPulseCooldownReverse)
totemTick.cd:SetHideCountdownNumbers(true)
totemTick.cd:SetAlpha(Gladdy.db.totemPulseCooldownAlpha)
totemTick.textFrame = CreateFrame("Frame", nil, totemTick)
totemTick.textFrame:SetAllPoints(totemTick)
totemTick.text = totemTick.textFrame:CreateFontString(nil, "OVERLAY")
totemTick.text:SetPoint("CENTER", totemTick.textFrame, "CENTER")
totemTick.text:SetFont(Gladdy:SMFetch("font", "totemPulseTextFont"), Gladdy.db.totemPulseTextSize, "OUTLINE")
totemTick.text:SetJustifyH("CENTER")
totemTick.text:SetShadowOffset(1, -1)
totemTick.text:SetTextColor(Gladdy:SetColor(Gladdy.db.totemPulseTextColor))
end
else
if #self.barCache > 0 then
totemTick = tremove(self.barCache, #self.barCache)
totemTick.bar:SetOrientation(style)
totemTick.spark:SetRotation(style == "Vertical" and ninetyDegreeInRad or 0)
totemTick.spark:SetHeight(style == "Vertical" and Gladdy.db.totemPulseBarWidth or Gladdy.db.totemPulseBarHeight)
else
totemTick = CreateFrame("Frame", nil)
totemTick:SetWidth(Gladdy.db.totemPulseBarWidth)
totemTick:SetHeight(Gladdy.db.totemPulseBarHeight)
totemTick.backdrop = CreateFrame("Frame", nil, totemTick, BackdropTemplateMixin and "BackdropTemplate")
totemTick.backdrop:SetAllPoints(totemTick)
totemTick.backdrop:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "totemPulseBarBorderStyle"),
edgeSize = Gladdy.db.totemPulseBarBorderSize })
totemTick.backdrop:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.totemPulseBarBorderColor))
totemTick.backdrop:SetFrameLevel(1)
totemTick.bar = CreateFrame("StatusBar", nil, totemTick)
totemTick.bar:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "totemPulseBarTexture"))
totemTick.bar:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.totemPulseBarColor))
totemTick.bar:SetOrientation(style)
totemTick.bar:SetFrameLevel(0)
totemTick.bar:SetAllPoints(totemTick)
totemTick.spark = totemTick.bar:CreateTexture(nil, "OVERLAY")
totemTick.spark:SetTexture("Interface\\CastingBar\\UI-CastingBar-Spark")
totemTick.spark:SetBlendMode("ADD")
totemTick.spark:SetWidth(8)
totemTick.spark:SetHeight(style == "Vertical" and Gladdy.db.totemPulseBarWidth or Gladdy.db.totemPulseBarHeight)
totemTick.spark.position = 0
totemTick.spark:SetRotation(style == "Vertical" and ninetyDegreeInRad or 0)
totemTick.bg = totemTick.bar:CreateTexture(nil, "BACKGROUND")
totemTick.bg:SetTexture(Gladdy:SMFetch("statusbar", "totemPulseBarTexture"))
totemTick.bg:SetAllPoints(totemTick.bar)
totemTick.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.totemPulseBarBgColor))
totemTick.text = totemTick.bar:CreateFontString(nil, "OVERLAY")
totemTick.text:SetPoint("CENTER", totemTick, "CENTER", 0, 0)
totemTick.text:SetFont(Gladdy:SMFetch("font", "totemPulseTextFont"), Gladdy.db.totemPulseTextSize, "OUTLINE")
totemTick.text:SetJustifyH("CENTER")
totemTick.text:SetShadowOffset(1, -1)
totemTick.text:SetTextColor(Gladdy:SetColor(Gladdy.db.totemPulseTextColor))
end
end
return totemTick
end
function TotemPulse:AddTimerFrame(nameplate, timestamp, test)
if (nameplate:IsShown() or test) and timestamp then
if not nameplate.totemTick then
nameplate.totemTick = TotemPulse:CreateCooldownFrame(Gladdy.db.totemPulseTotems["totem" .. timestamp.id].style)
end
nameplate.totemTick:SetParent(nameplate)
local cd = type(timestamp.pulse) == "table" and timestamp.pulse.cd or timestamp.pulse
local once = type(timestamp.pulse) == "table"
local cooldown = (timestamp.timeStamp - GetTime()) % cd
nameplate.totemTick.timestamp = timestamp.timeStamp
nameplate.totemTick.maxValue = cd
nameplate.totemTick.value = cooldown
nameplate.totemTick.once = once
nameplate.totemTick.id = timestamp.id
if nameplate.totemTick.bar then
self:UpdateBarPartial(nameplate.totemTick)
nameplate.totemTick.bar:SetMinMaxValues(0, cd)
nameplate.totemTick.bar:SetValue(cooldown)
self.activeFrames.bars[nameplate.totemTick] = nameplate.totemTick
else
self:UpdateCooldown(nameplate.totemTick)
self.activeFrames.cooldowns[nameplate.totemTick] = nameplate.totemTick
end
if once and GetTime() - timestamp.timeStamp > cd then
nameplate.totemTick:SetScript("OnUpdate", nil)
nameplate.totemTick:Hide()
else
nameplate.totemTick:SetScript("OnUpdate", TotemPulse.TotemPulseOnUpdate)
nameplate.totemTick:Show()
end
else
if nameplate.totemTick then
nameplate.totemTick:SetScript("OnUpdate", nil)
nameplate.totemTick:Hide()
nameplate.totemTick:SetParent(nil)
tinsert(nameplate.totemTick.bar and self.barCache or self.cooldownCache, nameplate.totemTick)
self.activeFrames.bars[nameplate.totemTick] = nil
self.activeFrames.cooldowns[nameplate.totemTick] = nil
nameplate.totemTick = nil
end
end
end
function TotemPulse:SetSparkPosition(totemTick, referenceSize, vertical)
if not Gladdy.db.totemPulseTotems["totem" .. totemTick.id].reverse then
totemTick.bar:SetValue(totemTick.maxValue - totemTick.value)
totemTick.spark.position = referenceSize / 2 - (totemTick.value / totemTick.maxValue) * referenceSize
if ( totemTick.spark.position < -referenceSize / 2 ) then
totemTick.spark.position = -referenceSize / 2
end
else
totemTick.bar:SetValue(totemTick.value)
totemTick.spark.position = referenceSize / 2 - ((totemTick.maxValue - totemTick.value) / totemTick.maxValue) * referenceSize
if ( totemTick.spark.position > referenceSize / 2 ) then
totemTick.spark.position = referenceSize / 2
end
end
totemTick.spark:SetPoint("CENTER", totemTick.bar, "CENTER", vertical and 0 or totemTick.spark.position, vertical and totemTick.spark.position or 0)
end
function TotemPulse.TotemPulseOnUpdate(totemTick)
totemTick.now = GetTime()
totemTick.value = (totemTick.timestamp - totemTick.now) % totemTick.maxValue
if totemTick.once and totemTick.now - totemTick.timestamp >= totemTick.maxValue then
totemTick:SetScript("OnUpdate", nil)
totemTick:Hide()
end
if not totemTick.bar and not (totemTick.once and totemTick.now - totemTick.timestamp >= totemTick.maxValue) then
if Gladdy.db.totemPulseTotems["totem" .. totemTick.id].reverse then
totemTick.cd:SetCooldown(totemTick.now - totemTick.value, totemTick.maxValue)
else
totemTick.cd:SetCooldown(totemTick.now - (totemTick.maxValue - totemTick.value), totemTick.maxValue)
end
elseif totemTick.bar then
if Gladdy.db.totemPulseTotems["totem" .. totemTick.id].style == "Vertical" then
TotemPulse:SetSparkPosition(totemTick, totemTick.bar:GetHeight(), true)
else
TotemPulse:SetSparkPosition(totemTick, totemTick.bar:GetWidth(), false)
end
end
totemTick.text:SetFormattedText("%.1f", totemTick.value)
end
---------------------------------------------------
-- Update Styles
---------------------------------------------------
function TotemPulse:UpdateBarPartial(bar)
local style = bar.id and Gladdy.db.totemPulseTotems["totem" .. bar.id].style
bar:SetWidth(Gladdy.db.totemPulseBarWidth)
bar:SetHeight(Gladdy.db.totemPulseBarHeight)
bar.spark:SetWidth(8)
bar.spark:SetHeight(style == "Vertical" and Gladdy.db.totemPulseBarWidth or Gladdy.db.totemPulseBarHeight)
bar.spark:SetRotation(style == "Vertical" and ninetyDegreeInRad or 0)
if bar:GetParent() and bar:GetParent() ~= UIParent then
local gladdyTotemFrame = bar:GetParent().gladdyTotemFrame and bar:GetParent().gladdyTotemFrame
local nameplate = bar:GetParent()
bar:ClearAllPoints()
if bar.id and gladdyTotemFrame and gladdyTotemFrame:IsShown() and Gladdy.db.totemPulseTotems["totem" .. bar.id].attachToGladdyTotemFrame then
bar:SetPoint("TOPLEFT", gladdyTotemFrame, "TOPLEFT", Gladdy.db.npTotemPlatesSize/16, -Gladdy.db.npTotemPlatesSize/16)
bar:SetPoint("BOTTOMRIGHT", gladdyTotemFrame, "BOTTOMRIGHT", -Gladdy.db.npTotemPlatesSize/16, Gladdy.db.npTotemPlatesSize/16)
if style then
bar.spark:SetHeight(style == "Vertical" and gladdyTotemFrame:GetWidth() or gladdyTotemFrame:GetHeight())
end
elseif bar.id and gladdyTotemFrame and gladdyTotemFrame:IsShown() and not Gladdy.db.totemPulseTotems["totem" .. bar.id].attachToGladdyTotemFrame then
bar:SetPoint("TOP", gladdyTotemFrame, "BOTTOM", 0, -0.5)
else
bar:SetPoint("TOP", nameplate, "BOTTOM", 0, -0.5)
end
end
bar.bar:SetOrientation(style ~= "COOLDOWN" and style or bar.bar:GetOrientation())
end
function TotemPulse:UpdateBar(bar)
self:UpdateBarPartial(bar)
bar.backdrop:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "totemPulseBarBorderStyle"),
edgeSize = Gladdy.db.totemPulseBarBorderSize })
bar.backdrop:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.totemPulseBarBorderColor))
bar.bar:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "totemPulseBarTexture"))
bar.bar:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.totemPulseBarColor))
bar.bar:SetAllPoints(bar)
bar.bg:SetTexture(Gladdy:SMFetch("statusbar", "totemPulseBarTexture"))
bar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.totemPulseBarBgColor))
bar.text:SetFont(Gladdy:SMFetch("font", "totemPulseTextFont"), Gladdy.db.totemPulseTextSize, "OUTLINE")
bar.text:SetTextColor(Gladdy:SetColor(Gladdy.db.totemPulseTextColor))
end
function TotemPulse:UpdateCooldown(cooldown)
cooldown:SetWidth(Gladdy.db.totemPulseCooldownWidth)
cooldown:SetHeight(Gladdy.db.totemPulseCooldownHeight)
cooldown.cd:SetCooldown(0,0)
cooldown.cd:SetReverse(Gladdy.db.totemPulseCooldownReverse)
cooldown.cd:SetAlpha(Gladdy.db.totemPulseCooldownAlpha)
cooldown.text:SetFont(Gladdy:SMFetch("font", "totemPulseTextFont"), Gladdy.db.totemPulseTextSize, "OUTLINE")
cooldown.text:SetTextColor(Gladdy:SetColor(Gladdy.db.totemPulseTextColor))
if cooldown:GetParent() and cooldown:GetParent() ~= UIParent then
local gladdyTotemFrame = cooldown:GetParent().gladdyTotemFrame and cooldown:GetParent().gladdyTotemFrame
local nameplate = cooldown:GetParent()
cooldown:ClearAllPoints()
if cooldown.id and gladdyTotemFrame and gladdyTotemFrame:IsShown() and Gladdy.db.totemPulseTotems["totem" .. cooldown.id].attachToGladdyTotemFrame then
cooldown:SetPoint("TOPLEFT", gladdyTotemFrame, "TOPLEFT", Gladdy.db.npTotemPlatesSize/16, -Gladdy.db.npTotemPlatesSize/16)
cooldown:SetPoint("BOTTOMRIGHT", gladdyTotemFrame, "BOTTOMRIGHT", -Gladdy.db.npTotemPlatesSize/16, Gladdy.db.npTotemPlatesSize/16)
elseif cooldown.id and gladdyTotemFrame and gladdyTotemFrame:IsShown() and not Gladdy.db.totemPulseTotems["totem" .. cooldown.id].attachToGladdyTotemFrame then
cooldown:SetPoint("TOP", gladdyTotemFrame, "BOTTOM", 0, -0.5)
else
cooldown:SetPoint("TOP", nameplate, "BOTTOM", 0, -0.5)
end
end
end
function TotemPulse:UpdateFrameOnce()
if Gladdy.frame.testing then
TotemPulse:TestOnce()
end
if Gladdy.db.totemPulseEnabled then
self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
self:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
self:RegisterEvent("NAME_PLATE_UNIT_ADDED")
self:RegisterEvent("UNIT_NAME_UPDATE")
self:SetScript("OnEvent", self.OnEvent)
else
for _,bar in pairs(self.activeFrames.bars) do
bar:SetScript("OnUpdate", nil)
bar:Hide()
bar:SetParent(nil)
tinsert(self.barCache, bar)
self.activeFrames.bars[bar] = nil
end
for _,cooldown in pairs(self.activeFrames.cooldowns) do
cooldown:SetScript("OnUpdate", nil)
cooldown:Hide()
cooldown:SetParent(nil)
tinsert(self.cooldownCache, cooldown)
self.activeFrames.cooldowns[cooldown] = nil
end
self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
self:UnregisterEvent("NAME_PLATE_UNIT_REMOVED")
self:UnregisterEvent("NAME_PLATE_UNIT_ADDED")
self:UnregisterEvent("UNIT_NAME_UPDATE")
self:SetScript("OnEvent", nil)
end
for _,bar in pairs(self.activeFrames.bars) do
self:UpdateBar(bar)
end
for _,cooldown in pairs(self.activeFrames.cooldowns) do
self:UpdateCooldown(cooldown)
end
for _,bar in pairs(self.barCache) do
self:UpdateBar(bar)
end
for _,cooldown in pairs(self.cooldownCache) do
self:UpdateCooldown(cooldown)
end
end
---------------------------------------------------
-- TEST
---------------------------------------------------
function TotemPulse:TestOnce()
local totemPlatesTestFrame = Gladdy.modules["Totem Plates"].testFrame
if totemPlatesTestFrame then
if totemPlatesTestFrame.totemTick
and (Gladdy.db.totemPulseTotems["totem" .. npcIdToTotemData[5913].id].style == "COOLDOWN" and totemPlatesTestFrame.totemTick.bar
or Gladdy.db.totemPulseTotems["totem" .. npcIdToTotemData[5913].id].style ~= "COOLDOWN" and not totemPlatesTestFrame.totemTick.bar) then
totemPlatesTestFrame.totemTick:SetScript("OnUpdate", nil)
totemPlatesTestFrame.totemTick:Hide()
totemPlatesTestFrame.totemTick:SetParent(nil)
totemPlatesTestFrame.totemTick.id = nil
tinsert(totemPlatesTestFrame.totemTick.bar and self.barCache or self.cooldownCache, totemPlatesTestFrame.totemTick)
self.activeFrames.bars[totemPlatesTestFrame.totemTick] = nil
self.activeFrames.cooldowns[totemPlatesTestFrame.totemTick] = nil
totemPlatesTestFrame.totemTick = nil
end
local timestamp = { timeStamp = GetTime(), pulse = npcIdToTotemData[5913].pulse, id = npcIdToTotemData[5913].id }
TotemPulse:AddTimerFrame(totemPlatesTestFrame, timestamp, true)
self.testFrame = totemPlatesTestFrame.totemTick
end
end
function TotemPulse:Reset()
if self.testFrame then
self.testFrame:SetScript("OnUpdate", nil)
self.testFrame:Hide()
self.testFrame:SetParent(nil)
tinsert(self.testFrame.bar and self.barCache or self.cooldownCache, self.testFrame)
self.activeFrames.bars[self.testFrame] = nil
self.activeFrames.cooldowns[self.testFrame] = nil
self.testFrame = nil
Gladdy.modules["Totem Plates"].testFrame.totemTick = nil
end
end
---------------------------------------------------
-- OPTIONS
---------------------------------------------------
function TotemPulse:GetOptions()
return {
headerClassicon = {
type = "header",
name = L["Totem Pulse"],
order = 2,
},
totemPulseEnabled = Gladdy:option({
type = "toggle",
name = L["Totem Pulse Enabled"],
order = 3,
}),
group = {
type = "group",
childGroups = "tree",
name = L["Frame"],
order = 4,
disabled = function() return not Gladdy.db.totemPulseEnabled end,
args = {
barFrame = {
type = "group",
name = L["Bar"],
order = 2,
args = {
headerSize = {
type = "header",
name = L["Size"],
order = 10,
},
totemPulseBarHeight = Gladdy:option({
type = "range",
name = L["Bar height"],
desc = L["Height of the bar"],
order = 11,
min = 0.1,
max = 200,
step = .1,
width = "full",
}),
totemPulseBarWidth = Gladdy:option({
type = "range",
name = L["Bar width"],
desc = L["Width of the bar"],
order = 12,
min = 0.1,
max = 600,
step = .1,
width = "full",
}),
headerTexture = {
type = "header",
name = L["Texture"],
order = 20,
},
totemPulseBarTexture = Gladdy:option({
type = "select",
name = L["Bar texture"],
desc = L["Texture of the bar"],
order = 21,
dialogControl = "LSM30_Statusbar",
values = AceGUIWidgetLSMlists.statusbar,
}),
totemPulseBarColor = Gladdy:colorOption({
type = "color",
name = L["Bar color"],
desc = L["Color of the cast bar"],
order = 22,
hasAlpha = true,
}),
totemPulseBarBgColor = Gladdy:colorOption({
type = "color",
name = L["Background color"],
desc = L["Color of the cast bar background"],
order = 23,
hasAlpha = true,
}),
headerBorder = {
type = "header",
name = L["Border"],
order = 30,
},
totemPulseBarBorderSize = Gladdy:option({
type = "range",
name = L["Border size"],
order = 31,
min = 0.5,
max = Gladdy.db.castBarHeight/2,
step = 0.5,
width = "full",
}),
totemPulseBarBorderStyle = Gladdy:option({
type = "select",
name = L["Status Bar border"],
order = 32,
dialogControl = "LSM30_Border",
values = AceGUIWidgetLSMlists.border,
}),
totemPulseBarBorderColor = Gladdy:colorOption({
type = "color",
name = L["Status Bar border color"],
order = 33,
hasAlpha = true,
}),
},
},
cooldownFrame = {
type = "group",
name = L["Cooldown"],
order = 3,
args = {
headerSize = {
type = "header",
name = L["Frame"],
order = 10,
},
totemPulseCooldownHeight = Gladdy:option({
type = "range",
name = L["Height"],
order = 11,
min = 0.1,
max = 200,
step = .1,
width = "full",
}),
totemPulseCooldownWidth = Gladdy:option({
type = "range",
name = L["Width"],
order = 12,
min = 0.1,
max = 600,
step = .1,
width = "full",
}),
totemPulseCooldownAlpha = Gladdy:option({
type = "range",
name = L["Alpha"],
order = 21,
min = 0.1,
max = 1,
step = .1,
width = "full",
}),
},
},
text = {
type = "group",
name = L["Text"],
order = 4,
args = {
headerSize = {
type = "header",
name = L["Text"],
order = 10,
},
totemPulseTextSize = Gladdy:option({
type = "range",
name = L["Size"],
order = 11,
min = 0.5,
max = 30,
step = 0.5,
width = "full",
}),
totemPulseTextFont = Gladdy:option({
type = "select",
name = L["Font"],
desc = L["Font of the bar"],
order = 12,
dialogControl = "LSM30_Font",
values = AceGUIWidgetLSMlists.font,
}),
totemPulseTextColor = Gladdy:colorOption({
type = "color",
name = L["Font color"],
desc = L["Color of the text"],
order = 13,
hasAlpha = true,
}),
},
},
},
},
customizeTotems = {
order = 50,
name = L["Customize Totems"],
type = "group",
childGroups = "tree",
disabled = function() return not Gladdy.db.totemPulseEnabled end,
args = select(1, TotemOptions())
},
}
end
Modules/Trinket.lua
+51 -6
View File
@@ -1,4 +1,4 @@
local ceil = ceil
local ceil, str_gsub = ceil, string.gsub
local C_PvP = C_PvP
local CreateFrame = CreateFrame
@@ -25,13 +25,24 @@ local Trinket = Gladdy:NewModule("Trinket", 80, {
trinketColored = false,
trinketColoredCd = { r = 1, g = 0, b = 0, a = 1 },
trinketColoredNoCd = { r = 0, g = 1, b = 0, a = 1 },
trinketGroup = false,
trinketGroupDirection = "DOWN",
})
function Trinket:Initialize()
self.frames = {}
if Gladdy.db.trinketEnabled then
self:RegisterMessage("JOINED_ARENA")
end
end
function Trinket:UpdateFrameOnce()
if Gladdy.db.trinketEnabled then
self:RegisterMessage("JOINED_ARENA")
else
self:UnregisterAllMessages()
end
end
local function iconTimer(self, elapsed)
if (self.active) then
@@ -166,6 +177,22 @@ function Trinket:UpdateFrame(unit)
Gladdy:SetPosition(trinket, unit, "trinketXOffset", "trinketYOffset", Trinket:LegacySetPosition(trinket, unit), Trinket)
if (Gladdy.db.trinketGroup) then
if (unit ~= "arena1") then
local previousUnit = "arena" .. str_gsub(unit, "arena", "") - 1
self.frames[unit]:ClearAllPoints()
if Gladdy.db.trinketGroupDirection == "RIGHT" then
self.frames[unit]:SetPoint("LEFT", self.frames[previousUnit], "RIGHT", 0, 0)
elseif Gladdy.db.trinketGroupDirection == "LEFT" then
self.frames[unit]:SetPoint("RIGHT", self.frames[previousUnit], "LEFT", 0, 0)
elseif Gladdy.db.trinketGroupDirection == "UP" then
self.frames[unit]:SetPoint("BOTTOM", self.frames[previousUnit], "TOP", 0, 0)
elseif Gladdy.db.trinketGroupDirection == "DOWN" then
self.frames[unit]:SetPoint("TOP", self.frames[previousUnit], "BOTTOM", 0, 0)
end
end
end
if (unit == "arena1") then
Gladdy:CreateMover(trinket,"trinketXOffset", "trinketYOffset", L["Trinket"],
{"TOPLEFT", "TOPLEFT"},
@@ -272,6 +299,7 @@ function Trinket:GetOptions()
name = L["Colored trinket"],
desc = L["Shows a solid colored icon when off/off CD."],
order = 4,
disabled = function() return not Gladdy.db.trinketEnabled end,
}),
trinketColoredCd = Gladdy:colorOption({
type = "color",
@@ -279,9 +307,7 @@ function Trinket:GetOptions()
desc = L["Color of the border"],
order = 5,
hasAlpha = true,
disabled = function()
return not Gladdy.db.trinketColored
end,
disabled = function() return not Gladdy.db.trinketEnabled end,
}),
trinketColoredNoCd = Gladdy:colorOption({
type = "color",
@@ -289,8 +315,26 @@ function Trinket:GetOptions()
desc = L["Color of the border"],
order = 6,
hasAlpha = true,
disabled = function() return not Gladdy.db.trinketEnabled end,
}),
trinketGroup = Gladdy:option({
type = "toggle",
name = L["Group Class Icons"],
order = 7,
disabled = function() return not Gladdy.db.trinketEnabled end,
}),
trinketGroupDirection = Gladdy:option({
type = "select",
name = L["Group direction"],
order = 8,
values = {
["RIGHT"] = L["Right"],
["LEFT"] = L["Left"],
["UP"] = L["Up"],
["DOWN"] = L["Down"],
},
disabled = function()
return not Gladdy.db.trinketColored
return not Gladdy.db.trinketGroup or not Gladdy.db.trinketEnabled
end,
}),
group = {
@@ -298,6 +342,7 @@ function Trinket:GetOptions()
childGroups = "tree",
name = L["Frame"],
order = 5,
disabled = function() return not Gladdy.db.trinketEnabled end,
args = {
general = {
type = "group",
Modules/VersionCheck.lua
+7 -7
View File
@@ -1,4 +1,4 @@
local tonumber, tostring = tonumber, tostring
local tonumber, tostring, str_format = tonumber, tostring, string.format
local UnitName = UnitName
local IsInGroup, IsInRaid = IsInGroup, IsInRaid
@@ -24,11 +24,11 @@ end
function VersionCheck:JOINED_ARENA()
self:RegisterComm("GladdyVCheck", VersionCheck.OnCommReceived)
if IsInRaid(LE_PARTY_CATEGORY_HOME) then
self:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "RAID", self.playerName)
self:SendCommMessage("GladdyVCheck", str_format("%.2f", Gladdy.version_num), "RAID", self.playerName)
elseif IsInGroup(LE_PARTY_CATEGORY_INSTANCE) or IsInRaid(LE_PARTY_CATEGORY_INSTANCE) then
self:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "INSTANCE_CHAT", self.playerName)
self:SendCommMessage("GladdyVCheck", str_format("%.2f", Gladdy.version_num), "INSTANCE_CHAT", self.playerName)
elseif IsInGroup(LE_PARTY_CATEGORY_HOME) then
self:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "PARTY", self.playerName)
self:SendCommMessage("GladdyVCheck", str_format("%.2f", Gladdy.version_num), "PARTY", self.playerName)
end
end
@@ -41,9 +41,9 @@ end
function VersionCheck.OnCommReceived(prefix, message, distribution, sender)
if sender ~= VersionCheck.playerName then
local addonVersion = Gladdy.version_num
message = tonumber(message)
if message and message <= Gladdy.version_num then
local addonVersion = str_format("%.2f", Gladdy.version_num)
local message_num = tonumber(message) or 0
if message and message_num <= Gladdy.version_num then
--Gladdy:Print("Version", "\"".. addonVersion.."\"", "is up to date")
else
Gladdy:Warn("Current version", "\"".. addonVersion.."\"", "is outdated. Most recent version is", "\"".. message.."\"")
Options.lua
+11 -4
View File
@@ -1,5 +1,5 @@
local type, pairs, tinsert, tsort = type, pairs, table.insert, table.sort
local tostring, str_match, tonumber, string_format = tostring, string.match, tonumber, string.format
local tostring, str_match, tonumber, str_format = tostring, string.match, tonumber, string.format
local ceil, floor = ceil, floor
local ReloadUI = ReloadUI
@@ -31,7 +31,7 @@ function Gladdy:FormatTimer(fontString, timeLeft, milibreakpoint, showSeconds)
else
if time >= 60 then
if showSeconds then
fontString:SetText(floor(timeLeft / 60) .. ":" .. string_format("%02.f", floor(timeLeft - floor(timeLeft / 60) * 60)))
fontString:SetText(floor(timeLeft / 60) .. ":" .. str_format("%02.f", floor(timeLeft - floor(timeLeft / 60) * 60)))
else
fontString:SetText(ceil(ceil(time / 60)) .. "m")
end
@@ -48,6 +48,7 @@ Gladdy.defaults = {
x = 0,
y = 0,
growDirection = "BOTTOM",
growMiddle = false,
frameScale = 1,
pixelPerfect = false,
barWidth = 180,
@@ -278,7 +279,7 @@ function Gladdy:SetupOptions()
order = 5,
width = 1,
type = "description",
name = " Gladdy v" .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType
name = " " .. Gladdy.version
},
general = {
type = "group",
@@ -311,7 +312,7 @@ function Gladdy:SetupOptions()
group = {
type = "group",
name = L["General"],
order = 5,
order = 6,
childGroups = "tree",
args = {
frameGeneral = {
@@ -322,6 +323,12 @@ function Gladdy:SetupOptions()
headerFrame = {
type = "header",
name = L["Frame General"],
order = 2,
},
growMiddle = {
type = "toggle",
name = L["Grow Middle"],
desc = L["Frames expand along a centric anchor"],
order = 3,
},
pixelPerfect = {
README.md
+35 -2
View File
@@ -1,10 +1,10 @@
# Gladdy - TBC
### The most powerful arena addon for WoW TBC 2.5.1
### The most powerful arena addon for WoW TBC 2.5.4
---
## [v2.00-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.00-Release/Gladdy_TBC-Classic_v2.00-Release.zip)
## [v2.10-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.10-Release/Gladdy_TBC-Classic_v2.10-Release.zip)
###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
@@ -34,6 +34,7 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
- **Range Check** (checks the range to a unit by a configurable spell)
- **Shadowsight Timer** (shows a little movable frame with time left until Shadow Eyes spawn)
- **TotemPlates** (show totem icons instead of normal nameplates, compatible with **Plater, NeatPlates, KUI, ThreatPlates, ElvUI, TukUI**)
- **TotemPulse** (shows pulse on TotemPlate icon or beneath nameplate)
- **Trinket** (tracks trinket usage)
- **VersionCheck** (checks if you use an older version that your teammate)
- **XiconProfiles** (predefined profiles to start your configuration from)
@@ -78,6 +79,38 @@ Thank you!
### Changes
### v2.10-Release
- **Totems**:
- added new module **TotemPulse** (sorry Shamans)
- displays pulse ticks on all totems that have a pulse mechanic (e.g. tremor totem)
- either cooldown or bar style
- attaches to TotemPlates if enabled (con be configured individually by totem)
- completely hide totem nameplate option added
- added a dummy totemplate in config mode
- totem detection is completely localization independent now
- **Cooldowns**:
- completely refactored to fix general bugs
- can now be ordered individually
- some cooldown tracking improved for units coming out of stealth (e.g. perception, sprint, shadowstep)
- **Custom Text Tags**
- PowerBar and HealthBar can now have custom tags. Check it out
- also the texts can be moved to achieve a Blizzlike style with names above HealthBar
- general improvements to spec detection
- no more restoration warlocks :D
- tree of life spec detection should work now
- fix Announcements
- added grouping option for Auras (+ Interrupts) in detached mode, ClassIcon, Cooldowns, Trinket, Racial
- added a "Grow Middle" option, which aligns the gladdy frames on a centric point
- added frFR localization by Macumba
- added Flat statusbar texture
- added some auras (e.g. disarm)
- added disarm DRs
- improved some class icons
- added font OUTLINE option for Health-/Power-/CastBar texts
- fixed health bug since 2.5.4
- updated Mir Profile
### v2.00-Release
This is a packed release with new features and bugfixes. Most importantly, positioning of all elements has been redone with movable frames.
Util.lua
+144
View File
@@ -0,0 +1,144 @@
local pairs, ipairs = pairs, ipairs
local floor = math.floor
local str_find, str_gsub, str_sub, tinsert = string.find, string.gsub, string.sub, table.insert
local Gladdy = LibStub("Gladdy")
local L = Gladdy.L
---------------------------
-- TAGS
---------------------------
local tags = {
["current"] = true,
["max"] = true,
["percent"] = true,
["race"] = "race",
["class"] = "class",
["arena"] = true,
["name"] = "name",
["status"] = true,
["spec"] = "spec",
}
local function str_extract(s, pattern)
local t = {} -- table to store the indices
local i, j = 0,0
while true do
i, j = str_find(s, pattern, i+1) -- find 'next' occurrence
if i == nil then break end
tinsert(t, str_sub(s, i, j))
end
return t
end
--TODO optimize this function as it's being called often!
local function getTagText(unit, tag, current, max, status)
local button = Gladdy.buttons[unit]
if not button then
return
end
if str_find(tag, "percent") then
return current and max and floor(current * 100 / max) .. "%%" or ""
elseif str_find(tag, "current") then
return current and max > 999 and ("%.1fk"):format(current / 1000) or current or ""
elseif str_find(tag, "max") then
return max and max > 999 and ("%.1fk"):format(max / 1000) or max or ""
elseif str_find(tag, "status") then
if str_find(tag, "%|") and status == nil then
return nil
else
return status or ""
end
elseif str_find(tag, "name") then
return button.name or ""
elseif str_find(tag, "class") then
return button.classLoc or ""
elseif str_find(tag, "race") then
return button.raceLoc or ""
elseif str_find(tag, "arena") then
local str,found = str_gsub(unit, "arena", "")
return found == 1 and str or ""
elseif str_find(tag, "spec") then
if str_find(tag, "%|") and button.spec == nil then
return nil
else
return button.spec or ""
end
end
end
function Gladdy:SetTag(unit, tagOption, current, max, status)
local button = self.buttons[unit]
if not button then
return
end
local returnStr = tagOption
local t = str_extract(returnStr, "%[[^%[].-%]")
for _, tag in ipairs(t) do
local replace
if str_find(tag, "|") then -- or operator
local indicators = str_extract(tag, "[%[|%|]%a+[%||%]]")
local replaces = {}
for _, indicator in ipairs(indicators) do
tinsert(replaces, getTagText(unit, indicator, current, max, status))
end
replace = replaces[#replaces]
else
replace = getTagText(unit, tag, current, max, status)
end
if replace then
local find = str_gsub(tag, "%[", "%%[")
find = str_gsub(find, "%]", "%%]")
find = str_gsub(find, "%|", "%%|")
returnStr = str_gsub(returnStr, find, replace)
end
end
return returnStr
end
function Gladdy:GetTagOption(name, order, enabledOption, func, toggle)
if toggle then
return func({
type = "toggle",
name = name,
order = order,
width = "full",
desc = L["Custom Tags:\n"..
"\n|cff1ac742[current]|r - Shows current\n" ..
"\n|cff1ac742[max]|r - Shows max\n" ..
"\n|cff1ac742[percent]|r - Shows percent\n" ..
"\n|cff1ac742[name]|r - Shows name\n" ..
"\n|cff1ac742[arena]|r - Shows arena number\n" ..
"\n|cff1ac742[status]|r - Shows status (eg DEATH)\n" ..
"\n|cff1ac742[race]|r - Shows race\n" ..
"\n|cff1ac742[class]|r - Shows class\n" ..
"\n|cff1ac742[spec]|r - Shows spec\n\n" ..
"Can be combined with OR operator like |cff1ac742[percent|status]|r. The last valid option will be used.\n"],
})
else
return func({
type = "input",
name = name,
order = order,
width = "full",
disabled = function() return not Gladdy.db[enabledOption] end,
desc = L["Custom Tags:\n"..
"\n|cff1ac742[current]|r - Shows current\n" ..
"\n|cff1ac742[max]|r - Shows max\n" ..
"\n|cff1ac742[percent]|r - Shows percent\n" ..
"\n|cff1ac742[name]|r - Shows name\n" ..
"\n|cff1ac742[arena]|r - Shows arena number\n" ..
"\n|cff1ac742[status]|r - Shows status (eg DEATH)\n" ..
"\n|cff1ac742[race]|r - Shows race\n" ..
"\n|cff1ac742[class]|r - Shows class\n" ..
"\n|cff1ac742[spec]|r - Shows spec\n\n" ..
"Can be combined with OR operator like |cff1ac742[percent|status]|r. The last valid option will be used.\n"],
})
end
end