TWW Updates #8

Kkthnx-Wow · Aug 17, 2024 · 7608800 · 7608800
1 parent 0264c3f
commit 7608800
Show file tree

Hide file tree

Showing 13 changed files with 156 additions and 170 deletions.
diff --git a/KkthnxUI/Modules/ActionBars/ButtonStyle.lua b/KkthnxUI/Modules/ActionBars/ButtonStyle.lua
@@ -114,6 +114,7 @@ function Module:StyleActionButton(button)
 	end
 	if autoCastable then
 		autoCastable:SetTexCoord(0.217, 0.765, 0.217, 0.765)
+		autoCastable:SetDrawLayer("OVERLAY", 3)
 		autoCastable:SetAllPoints()
 	end
 	if icon then

diff --git a/KkthnxUI/Modules/Auras/Lumos/DemonHunter.lua b/KkthnxUI/Modules/Auras/Lumos/DemonHunter.lua
@@ -19,7 +19,7 @@ end
 
 local function UpdateSpellStatus(button, spellID)
 	button.Icon:SetTexture(GetSpellTexture(spellID))
-	if IsUsableSpell(spellID) then
+	if C_Spell.IsSpellUsable(spellID) then
 		button.Icon:SetDesaturated(false)
 	else
 		button.Icon:SetDesaturated(true)
@@ -38,7 +38,7 @@ function Module:ChantLumos(self)
 		do
 			local button, spellID = self.lumos[1], 228477
 			UpdateSpellStatus(button, spellID)
-			button.Count:SetText(GetSpellCount(spellID))
+			button.Count:SetText(_Spell.GetSpellCastCount(spellID))
 		end
 
 		UpdateBuff(self.lumos[2], 258920, 258920, true)

diff --git a/KkthnxUI/Modules/Auras/Lumos/Druid.lua b/KkthnxUI/Modules/Auras/Lumos/Druid.lua
@@ -19,7 +19,7 @@ end
 
 local function UpdateSpellStatus(button, spellID)
 	button.Icon:SetTexture(GetSpellTexture(spellID))
-	if IsUsableSpell(spellID) then
+	if C_Spell.IsSpellUsable(spellID) then
 		button.Icon:SetDesaturated(false)
 	else
 		button.Icon:SetDesaturated(true)
@@ -32,14 +32,14 @@ function Module:ChantLumos(self)
 		local currentPower = UnitPower("player", 8)
 		do
 			local button = self.lumos[1]
-			local count = GetSpellCount(190984)
+			local count = C_Spell.GetSpellCastCount(190984)
 			UpdateBuff(button, 190984, 48517)
 			button.Count:SetText(count > 0 and count or "")
 		end
 
 		do
 			local button = self.lumos[2]
-			local count = GetSpellCount(194153)
+			local count = C_Spell.GetSpellCastCount(194153)
 			UpdateBuff(button, 194153, 48518)
 			button.Count:SetText(count > 0 and count or "")
 		end

diff --git a/KkthnxUI/Modules/Auras/Lumos/Evoker.lua b/KkthnxUI/Modules/Auras/Lumos/Evoker.lua
@@ -23,7 +23,7 @@ end
 
 local function UpdateSpellStatus(button, spellID)
 	button.Icon:SetTexture(GetSpellTexture(spellID))
-	if IsUsableSpell(spellID) then
+	if C_Spell.IsSpellUsable(spellID) then
 		button.Icon:SetDesaturated(false)
 	else
 		button.Icon:SetDesaturated(true)

diff --git a/KkthnxUI/Modules/Auras/Lumos/Hunter.lua b/KkthnxUI/Modules/Auras/Lumos/Hunter.lua
@@ -28,7 +28,7 @@ end
 
 local function UpdateSpellStatus(button, spellID)
 	button.Icon:SetTexture(GetSpellTexture(spellID))
-	if IsUsableSpell(spellID) then
+	if C_Spell.IsSpellUsable(spellID) then
 		button.Icon:SetDesaturated(false)
 	else
 		button.Icon:SetDesaturated(true)

diff --git a/KkthnxUI/Modules/Auras/Lumos/Monk.lua b/KkthnxUI/Modules/Auras/Lumos/Monk.lua
@@ -19,7 +19,7 @@ end
 
 local function UpdateSpellStatus(button, spellID)
 	button.Icon:SetTexture(GetSpellTexture(spellID))
-	if IsUsableSpell(spellID) then
+	if C_Spell.IsSpellUsable(spellID) then
 		button.Icon:SetDesaturated(false)
 	else
 		button.Icon:SetDesaturated(true)
@@ -31,7 +31,7 @@ function Module:ChantLumos(self)
 	if spec == 1 then
 		UpdateCooldown(self.lumos[1], 121253, true)
 		UpdateCooldown(self.lumos[2], 322101, true)
-		self.lumos[2].Count:SetText(GetSpellCount(322101))
+		self.lumos[2].Count:SetText(C_Spell.GetSpellCastCount(322101))
 		UpdateBuff(self.lumos[3], 215479, 215479)
 		UpdateBuff(self.lumos[4], 325092, 325092, nil, "END")
 		UpdateBuff(self.lumos[5], 322507, 322507, true)
@@ -47,7 +47,7 @@ function Module:ChantLumos(self)
 
 		do
 			local button = self.lumos[3]
-			button.Count:SetText(GetSpellCount(101546))
+			button.Count:SetText(C_Spell.GetSpellCastCount(101546))
 			UpdateSpellStatus(button, 101546)
 		end
 

diff --git a/KkthnxUI/Modules/Auras/Lumos/Paladin.lua b/KkthnxUI/Modules/Auras/Lumos/Paladin.lua
@@ -5,7 +5,7 @@ if K.Class ~= "PALADIN" then
 	return
 end
 
-local IsUsableSpell, IsPlayerSpell = IsUsableSpell, IsPlayerSpell
+local C_Spell_IsSpellUsable, IsPlayerSpell = C_Spell.IsSpellUsable, IsPlayerSpell
 local GetCurrentGlyphNameForSpell = GetCurrentGlyphNameForSpell
 
 local function UpdateCooldown(button, spellID, texture)
@@ -16,19 +16,6 @@ local function UpdateBuff(button, spellID, auraID, cooldown, glow)
 	return Module:UpdateAura(button, "player", auraID, "HELPFUL", spellID, cooldown, glow)
 end
 
-local function UpdateDebuff(button, spellID, auraID, cooldown, glow)
-	return Module:UpdateAura(button, "target", auraID, "HARMFUL", spellID, cooldown, glow)
-end
-
-local function UpdateSpellStatus(button, spellID)
-	button.Icon:SetTexture(GetSpellTexture(spellID))
-	if IsUsableSpell(spellID) then
-		button.Icon:SetDesaturated(false)
-	else
-		button.Icon:SetDesaturated(true)
-	end
-end
-
 local function checkQueenGlyph()
 	local name, spellID = GetCurrentGlyphNameForSpell(86659)
 	Module.hasQueenGlyph = name and spellID == 212642

diff --git a/KkthnxUI/Modules/Auras/Lumos/Shaman.lua b/KkthnxUI/Modules/Auras/Lumos/Shaman.lua
@@ -38,7 +38,7 @@ function Module:ChantLumos(self)
 			elseif IsPlayerSpell(117014) then
 				UpdateCooldown(button, 117014, true)
 			else
-				if IsUsableSpell(8042) then
+				if C_Spell.IsSpellUsable(8042) then
 					button.Icon:SetDesaturated(false)
 					K.ShowOverlayGlow(button.glowFrame)
 				else

diff --git a/KkthnxUI/Modules/Auras/Lumos/Warrior.lua b/KkthnxUI/Modules/Auras/Lumos/Warrior.lua
@@ -23,7 +23,7 @@ end
 
 local function UpdateSpellStatus(button, spellID)
 	button.Icon:SetTexture(GetSpellTexture(spellID))
-	if IsUsableSpell(spellID) then
+	if C_Spell.IsSpellUsable(spellID) then
 		button.Icon:SetDesaturated(false)
 	else
 		button.Icon:SetDesaturated(true)