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

more fixes to nameplate and npcid

Browse Source
This commit is contained in:
NoM0Re
2024-06-30 14:28:25 +02:00
parent 909f61f102
commit 5521af916a
2 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WeakAuras/BuffTrigger2.lua
+5 -1
View File
@@ -1067,6 +1067,10 @@ local function TriggerInfoApplies(triggerInfo, unit)
return false
end
if triggerInfo.npcId and not triggerInfo.npcId:Check(select(6, strsplit('-', UnitGUID(unit) or ''))) then
return false
end
if triggerInfo.nameChecker and not triggerInfo.nameChecker:Check(WeakAuras.UnitNameWithRealm(unit)) then
return false
end
@@ -2373,7 +2377,7 @@ function BuffTrigger.Add(data)
local effectiveIgnoreInvisible = groupTrigger and trigger.ignoreInvisible
local effectiveHostility = trigger.unit == "nameplate" and trigger.useHostility and trigger.hostility
local effectiveNameCheck = groupTrigger and trigger.useUnitName and trigger.unitName
local effectiveNpcId = trigger.unit == "nameplate" and trigger.useNpcId and Private.ExecEnv.ParseStringCheck(trigger.npcId)
local effectiveNpcId = trigger.unit == "nameplate" and trigger.useNpcId and WeakAuras.ParseNameCheck(trigger.npcId)
if trigger.unit == "multi" then
BuffTrigger.InitMultiAura()
WeakAuras/Prototypes.lua
+41 -32
View File
@@ -1903,7 +1903,7 @@ Private.event_prototypes = {
type = "toggle",
width = WeakAuras.doubleWidth,
enable = function(trigger)
return trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
return trigger.unit == "nameplate" or trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
end,
init = "not UnitIsUnit(\"player\", unit)"
},
@@ -1927,6 +1927,15 @@ Private.event_prototypes = {
end,
init = "UnitIsConnected(unit)"
},
{
name = "nameplateType",
display = L["Nameplate Type"],
type = "select",
init = "WeakAuras.GetPlayerReaction(unit)",
values = "hostility_types",
store = true,
conditionType = "select",
},
{
hidden = true,
test = "WeakAuras.UnitExistsFixed(unit, smart) and specificUnitCheck"
@@ -5396,37 +5405,6 @@ Private.event_prototypes = {
store = true,
conditionType = "select",
},
{
name = "includePets",
display = WeakAuras.newFeatureString .. L["Include Pets"],
type = "select",
values = "include_pets_types",
width = WeakAuras.normalWidth,
test = "true",
enable = function(trigger)
return trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
end
},
{
name = "ignoreSelf",
display = L["Ignore Self"],
type = "toggle",
width = WeakAuras.doubleWidth,
enable = function(trigger)
return trigger.unit == "nameplate" or trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
end,
init = "not UnitIsUnit(\"player\", unit)"
},
{
name = "onUpdateUnitTarget",
display = WeakAuras.newFeatureString .. L["Advanced Caster's Target Check"],
desc = L["Check nameplate's target every 0.2s"],
type = "toggle",
test = "true",
enable = function(trigger)
return trigger.unit == "nameplate"
end
},
{
name = "sourceUnit",
init = "unit",
@@ -5535,6 +5513,37 @@ Private.event_prototypes = {
end,
reloadOptions = true
},
{
name = "includePets",
display = WeakAuras.newFeatureString .. L["Include Pets"],
type = "select",
values = "include_pets_types",
width = WeakAuras.normalWidth,
test = "true",
enable = function(trigger)
return trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
end
},
{
name = "ignoreSelf",
display = L["Ignore Self"],
type = "toggle",
width = WeakAuras.doubleWidth,
enable = function(trigger)
return trigger.unit == "nameplate" or trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
end,
init = "not UnitIsUnit(\"player\", unit)"
},
{
name = "onUpdateUnitTarget",
display = WeakAuras.newFeatureString .. L["Advanced Caster's Target Check"],
desc = L["Check nameplate's target every 0.2s"],
type = "toggle",
test = "true",
enable = function(trigger)
return trigger.unit == "nameplate"
end
},
{
name = "inverse",
display = L["Inverse"],