WA v4.0.0.

.luacheckrc

@@ -2356,13 +2356,13 @@ globals = {
 	"GetSpellAutocast",
 	"GetSpellBonusDamage",
 	"GetSpellBonusHealing",
+	"GetSpellBookItemName",
 	"GetSpellCooldown",
 	"GetSpellCount",
 	"GetSpellCritChance",
 	"GetSpellCritChanceFromIntellect",
 	"GetSpellInfo",
 	"GetSpellLink",
-	"GetSpellName",
 	"GetSpellNameColor",
 	"GetSpellPenetration",
 	"GetSpellTabInfo",

README.md

@@ -1,4 +1,4 @@
-# WeakAuras 2 WotLK (3.3.5a)
+# WeakAuras 3 Cata (4.3.4)
 
 WeakAuras is a powerful and flexible framework that allows the display of highly customizable graphics on World of Warcraft's user interface to indicate buffs, debuffs, and other relevant information. This addon was created to be a lightweight replacement for Power Auras but has since introduced more functionalities while remaining efficient and easy to use.
 

WeakAuras/GenericTrigger.lua

@@ -1481,7 +1481,7 @@ do
     WeakAuras.ScanEvents("SWING_TIMER_END");
   end
 
-  local function swingTimerCLEUCheck(ts, event, sourceGUID, _, _, destGUID, _, _, ...)
+  local function swingTimerCLEUCheck(ts, event, _, sourceGUID, _, _, _, destGUID, _, _, _, ...)
     Private.StartProfileSystem("generictrigger swing");
     if(sourceGUID == selfGUID) then
       if(event == "SWING_DAMAGE" or event == "SWING_MISSED") then
@@ -1808,6 +1808,9 @@ do
 
   local spellCds = CreateSpellCDHandler();
   local spellCdsRune = CreateSpellCDHandler();
+  local spellCdsOnlyCooldown = CreateSpellCDHandler();
+  local spellCdsOnlyCooldownRune = CreateSpellCDHandler();
+  local spellCdsCharges = CreateSpellCDHandler();
 
   local spellIds = {}
 
@@ -1863,9 +1866,17 @@ do
     end
   end
 
-  function WeakAuras.GetSpellCooldown(id, ignoreRuneCD, showgcd)
+  function WeakAuras.GetSpellCooldown(id, ignoreRuneCD, showgcd, track)
     local startTime, duration, gcdCooldown, readyTime
-    if (ignoreRuneCD) then
+    if track == "charges" then
+      startTime, duration, readyTime = spellCdsCharges:FetchSpellCooldown(id)
+    elseif track == "cooldown" then
+      if ignoreRuneCD then
+        startTime, duration, readyTime = spellCdsOnlyCooldownRune:FetchSpellCooldown(id)
+      else
+        startTime, duration, readyTime = spellCdsOnlyCooldown:FetchSpellCooldown(id)
+      end
+    elseif (ignoreRuneCD) then
       startTime, duration, readyTime = spellCdsRune:FetchSpellCooldown(id)
     else
       startTime, duration, readyTime = spellCds:FetchSpellCooldown(id)
@@ -2025,17 +2036,18 @@ do
     end
 
     -- Default to GetSpellCharges
-    local cooldownBecauseRune = false;
+    local unifiedCooldownBecauseRune, cooldownBecauseRune = false, false;
     if (enabled == 0) then
       startTimeCooldown, durationCooldown = 0, 0
     end
 
     local onNonGCDCD = durationCooldown and startTimeCooldown and durationCooldown > 0 and (durationCooldown ~= gcdDuration or startTimeCooldown ~= gcdStart);
     if (onNonGCDCD) then
       cooldownBecauseRune = runeDuration and durationCooldown and abs(durationCooldown - runeDuration) < 0.001;
+      unifiedCooldownBecauseRune = cooldownBecauseRune
     end
 
-    return startTimeCooldown, durationCooldown, cooldownBecauseRune, GetSpellCount(id);
+    return startTimeCooldown, durationCooldown, unifiedCooldownBecauseRune, cooldownBecauseRune, GetSpellCount(id);
   end
 
   function Private.CheckSpellKnown()
@@ -2051,7 +2063,7 @@ do
   end
 
   function Private.CheckSpellCooldown(id, runeDuration)
-    local startTimeCooldown, durationCooldown, cooldownBecauseRune, spellCount = WeakAuras.GetSpellCooldownUnified(id, runeDuration);
+    local startTimeCooldown, durationCooldown, unifiedCooldownBecauseRune, cooldownBecauseRune, spellCount = WeakAuras.GetSpellCooldownUnified(id, runeDuration);
 
     local time = GetTime();
     local remaining = startTimeCooldown + durationCooldown - time;
@@ -2067,10 +2079,14 @@ do
       chargesChanged = true
     end
 
-    local cdChanged, nowReady = spellCds:HandleSpell(id, startTimeCooldown, durationCooldown)
+    changed = spellCds:HandleSpell(id, startTimeCooldown, durationCooldown) or changed
+    if not unifiedCooldownBecauseRune then
+      changed = spellCdsRune:HandleSpell(id, startTimeCooldown, durationCooldown) or changed
+    end
+    local cdChanged, nowReady = spellCdsOnlyCooldown:HandleSpell(id, startTimeCooldown, durationCooldown)
     changed = cdChanged or changed
     if not cooldownBecauseRune then
-      changed = spellCdsRune:HandleSpell(id, startTimeCooldown, durationCooldown) or changed
+      changed = spellCdsOnlyCooldownRune:HandleSpell(id, startTimeCooldown, durationCooldown) or changed
     end
 
     if not WeakAuras.IsPaused() then
@@ -2276,12 +2292,16 @@ do
     spellIds[id] = id
     spellKnown[id] = WeakAuras.IsSpellKnownIncludingPet(id);
 
-    local startTimeCooldown, durationCooldown, cooldownBecauseRune, spellCount = WeakAuras.GetSpellCooldownUnified(id, GetRuneDuration());
+    local startTimeCooldown, durationCooldown, unifiedCooldownBecauseRune, cooldownBecauseRune, spellCount = WeakAuras.GetSpellCooldownUnified(id, GetRuneDuration());
     spellCounts[id] = spellCount
     spellCds:HandleSpell(id, startTimeCooldown, durationCooldown)
-    if not cooldownBecauseRune then
+    if not unifiedCooldownBecauseRune then
       spellCdsRune:HandleSpell(id, startTimeCooldown, durationCooldown)
     end
+    spellCdsOnlyCooldown:HandleSpell(id, startTimeCooldown, durationCooldown)
+    if not cooldownBecauseRune then
+      spellCdsOnlyCooldownRune:HandleSpell(id, startTimeCooldown, durationCooldown)
+    end
   end
 
   function WeakAuras.WatchItemCooldown(id)
@@ -2362,7 +2382,8 @@ function WeakAuras.WatchUnitChange(unit)
     watchUnitChange:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT");
     watchUnitChange:RegisterEvent("PARTY_MEMBERS_CHANGED");
     watchUnitChange:RegisterEvent("RAID_ROSTER_UPDATE");
-    watchUnitChange:RegisterEvent("PLAYER_ENTERING_WORLD")
+    watchUnitChange:RegisterEvent("PLAYER_ENTERING_WORLD");
+    watchUnitChange:RegisterEvent("PLAYER_ROLES_ASSIGNED");
 
     watchUnitChange:SetScript("OnEvent", function(self, event, unit)
       Private.StartProfileSystem("generictrigger unit change");
@@ -2377,6 +2398,12 @@ function WeakAuras.WatchUnitChange(unit)
           -- If in raid changed we send a UNIT_CHANGED for the group units
           if inRaid ~= watchUnitChange.inRaid then
             WeakAuras.ScanEvents("UNIT_CHANGED_" .. unit, unit)
+          else
+            local newRole = UnitGroupRolesAssigned(unit)
+            if watchUnitChange.unitRoles[unit] ~= newRole then
+              watchUnitChange.unitRoles[unit] = newRole
+              WeakAuras.ScanEvents("UNIT_ROLE_CHANGED_" .. unit, unit)
+            end
           end
         end
       end
@@ -2406,11 +2433,11 @@ function WeakAuras.GetEquipmentSetInfo(itemSetName, partial)
       if (name ~= nil) then
         equipmentSetItemIDs = GetEquipmentSetItemIDs(name, equipmentSetItemIDs)
         for slot, item in ipairs(equipmentSetItemIDs) do
-          if item > 0 then
+          if item > 1 then
             numItems = numItems + 1
-			if equipmentItemIDs[slot] == item then
-			  numEquipped = numEquipped + 1
-			end
+            if equipmentItemIDs[slot] == item then
+              numEquipped = numEquipped + 1
+            end
           end
         end
         local match = (not partial and numItems == numEquipped)
@@ -2873,12 +2900,16 @@ end
 do
   local mh = GetInventorySlotInfo("MainHandSlot")
   local oh = GetInventorySlotInfo("SecondaryHandSlot")
+  local th = GetInventorySlotInfo("RangedSlot")
 
   local mh_name, mh_shortenedName, mh_exp, mh_dur, mh_charges;
-  local mh_icon = GetInventoryItemTexture("player", mh);
+  local mh_icon = GetInventoryItemTexture("player", mh) or "Interface\\Icons\\INV_Misc_QuestionMark"
 
   local oh_name, oh_shortenedName, oh_exp, oh_dur, oh_charges;
-  local oh_icon = GetInventoryItemTexture("player", oh);
+  local oh_icon = GetInventoryItemTexture("player", oh) or "Interface\\Icons\\INV_Misc_QuestionMark"
+
+  local th_name, th_shortenedName, th_exp, th_dur, th_charges;
+  local th_icon = GetInventoryItemTexture("player", th) or "Interface\\Icons\\INV_Misc_QuestionMark"
 
   local tenchFrame = nil
   WeakAuras.frames["Temporary Enchant Handler"] = tenchFrame;
@@ -2911,11 +2942,12 @@ do
 
       local function tenchUpdate()
         Private.StartProfileSystem("generictrigger");
-        local _, mh_rem, oh_rem
-        _, mh_rem, mh_charges, _, oh_rem, oh_charges = GetWeaponEnchantInfo();
+        local mh_rem, oh_rem, th_rem
+        _, mh_rem, mh_charges, _, oh_rem, oh_charges, _, th_rem, th_charges = GetWeaponEnchantInfo();
         local time = GetTime();
         local mh_exp_new = mh_rem and (time + (mh_rem / 1000));
         local oh_exp_new = oh_rem and (time + (oh_rem / 1000));
+        local th_exp_new = th_rem and (time + (th_rem / 1000));
         if(math.abs((mh_exp or 0) - (mh_exp_new or 0)) > 1) then
           mh_exp = mh_exp_new;
           mh_dur = mh_rem and mh_rem / 1000;
@@ -2936,6 +2968,16 @@ do
           end
           oh_icon = GetInventoryItemTexture("player", oh)
         end
+        if(math.abs((th_exp or 0) - (th_exp_new or 0)) > 1) then
+          th_exp = th_exp_new;
+          th_dur = th_rem and th_rem / 1000;
+          if th_exp then
+            th_name, th_shortenedName = getTenchName(th)
+          else
+            th_name, th_shortenedName = "None", "None"
+          end
+          th_icon = GetInventoryItemTexture("player", th)
+        end
         WeakAuras.ScanEvents("TENCH_UPDATE");
         Private.StopProfileSystem("generictrigger");
       end
@@ -2959,6 +3001,16 @@ do
   function WeakAuras.GetOHTenchInfo()
     return oh_exp, oh_dur, oh_name, oh_shortenedName, oh_icon, oh_charges;
   end
+
+  function WeakAuras.GetTHTenchInfo()
+    return th_exp, th_dur, th_name, th_shortenedName, th_icon, th_charges;
+  end
+end
+
+WeakAuras.GetItemSubClassInfo = function(i)
+  local subClassId = i % 256
+  local classId = (i - subClassId) / 256
+  return select(subClassId, GetAuctionItemSubClasses(classId))
 end
 
 -- Pets
@@ -3091,7 +3143,7 @@ do
   local function findNewPlate(...)
     for i = lastChildern + 1, numChildren do
       local frame = select(i, ...)
-      local region, _, _, _, _, _, nameText = frame:GetRegions()
+      local region, _, _, nameText = frame:GetRegions()
       if (frame.UnitFrame or (region and region:GetObjectType() == "Texture" and region:GetTexture() == OVERLAY)) and not nameplateList[frame] then
         frame.nameText = nameText
         frame:HookScript("OnShow", nameplateShow)