X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/e90f2ac0721c80f251ba1a019e98f0a183a245c6..12d76ae2c314f474b221fbaed3996e9d261c95cd:/OmaAB/ActionBars.lua diff --git a/OmaAB/ActionBars.lua b/OmaAB/ActionBars.lua index 02bdcb9..5b2233b 100644 --- a/OmaAB/ActionBars.lua +++ b/OmaAB/ActionBars.lua @@ -67,7 +67,6 @@ local settings = { bar = 5, start = 49, length = 12, - columns = 3, x = 1000, y = 840, }, @@ -118,12 +117,16 @@ local usingBonusbars = { }; local chars = { + ["Sylvanas"] = { + ["Vildana"] = {1, 2, 3, 4,}, + }, ["Stormreaver"] = { ["Vildan"] = {1, 2, 3, 4,}, ["Gedren"] = {1, 2, 3, 4,}, ["Gazden"] = {1, 2, 3, 4,}, ["Gedran"] = {1, 2, 3, 4,}, ["Iled"] = {1, 2, 3, 4,}, + ["Gilden"] = {1, 2, 3, 4,}, }, }; @@ -258,11 +261,11 @@ local function updateState(button, slot) end local function updateGlow(button, slot) - local stype, id, _ = GetActionInfo(slot); + local stype, id = GetActionInfo(slot); if stype == "spell" and IsSpellOverlayed(id) then button.glow:Show(); elseif stype == "macro" then - local _, _, macroid = GetMacroSpell(id); + local macroid = GetMacroSpell(id); if macroid and IsSpellOverlayed(macroid) then button.glow:Show(); else @@ -274,11 +277,11 @@ local function updateGlow(button, slot) end local function startGlow(button, slot, spell) - local stype, id, _ = GetActionInfo(slot); + local stype, id = GetActionInfo(slot); if stype == "spell" and id == spell then button.glow:Show(); elseif stype == "macro" then - local _, _, macroid = GetMacroSpell(id); + local macroid = GetMacroSpell(id); if macroid and macroid == spell then button.glow:Show(); end @@ -287,11 +290,11 @@ local function startGlow(button, slot, spell) end local function stopGlow(button, slot, spell) - local stype, id, _ = GetActionInfo(slot); + local stype, id = GetActionInfo(slot); if stype == "spell" and id == spell then button.glow:Hide(); elseif stype == "macro" then - local _, _, macroid = GetMacroSpell(id); + local macroid = GetMacroSpell(id); if macroid and macroid == spell then button.glow:Hide(); end @@ -673,7 +676,7 @@ local events = { end, }; events["LOSS_OF_CONTROL_ADDED"] = events["ACTIONBAR_UPDATE_COOLDOWN"]; -events["LOSS_OF_CONTROL_UPDATE"] = events["ACTIONBAR_UPDATE_COOLDOWN"]; -- TODO might change once tooltips are in +events["LOSS_OF_CONTROL_UPDATE"] = events["ACTIONBAR_UPDATE_COOLDOWN"]; events["PLAYER_MOUNT_DISPLAY_CHANGED"] = events["ACTIONBAR_UPDATE_USABLE"]; events["TRADE_SKILL_SHOW"] = events["ACTIONBAR_UPDATE_STATE"]; events["TRADE_SKILL_CLOSE"] = events["ACTIONBAR_UPDATE_STATE"];