from retail

This commit is contained in:
NoM0Re
2025-02-11 20:50:42 +01:00
parent d2b893e5f1
commit fc4b265688
2 changed files with 29 additions and 2 deletions
+7
View File
@@ -3220,6 +3220,13 @@ function Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTote
return true return true
end end
function Private.ExecEnv.CheckTotemIcon(totemIcon, triggerTotemIcon, operator)
if not triggerTotemIcon then
return true
end
return (totemIcon == triggerTotemIcon) == (operator == "==")
end
-- Queueable Spells -- Queueable Spells
local queueableSpells local queueableSpells
local classQueueableSpells = { local classQueueableSpells = {
+22 -2
View File
@@ -4854,6 +4854,8 @@ Private.event_prototypes = {
local triggerTotemName = %q local triggerTotemName = %q
local triggerTotemPattern = %q local triggerTotemPattern = %q
local triggerTotemPatternOperator = %q local triggerTotemPatternOperator = %q
local triggerTotemIcon = %s
local triggerTotemIconOperator = %q
local clone = %s local clone = %s
local inverse = %s local inverse = %s
local remainingCheck = %s local remainingCheck = %s
@@ -4870,6 +4872,10 @@ Private.event_prototypes = {
active = false; active = false;
end end
if not Private.ExecEnv.CheckTotemIcon(icon, triggerTotemIcon, triggerTotemIconOperator) then
active = false
end
if (inverse) then if (inverse) then
active = not active; active = not active;
if (triggerTotemName) then if (triggerTotemName) then
@@ -4900,7 +4906,9 @@ Private.event_prototypes = {
for i = 1, 4 do for i = 1, 4 do
local _, totemName, startTime, duration, icon = GetTotemInfo(i); 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) if ((startTime and startTime ~= 0)
and Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTotemPattern, triggerTotemPatternOperator)
and Private.ExecEnv.CheckTotemIcon(icon, triggerTotemIcon, triggerTotemIconOperator)
) then ) then
found = true; found = true;
end end
@@ -4920,7 +4928,9 @@ Private.event_prototypes = {
local _, totemName, startTime, duration, icon = GetTotemInfo(i); local _, totemName, startTime, duration, icon = GetTotemInfo(i);
active = (startTime and startTime ~= 0); active = (startTime and startTime ~= 0);
if not Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTotemPattern, triggerTotemPatternOperator) then if not Private.ExecEnv.CheckTotemName(totemName, triggerTotemName, triggerTotemPattern, triggerTotemPatternOperator)
or not Private.ExecEnv.CheckTotemIcon(icon, triggerTotemIcon, triggerTotemIconOperator)
then
active = false; active = false;
end end
if (active and remainingCheck) then if (active and remainingCheck) then
@@ -4958,6 +4968,8 @@ Private.event_prototypes = {
trigger.use_totemName and totemName or "", trigger.use_totemName and totemName or "",
trigger.use_totemNamePattern and trigger.totemNamePattern or "", trigger.use_totemNamePattern and trigger.totemNamePattern or "",
trigger.use_totemNamePattern and trigger.totemNamePattern_operator 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_clones and "true" or "false",
trigger.use_inverse and "true" or "false", trigger.use_inverse and "true" or "false",
trigger.use_remaining and tonumber(trigger.remaining or 0) or "nil", trigger.use_remaining and tonumber(trigger.remaining or 0) or "nil",
@@ -4984,6 +4996,14 @@ Private.event_prototypes = {
display = L["Totem Name Pattern Match"], display = L["Totem Name Pattern Match"],
type = "longstring", type = "longstring",
}, },
{
name = "icon",
display = L["Totem Icon"],
type = "number",
conditionType = "number",
operator_types = "only_equal",
store = true,
},
{ {
name = "clones", name = "clones",
display = L["Clone per Match"], display = L["Clone per Match"],