caspervk/wow-addons
1
0
Fork 0
Code Releases Activity

3pT2BS: Fix action composition.

Browse source
This commit is contained in:
Casper V. Kristensen 2020-10-18 04:17:49 +02:00
parent ecd81ac57a
commit 054d03039f
Signed by: caspervk
GPG key ID: 289CA03790535054
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
3pT2BS/3pT2BS.lua
View file

@ -5,7 +5,7 @@ ThreepT2BS.author = GetAddOnMetadata("3pT2BS", "Author")
print(("Loaded %s v%s by %s."):format(ThreepT2BS.title, ThreepT2BS.version, ThreepT2BS.author)) print(("Loaded %s v%s by %s."):format(ThreepT2BS.title, ThreepT2BS.version, ThreepT2BS.author))
local lastT2BattleShout = 0 local lastT2BattleShout = 0
local actionMacros = {} local actions = {}
local function hasRecentlyBattleShouted() local function hasRecentlyBattleShouted()
@ -38,18 +38,18 @@ button:SetScript("PreClick", function (self, button, down)
return return
end end
if hasRecentlyBattleShouted() then if hasRecentlyBattleShouted() then
return self:SetAttribute("macrotext", actionMacros.takeWrathOff) return self:SetAttribute("macrotext", actions.takeWrathOff)
end end
if not hasEnoughRageForBattleShout() then if not hasEnoughRageForBattleShout() then
if isBloodRageReady() then if isBloodRageReady() then
return self:SetAttribute("macrotext", actionMacros.putWrathOn .. actionMacros.castBloodRage) return self:SetAttribute("macrotext", actions.putWrathOn .. actions.castBloodRage)
end end
return self:SetAttribute("macrotext", actionMacros.takeWrathOff) return self:SetAttribute("macrotext", actions.takeWrathOff)
end end
if not has3pT2() then if not has3pT2() then
return self:SetAttribute("macrotext", actionMacros.putWrathOn) return self:SetAttribute("macrotext", actions.putWrathOn)
end end
return self:SetAttribute("macrotext", actionMacros.castBattleShout) return self:SetAttribute("macrotext", actions.castBattleShout .. actions.takeWrathOff)
end) end)
@ -101,7 +101,7 @@ function events:ADDON_LOADED()
}, },
} }
for action, lines in pairs(ThreepT2BSDB.actions) do for action, lines in pairs(ThreepT2BSDB.actions) do
actionMacros[action] = table.concat(lines, "\n") actions[action] = table.concat(lines, "\n") .. "\n" -- extra newline allows for action composition
end end
end end