from retail
This commit is contained in:
+73
-18
@@ -2542,8 +2542,10 @@ Private.event_prototypes = {
|
||||
store = true,
|
||||
test = "Private.ExecEnv.CheckCombatLogFlags(sourceFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckCombatLogFlags(state.sourceFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckCombatLogFlags(state.sourceFlags, needle) == (op == "==")
|
||||
end
|
||||
end
|
||||
},
|
||||
{
|
||||
@@ -2553,8 +2555,10 @@ Private.event_prototypes = {
|
||||
values = "combatlog_flags_check_reaction",
|
||||
test = "Private.ExecEnv.CheckCombatLogFlagsReaction(sourceFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckCombatLogFlagsReaction(state.sourceFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckCombatLogFlagsReaction(state.sourceFlags, needle) == (op == "==")
|
||||
end
|
||||
end
|
||||
},
|
||||
{
|
||||
@@ -2564,8 +2568,10 @@ Private.event_prototypes = {
|
||||
values = "combatlog_flags_check_object_type",
|
||||
test = "Private.ExecEnv.CheckCombatLogFlagsObjectType(sourceFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckCombatLogFlagsObjectType(state.sourceFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckCombatLogFlagsObjectType(state.sourceFlags, needle) == (op == "==")
|
||||
end
|
||||
end
|
||||
},
|
||||
{
|
||||
@@ -2577,8 +2583,10 @@ Private.event_prototypes = {
|
||||
store = true,
|
||||
test = "Private.ExecEnv.CheckRaidFlags(sourceRaidFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckRaidFlags(state.sourceRaidFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckRaidFlags(state.sourceRaidFlags, needle) == (op == "==")
|
||||
end
|
||||
end
|
||||
},
|
||||
{
|
||||
@@ -2679,8 +2687,10 @@ Private.event_prototypes = {
|
||||
store = true,
|
||||
test = "Private.ExecEnv.CheckCombatLogFlags(destFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckCombatLogFlags(state.destFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckCombatLogFlags(state.destFlags, needle) == (op == "==")
|
||||
end
|
||||
end,
|
||||
enable = function(trigger)
|
||||
return not (trigger.subeventPrefix == "SPELL" and trigger.subeventSuffix == "_CAST_START");
|
||||
@@ -2693,8 +2703,10 @@ Private.event_prototypes = {
|
||||
values = "combatlog_flags_check_reaction",
|
||||
test = "Private.ExecEnv.CheckCombatLogFlagsReaction(destFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckCombatLogFlagsReaction(state.destFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckCombatLogFlagsReaction(state.destFlags, needle) == (op == "==")
|
||||
end
|
||||
end,
|
||||
enable = function(trigger)
|
||||
return not (trigger.subeventPrefix == "SPELL" and trigger.subeventSuffix == "_CAST_START");
|
||||
@@ -2707,8 +2719,10 @@ Private.event_prototypes = {
|
||||
values = "combatlog_flags_check_object_type",
|
||||
test = "Private.ExecEnv.CheckCombatLogFlagsObjectType(destFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckCombatLogFlagsObjectType(state.destFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckCombatLogFlagsObjectType(state.destFlags, needle) == (op == "==")
|
||||
end
|
||||
end,
|
||||
enable = function(trigger)
|
||||
return not (trigger.subeventPrefix == "SPELL" and trigger.subeventSuffix == "_CAST_START");
|
||||
@@ -2728,8 +2742,10 @@ Private.event_prototypes = {
|
||||
store = true,
|
||||
test = "Private.ExecEnv.CheckRaidFlags(destRaidFlags, %q)",
|
||||
conditionType = "select",
|
||||
conditionTest = function(state, needle)
|
||||
return state and state.show and Private.ExecEnv.CheckRaidFlags(state.destRaidFlags, needle);
|
||||
conditionTest = function(state, needle, op)
|
||||
if state and state.show then
|
||||
return Private.ExecEnv.CheckRaidFlags(state.destRaidFlags, needle) == (op == "==")
|
||||
end
|
||||
end,
|
||||
enable = function(trigger)
|
||||
return not (trigger.subeventPrefix == "SPELL" and trigger.subeventSuffix == "_CAST_START");
|
||||
@@ -4479,7 +4495,8 @@ Private.event_prototypes = {
|
||||
display = L["Totem Name"],
|
||||
type = "string",
|
||||
conditionType = "string",
|
||||
store = true
|
||||
store = true,
|
||||
desc = L["Enter a name or a spellId"]
|
||||
},
|
||||
{
|
||||
name = "totemNamePattern",
|
||||
@@ -5429,6 +5446,7 @@ Private.event_prototypes = {
|
||||
trigger.unit = trigger.unit or "target";
|
||||
local ret = [[
|
||||
unit = string.lower(unit)
|
||||
local name = UnitName(unit, false)
|
||||
local ok = true
|
||||
local aggro, status, threatpct, rawthreatpct, threatvalue, threattotal
|
||||
if unit and unit ~= "none" then
|
||||
@@ -5510,6 +5528,43 @@ Private.event_prototypes = {
|
||||
limit = 2
|
||||
},
|
||||
},
|
||||
{
|
||||
name = "name",
|
||||
display = L["Unit Name"],
|
||||
type = "string",
|
||||
store = true,
|
||||
multiline = true,
|
||||
preamble = "local nameChecker = Private.ExecEnv.ParseStringCheck(%q)",
|
||||
test = "nameChecker:Check(name)",
|
||||
conditionType = "string",
|
||||
conditionPreamble = function(input)
|
||||
return Private.ExecEnv.ParseStringCheck(input)
|
||||
end,
|
||||
conditionTest = function(state, needle, op, preamble)
|
||||
return preamble:Check(state.name)
|
||||
end,
|
||||
operator_types = "none",
|
||||
desc = L["Supports multiple entries, separated by commas"]
|
||||
},
|
||||
{
|
||||
name = "npcId",
|
||||
display = L["Npc ID"],
|
||||
type = "string",
|
||||
multiline = true,
|
||||
store = true,
|
||||
init = "tostring(tonumber(string.sub(UnitGUID(unit) or '', 8, 12), 16) or '')",
|
||||
conditionType = "string",
|
||||
preamble = "local npcIdChecker = Private.ExecEnv.ParseStringCheck(%q)",
|
||||
test = "npcIdChecker:Check(npcId)",
|
||||
conditionPreamble = function(input)
|
||||
return Private.ExecEnv.ParseStringCheck(input)
|
||||
end,
|
||||
conditionTest = function(state, needle, op, preamble)
|
||||
return preamble:Check(state.npcId)
|
||||
end,
|
||||
operator_types = "none",
|
||||
desc = L["Supports multiple entries, separated by commas"]
|
||||
},
|
||||
{
|
||||
name = "value",
|
||||
hidden = true,
|
||||
@@ -5537,7 +5592,7 @@ Private.event_prototypes = {
|
||||
},
|
||||
{
|
||||
hidden = true,
|
||||
test = "WeakAuras.UnitExistsFixed(unit, smart) and specificUnitCheck"
|
||||
test = "WeakAuras.UnitExistsFixed(unit, false) and specificUnitCheck"
|
||||
}
|
||||
},
|
||||
automaticrequired = true
|
||||
|
||||
Reference in New Issue
Block a user