@@ -3220,13 +3220,6 @@ function Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTote
|
||||
return true
|
||||
end
|
||||
|
||||
function Private.ExecEnv.CheckTotemIcon(totemIcon, triggerTotemIcon, operator)
|
||||
if not triggerTotemIcon then
|
||||
return true
|
||||
end
|
||||
return (totemIcon == triggerTotemIcon) == (operator == "==")
|
||||
end
|
||||
|
||||
-- Queueable Spells
|
||||
local queueableSpells
|
||||
local classQueueableSpells = {
|
||||
|
||||
@@ -4854,8 +4854,6 @@ Private.event_prototypes = {
|
||||
local triggerTotemName = %q
|
||||
local triggerTotemPattern = %q
|
||||
local triggerTotemPatternOperator = %q
|
||||
local triggerTotemIcon = %s
|
||||
local triggerTotemIconOperator = %q
|
||||
local clone = %s
|
||||
local inverse = %s
|
||||
local remainingCheck = %s
|
||||
@@ -4872,10 +4870,6 @@ Private.event_prototypes = {
|
||||
active = false;
|
||||
end
|
||||
|
||||
if not Private.ExecEnv.CheckTotemIcon(icon, triggerTotemIcon, triggerTotemIconOperator) then
|
||||
active = false
|
||||
end
|
||||
|
||||
if (inverse) then
|
||||
active = not active;
|
||||
if (triggerTotemName) then
|
||||
@@ -4906,9 +4900,7 @@ Private.event_prototypes = {
|
||||
for i = 1, 4 do
|
||||
local _, totemName, startTime, duration, icon = GetTotemInfo(i);
|
||||
if ((startTime and startTime ~= 0) and
|
||||
if ((startTime and startTime ~= 0)
|
||||
and Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTotemPattern, triggerTotemPatternOperator)
|
||||
and Private.ExecEnv.CheckTotemIcon(icon, triggerTotemIcon, triggerTotemIconOperator)
|
||||
Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTotemPattern, triggerTotemPatternOperator)
|
||||
) then
|
||||
found = true;
|
||||
end
|
||||
@@ -4928,9 +4920,7 @@ Private.event_prototypes = {
|
||||
local _, totemName, startTime, duration, icon = GetTotemInfo(i);
|
||||
active = (startTime and startTime ~= 0);
|
||||
|
||||
if not Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTotemPattern, triggerTotemPatternOperator)
|
||||
or not Private.ExecEnv.CheckTotemIcon(icon, triggerTotemIcon, triggerTotemIconOperator)
|
||||
then
|
||||
if not Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTotemPattern, triggerTotemPatternOperator) then
|
||||
active = false;
|
||||
end
|
||||
if (active and remainingCheck) then
|
||||
@@ -4968,8 +4958,6 @@ Private.event_prototypes = {
|
||||
trigger.use_totemName and totemName or "",
|
||||
trigger.use_totemNamePattern and trigger.totemNamePattern or "",
|
||||
trigger.use_totemNamePattern and trigger.totemNamePattern_operator or "",
|
||||
trigger.use_icon and trigger.icon or "nil",
|
||||
trigger.use_icon and trigger.icon_operator or "",
|
||||
trigger.use_clones and "true" or "false",
|
||||
trigger.use_inverse and "true" or "false",
|
||||
trigger.use_remaining and tonumber(trigger.remaining or 0) or "nil",
|
||||
@@ -4996,14 +4984,6 @@ Private.event_prototypes = {
|
||||
display = L["Totem Name Pattern Match"],
|
||||
type = "longstring",
|
||||
},
|
||||
{
|
||||
name = "icon",
|
||||
display = L["Totem Icon"],
|
||||
type = "number",
|
||||
conditionType = "number",
|
||||
operator_types = "only_equal",
|
||||
store = true,
|
||||
},
|
||||
{
|
||||
name = "clones",
|
||||
display = L["Clone per Match"],
|
||||
|
||||
Reference in New Issue
Block a user