3pT2BS: Allow casting Battle Shout in combat, and add back automatic switching back to normal gear immediately after casting Battle Shout, as this works properly with battle-shouting in combat.
This commit is contained in:
parent
f22939b979
commit
6d5cd315fa
1 changed files with 2 additions and 3 deletions
|
@ -32,7 +32,7 @@ end
|
|||
|
||||
local button = CreateFrame("Button", "3pT2BS", UIParent, "SecureActionButtonTemplate")
|
||||
button:SetAttribute("type", "macro")
|
||||
button:SetAttribute("macrotext", wrathOff)
|
||||
button:SetAttribute("macrotext", actions.takeWrathOff)
|
||||
button:SetScript("PreClick", function (self, button, down)
|
||||
if InCombatLockdown() then
|
||||
return
|
||||
|
@ -49,7 +49,7 @@ button:SetScript("PreClick", function (self, button, down)
|
|||
if not has3pT2() then
|
||||
return self:SetAttribute("macrotext", actions.putWrathOn)
|
||||
end
|
||||
return self:SetAttribute("macrotext", actions.castBattleShout)
|
||||
return self:SetAttribute("macrotext", actions.castBattleShout .. actions.takeWrathOff)
|
||||
end)
|
||||
|
||||
|
||||
|
@ -88,7 +88,6 @@ function events:ADDON_LOADED()
|
|||
},
|
||||
["castBattleShout"] = {
|
||||
"/cancelaura Bloodrage",
|
||||
"/stopmacro [combat]",
|
||||
"/cast Battle Shout",
|
||||
},
|
||||
["takeWrathOff"] = {
|
||||
|
|
Loading…
Reference in a new issue