Exiles/coa-weakauras
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

correct combat log prototype

Browse Source
This commit is contained in:
Bunny67
2020-06-09 19:05:09 +03:00
parent 3d539e2574
commit 262cd78f5f
2 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WeakAuras/Prototypes.lua
+5 -38
View File
@@ -1555,43 +1555,23 @@ WeakAuras.event_prototypes = {
}, },
{ {
enable = function(trigger) 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 end
}, -- source of absorb GUID ignored with SPELL_ABSORBED }, -- extraSpellId ignored with SPELL_INTERRUPT
{
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
{ {
name = "extraSpellName", name = "extraSpellName",
display = L["Extra Spell Name"], display = L["Extra Spell Name"],
type = "string", type = "string",
init = "arg", init = "arg",
enable = function(trigger) 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, end,
store = true, store = true,
conditionType = "string" conditionType = "string"
}, },
{ {
enable = function(trigger) 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 end
}, -- extraSchool ignored with _ argument }, -- extraSchool ignored with _ argument
{ {
@@ -1612,7 +1592,7 @@ WeakAuras.event_prototypes = {
type = "number", type = "number",
init = "arg", init = "arg",
enable = function(trigger) 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, end,
store = true, store = true,
conditionType = "number" conditionType = "number"
@@ -1710,19 +1690,6 @@ WeakAuras.event_prototypes = {
store = true, store = true,
conditionType = "bool" 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", name = "number",
display = L["Number"], display = L["Number"],
WeakAuras/Types.lua
-1
View File
@@ -393,7 +393,6 @@ WeakAuras.subevent_actual_prefix_types = {
} }
WeakAuras.subevent_suffix_types = { WeakAuras.subevent_suffix_types = {
_ABSORBED = L["Absorbed"],
_DAMAGE = L["Damage"], _DAMAGE = L["Damage"],
_MISSED = L["Missed"], _MISSED = L["Missed"],
_HEAL = L["Heal"], _HEAL = L["Heal"],