Cleanups

BigWigsMods · Dec 3, 2023 · 3cbf37d · 3cbf37d
1 parent 8032219
commit 3cbf37d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 24 deletions.
diff --git a/BlackwingLair/Chromaggus.lua b/BlackwingLair/Chromaggus.lua
@@ -80,7 +80,7 @@ end
 
 function mod:Frenzy(args)
 	self:UnregisterUnitEvent("UNIT_HEALTH", "boss1")
-	self:MessageOld(args.spellId, "red", nil, "20% - ".. args.spellName)
+	self:MessageOld(args.spellId, "red", nil, CL.percent:format(20, args.spellName))
 end
 
 function mod:Debuffs(args)

diff --git a/BlackwingLair/Locales/zhCN.lua b/BlackwingLair/Locales/zhCN.lua
@@ -23,7 +23,6 @@ if L then
 	L.breath = "吐息警报"
 	L.breath_desc = "吐息警报"
 
-	L.debuffs = "{23174} （{605}）" -- 多彩变形 （统御意志）
 	L.debuffs_message = "3/5 减益，注意！"
 	L.debuffs_warning = "4/5 减益， 5层后将%s！"
 end

diff --git a/BlackwingLair/Locales/zhTW.lua b/BlackwingLair/Locales/zhTW.lua
@@ -23,7 +23,6 @@ if L then
 	L.breath = "吐息警報"
 	L.breath_desc = "當克洛瑪古斯吐息時發出警報"
 
-	L.debuffs = "{23174} （{605}）" -- 炫彩變形 （支配心智）
 	L.debuffs_message = "3/5 減益，注意！"
 	L.debuffs_warning = "4/5 減益， 5層後將%s！"
 end

diff --git a/BlackwingLair/Options/Colors.lua b/BlackwingLair/Options/Colors.lua
@@ -33,9 +33,9 @@ BigWigs:AddColors("Flamegor", {
 
 BigWigs:AddColors("Chromaggus", {
 	[23128] = "yellow",
+	[23174] = {"orange","red"},
 	[23537] = {"cyan","red"},
 	["breath"] = {"green","red","yellow"},
-	["debuffs"] = {"orange","red"},
 })
 
 BigWigs:AddColors("Nefarian ", {

diff --git a/BlackwingLair/Options/Sounds.lua b/BlackwingLair/Options/Sounds.lua
@@ -21,7 +21,7 @@ BigWigs:AddSounds("Flamegor", {
 })
 
 BigWigs:AddSounds("Chromaggus", {
-	["debuffs"] = {"alarm","warning"},
+	[23174] = {"alarm","warning"},
 })
 
 BigWigs:AddSounds("Nefarian ", {

diff --git a/BlackwingLair_Classic/Chromaggus.lua b/BlackwingLair_Classic/Chromaggus.lua
@@ -13,18 +13,6 @@ mod:SetEncounterID(616)
 
 local barcount = 2
 local debuffCount = 0
-local icons = {
-	[mod:SpellName(23170)] = 23170,
-	[mod:SpellName(23154)] = 23154,
-	[mod:SpellName(23155)] = 23155,
-	[mod:SpellName(23169)] = 23169,
-	[mod:SpellName(23153)] = 23153,
-	[mod:SpellName(23310)] = 23310,
-	[mod:SpellName(23313)] = 23313,
-	[mod:SpellName(23315)] = 23315,
-	[mod:SpellName(23308)] = 23308,
-	[mod:SpellName(23187)] = 23187,
-}
 
 --------------------------------------------------------------------------------
 -- Localization
@@ -103,20 +91,20 @@ function mod:Enrage(args)
 end
 
 function mod:Frenzy(args)
-	self:Message(23537, "red", "20% - ".. args.spellName)
+	self:Message(23537, "red", CL.percent:format(20, args.spellName))
 end
 
 function mod:Debuffs(args)
 	if self:Me(args.destGUID) then
 		debuffCount = debuffCount + 1
 		if debuffCount == 3 then
-			self:Message(23174, "red", L.debuffs_message, icons[args.spellName] or false)
+			self:Message(23174, "red", L.debuffs_message, args.spellId)
 			self:PlaySound(23174, "alarm")
 		elseif debuffCount == 4 then
-			self:Message(23174, "orange", L.debuffs_warning:format(self:SpellName(605)), icons[args.spellName] or false) -- 605 = Mind Control
+			self:Message(23174, "orange", L.debuffs_warning:format(self:SpellName(605)), args.spellId) -- 605 = Mind Control
 			self:PlaySound(23174, "warning")
 		elseif debuffCount == 5 then
-			self:Message(23174, "orange", 605, icons[args.spellName] or false) -- 605 = Mind Control
+			self:Message(23174, "orange", 605, args.spellId) -- 605 = Mind Control
 			self:PlaySound(23174, "warning")
 		end
 	end
@@ -137,10 +125,10 @@ function mod:Breath(args)
 		self:StopBar(CL.count:format(self:SpellName(18617), 2)) -- Breath (2)
 	end
 
-	self:Bar("breath", 2, CL.cast:format(args.spellName), icons[args.spellName])
-	self:Message("breath", "yellow", CL.casting:format(args.spellName), icons[args.spellName])
+	self:Bar("breath", 2, CL.cast:format(args.spellName), args.spellId)
+	self:Message("breath", "yellow", CL.casting:format(args.spellName), args.spellId)
 	self:DelayedMessage("breath", 50, "red", CL.custom_sec:format(args.spellName, 10))
-	self:Bar("breath", 60, icons[args.spellName])
+	self:Bar("breath", 60, args.spellId)
 end
 
 --function mod:CHAT_MSG_MONSTER_EMOTE(msg)