Revised Raid Buff Reminders (#45)
* Update RaidBuffReminder.lua make adjustments to the display of the RBR * Update Auras.lua add relevant options * Update Profile.lua * Update enUS.lua * Update Minimap.lua * Update RaidBuffReminder.lua fix variable typo * match order of options * merge thorns and armor buffs * match the edges of the minimap
This commit is contained in:
Anthony Narkevicius
committed by
GitHub
GitHub
parent
849362ae48
commit
716ec59644
@@ -262,12 +262,13 @@ function M:UpdateSettings()
|
||||
if InCombatLockdown() then
|
||||
self:RegisterEvent("PLAYER_REGEN_ENABLED")
|
||||
end
|
||||
local wide = E.db.general.reminder.wide
|
||||
|
||||
E.MinimapSize = E.private.general.minimap.enable and E.db.general.minimap.size or Minimap:GetWidth() + 10
|
||||
E.MinimapWidth, E.MinimapHeight = E.MinimapSize, E.MinimapSize
|
||||
|
||||
if E.db.general.reminder.enable then
|
||||
E.RBRWidth = (E.MinimapHeight + ((E.Border - E.Spacing*3) * 5) + E.Border*2) / 8
|
||||
E.RBRWidth = (E.MinimapHeight + ((E.Border - E.Spacing*3) * 5) + E.Border*2) / 7
|
||||
else
|
||||
E.RBRWidth = 0
|
||||
end
|
||||
@@ -335,7 +336,7 @@ function M:UpdateSettings()
|
||||
end
|
||||
|
||||
if MMHolder then
|
||||
MMHolder:Width((Minimap:GetWidth() + E.Border*2 + E.Spacing*3) + E.RBRWidth * 2 - 2)
|
||||
MMHolder:Width((Minimap:GetWidth() + E.Border*2 + E.Spacing*3) + E.RBRWidth * (wide and 2 or 1) - (wide and 1 or 2))
|
||||
|
||||
if E.db.datatexts.minimapPanels then
|
||||
MMHolder:Height(Minimap:GetHeight() + (LeftMiniPanel and (LeftMiniPanel:GetHeight() + E.Border) or 24) + E.Spacing*3)
|
||||
@@ -409,7 +410,7 @@ function M:UpdateSettings()
|
||||
if ElvConfigToggle then
|
||||
if E.db.general.reminder.enable and E.db.datatexts.minimapPanels and E.private.general.minimap.enable then
|
||||
ElvConfigToggle:Show()
|
||||
ElvConfigToggle:Width(E.RBRWidth * 2)
|
||||
ElvConfigToggle:Width(E.RBRWidth * (wide and 2 or 1))
|
||||
else
|
||||
ElvConfigToggle:Hide()
|
||||
end
|
||||
|
||||
@@ -86,12 +86,16 @@ RB.CasterSpell7Buffs = {
|
||||
61316, -- Dalaran Brilliance
|
||||
43002, -- Arcane Brilliance
|
||||
42995, -- Arcane Intellect
|
||||
30706, -- Totem of Wrath
|
||||
8227, -- Flametongue Totem
|
||||
47236, -- Demonic Pact
|
||||
}
|
||||
|
||||
RB.AttackSpell7Buffs = {
|
||||
48934, -- Greater Blessing of Might
|
||||
48932, -- Blessing of Might
|
||||
47436, -- Battle Shout
|
||||
25527, -- Strength of Earth Totem
|
||||
}
|
||||
|
||||
RB.Spell8Buffs = {
|
||||
@@ -99,72 +103,66 @@ RB.Spell8Buffs = {
|
||||
469, -- Commanding Shout
|
||||
}
|
||||
|
||||
-- Armor buffs
|
||||
RB.Spell9Buffs = {
|
||||
-- Concentration / Thorns
|
||||
RB.CasterSpell9Buffs = {
|
||||
19746, -- Concentration Aura
|
||||
}
|
||||
RB.AttackSpell9Buffs = {
|
||||
467, -- Thorns
|
||||
7294, -- Retribution Aura
|
||||
25506, -- Stoneskin Totem
|
||||
465, -- Devotion Aura
|
||||
}
|
||||
|
||||
-- Concentration / Thorns
|
||||
RB.CasterSpell10Buffs = {
|
||||
19746, -- Concentration Aura
|
||||
}
|
||||
RB.AttackSpell10Buffs = {
|
||||
467, -- Thorns
|
||||
7294, -- Retribution Aura
|
||||
}
|
||||
|
||||
-- SP / Str+Dex totems
|
||||
RB.CasterSpell11Buffs = {
|
||||
30706, -- Totem of Wrath
|
||||
8227, -- Flametongue Totem
|
||||
47236, -- Demonic Pact
|
||||
}
|
||||
RB.AttackSpell11Buffs = {
|
||||
25527, -- Strength of Earth Totem
|
||||
}
|
||||
|
||||
-- Mana regen
|
||||
RB.Spell12Buffs = {
|
||||
RB.Spell10Buffs = {
|
||||
48938, -- Greater Blessing of Wisdom
|
||||
48936, -- Blessing of Wisdom
|
||||
58777, -- Mana Spring
|
||||
}
|
||||
|
||||
-- Crit % Increase
|
||||
RB.CasterSpell13Buffs = {
|
||||
RB.CasterSpell11Buffs = {
|
||||
51471, -- Elemental Oath
|
||||
24907, -- Moonkin Aura
|
||||
}
|
||||
RB.AttackSpell13Buffs = {
|
||||
RB.AttackSpell11Buffs = {
|
||||
17007, -- Leader of the Pack
|
||||
29801, -- Rampage
|
||||
}
|
||||
|
||||
-- Haste % Increase
|
||||
RB.CasterSpell14Buffs = {
|
||||
RB.CasterSpell12Buffs = {
|
||||
50172, -- Moonkin's Presence
|
||||
2895, -- Wrath of Air
|
||||
853648, -- Swift Retribution
|
||||
}
|
||||
RB.AttackSpell14Buffs = {
|
||||
RB.AttackSpell12Buffs = {
|
||||
8512, -- Windfury Totem
|
||||
}
|
||||
RB.HunterSpell12Buffs = {
|
||||
61316, -- Dalaran Brilliance
|
||||
43002, -- Arcane Brilliance
|
||||
42995, -- Arcane Intellect
|
||||
30706, -- Totem of Wrath
|
||||
8227, -- Flametongue Totem
|
||||
47236, -- Demonic Pact
|
||||
}
|
||||
|
||||
-- Spirit Buff
|
||||
RB.CasterSpell15Buffs = {
|
||||
RB.CasterSpell13Buffs = {
|
||||
14752, -- Divine Spirit
|
||||
27681, -- Prayer of Spirit
|
||||
}
|
||||
-- Percent AP
|
||||
RB.AttackSpell15Buffs = {
|
||||
RB.AttackSpell13Buffs = {
|
||||
19506, -- Trueshot Aura
|
||||
30802, -- Unleashed Rage
|
||||
53137, -- Abomination's Might
|
||||
}
|
||||
|
||||
-- Percent Damage
|
||||
RB.Spell16Buffs = {
|
||||
RB.Spell14Buffs = {
|
||||
31579, -- Arcane Empowerment
|
||||
31869, -- Sanctified Retribution
|
||||
34455, -- Ferocious Inspiration
|
||||
@@ -206,8 +204,8 @@ end
|
||||
|
||||
function RB:UpdateReminder(event, unit)
|
||||
if event == "UNIT_AURA" and unit ~= "player" then return end
|
||||
|
||||
for i = 1, 16 do
|
||||
local wide = E.db.general.reminder.wide
|
||||
for i = 1, wide and 14 or 7 do
|
||||
local texture, duration, expirationTime = self:CheckFilterForActiveBuff(self["Spell"..i.."Buffs"])
|
||||
local button = self.frame[i]
|
||||
|
||||
@@ -276,11 +274,12 @@ end
|
||||
|
||||
function RB:UpdateSettings(isCallback)
|
||||
local frame = self.frame
|
||||
frame:Width(E.RBRWidth * 2)
|
||||
local wide = E.db.general.reminder.wide
|
||||
frame:Width(E.RBRWidth * (wide and 2 or 1))
|
||||
|
||||
self:UpdateDefaultIcons()
|
||||
|
||||
for i = 1, 16 do
|
||||
for i = 1, 14 do
|
||||
local button = frame[i]
|
||||
button:ClearAllPoints()
|
||||
button:SetWidth(E.RBRWidth)
|
||||
@@ -288,12 +287,11 @@ function RB:UpdateSettings(isCallback)
|
||||
|
||||
if i == 1 then
|
||||
button:SetPoint("TOPLEFT", ElvUI_ReminderBuffs, "TOPLEFT", 0, -1)
|
||||
elseif i == 9 then
|
||||
elseif i == 8 then
|
||||
button:SetPoint("TOPRIGHT", ElvUI_ReminderBuffs, "TOPRIGHT", 0, -1)
|
||||
else
|
||||
button:Point("TOP", frame[i - 1], "BOTTOM", 0, E.Border - E.Spacing*3)
|
||||
end
|
||||
|
||||
if E.db.general.reminder.durations then
|
||||
button.cd:SetAlpha(1)
|
||||
else
|
||||
@@ -301,6 +299,12 @@ function RB:UpdateSettings(isCallback)
|
||||
end
|
||||
|
||||
button.timer:FontTemplate(LSM:Fetch("font", E.db.general.reminder.font), E.db.general.reminder.fontSize, E.db.general.reminder.fontOutline)
|
||||
|
||||
if not wide and i > 7 then
|
||||
button:Hide()
|
||||
elseif wide and i > 7 then
|
||||
button:Show()
|
||||
end
|
||||
end
|
||||
|
||||
if not isCallback then
|
||||
@@ -335,6 +339,7 @@ end
|
||||
|
||||
function RB:UpdateDefaultIcons()
|
||||
local isCaster = E.private.general.reminder.classtype == "Caster"
|
||||
local isRanged = E.private.general.reminder.classtype == "Ranged"
|
||||
self.DefaultIcons = {
|
||||
[1] = "Interface\\Icons\\INV_Potion_97",
|
||||
[2] = "Interface\\Icons\\Spell_Misc_Food",
|
||||
@@ -344,28 +349,26 @@ function RB:UpdateDefaultIcons()
|
||||
[6] = "Interface\\Icons\\spell_nature_lightningshield",
|
||||
[7] = (isCaster and "Interface\\Icons\\Spell_Holy_MagicalSentry") or "Interface\\Icons\\spell_holy_fistofjustice",
|
||||
[8] = "Interface\\Icons\\ability_warrior_rallyingcry",
|
||||
[9] = "Interface\\Icons\\spell_nature_stoneskintotem",
|
||||
[10] = (isCaster and "Interface\\Icons\\spell_holy_mindsooth") or "Interface\\Icons\\spell_nature_thorns",
|
||||
[11] = (isCaster and "Interface\\Icons\\spell_fire_totemofwrath") or "Interface\\Icons\\spell_nature_earthbindtotem",
|
||||
[12] = "Interface\\Icons\\Spell_Holy_GreaterBlessingofWisdom",
|
||||
[13] = (isCaster and "Interface\\Icons\\spell_nature_moonglow") or "Interface\\Icons\\spell_nature_unyeildingstamina",
|
||||
[14] = (isCaster and "Interface\\Icons\\spell_nature_forceofnature") or "Interface\\Icons\\spell_nature_windfury",
|
||||
[15] = (isCaster and "Interface\\Icons\\spell_holy_prayerofspirit") or "Interface\\Icons\\ability_trueshot",
|
||||
[16] = "Interface\\Icons\\spell_nature_starfall",
|
||||
[9] = (isCaster and "Interface\\Icons\\spell_holy_mindsooth") or "Interface\\Icons\\spell_holy_devotionaura",
|
||||
[10] = "Interface\\Icons\\Spell_Holy_GreaterBlessingofWisdom",
|
||||
[11] = (isCaster and "Interface\\Icons\\spell_nature_moonglow") or "Interface\\Icons\\spell_nature_unyeildingstamina",
|
||||
[12] = (isCaster and "Interface\\Icons\\spell_nature_forceofnature") or (isRanged and "Interface\\Icons\\Spell_Holy_MagicalSentry") or "Interface\\Icons\\spell_nature_windfury",
|
||||
[13] = (isCaster and "Interface\\Icons\\spell_holy_prayerofspirit") or "Interface\\Icons\\ability_trueshot",
|
||||
[14] = "Interface\\Icons\\spell_nature_starfall",
|
||||
}
|
||||
|
||||
self.Spell7Buffs = isCaster and self.CasterSpell7Buffs or self.AttackSpell7Buffs
|
||||
|
||||
self.Spell10Buffs = isCaster and self.CasterSpell10Buffs or self.AttackSpell10Buffs
|
||||
self.Spell11Buffs = isCaster and self.CasterSpell11Buffs or self.AttackSpell11Buffs
|
||||
self.Spell9Buffs = isCaster and self.CasterSpell9Buffs or self.AttackSpell9Buffs
|
||||
|
||||
self.Spell11Buffs = isCaster and self.CasterSpell11Buffs or self.AttackSpell11Buffs
|
||||
self.Spell12Buffs = isCaster and self.CasterSpell12Buffs or isRanged and self.HunterSpell12Buffs or self.AttackSpell12Buffs
|
||||
self.Spell13Buffs = isCaster and self.CasterSpell13Buffs or self.AttackSpell13Buffs
|
||||
self.Spell14Buffs = isCaster and self.CasterSpell14Buffs or self.AttackSpell14Buffs
|
||||
self.Spell15Buffs = isCaster and self.CasterSpell15Buffs or self.AttackSpell15Buffs
|
||||
end
|
||||
|
||||
function RB:Initialize()
|
||||
if not E.private.general.minimap.enable then return end
|
||||
local wide = E.db.general.reminder.wide
|
||||
|
||||
self.db = E.db.general.reminder
|
||||
|
||||
@@ -380,7 +383,7 @@ function RB:Initialize()
|
||||
end
|
||||
self.frame = frame
|
||||
|
||||
for i = 1, 16 do
|
||||
for i = 1, 14 do
|
||||
frame[i] = self:CreateButton()
|
||||
frame[i]:SetID(i)
|
||||
end
|
||||
@@ -392,4 +395,4 @@ local function InitializeCallback()
|
||||
RB:Initialize()
|
||||
end
|
||||
|
||||
E:RegisterModule(RB:GetName(), InitializeCallback)
|
||||
E:RegisterModule(RB:GetName(), InitializeCallback)
|
||||
|
||||
@@ -108,7 +108,8 @@ P.general = {
|
||||
position = "RIGHT",
|
||||
font = "Homespun",
|
||||
fontSize = 10,
|
||||
fontOutline = "MONOCHROMEOUTLINE"
|
||||
fontOutline = "MONOCHROMEOUTLINE",
|
||||
wide = true
|
||||
},
|
||||
kittys = false
|
||||
}
|
||||
@@ -4203,4 +4204,4 @@ do -- cooldown stuff
|
||||
|
||||
-- we gonna need this on by default :3
|
||||
P.cooldown.enable = true
|
||||
end
|
||||
end
|
||||
|
||||
@@ -356,8 +356,15 @@ E.Options.args.auras = {
|
||||
name = L["Reverse Style"],
|
||||
desc = L["When enabled active buff icons will light up instead of becoming darker, while inactive buff icons will become darker instead of being lit up."]
|
||||
},
|
||||
position = {
|
||||
wide = {
|
||||
order = 3,
|
||||
type = "toggle",
|
||||
name = "Two Rows",
|
||||
desc = "Show all available buff reminders",
|
||||
set = function(info, value) E.db.general.reminder[info[#info]] = value RB:UpdateSettings() M:UpdateSettings() end,
|
||||
},
|
||||
position = {
|
||||
order = 4,
|
||||
type = "select",
|
||||
name = L["Position"],
|
||||
set = function(info, value) E.db.general.reminder[info[#info]] = value RB:UpdatePosition() end,
|
||||
@@ -367,14 +374,15 @@ E.Options.args.auras = {
|
||||
}
|
||||
},
|
||||
classtype = {
|
||||
order = 4,
|
||||
order = 5,
|
||||
type = "select",
|
||||
name = L["Class Type"],
|
||||
get = function(info) return E.private.general.reminder[info[#info]] end,
|
||||
set = function(info, value) E.private.general.reminder[info[#info]] = value RB:UpdateSettings() end,
|
||||
values = {
|
||||
["Caster"] = L["Caster"],
|
||||
["Attack"] = L["Attack"]
|
||||
["Melee"] = L["Melee"],
|
||||
["Ranged"] = L["Ranged"]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -410,4 +418,4 @@ E.Options.args.auras = {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1396,3 +1396,5 @@ L["Set the size of the map markers"] = true
|
||||
L["Receive from Raid Members"] = true
|
||||
L["Allows Raid Members to send you Map Markers"] = true
|
||||
L["MAP_MARKER_DISCRIPTION"] = "Allows Map Markers to be created by middle clicking (Mouse3) on the world map.\nMarkers are automatically shared with raid members."
|
||||
L["Ranged"] = "Ranged"
|
||||
L["Melee"] = "Melee"
|
||||
|
||||
Reference in New Issue
Block a user