Merge branch 'hotfix/ci-disable' into main

v1.15-Beta hotfix nature's grasp

Constants.lua

@@ -182,6 +182,13 @@ local importantAuras = {
         root = true,
         spellID = 26989,
     },
+    [select(1, GetSpellInfo(27010)) .. " " .. select(1, GetSpellInfo(16689))] = {
+        track = AURA_TYPE_DEBUFF,
+        duration = 10,
+        priority = 30,
+        spellID = 27010,
+        altName = select(1, GetSpellInfo(27010)) .. " " .. select(1, GetSpellInfo(16689)),
+    },
     -- Feral Charge
     [GetSpellInfo(16979)] = {
         track = AURA_TYPE_DEBUFF,

Frame.lua

@@ -228,10 +228,10 @@ function Gladdy:UpdateFrame()
         if (self.db.growDirection == "TOP") then
             if (i == 1) then
                 button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMLEFT", leftSize, powerBarHeight)
-                button.secure:SetPoint("TOPLEFT", button.powerBar, "TOPLEFT")
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
             else
                 button:SetPoint("BOTTOMLEFT", self.buttons["arena" .. (i - 1)], "TOPLEFT", 0, margin + self.db.bottomMargin)
-                button.secure:SetPoint("TOPLEFT", button.powerBar, "TOPLEFT")
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
             end
         elseif (self.db.growDirection == "BOTTOM") then
             if (i == 1) then

Gladdy.lua

@@ -25,7 +25,7 @@ local MAJOR, MINOR = "Gladdy", 4
 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
 local L
 Gladdy.version_major_num = 1
-Gladdy.version_minor_num = 0.13
+Gladdy.version_minor_num = 0.16
 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
 Gladdy.version_releaseType = RELEASE_TYPES.beta
 Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType

Gladdy.toc

@@ -1,6 +1,6 @@
 ## Interface: 20501
 ## Title: Gladdy - TBC
-## Version: 1.13-Beta
+## Version: 1.16-Beta
 ## Notes: The most powerful arena AddOn for WoW 2.5.1
 ## Author: XiconQoo, DnB_Junkee, Knall
 ## X-Email: contact me on discord Knall#1751

Modules/Auras.lua

@@ -275,10 +275,11 @@ function Auras:Test(unit)
         self:AURA_GAIN(unit,AURA_TYPE_DEBUFF, 7922, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration)
         self:SPELL_INTERRUPT(unit,19244, select(1, GetSpellInfo(19244)), "physical", 25396, select(1, GetSpellInfo(25396)), 64)
     elseif (unit == "arena2") then
-        spellName, _, icon = GetSpellInfo(6770)
+        spellName = select(1, GetSpellInfo(27010)) .. " " .. select(1, GetSpellInfo(16689))
+        _, _, icon = GetSpellInfo(27010)
         self:AURA_FADE(unit, AURA_TYPE_BUFF)
         self:AURA_FADE(unit,AURA_TYPE_DEBUFF)
-        self:AURA_GAIN(unit,AURA_TYPE_DEBUFF, 6770, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration)
+        self:AURA_GAIN(unit,AURA_TYPE_DEBUFF, 27010, spellName, icon, self.auras[spellName].duration, GetTime() + self.auras[spellName].duration)
         self:SPELL_INTERRUPT(unit,19244, select(1, GetSpellInfo(19244)), "physical", 25396, select(1, GetSpellInfo(25396)), 64)
     elseif (unit == "arena3") then
         spellName, _, icon = GetSpellInfo(31224)
@@ -618,9 +619,12 @@ function Auras:GetAuraOptions(auraType)
     for i,k in ipairs(auras) do
         options[tostring(k)] = {
             type = "group",
-            name = Gladdy:GetImportantAuras()["Unstable Affliction Silence"]
+            name = (Gladdy:GetImportantAuras()["Unstable Affliction Silence"]
                     and Gladdy:GetImportantAuras()["Unstable Affliction Silence"].spellID == k
-                    and Gladdy:GetImportantAuras()["Unstable Affliction Silence"].altName
+                    and Gladdy:GetImportantAuras()["Unstable Affliction Silence"].altName)
+                    or (Gladdy:GetImportantAuras()[select(1, GetSpellInfo(27010)) .. " " .. select(1, GetSpellInfo(16689))]
+                    and Gladdy:GetImportantAuras()[select(1, GetSpellInfo(27010)) .. " " .. select(1, GetSpellInfo(16689))].spellID == k
+                    and Gladdy:GetImportantAuras()[select(1, GetSpellInfo(27010)) .. " " .. select(1, GetSpellInfo(16689))].altName)
                     or GetSpellInfo(k),
             order = i+2,
             icon = Gladdy:GetImportantAuras()[GetSpellInfo(k)] and Gladdy:GetImportantAuras()[GetSpellInfo(k)].texture or select(3, GetSpellInfo(k)),

Modules/CombatIndicator.lua

@@ -95,7 +95,7 @@ function CombatIndicator.OnEvent(self, elapsed)
     if (self.lastTimeUpdated > self.updateInterval) then
         for i=1,Gladdy.curBracket do
             local unit = "arena" .. i
-            if CombatIndicator.test or (UnitExists(unit) and UnitAffectingCombat(unit)) then
+            if Gladdy.db.ciEnabled and (CombatIndicator.test or (UnitExists(unit) and UnitAffectingCombat(unit))) then
                 CombatIndicator.frames[unit]:Show()
             else
                 CombatIndicator.frames[unit]:Hide()

Modules/RangeCheck.lua

@@ -185,9 +185,15 @@ function RangeCheck:ENEMY_STEALTH(unit, stealth)
     button.lastState = 0
     if stealth then
         button.classColors = { r = 0.66, g = 0.66, b = 0.66 }
+        if not Gladdy.db.rangeCheckEnabled then
+            button.healthBar.hp:SetStatusBarColor(0.66, 0.66, 0.66, 1)
+        end
     else
         if button.class then
             button.classColors = { r = RAID_CLASS_COLORS[button.class].r, g = RAID_CLASS_COLORS[button.class].g, b = RAID_CLASS_COLORS[button.class].b }
+            if not Gladdy.db.rangeCheckEnabled then
+                button.healthBar.hp:SetStatusBarColor(RAID_CLASS_COLORS[button.class].r, RAID_CLASS_COLORS[button.class].g, RAID_CLASS_COLORS[button.class].b, 1)
+            end
         end
     end
 end

README.md

@@ -1,37 +1,47 @@
 # Gladdy - TBC
 
 ### The most powerful arena addon for WoW TBC 2.5.1
-## [v1.13-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.13-Beta/Gladdy_TBC-Classic_v1.13-Beta.zip)
+## [v1.16-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.16-Beta/Gladdy_TBC-Classic_v1.16-Beta.zip)
 
 ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
 
 ### Origin
 
-Based on https://github.com/Schaka/gladdy
+Based on https://github.com/miraage/gladdy
 
 ### Motivation for this edit
 
 The goal is to make Gladdy highly configurable in it's appearance. Everything can be arranged left or right independently. Also I gave Gladdy a new look with black borders. A lot can be configured.
 
 ### Modules:
-- Announcement (drink, trinket usage, spec detection ...)
-- ArenaCountDown
-- Auras (show important (de)buffs in the class icon)
-- BuffsDebuffs (show buffs and debuffs on arena frames - can be filtered)
-- ClassIcon (or specicon, once detected)
-- CombatIndicator 
-- Cooldown (tracks important cooldowns)
-- Diminishing (tracks DRs)
-- ExportImport (share your profile with your friends in the form of a string, which can be imported)
-- Highlight (highlights focus and target)
-- Pets (show arena pets)
-- Racial Spells
-- Range Check
-- Shadowsight Timer
-- TotemPlates (show totem icons instead of normal nameplates)
-- Trinket (tracks trinket usage)
-- VersionCheck (checks if you use an older version that your teammate)
-- XiconProfiles (predefined profiles to start your configuration from)
+- **Announcement** (drink, trinket usage, spec detection ...)
+- **ArenaCountDown**
+- **Auras** (show important (de)buffs as well as interrupts on the class icon)
+- **BuffsDebuffs** (show buffs and debuffs on arena frames - can be filtered)
+- **CastBar** (shows a castbar, can be disabled)
+- **ClassIcon** (or specicon, once detected)
+- **Clicks** (bind spells or macros to click actions)
+- **CombatIndicator** (shows a sword icon if unit is in combat)
+- **Cooldown** (tracks important cooldowns)
+- **Diminishing** (tracks DRs)
+- **ExportImport** (share your profile with your friends in the form of a string, which can be imported)
+- **Highlight** (highlights focus and target)
+- **Pets** (show arena pets)
+- **Racial** (show arena racial cooldowns)
+- **Range Check** (checks the range to a unit by a configurable spell)
+- **Shadowsight Timer** (shows a little movable frame with time left until Shadow Eyes spawn)
+- **TotemPlates** (show totem icons instead of normal nameplates, compatible with **Plater, NeatPlates, KUI, ThreatPlates, ElvUI, TukUI**)
+- **Trinket** (tracks trinket usage)
+- **VersionCheck** (checks if you use an older version that your teammate)
+- **XiconProfiles** (predefined profiles to start your configuration from)
+
+### Valid Slash commands
+
+- **/gladdy ui** (shows config)
+- **/gladdy test** (standard 3v3 test mode)
+- **/gladdy test1** to **/gladdy test5** (test mode with 1-5 frames active)
+- **/gladdy hide** (hides the frames)
+- **/gladdy reset** (resets current profile to default settings)
 
 ## Screenshots
 
@@ -41,7 +51,8 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
 
 ## Special Thanks
 
-- **Schaka** - the original author of Gladdy! (thanks for letting me continue Gladdy and all the work you put into the TBC community)
+- **miraage** - the origininal author of Gladdy! Your work set the foundation for this edit. Thanks!
+- **Schaka** - the maintainer of Gladdy! (thanks for letting me continue Gladdy and all the work you put into the TBC community)
 - **Macumba** (thanks for all the support, your feedback and your dedication for the TBC community)
 - **RMO** (without you I would not have modified Gladdy at all and thanks for all the suggestions and active feedback)
 - **Ur0b0r0s aka DrainTheLock** (thanks for testing, giving feedback and correcting/adding wrong CDs)
@@ -51,6 +62,15 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
 
 ### Changes
 
+### v1.16-Beta
+- unit gray in stealth when rangecheck module disabled
+
+### v1.15-Beta
+- hotfix added entangling roots nature's grasp
+
+### v1.14-Beta
+- hotfix for secure button grow direction up
+
 ### v1.13-Beta
 - frames behave now to mouseover macros
 - added Range Check module (configurable which spell is used for range check)