Merge branch 'release/v1.0.2-Release' into main

XiconQoo · Mar 6, 2021 · 5f093f5 · 5f093f5
2 parents d4fc5a6 + ef2724b
commit 5f093f5
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 XiconPlateBuffs
 *.zip
 lib_old
-Ace-Libs
+Ace-Libs
+*.log
diff --git a/Constants.lua b/Constants.lua
@@ -10,6 +10,7 @@ XiconPlateBuffs.trackedCrowdControl = {
         [GetSpellInfo(72)] = {duration = 6, id = 72, track = "debuff", texture = select(3, GetSpellInfo(72))}, -- Shield Bash (Warrior)
         [GetSpellInfo(8042)] = {duration = 2, id = 8042, track = "debuff", texture = select(3, GetSpellInfo(8042))}, -- Earth Shock (Shaman)
         [GetSpellInfo(19244)] = {duration = 5, id = 1, track = "debuff", texture = select(3, GetSpellInfo(19244))}, -- Spell Lock (Warlock
+        [GetSpellInfo(32747)] = {duration = 3, id = 32747, track = "debuff", texture = select(3, GetSpellInfo(32747))}, -- Deadly Throw Interrupt
     },
     ["shortinterrupts"] = {
         --Shaman
@@ -145,7 +146,22 @@ XiconPlateBuffs.trackedCrowdControl = {
         spellSchool = "physical",
         id = 19577,
     },
-
+    --Scare Beast 14327
+    [GetSpellInfo(14327)] = {
+        track = "debuff",
+        duration = 10,
+        priority = 40,
+        spellSchool = "magic",
+        id = 14327,
+    },
+    -- Improved Wing Clip 19229
+    [GetSpellInfo(19229)] = {
+        track = "debuff",
+        duration = 5,
+        priority = 20,
+        spellSchool = "physical",
+        id = 19229,
+    },
     -- The Beast Within
     [GetSpellInfo(34692)] = {
         track = "buff",
@@ -277,6 +293,14 @@ XiconPlateBuffs.trackedCrowdControl = {
         spellSchool = "magic",
         id = 8122,
     },
+    --Blackout Stun 15269
+    [GetSpellInfo(15269)] = {
+        track = "debuff",
+        duration = 3,
+        priority = 40,
+        spellSchool = "physical",
+        id = 15269,
+    },
     -- Chastise
     [GetSpellInfo(44047)] = {
         track = "debuff",
@@ -474,9 +498,26 @@ XiconPlateBuffs.trackedCrowdControl = {
         duration = 3,
         priority = 40,
         spellSchool = "physical",
+        texture = select(3, GetSpellInfo(20252)),
         id = 25274,
     },
-
+    --Charge Stun
+    [GetSpellInfo(7922)] = {
+        track = "debuff",
+        duration = 1,
+        priority = 40,
+        spellSchool = "physical",
+        texture = select(3, GetSpellInfo(100)),
+        id = 7922,
+    },
+    --Improved Hamstring 23694
+    [GetSpellInfo(23694)] = {
+        track = "debuff",
+        duration = 5,
+        priority = 40,
+        spellSchool = "physical",
+        id = 23694,
+    },
     -- Spell Reflection
     [GetSpellInfo(23920)] = {
         track = "buff",
@@ -501,9 +542,17 @@ XiconPlateBuffs.trackedCrowdControl = {
         duration = 3,
         priority = 40,
         spellSchool = "physical",
+        texture = select(3, GetSpellInfo(12284)),
         id = 5530,
     },
-
+    -- Storm Herald Stun effect
+    [GetSpellInfo(34510)] = {
+        track = "debuff",
+        duration = 4,
+        priority = 40,
+        spellSchool = "physical",
+        id = 34510,
+    },
     -- War Stomp
     [GetSpellInfo(20549)] = {
         track = "debuff",

diff --git a/Options.lua b/Options.lua
@@ -129,6 +129,9 @@ local function getSpells()
     end)
     for i=1, #debuffs do
         local spellName, _, texture = GetSpellInfo(debuffs[i].id)
+        if debuffs[i].texture then
+            texture = debuffs[i].texture
+        end
         spells.debuffs.args["debuff"..debuffs[i].id] = {
             order = i,
             name = spellName,
@@ -141,6 +144,9 @@ local function getSpells()
     end
     for i=1, #buffs do
         local spellName, _, texture = GetSpellInfo(buffs[i].id)
+        if buffs[i].texture then
+            texture = buffs[i].texture
+        end
         spells.buffs.args["buff"..buffs[i].id] = {
             order = i,
             name = spellName,
@@ -212,6 +218,7 @@ function XPB:CreateOptions()
                 iconBorder = "Interface\\AddOns\\XiconPlateBuffs\\media\\Border_rounded_blp",
                 iconBorderColor = {r = 1, g = 0, b = 0, a = 1},
                 fontSize = 15,
+                fontSizeStacks = 9,
                 responsive = true,
                 responsiveMax = 120,
                 font = "Fonts\\FRIZQT__.ttf",
@@ -229,6 +236,7 @@ function XPB:CreateOptions()
                 iconBorder = "Interface\\AddOns\\XiconPlateBuffs\\media\\Border_rounded_blp",
                 iconBorderColor = {r = 0, g = 0, b = 0, a = 1},
                 fontSize = 15,
+                fontSizeStacks = 9,
                 responsive = true,
                 responsiveMax = 120,
                 font = "Fonts\\FRIZQT__.ttf",
@@ -420,12 +428,20 @@ function XPB:CreateOptions()
                                 max = 100,
                                 step = 1,
                                 type = "range",
-                                name = "Font Size",
+                                name = "CD Font Size",
                             },
-                            font = {
+                            fontSizeStacks = {
                                 order = 12,
+                                min = 1,
+                                max = 100,
+                                step = 1,
+                                type = "range",
+                                name = "Stack Font Size",
+                            },
+                            font = {
+                                order = 13,
                                 type = "select",
-                                name = "Cooldown Font",
+                                name = "Font",
                                 values = { ["Fonts\\ARIALN.ttf"] = "Arial",
                                            ["Fonts\\FRIZQT__.ttf"] = "Fritz Quadrata",
                                            ["Fonts\\MORPHEUS.ttf"] = "Morpheus",
@@ -598,12 +614,20 @@ function XPB:CreateOptions()
                                 max = 100,
                                 step = 1,
                                 type = "range",
-                                name = "Font Size",
+                                name = "CD Font Size",
                             },
-                            font = {
+                            fontSizeStacks = {
                                 order = 12,
+                                min = 1,
+                                max = 100,
+                                step = 1,
+                                type = "range",
+                                name = "Stack Font Size",
+                            },
+                            font = {
+                                order = 13,
                                 type = "select",
-                                name = "Cooldown Font",
+                                name = "Font",
                                 values = { ["Fonts\\ARIALN.ttf"] = "Arial",
                                            ["Fonts\\FRIZQT__.ttf"] = "Fritz Quadrata",
                                            ["Fonts\\MORPHEUS.ttf"] = "Morpheus",

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # XiconPlateBuffs TBC Addon
 
-### [v1.0.1-Release Download Here](https://github.com/XiconQoo/XiconPlateBuffs/releases/download/v1.0.1-Release/XiconPlateBuffs_v1.0.1-Release.zip)
+### [v1.0.2-Release Download Here](https://github.com/XiconQoo/XiconPlateBuffs/releases/download/v1.0.2-Release/XiconPlateBuffs_v1.0.2-Release.zip)
 
 #### Recommended addons to use with XiconPlateBuffs
 
@@ -18,6 +18,12 @@ This is inferior to PlateBuffer in PvE. PvE is not the main aim for this addon.
 
 ### Changes#
 
+v1.0.2-Release
+- add deadly throw interrupt
+- add Blackout, Improved Wingclip, Improved Hamstring, Scare Beast, Stormherald Stun
+- changed textures for charge, intercept and macestun
+- add stacks numbers to buffs/debuffs
+
 v1.0.1-Release
 - add button to blizz options to open own config gui
 - add center lock optiojn for buffs/debuffs