diff --git a/.vscode/settings.json b/.vscode/settings.json
index 18d9bca..022c66c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -31,6 +31,21 @@
"ChatFontNormal",
"OKAY",
"NOT_BOUND",
- "UnitAura"
+ "ReloadUI"
+ ],
+ "Lua.runtime.version": "Lua 5.1",
+ "Lua.runtime.builtin": {
+ "basic": "disable",
+ "debug": "disable",
+ "io": "disable",
+ "math": "disable",
+ "os": "disable",
+ "package": "disable",
+ "string": "disable",
+ "table": "disable",
+ "utf8": "disable"
+ },
+ "Lua.workspace.library": [
+ "~\\.vscode\\extensions\\ketho.wow-api-0.17.6\\Annotations"
]
}
\ No newline at end of file
diff --git a/Config.lua b/Config.lua
index 99288b6..4967ce1 100644
--- a/Config.lua
+++ b/Config.lua
@@ -25,6 +25,8 @@ local drCategories = {
["Disorient"] = "Disorients",
["Silence"] = "Silences",
["Root"] = "Roots",
+ ["Knock"] = "Knocks",
+ ["Disarm"] = "Disarms",
}
local drIcons = {
@@ -33,6 +35,8 @@ local drIcons = {
Disorient = 136183,
Silence = 458230,
Root = 136100,
+ Knock = 237589,
+ Disarm = 132343,
}
@@ -567,6 +571,8 @@ function sArenaMixin:UpdateDRSettings(db, info, val)
"Disorient",
"Silence",
"Root",
+ "Knock",
+ "Disarm",
}
if ( val ) then
@@ -639,7 +645,7 @@ function sArenaMixin:UpdateRacialSettings(db, info, val)
end
local function setDRIcons()
- local drIconsOrder = {"Stun", "Incapacitate", "Disorient", "Silence", "Root"}
+ local drIconsOrder = {"Stun", "Incapacitate", "Disorient", "Silence", "Root", "Knock", "Disarm"}
local inputs = {
drIconsTitle = {
order = 1,
diff --git a/Modules/Auras.lua b/Modules/Auras.lua
index 9cd10be..cc15821 100644
--- a/Modules/Auras.lua
+++ b/Modules/Auras.lua
@@ -24,6 +24,7 @@ sArenaMixin.auraList = tInvert({
-- Higher up = higher priority
-- CCs
+ 33786, -- Cyclone (Disorient)
5211, -- Mighty Bash (Stun)
108194, -- Asphyxiate (Unholy) (Stun)
221562, -- Asphyxiate (Blood) (Stun)
@@ -43,6 +44,7 @@ sArenaMixin.auraList = tInvert({
30283, -- Shadowfury (Stun)
24394, -- Intimidation (Stun)
117526, -- Binding Shot (Stun)
+ 117405, -- Binding Shot
357021, -- Consecutive Concussion (Stun)
211881, -- Fel Eruption (Stun)
91800, -- Gnaw (Stun)
@@ -70,7 +72,6 @@ sArenaMixin.auraList = tInvert({
372245, -- Terror of the Skies (stun)
389831, -- Snowdrift (Stun)
- 33786, -- Cyclone (Disorient)
5246, -- Intimidating Shout (Disorient)
316593, -- Intimidating Shout (Menace Main Target) (Disorient)
316595, -- Intimidating Shout (Menace Other Targets) (Disorient)
@@ -89,6 +90,7 @@ sArenaMixin.auraList = tInvert({
10326, -- Turn Evil (Disorient)
6358, -- Seduction (Disorient)
261589, -- Seduction 2 (Disorient)
+ 5484, -- Howl (Disorient)
115268, -- Mesmerize (Shivarra) (Disorient)
87204, -- Sin and Punishment (Disorient)
2637, -- Hibernate (Disorient)
@@ -97,6 +99,7 @@ sArenaMixin.auraList = tInvert({
331866, -- Agent of Chaos (Disorient)
324263, -- Sulfuric Emission (Disorient)
360806, -- Sleep Walk (Disorient)
+ 358861, -- Void Volley
51514, -- Hex (Incapacitate)
211004, -- Hex: Spider (Incapacitate)
@@ -143,11 +146,14 @@ sArenaMixin.auraList = tInvert({
6789, -- Mortal Coil (Incapacitate)
-- Immunities
+ 378441, -- Time Stop
+ 354610, -- Demon Hunter: Glimpse
642, -- Divine Shield
186265, -- Aspect of the Turtle
45438, -- Ice Block
196555, -- Demon Hunter: Netherwalk
47585, -- Priest: Dispersion
+ 377362, -- Precog
1022, -- Blessing of Protection
204018, -- Blessing of Spellwarding
323524, -- Ultimate Form
@@ -158,7 +164,20 @@ sArenaMixin.auraList = tInvert({
8178, -- Grounding Totem Effect
199448, -- Blessing of Sacrifice
236321, -- War Banner
- 378441, -- Time Stop
+ 215769, -- Spirit of Redemption
+ 5277, -- Rogue: Evasion
+ 227847, -- Warrior: Bladestorm (Arms)
+ 118038, -- Warrior: Die by the Sword
+ 357210, -- Deep Breath
+ 359816, -- Dream Flight
+ 408557, -- Phase Shift
+ 408558, -- Phase Shift
+ 362486, -- Keeper of the Grove
+ 116849, -- Monk: Life Cocoon
+ 212800, -- Demon Hunter: Blur
+ 147833, -- Friendly Intervene
+ 48792, -- Death Knight: Icebound Fortitude
+ 409293, -- Burrow
-- Interrupts
1766, -- Kick (Rogue)
@@ -191,6 +210,9 @@ sArenaMixin.auraList = tInvert({
5384, -- Hunter: Feign Death
353319, -- Monk: Peaceweaver
378464, -- Evoker: Nullifying Shroud
+ 31821, -- Aura Mastery
+ 206803, -- Rain from Above
+
-- Silences
81261, -- Solar Beam
@@ -206,6 +228,7 @@ sArenaMixin.auraList = tInvert({
43523, -- Unstable Affliction Silence 1
196364, -- Unstable Affliction Silence 2
317589, -- Tormenting Backlash
+ 410065, -- Reactive Resin
375901, -- Mindgames
-- Disarms
@@ -216,12 +239,25 @@ sArenaMixin.auraList = tInvert({
233759, -- Grapple Weapon
207777, -- Dismantle
+ -- Offensive Debuffs
+ 383005, -- Chrono Loop
+ 372048, -- Opressing Roar
+ 356723, -- Scorpid Venom
+
-- Roots
+ 376080, -- Spear
+ 105771, -- Charge
+ 356356, -- Warbringer
+ 324382, -- Clash
+ 114404, -- Void Tendril's
+ 356738, -- Earth Unleashed
+ 288515, -- Surge of Power
339, -- Entangling Roots
170855, -- Entangling Roots (Nature's Grasp)
201589, -- Entangling Roots (Tree of Life)
235963, -- Entangling Roots (Feral honor talent)
122, -- Frost Nova
+ 386770, -- Freezing Cold
102359, -- Mass Entanglement
64695, -- Earthgrab
200108, -- Ranger's Net
@@ -238,20 +274,25 @@ sArenaMixin.auraList = tInvert({
53148, -- Charge (Hunter Pet)
190927, -- Harpoon
136634, -- Narrow Escape (unused?)
+ 157997, -- Ice Nova
378760, -- Frostbite
233395, -- Deathchill (Remorseless Winter)
204085, -- Deathchill (Chains of Ice)
241887, -- Landslide
+ 355689, -- Landslide
+ 393456, -- Entrapment
-- Offensive Buffs
51271, -- Death Knight: Pillar of Frost
-- 47568, -- Death Knight: Empower Rune Weapon
207289, -- Death Knight: Unholy Assault
+ 212800, -- Demon Hunter: Blur
162264, -- Demon Hunter: Metamorphosis
194223, -- Druid: Celestial Alignment
383410, -- Druid: Celestial Alignment (Orbital Strike)
102560, -- Druid: Incarnation: Chosen of Elune
390414, -- Druid: Incarnation: Chosen of Elune (Orbital Strike)
+ 5217, -- Tiger's Fury
102543, -- Druid: Incarnation: King of the Jungle
19574, -- Hunter: Bestial Wrath
266779, -- Hunter: Coordinated Assault
@@ -261,16 +302,21 @@ sArenaMixin.auraList = tInvert({
190319, -- Mage: Combustion
324220, -- Mage: Deathborne
198144, -- Mage: Ice Form
- -- 12472, -- Mage: Icy Veins
+ 12472, -- Mage: Icy Veins
80353, -- Mage: Time Warp
152173, -- Monk: Serenity
137639, -- Monk: Storm, Earth, and Fire
31884, -- Paladin: Avenging Wrath (Retribution)
152262, -- Paladin: Seraphim
231895, -- Paladin: Crusade
+ 185313, -- Rogue: Shadow Dance
+ 185422, -- Rogue: Shadow Dance
+ 457333, -- Death's Arrival
197871, -- Priest: Dark Archangel
- -- 10060, -- Priest: Power Infusion
+ 10060, -- Priest: Power Infusion
194249, -- Priest: Voidform
+
+ 384631, -- Rogue: Flagellation
13750, -- Rogue: Adrenaline Rush
121471, -- Rogue: Shadow Blades
114050, -- Shaman: Ascendance (Elemental)
@@ -283,38 +329,53 @@ sArenaMixin.auraList = tInvert({
204366, -- Shaman: Thundercharge
113858, -- Warlock: Dark Soul: Instability
113860, -- Warlock: Dark Soul: Misery
+ 399680, -- Soul Swap
+ 442726, -- Malevolence
+ 328774, -- Amp Curse
+
+
107574, -- Warrior: Avatar
227847, -- Warrior: Bladestorm (Arms)
-- 260708, -- Warrior: Sweeping Strikes
262228, -- Warrior: Deadly Calm
1719, -- Warrior: Recklessness
375087, -- Evoker: Dragonrage
- 370553, -- Evoker: Tip the Scales
+ 370553, -- Evoker: Tip the Scales
+ 375087, -- Evoker: Dragonrage
+
-- Defensive Buffs
- 48792, -- Death Knight: Icebound Fortitude
+
+ 232707, -- Priest: Ray of Hope
+ 232708, -- Ray of Hope
49039, -- Death Knight: Lichborne
145629, -- Death Knight: Anti-Magic Zone
81256, -- Death Knight: Dancing Rune Weapon
55233, -- Death Knight: Vampiric Blood
- 212800, -- Demon Hunter: Blur
+
188499, -- Demon Hunter: Blade Dance
209426, -- Demon Hunter: Darkness
- 354610, -- Demon Hunter: Glimpse
+
+ 132158, -- Duid: NS
+ 22842, -- Frenzied Regen
102342, -- Druid: Ironbark
22812, -- Druid: Barkskin
61336, -- Druid: Survival Instincts
117679, -- Druid: Incarnation: Tree of Life
236696, -- Druid: Thorns
305497, -- Druid: Thorns
+ 29166, -- Innervate
53480, -- Hunter: Roar of Sacrifice
+ 202748, -- Survival Tactics
+ 113862, -- Greater invis
198111, -- Mage: Temporal Shield
342246, -- Mage: Alter Time (Arcane)
110909, -- Mage: Alter Time (Fire, Frost)
125174, -- Monk: Touch of Karma
- 116849, -- Monk: Life Cocoon
+ 209584, -- Zen Focus Tea
120954, -- Monk: Fortifying Brew
122783, -- Monk: Diffuse Magic
+ 122278, -- Dampen Harm
228050, -- Paladin: Guardian of the Forgotten Queen
86659, -- Paladin: Guardian of Ancient Kings
210256, -- Paladin: Blessing of Sanctuary
@@ -326,9 +387,10 @@ sArenaMixin.auraList = tInvert({
31842, -- Paladin: Avenging Wrath (Holy)
205191, -- Paladin: Eye for an Eye
498, -- Paladin: Divine Protection
+ 289655, -- Sanctified Ground
47788, -- Priest: Guardian Spirit
33206, -- Priest: Pain Suppression
- 232707, -- Priest: Ray of Hope
+
81782, -- Priest: Power Word: Barrier
15286, -- Priest: Vampiric Embrace
19236, -- Priest: Desperate Prayer
@@ -336,40 +398,105 @@ sArenaMixin.auraList = tInvert({
47536, -- Priest: Rapture
271466, -- Priest: Luminous Barrier
207736, -- Rogue: Shadowy Duel
- 5277, -- Rogue: Evasion
+
199754, -- Rogue: Riposte
+ 378081, -- Shaman: NS
108271, -- Shaman: Astral Shift
114052, -- Shaman: Ascendance (Restoration)
+ 108281, -- Ancestral Guidance
104773, -- Warlock: Unending Resolve
108416, -- Warlock: Dark Pact
- 118038, -- Warrior: Die by the Sword
+
12975, -- Warrior: Last Stand
871, -- Warrior: Shield Wall
213871, -- Warrior: Bodyguard
+ 184364, -- Enraged Regeneration
345231, -- Trinket: Gladiator's Emblem
197690, -- Warrior: Defensive Stance
+ 370960, -- Evoker: Emerald Communion
+ 363916, -- Evoker: Obsidian Scales
+ 406789, -- Paradox 1
+ 406732, -- Paradox 2
374348, -- Evoker: Renewing Blaze
- 370960, -- Evoker: Emerald Communion
- 363916, -- Evoker: Obsidian Scales
357170, -- Evoker: Time Dilation
+ 201633, -- Earthen Wall
+ 234084, -- Moon and Stars
+ 281195, -- Survival of the Fittest
-- Refreshments
167152, -- Mage Food
274914, -- Rockskip Mineral Water
+ 396920, -- Delicious Dragon Spittle
+ 369162, -- drink
+
-- Miscellaneous
199450, -- Ultimate Sacrifice
+ 172865, -- Stone Bulwark
320224, -- Podtender
327140, -- Forgeborne
188501, -- Spectral Sight
305395, -- Blessing of Freedom (Unbound Freedom)
1044, -- Blessing of Freedom
+ 54216, -- Master's Call
41425, -- Hypothermia
66, -- Invisibility fade effect
96243, -- Invisibility invis effect?
110960, -- Greater Invisibility
198158, -- Mass Invisibility
-
+ 390612, -- Frost Bomb
+ 205021, -- Ray of Frost
+ 235450, -- Prismatic Barrier
+ 127797, -- Vortex
+ 342242, -- Time Warp
+
+ -- Mobility
+ 384100, -- Berserker Shout
+ 48265, -- Death Advance
+ 1850, -- Dash
+ 106898, -- Stampeding Roar
+ 77761, -- Stampeding Roar
+ 2983, -- Sprint
+ 358267, -- Hover
+ 202163, -- Bounding Stride
+ 190784, -- Divine Steed
+ 393897, -- Tireless Pursuit
+ 319454, -- hotw
+ 109215, -- Posthaste
+ 446044, -- Relentless Pursuit
+ 202164, -- Heroic Leap speed buff
+
+
+ -- Misc 2
+ 212431, -- Explosive Shot
+ 382440, -- Shifting Power
+ 394087, -- Mayhem
+ 431177, -- Frostfire Empowerement
+ 455679, -- Embral Lattice
+ 333889, -- Fel Dom
+ 383269, -- Abo Limb
+ 114108, -- Soul of the Forest
+ 20594, -- Stone Form
+ 393903, -- Ursine Vigor
+ 263165, -- void torrent
+ 199845, -- Psyfiend
+ 210824, -- Touch of the Magi
+ 319504, -- Shiv
+ 410598, -- Soul Rip
+ 329543, -- Divine Ascension
+ 214621, -- Schism
+ 236273, -- Duel
+ 77606, -- Dark Sim
+ 12323, -- Piercing Howl
+ 274838, -- Feral Frenzy
+ 80240, -- Havoc
+ 25771, -- Forbearance
+ 391528, -- Convoke
+ 51690, -- Killing Spree
+ 200183, -- Apotheosis
+ 212552, -- Wraith Walk
+ 256948, -- Spatial Rift
+ 208963, -- Totem of Wrath
322459, -- Thoughtstolen (Shaman)
322464, -- Thoughtstolen (Mage)
322442, -- Thoughtstolen (Druid)
@@ -380,9 +507,13 @@ sArenaMixin.auraList = tInvert({
322458, -- Thoughtstolen (Monk)
394902, -- Thoughtstolen (Evoker)
322460, -- Thoughtstolen (Priest - Shadow)
+ 389714, -- Displacement beacon
+ 394112, -- Escape from Reality
+ 345231, -- BM
-- Druid Forms
768, -- Cat form
783, -- Travel form
5487, -- Bear form
+ 197625, -- Moonkin Form
})
diff --git a/Modules/DiminishingReturns.lua b/Modules/DiminishingReturns.lua
index ab4ea4e..1216d17 100644
--- a/Modules/DiminishingReturns.lua
+++ b/Modules/DiminishingReturns.lua
@@ -4,6 +4,8 @@ sArenaMixin.drCategories = {
"Disorient",
"Silence",
"Root",
+ "Knock",
+ "Disarm",
}
sArenaMixin.defaultSettings.profile.drCategories = {
@@ -12,6 +14,8 @@ sArenaMixin.defaultSettings.profile.drCategories = {
Disorient = true,
Silence = true,
Root = true,
+ Knock = true,
+ Disarm = true,
}
sArenaMixin.defaultSettings.profile.drDynamicIcons = false
@@ -30,6 +34,8 @@ sArenaMixin.defaultSettings.profile.drIcons = {
Disorient = 136183,
Silence = 458230,
Root = 136100,
+ Knock = 237589,
+ Disarm = 132343,
}
local GetTime = GetTime
@@ -115,7 +121,7 @@ function sArenaFrameMixin:ResetDR()
end
drList = {
- [207167] = "Disorient", -- Blinding Sleet
+ [207167] = "Disorient", -- Blinding Sleet
[207685] = "Disorient", -- Sigil of Misery
[33786] = "Disorient", -- Cyclone
[209753] = "Disorient", -- Cyclone (Honor talent)
@@ -129,6 +135,7 @@ drList = {
[2094] = "Disorient", -- Blind
[118699] = "Disorient", -- Fear
[130616] = "Disorient", -- Fear (Warlock Horrify talent)
+ [5484] = "Disorient", -- Howl of Terror
[6358] = "Disorient", -- Seduction (Succubus)
[115268] = "Disorient", -- Mesmerize (Shivarra)
[5246] = "Disorient", -- Intimidating Shout
@@ -261,11 +268,20 @@ drList = {
[285515] = "Root", -- Surge of Power (Frost Shock Root)
[241887] = "Root", -- Landslide
- --[[
[207777] = "Disarm", -- Dismantle
[233759] = "Disarm", -- Grapple Weapon
[236077] = "Disarm", -- Disarm
[236236] = "Disarm", -- Disarm (Prot)
[209749] = "Disarm", -- Faerie Swarm (Balance)
- ]]
+ [407032] = "Disarm", -- Sticky Tar Bomb
+ [407031] = "Disarm", -- Sticky Tar Bomb
+
+ [51490] = "Knock", -- Thunderstorm
+-- [102793] = "Knock", -- Vortex
+ [116844] = "Knock", -- Ring of Peace
+ [132469] = "Knock", -- Typhoon
+ [61391] = "Knock", -- Typhoon
+ [357214] = "Knock", -- Evoker Racial
+ [236776] = "Knock", -- High explosive trap
+ [127797] = "Knock", -- Vortex
}
diff --git a/TWW-issues.txt b/TWW-issues.txt
deleted file mode 100644
index 54e7494..0000000
--- a/TWW-issues.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Current known issues:
-- hpUnderlay and ppUnderlay is working for any of the layouts, however switching layout requires a reload to not mess up the textures.
\ No newline at end of file
diff --git a/sArena.lua b/sArena.lua
index 458a2ed..49e4c89 100644
--- a/sArena.lua
+++ b/sArena.lua
@@ -165,6 +165,7 @@ function sArenaMixin:Initialize()
LibStub("AceConfigDialog-3.0"):AddToBlizOptions("sArena")
LibStub("AceConfigDialog-3.0"):SetDefaultSize("sArena", 700, 620)
LibStub("AceConsole-3.0"):RegisterChatCommand("sarena", ChatCommand)
+ LibStub("AceConsole-3.0"):RegisterChatCommand("sa", ChatCommand)
self:SetLayout(nil, db.profile.currentLayout)
end
diff --git a/sArena.xml b/sArena.xml
index 6b73257..b5a398a 100644
--- a/sArena.xml
+++ b/sArena.xml
@@ -223,6 +223,8 @@
+
+
diff --git a/sArena_Updated2_by_sammers.toc b/sArena_Updated2_by_sammers.toc
index c44db0e..7bd5b53 100644
--- a/sArena_Updated2_by_sammers.toc
+++ b/sArena_Updated2_by_sammers.toc
@@ -1,7 +1,7 @@
-## Interface: 110000 110002
+## Interface: 110002
## Title: sArena Updated 2 by sammers
## Notes: Enhanced arena frames
-## Author: Stako
+## Author: Sammers
## Version: 3.2.3
## OptionalDeps: ElvUI
## X-Category: PvP/Arena