diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua index 7b8ac0b..ce222b2 100644 --- a/WeakAuras/Prototypes.lua +++ b/WeakAuras/Prototypes.lua @@ -1555,43 +1555,23 @@ WeakAuras.event_prototypes = { }, { enable = function(trigger) - return trigger.subeventSuffix and (trigger.subeventSuffix == "_ABSORBED") + return trigger.subeventSuffix and (trigger.subeventSuffix == "_INTERRUPT" or trigger.subeventSuffix == "_DISPEL" or trigger.subeventSuffix == "_DISPEL_FAILED" or trigger.subeventSuffix == "_STOLEN" or trigger.subeventSuffix == "_AURA_BROKEN_SPELL") end - }, -- source of absorb GUID ignored with SPELL_ABSORBED - { - enable = function(trigger) - return trigger.subeventSuffix and (trigger.subeventSuffix == "_ABSORBED") - end - }, -- source of absorb Name ignored with SPELL_ABSORBED - { - enable = function(trigger) - return trigger.subeventSuffix and (trigger.subeventSuffix == "_ABSORBED") - end - }, -- source of absorb Flags ignored with SPELL_ABSORBED - { - enable = function(trigger) - return trigger.subeventSuffix and (trigger.subeventSuffix == "_ABSORBED") - end - }, -- source of absorb Raid Flags ignored with SPELL_ABSORBED - { - enable = function(trigger) - return trigger.subeventSuffix and (trigger.subeventSuffix == "_ABSORBED" or trigger.subeventSuffix == "_INTERRUPT" or trigger.subeventSuffix == "_DISPEL" or trigger.subeventSuffix == "_DISPEL_FAILED" or trigger.subeventSuffix == "_STOLEN" or trigger.subeventSuffix == "_AURA_BROKEN_SPELL") - end - }, -- extraSpellId ignored with SPELL_ABSORBED + }, -- extraSpellId ignored with SPELL_INTERRUPT { name = "extraSpellName", display = L["Extra Spell Name"], type = "string", init = "arg", enable = function(trigger) - return trigger.subeventSuffix and (trigger.subeventSuffix == "_ABSORBED" or trigger.subeventSuffix == "_INTERRUPT" or trigger.subeventSuffix == "_DISPEL" or trigger.subeventSuffix == "_DISPEL_FAILED" or trigger.subeventSuffix == "_STOLEN" or trigger.subeventSuffix == "_AURA_BROKEN_SPELL") + return trigger.subeventSuffix and (trigger.subeventSuffix == "_INTERRUPT" or trigger.subeventSuffix == "_DISPEL" or trigger.subeventSuffix == "_DISPEL_FAILED" or trigger.subeventSuffix == "_STOLEN" or trigger.subeventSuffix == "_AURA_BROKEN_SPELL") end, store = true, conditionType = "string" }, { enable = function(trigger) - return trigger.subeventSuffix and (trigger.subeventSuffix == "_ABSORBED" or trigger.subeventSuffix == "_INTERRUPT" or trigger.subeventSuffix == "_DISPEL" or trigger.subeventSuffix == "_DISPEL_FAILED" or trigger.subeventSuffix == "_STOLEN" or trigger.subeventSuffix == "_AURA_BROKEN_SPELL") + return trigger.subeventSuffix and (trigger.subeventSuffix == "_INTERRUPT" or trigger.subeventSuffix == "_DISPEL" or trigger.subeventSuffix == "_DISPEL_FAILED" or trigger.subeventSuffix == "_STOLEN" or trigger.subeventSuffix == "_AURA_BROKEN_SPELL") end }, -- extraSchool ignored with _ argument { @@ -1612,7 +1592,7 @@ WeakAuras.event_prototypes = { type = "number", init = "arg", enable = function(trigger) - return trigger.subeventSuffix and trigger.subeventPrefix and (trigger.subeventSuffix == "_ABSORBED" or trigger.subeventSuffix == "_DAMAGE" or trigger.subeventSuffix == "_HEAL" or trigger.subeventSuffix == "_ENERGIZE" or trigger.subeventSuffix == "_DRAIN" or trigger.subeventSuffix == "_LEECH" or trigger.subeventPrefix:find("DAMAGE")) + return trigger.subeventSuffix and trigger.subeventPrefix and (trigger.subeventSuffix == "_DAMAGE" or trigger.subeventSuffix == "_HEAL" or trigger.subeventSuffix == "_ENERGIZE" or trigger.subeventSuffix == "_DRAIN" or trigger.subeventSuffix == "_LEECH" or trigger.subeventPrefix:find("DAMAGE")) end, store = true, conditionType = "number" @@ -1710,19 +1690,6 @@ WeakAuras.event_prototypes = { store = true, conditionType = "bool" }, - { - name = "isOffHand", - display = L["Is Off Hand"], - type = "tristate", - init = "arg", - enable = function(trigger) - return trigger.subeventSuffix and trigger.subeventPrefix and ( - trigger.subeventSuffix == "_DAMAGE" or trigger.subeventPrefix == "DAMAGE_SHIELD" or trigger.subeventPrefix == "DAMAGE_SPLIT" - or trigger.subeventSuffix == "_MISSED" or trigger.subeventPrefix == "DAMAGE_SHIELD_MISSED") - end, - store = true, - conditionType = "bool" - }, { name = "number", display = L["Number"], diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua index 7b5cc84..fe75841 100644 --- a/WeakAuras/Types.lua +++ b/WeakAuras/Types.lua @@ -393,7 +393,6 @@ WeakAuras.subevent_actual_prefix_types = { } WeakAuras.subevent_suffix_types = { - _ABSORBED = L["Absorbed"], _DAMAGE = L["Damage"], _MISSED = L["Missed"], _HEAL = L["Heal"],