fix a bug in auto-assist logic
This commit is contained in:
+8
-6
@@ -190,8 +190,6 @@ function Button:SetStateAction(state, action)
|
|||||||
local type, id, subtype = GetActionInfo(action)
|
local type, id, subtype = GetActionInfo(action)
|
||||||
if type == "spell" then
|
if type == "spell" then
|
||||||
local spellName, spellRank = GetSpellInfo(id, subtype)
|
local spellName, spellRank = GetSpellInfo(id, subtype)
|
||||||
self:SetAttribute(("*type-S%d"):format(state), "macro")
|
|
||||||
self:SetAttribute(("*type-S%dRight"):format(state), "macro")
|
|
||||||
|
|
||||||
local macroText
|
local macroText
|
||||||
if IsHelpfulSpell(id, subtype) then
|
if IsHelpfulSpell(id, subtype) then
|
||||||
@@ -206,14 +204,18 @@ function Button:SetStateAction(state, action)
|
|||||||
selfcast = selfcast .. "[modifier:".. GetModifiedClick("SELFCAST").. ", target=player]"
|
selfcast = selfcast .. "[modifier:".. GetModifiedClick("SELFCAST").. ", target=player]"
|
||||||
end
|
end
|
||||||
macroText = macroText:format(selfcast)
|
macroText = macroText:format(selfcast)
|
||||||
else
|
elseif IsHarmfulSpell(id, subtype) then
|
||||||
macroText = "/cast [harm] [target=targettarget, harm] [target=none]"
|
macroText = "/cast [harm] [target=targettarget, harm] [target=none]"
|
||||||
end
|
end
|
||||||
|
|
||||||
macroText = ("%s%s(%s)"):format(macroText, spellName, spellRank)
|
if macroText then
|
||||||
|
self:SetAttribute(("*type-S%d"):format(state), "macro")
|
||||||
|
self:SetAttribute(("*type-S%dRight"):format(state), "macro")
|
||||||
|
macroText = ("%s%s(%s)"):format(macroText, spellName, spellRank)
|
||||||
|
|
||||||
self:SetAttribute(("*macrotext-S%d"):format(state), macroText)
|
self:SetAttribute(("*macrotext-S%d"):format(state), macroText)
|
||||||
self:SetAttribute(("*macrotext-S%dRight"):format(state), macroText)
|
self:SetAttribute(("*macrotext-S%dRight"):format(state), macroText)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user