Smallpatches

WeakAuras/BuffTrigger2.lua

@@ -142,6 +142,13 @@ local function UnitIsVisibleFixed(unit)
   return unitVisible[unit]
 end
 
+local function UnitInRangeFixed(unit)
+  local inRange, checked = UnitInRange(unit)
+  return inRange or not checked
+end
+
+Private.ExecEnv.UnitInRangeFixed = UnitInRangeFixed
+
 local function UnitInSubgroupOrPlayer(unit, includePets)
   if includePets == nil then
     return UnitInSubgroup(unit) or UnitIsUnit("player", unit)
@@ -1308,6 +1315,8 @@ local function MaxUnitCount(triggerInfo)
   end
 end
 
+
+
 local function TriggerInfoApplies(triggerInfo, unit)
   local controllingUnit = unit
   if WeakAuras.UnitIsPet(unit) then
@@ -1392,15 +1401,15 @@ local function TriggerInfoApplies(triggerInfo, unit)
     return false
   end
 
-  if triggerInfo.npcId and select(6, strsplit('-', UnitGUID(unit) or '')) ~= triggerInfo.npcId then
+  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
 
-  if triggerInfo.inRange and not UnitInRange(unit) then
+  if triggerInfo.inRange and not UnitInRangeFixed(unit) then
     return false
   end
 
@@ -3143,7 +3152,7 @@ function BuffTrigger.Add(data)
       local effectiveIgnoreDisconnected = groupTrigger and trigger.ignoreDisconnected
       local effectiveIgnoreInvisible = groupTrigger and trigger.ignoreInvisible
       local effectiveNameCheck = groupTrigger and trigger.useUnitName and trigger.unitName
-      local effectiveNpcId = trigger.unit == "nameplate" and trigger.useNpcId and trigger.npcId
+      local effectiveNpcId = trigger.unit == "nameplate" and trigger.useNpcId and Private.ExecEnv.ParseStringCheck(trigger.npcId)
       local effectiveInRange = WeakAuras.IsRetail() and groupTrigger and trigger.inRange
 
       if trigger.unit == "multi" then

WeakAuras/Prototypes.lua

@@ -2258,7 +2258,7 @@ Private.event_prototypes = {
         enable = function(trigger)
           return WeakAuras.IsRetail() and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")
         end,
-        init = "UnitInRange(unit)"
+        init = "Private.ExecEnv.UnitInRangeFixed(unit)"
       },
       {
         name = "hostility",
@@ -3058,7 +3058,7 @@ Private.event_prototypes = {
         enable = function(trigger)
           return WeakAuras.IsRetail() and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")
         end,
-        init = "UnitInRange(unit)"
+        init = "Private.ExecEnv.UnitInRangeFixed(unit)"
       },
       {
         name = "nameplateType",
@@ -3617,7 +3617,7 @@ Private.event_prototypes = {
         enable = function(trigger)
           return WeakAuras.IsRetail() and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")
         end,
-        init = "UnitInRange(unit)"
+        init = "Private.ExecEnv.UnitInRangeFixed(unit)"
       },
       {
         name = "nameplateType",
@@ -3925,7 +3925,7 @@ Private.event_prototypes = {
         enable = function(trigger)
           return WeakAuras.IsRetail() and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")
         end,
-        init = "UnitInRange(unit)"
+        init = "Private.ExecEnv.UnitInRangeFixed(unit)"
       },
       {
         name = "nameplateType",

WeakAuras/RegionTypes/Model.lua

@@ -162,7 +162,7 @@ local function ConfigureModel(region, model, data)
       Private.StartProfileSystem("model");
       if (event ~= "UNIT_MODEL_CHANGED" or UnitIsUnit(unitId, unit)) then
         WeakAuras.SetModel(model, data.model_path, data.model_fileId, data.modelIsUnit, data.modelDisplayInfo)
-        if(data.advance and model:HasAnimation(data.sequence)) then
+        if data.advance then
           model:SetAnimation(data.sequence)
         else
           model:SetAnimation(0)
@@ -181,7 +181,7 @@ local function ConfigureModel(region, model, data)
   end
 
   -- Enable model animation
-  if(data.advance and model:HasAnimation(data.sequence)) then
+  if data.advance then
     model:SetAnimation(data.sequence)
   else
     model:SetAnimation(0)

WeakAurasOptions/BuffTrigger2.lua

@@ -1000,9 +1000,9 @@ local function GetBuffTriggerOptions(data, triggernum)
       type = "input",
       width = WeakAuras.normalWidth,
       name = L["Npc ID"],
-      validate = ValidateNumeric,
       hidden = function() return not (trigger.type == "aura2" and trigger.unit == "nameplate" and trigger.useNpcId) end,
-      order = 69.32
+      order = 69.32,
+      desc = L["Supports multiple entries, separated by commas"]
     },
     npcIdSpace = {
       type = "description",

WeakAurasOptions/OptionsFrames/IconPicker.lua

@@ -32,18 +32,6 @@ local function ConstructIconPicker(frame)
   local function iconPickerFill(subname, doSort)
     scroll:ReleaseChildren();
 
-    -- Work around special numbers such as inf and nan
-    if (tonumber(subname)) then
-      local spellId = tonumber(subname);
-      if (abs(spellId) < math.huge and tostring(spellId) ~= "nan") then
-        subname = GetSpellInfo(spellId)
-      end
-    end
-
-    if subname then
-      subname = subname:lower();
-    end
-
     local usedIcons = {};
     local AddButton = function(name, icon)
       local button = AceGUI:Create("WeakAurasIconButton");
@@ -57,6 +45,24 @@ local function ConstructIconPicker(frame)
       usedIcons[icon] = true;
     end
 
+    -- Work around special numbers such as inf and nan
+    if (tonumber(subname)) then
+      local spellId = tonumber(subname);
+      if (abs(spellId) < math.huge and tostring(spellId) ~= "nan") then
+        local name, _, icon = GetSpellInfo(spellId)
+        if name then
+          AddButton(name, icon)
+        end
+        return;
+      end
+    end
+
+    if subname then
+      subname = subname:lower();
+    end
+
+
+
     local num = 0;
     if(subname and subname ~= "") then
       for name, icons in pairs(spellCache.Get()) do