(cherry picked from commit 0b28c5780e55ac544c1acace487aad0a8d8faf28)
This commit is contained in:
NoM0Re
2026-01-13 00:47:51 -07:00
committed by andrew6180
parent 65ac8d1191
commit 05f060140a
36 changed files with 1367 additions and 99 deletions
+11 -4
View File
@@ -11,7 +11,7 @@ local ceil = ceil
-- WoW APIs
local GetTalentInfo = GetTalentInfo
local UnitClass = UnitClass
local GetSpellInfo, GetItemInfo, GetItemCount, GetItemIcon = GetSpellInfo, GetItemInfo, GetItemCount, GetItemIcon
local GetSpellInfo, GetItemInfo, GetItemIcon = GetSpellInfo, GetItemInfo, GetItemIcon
local GetShapeshiftFormInfo, GetShapeshiftForm = GetShapeshiftFormInfo, GetShapeshiftForm
local GetRuneCooldown, UnitCastingInfo, UnitChannelInfo = GetRuneCooldown, UnitCastingInfo, UnitChannelInfo
local UnitDetailedThreatSituation = UnitDetailedThreatSituation
@@ -85,6 +85,9 @@ function WeakAuras.UnitDetailedThreatSituation(unit1, unit2)
end
end
WeakAuras.UnitCastingInfo = UnitCastingInfo
WeakAuras.UnitChannelInfo = UnitChannelInfo
local constants = {
nameRealmFilterDesc = L[" Filter formats: 'Name', 'Name-Realm', '-Realm'. \n\nSupports multiple entries, separated by commas\nCan use \\ to escape -."],
instanceFilterDeprecated = L["This filter has been moved to the Location trigger. Change your aura to use the new Location trigger or join the WeakAuras Discord server for help."],
@@ -572,7 +575,7 @@ function WeakAuras.CheckTalentByIndex(index, extraOption)
else
-- Talent doesn't exist; ignore it
-- Should be cleared if missing, but struc doesn't exist yet
return true
return extraOption ~= 5
end
end
local result = rank and rank > 0
@@ -1108,7 +1111,7 @@ Private.load_prototype = {
display = L["Spell Known"],
type = "spell",
test = "WeakAuras.IsSpellKnownForLoad(%s, %s)",
events = {"SPELLS_CHANGED", "UNIT_PET"},
events = {"SPELLS_CHANGED", "UNIT_PET", "PLAYER_TALENT_UPDATE"},
showExactOption = true
},
{
@@ -8065,6 +8068,10 @@ Private.event_prototypes = {
if trigger.use_pvpflagged ~= nil or trigger.use_afk ~= nil then
tinsert(events, "PLAYER_FLAGS_CHANGED")
end
if trigger.use_pvpflagged ~= nil then
tinsert(events, "UNIT_FACTION")
tinsert(events, "ZONE_CHANGED")
end
if trigger.use_alive ~= nil then
tinsert(events, "PLAYER_DEAD")
tinsert(events, "PLAYER_ALIVE")
@@ -8160,7 +8167,7 @@ Private.event_prototypes = {
name = "pvpflagged",
display = L["PvP Flagged"],
type = "tristate",
init = "UnitIsPVP('player')",
init = "UnitIsPVP('player') or UnitIsPVPFreeForAll('player')",
},
{
name = "alive",