From d0ca3637c6d5bbe1e6e70b66d92a77e0bd680535 Mon Sep 17 00:00:00 2001
From: Bunny67 <zolov6767@gmail.com>
Date: Mon, 14 Sep 2020 12:50:19 +0300
Subject: [PATCH] update #31

---
 WeakAuras/GenericTrigger.lua |  2 +-
 WeakAuras/Types.lua          | 34 ++++++++++++----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index a70ac59..445d264 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -1578,7 +1578,7 @@ do
     Private.StopProfileSystem("generictrigger swing");
   end
 
-  local function swingTimerCheck(event, unit, guid, spell)
+  local function swingTimerCheck(event, unit, spell)
     if unit ~= "player" then return end
     Private.StartProfileSystem("generictrigger swing");
     if event == "UNIT_ATTACK_SPEED" then
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index cc6856f..af71dec 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -2506,15 +2506,19 @@ Private.weapon_enchant_types = {
   showOnMissing = L["Enchant Missing"],
   showAlways = L["Always"],
 }
-
-Private.reset_swing_spells = {}
+Private.reset_swing_spells = {
+  [GetSpellInfo(1464)] = true, -- Slam
+  [GetSpellInfo(78)] = true, -- Heroic Strike
+  [GetSpellInfo(845)] = true, -- Cleave
+  [GetSpellInfo(2973)] = true, -- Raptor Strike
+  [GetSpellInfo(6807)] = true, -- Maul
+  [GetSpellInfo(20549)] = true, -- War Stomp
+  [GetSpellInfo(56815)] = true, -- Rune Strike
+}
 Private.reset_ranged_swing_spells = {
-  [2480] = true, -- Shoot Bow
-  [7919] = true, -- Shoot Crossbow
-  [7918] = true, -- Shoot Gun
-  [2764] = true, -- Throw
-  [5019] = true, -- Shoot Wands
-  [75] = true, -- Auto Shot
+  [GetSpellInfo(2764)] = true, -- Throw
+  [GetSpellInfo(5019)] = true, -- Shoot Wands
+  [GetSpellInfo(75)] = true, -- Auto Shot
 }
 
 WeakAuras.StopMotion = {}
@@ -2541,20 +2545,6 @@ WeakAuras.StopMotion.animation_types = {
   progress = L["Progress"]
 }
 
-if WeakAuras.IsClassic() then
-  local reset_swing_spell_list = {
-    1464, 8820, 11604, 11605, -- Slam
-    78, 284, 285, 1608, 11564, 11565, 11566, 11567, 25286, -- Heroic Strike
-    845, 7369, 11608, 11609, 20569, -- Cleave
-    2973, 14260, 14261, 14262, 14263, 14264, 14265, 14266, -- Raptor Strike
-    6807, 6808, 6809, 8972, 9745, 9880, 9881, -- Maul
-    20549, -- War Stomp
-  }
-  for i, spellid in ipairs(reset_swing_spell_list) do
-    Private.reset_swing_spells[spellid] = true
-  end
-end
-
 Private.talent_types_specific = {}
 Private.talents_ids = {
   DEATHKNIGHT = {{48979,48997,49182,48978,49004,55107,48982,48987,49467,48985,49145,49015,48977,49006,49005,48988,53137,49027,49016,50365,62905,49018,55233,49189,55050,49023,61154,49028}, {49175,49455,49042,55061,49140,49226,50880,49039,51468,51123,49149,49137,49186,49471,49796,55610,49024,49188,50040,49203,50384,65661,54639,51271,49200,49143,50187,49202,49184}, {51745,48962,55129,49036,48963,49588,48965,49013,51459,49158,49146,49219,55620,49194,49220,49223,55666,49224,49208,52143,66799,51052,50391,63560,49032,49222,49217,51099,55090,50117,49206}},