From 032c194ca4f743de031d75b93f5473a7a1b5c55b Mon Sep 17 00:00:00 2001
From: Bunny67 <zolov6767@gmail.com>
Date: Thu, 4 Jun 2020 19:54:06 +0300
Subject: [PATCH] update

---
 WeakAuras/GenericTrigger.lua | 20 +++++---------------
 WeakAuras/Prototypes.lua     | 12 +++++++++---
 WeakAuras/Types.lua          |  1 -
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 6f52874..580841d 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -1548,7 +1548,7 @@ end
 do
   local mh = GetInventorySlotInfo("MainHandSlot")
   local oh = GetInventorySlotInfo("SecondaryHandSlot")
-  local ranged = WeakAuras.IsClassic() and GetInventorySlotInfo("RangedSlot")
+  local ranged = GetInventorySlotInfo("RangedSlot")
 
   local swingTimerFrame;
   local lastSwingMain, lastSwingOff, lastSwingRange;
@@ -1564,8 +1564,6 @@ do
       local name, _, _, _, _, _, _, _, _, icon = GetItemInfo(itemId or 0);
       if(lastSwingMain) then
         return swingDurationMain, lastSwingMain + swingDurationMain - mainSwingOffset, name, icon;
-      elseif not WeakAuras.IsClassic() and lastSwingRange then
-        return swingDurationRange, lastSwingRange + swingDurationRange, name, icon;
       else
         return 0, math.huge, name, icon;
       end
@@ -1611,14 +1609,14 @@ do
         local currentTime = GetTime();
         mainSpeed, offSpeed = UnitAttackSpeed("player");
         offSpeed = offSpeed or 0;
-        if not(isOffHand) then
+        if not(lastSwingMain) then
           lastSwingMain = currentTime;
           swingDurationMain = mainSpeed;
           mainSwingOffset = 0;
           event = "SWING_TIMER_START";
           timer:CancelTimer(mainTimer);
           mainTimer = timer:ScheduleTimerFixed(swingEnd, mainSpeed, "main");
-        elseif(isOffHand) then
+        elseif(OffhandHasWeapon() and not lastSwingOff) then
           lastSwingOff = currentTime;
           swingDurationOff = offSpeed;
           event = "SWING_TIMER_START";
@@ -1698,22 +1696,14 @@ do
         local currentTime = GetTime();
         local speed = UnitRangedDamage("player");
         if(lastSwingRange) then
-          if WeakAuras.IsClassic() then
-            timer:CancelTimer(rangeTimer, true)
-          else
-            timer:CancelTimer(mainTimer, true)
-          end
+          timer:CancelTimer(rangeTimer, true)
           event = "SWING_TIMER_CHANGE";
         else
           event = "SWING_TIMER_START";
         end
         lastSwingRange = currentTime;
         swingDurationRange = speed;
-        if WeakAuras.IsClassic() then
-          rangeTimer = timer:ScheduleTimerFixed(swingEnd, speed, "ranged");
-        else
-          mainTimer = timer:ScheduleTimerFixed(swingEnd, speed, "main");
-        end
+        rangeTimer = timer:ScheduleTimerFixed(swingEnd, speed, "ranged");
         WeakAuras.ScanEvents(event);
       end
     elseif event == "UNIT_SPELLCAST_START" then
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 1272684..95646e7 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -3574,9 +3574,10 @@ WeakAuras.event_prototypes = {
         "SPELL_UPDATE_USABLE",
         "PLAYER_TARGET_CHANGED",
         "RUNE_POWER_UPDATE",
+        "RUNE_TYPE_UPDATE",
       },
       ["unit_events"] = {
-        ["player"] = { "UNIT_POWER_FREQUENT" }
+        ["player"] = { "UNIT_POWER", "UNIT_ENERGY", "UNIT_MANA", "UNIT_RAGE" }
       }
     },
     internal_events = {
@@ -3608,6 +3609,8 @@ WeakAuras.event_prototypes = {
       local ret = [=[
         local spellName = %s
         local startTime, duration = WeakAuras.GetSpellCooldown(spellName);
+        startTime = startTime or 0
+        duration = duration or 0
         local ready = startTime == 0
         local active = IsUsableSpell(spellName) and ready
       ]=]
@@ -3629,9 +3632,8 @@ WeakAuras.event_prototypes = {
         name = "spellName",
         display = L["Spell"],
         required = true,
-        type = "spell",
+        type = "string",
         test = "true",
-        showExactOption = true,
         store = true
       },
       -- This parameter uses the IsSpellInRange API function, but it does not check spell range at all
@@ -5660,6 +5662,10 @@ WeakAuras.event_prototypes = {
 
 };
 
+WeakAuras.event_prototypes["DBM Announce"] = nil
+WeakAuras.event_prototypes["DBM Timer"] = nil
+WeakAuras.event_prototypes["BigWigs Message"] = nil
+WeakAuras.event_prototypes["BigWigs Timer"] = nil
 WeakAuras.event_prototypes["Item Set"] = nil
 WeakAuras.event_prototypes["Equipment Set"] = nil
 
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index 7c58ae6..ef040e0 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -458,7 +458,6 @@ WeakAuras.power_types = {
   [2] = FOCUS,
   [3] = ENERGY,
   [4] = HAPPINESS,
-  [5] = RUNES,
   [6] = RUNIC_POWER,
 }