5.19.6

WeakAuras/Prototypes.lua

@@ -1,5 +1,6 @@
 if not WeakAuras.IsLibsOK() then return end
-local AddonName, Private = ...
+local AddonName = ...
+local Private = select(2, ...)
 
 -- Lua APIs
 local tinsert, tsort = table.insert, table.sort
@@ -88,6 +89,7 @@ end
 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."],
+  guildFilterDesc = L["Supports multiple entries, separated by commas. Escape with \\. Prefix with '-' for negation."]
 }
 
 WeakAuras.UnitRaidRole = function(unit)
@@ -1007,6 +1009,13 @@ Private.load_prototype = {
       init = "arg",
       test = "true"
     },
+
+    {
+      name = "guild",
+      init = "arg",
+      enable = false,
+      hidden = true
+    },
     {
       name = "namerealm",
       display = L["Player Name/Realm"],
@@ -1025,6 +1034,16 @@ Private.load_prototype = {
       preamble = "local nameRealmIgnoreChecker = Private.ExecEnv.ParseNameCheck(%q)",
       desc = constants.nameRealmFilterDesc,
     },
+    {
+      name = "guildcheck",
+      display = L["Guild"],
+      type = "string",
+      multiline = true,
+      preamble = "local guildChecker = Private.ExecEnv.ParseStringCheck(%q)",
+      test = "guildChecker:Check(guild)",
+      desc = constants.guildFilterDesc,
+      events = {"GUILD_ROSTER_UPDATE"}
+    },
     {
       name = "class",
       display = L["Player Class"],
@@ -1292,8 +1311,9 @@ Private.load_prototype = {
       multiEntry = {
         operator = "or"
       },
-      test = "IsEquippedItem(GetItemInfo(%s))",
-      events = { "UNIT_INVENTORY_CHANGED", "PLAYER_EQUIPMENT_CHANGED"}
+      test = "Private.ExecEnv.IsEquippedItemForLoad(%s, %s)",
+      events = { "UNIT_INVENTORY_CHANGED", "PLAYER_EQUIPMENT_CHANGED"},
+      showExactOption = true
     },
     {
       name = "not_itemequiped",
@@ -1302,7 +1322,7 @@ Private.load_prototype = {
       multiEntry = {
         operator = "or"
       },
-      test = "not IsEquippedItem(GetItemInfo(%s))",
+      test = "not IsEquippedItem(GetItemInfo(%s) or '')",
       events = { "UNIT_INVENTORY_CHANGED", "PLAYER_EQUIPMENT_CHANGED"}
     },
   }