From 6d5cd315fa81936abf49b399031b6dab64d3503d Mon Sep 17 00:00:00 2001 From: "Casper V. Kristensen" Date: Mon, 19 Oct 2020 16:12:22 +0200 Subject: [PATCH] 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. --- 3pT2BS/3pT2BS.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/3pT2BS/3pT2BS.lua b/3pT2BS/3pT2BS.lua index d92b7f9..7d8ea9a 100644 --- a/3pT2BS/3pT2BS.lua +++ b/3pT2BS/3pT2BS.lua @@ -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"] = {