Updates and cleanups for classic

BigWigsMods · May 30, 2024 · 7a7a949 · 7a7a949
1 parent c3fb589
commit 7a7a949
Show file tree

Hide file tree

Showing 55 changed files with 1,214 additions and 962 deletions.
diff --git a/Baradin/Argaloth.lua b/Baradin/Argaloth.lua
@@ -14,16 +14,6 @@ mod:SetRespawnTime(30)
 
 local fireStormHP = 100
 
---------------------------------------------------------------------------------
--- Localization
---
-
-local L = mod:GetLocale()
-if L then
-	L.darkness_message = "Darkness"
-	L.firestorm_message = "Firestorm soon!"
-end
-
 --------------------------------------------------------------------------------
 -- Initialization
 --

diff --git a/Baradin/Locales/deDE.lua b/Baradin/Locales/deDE.lua
@@ -1,12 +1,5 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "deDE")
-if not L then return end
-if L then
-	L.darkness_message = "Dunkelheit"
-	L.firestorm_message = "Feuersturm bald!"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "deDE")
+local L = BigWigs:NewBossLocale("Occu'thar", "deDE")
 if not L then return end
 if L then
 	L.shadows_bar = "~Sengende Schatten"
@@ -22,4 +15,3 @@ if L then
 	L.first_ability = "Spießen oder Hass"
 	L.dance_message = "Klingentanz %d von 3"
 end
-
diff --git a/Baradin/Locales/esES.lua b/Baradin/Locales/esES.lua
@@ -1,12 +1,6 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "esES") or BigWigs:NewBossLocale("Argaloth", "esMX")
+local L = BigWigs:NewBossLocale("Occu'thar", "esES")
 if not L then return end
-if L then
-	L.darkness_message = "Oscuridad"
-	L.firestorm_message = "¡Tormenta de fuego inminente!"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "esES") or BigWigs:NewBossLocale("Occu'thar", "esMX")
 if L then
 	L.shadows_bar = "~Sombras abrasadoras"
 	L.destruction_bar = "<Explosión inminente>"
@@ -16,9 +10,8 @@ if L then
 	L.fire_bar = "~Láser"
 end
 
-L = BigWigs:NewBossLocale("Alizabal", "esES") or BigWigs:NewBossLocale("Alizabal", "esMX")
+L = BigWigs:NewBossLocale("Alizabal", "esES")
 if L then
 	L.first_ability = "Odio o Ensartar"
 	L.dance_message = "Danza de hojas %d de 3"
 end
-
diff --git a/Baradin/Locales/esMX.lua b/Baradin/Locales/esMX.lua
@@ -0,0 +1,17 @@
+
+local L = BigWigs:NewBossLocale("Occu'thar", "esMX")
+if not L then return end
+if L then
+	L.shadows_bar = "~Sombras abrasadoras"
+	L.destruction_bar = "<Explosión inminente>"
+	L.eyes_bar = "~Ojos"
+
+	L.fire_message = "Láser, Piu Piu"
+	L.fire_bar = "~Láser"
+end
+
+L = BigWigs:NewBossLocale("Alizabal", "esMX")
+if L then
+	L.first_ability = "Odio o Ensartar"
+	L.dance_message = "Danza de hojas %d de 3"
+end
diff --git a/Baradin/Locales/frFR.lua b/Baradin/Locales/frFR.lua
@@ -1,12 +1,5 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "frFR")
-if not L then return end
-if L then
-	L.darkness_message = "Ténèbres"
-	L.firestorm_message = "Tempête de feu imminente !"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "frFR")
+local L = BigWigs:NewBossLocale("Occu'thar", "frFR")
 if not L then return end
 if L then
 	L.shadows_bar = "~Ombres incendiaires"
@@ -22,4 +15,3 @@ if L then
 	L.first_ability = "Embrocher ou Haine"
 	L.dance_message = "Danse des lames %d sur 3"
 end
-
diff --git a/Baradin/Locales/itIT.lua b/Baradin/Locales/itIT.lua
@@ -1,12 +1,5 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "itIT")
-if not L then return end
-if L then
-	L.darkness_message = "Oscurità Logorante"
-	L.firestorm_message = "Tempesta di Fuoco Vile tra poco!"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "itIT")
+local L = BigWigs:NewBossLocale("Occu'thar", "itIT")
 if not L then return end
 if L then
 	L.shadows_bar = "~Ombre Roventi"
@@ -22,4 +15,3 @@ if L then
 	L.first_ability = "Spiedo o Odio"
 	L.dance_message = "Lame Danzanti %d di 3"
 end
-
diff --git a/Baradin/Locales/koKR.lua b/Baradin/Locales/koKR.lua
@@ -1,12 +1,5 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "koKR")
-if not L then return end
-if L then
-	L.darkness_message = "삼키는 어둠"
-	L.firestorm_message = "곧 화염폭풍!"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "koKR")
+local L = BigWigs:NewBossLocale("Occu'thar", "koKR")
 if not L then return end
 if L then
 	L.shadows_bar = "~암흑"
@@ -22,4 +15,3 @@ if L then
 	L.first_ability = "꿰기 또는 증오"
 	L.dance_message = "칼춤 %d / 3"
 end
-
diff --git a/Baradin/Locales/locales.xml b/Baradin/Locales/locales.xml
@@ -0,0 +1,15 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+
+<Script file="deDE.lua"/>
+<Script file="esES.lua"/>
+<Script file="esMX.lua"/>
+<Script file="frFR.lua"/>
+<Script file="itIT.lua"/>
+<Script file="koKR.lua"/>
+<Script file="ptBR.lua"/>
+<Script file="ruRU.lua"/>
+<Script file="zhCN.lua"/>
+<Script file="zhTW.lua"/>
+
+</Ui>
diff --git a/Baradin/Locales/ptBR.lua b/Baradin/Locales/ptBR.lua
@@ -1,12 +1,6 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "ptBR")
+local L = BigWigs:NewBossLocale("Occu'thar", "ptBR")
 if not L then return end
-if L then
-	L.darkness_message = "Escuridão"
-	L.firestorm_message = "Tempestade de fogo iminente!"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "ptBR")
 if L then
 	L.shadows_bar = "~Sombras"
 	L.destruction_bar = "<Explosão>"
@@ -21,4 +15,3 @@ if L then
 	L.first_ability = "Ódio ou Espetinho"
 	L.dance_message = "Dança de Lâminas %d de 3"
 end
-
diff --git a/Baradin/Locales/ruRU.lua b/Baradin/Locales/ruRU.lua
@@ -1,12 +1,5 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "ruRU")
-if not L then return end
-if L then
-	L.darkness_message = "Всепожирающая тьма"
-	L.firestorm_message = "Скоро Огненная буря!"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "ruRU")
+local L = BigWigs:NewBossLocale("Occu'thar", "ruRU")
 if not L then return end
 if L then
 	L.shadows_bar = "~Тень"
@@ -22,4 +15,3 @@ if L then
 	L.first_ability = "Вертел или Ненависть"
 	L.dance_message = "Танец клинков %d из 3"
 end
-
diff --git a/Baradin/Locales/zhCN.lua b/Baradin/Locales/zhCN.lua
@@ -1,12 +1,5 @@
 
-local L = BigWigs:NewBossLocale("Argaloth", "zhCN")
-if not L then return end
-if L then
-	L.darkness_message = "黑暗噬体！"
-	L.firestorm_message = "即将 邪火风暴！"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "zhCN")
+local L = BigWigs:NewBossLocale("Occu'thar", "zhCN")
 if not L then return end
 if L then
 	L.shadows_bar = "灼热暗影"
@@ -22,4 +15,3 @@ if L then
 	L.first_ability = "刺穿或沸腾之怨"
 	L.dance_message = "刃舞：>%d - 3<！"
 end
-
diff --git a/Baradin/Locales/zhTW.lua b/Baradin/Locales/zhTW.lua
@@ -1,12 +1,4 @@
-
-local L = BigWigs:NewBossLocale("Argaloth", "zhTW")
-if not L then return end
-if L then
-	L.darkness_message = "吞噬黑暗！"
-	L.firestorm_message = "即將 魔化火颶！"
-end
-
-L = BigWigs:NewBossLocale("Occu'thar", "zhTW")
+local L = BigWigs:NewBossLocale("Occu'thar", "zhTW")
 if not L then return end
 if L then
 	L.shadows_bar = "灼熱暗影"
@@ -22,4 +14,3 @@ if L then
 	L.first_ability = "烤肉釘或沸騰憎恨"
 	L.dance_message = "劍刃之舞：>%d - 3<！"
 end
-
diff --git a/Baradin/locales.xml b/Baradin/locales.xml
diff --git a/Bastion/DoubleDragon.lua b/Bastion/DoubleDragon.lua
@@ -90,15 +90,14 @@ end
 --
 
 do
-	local function checkTarget(sGUID, spellId)
-		local bossId = mod:UnitGUID("boss2") == sGUID and "boss2target" or "boss1target"
-		if not mod:UnitName(bossId) then return end --The first is sometimes delayed longer than 0.3
-		if UnitIsUnit(bossId, "player") then
-			mod:MessageOld(spellId, "blue", "long", CL["you"]:format(L["blast_message"]))
+	local function printTarget(self, name, guid)
+		if self:Me(guid) then
+			self:PersonalMessage(86369)
+			self:PlaySound(86369, "warning", nil, name)
 		end
 	end
 	function mod:TwilightBlast(args)
-		self:ScheduleTimer(checkTarget, 0.3, args.sourceGUID, args.spellId)
+		self:GetUnitTarget(printTarget, 0.7, args.sourceGUID)
 	end
 end
 
@@ -196,7 +195,7 @@ do
 	end
 	function mod:EngulfingMagicApplied(args)
 		if self:Me(args.destGUID) then
-			self:Say(args.spellId, L["engulfingmagic_say"])
+			self:Say(args.spellId, nil, nil, "Engulfing Magic")
 			--self:Flash(args.spellId)
 		end
 		emTargets[#emTargets + 1] = args.destName

diff --git a/Bastion/Halfus.lua b/Bastion/Halfus.lua
@@ -16,28 +16,34 @@ local L = mod:GetLocale()
 if L then
 	L.strikes_message = "Strikes"
 
-	L.breath_message = "Breath incoming!"
-	L.breath_bar = "~Breath"
-
-	L.engage_yell = "Cho'gall will have your heads"
+	L.engage_yell_trigger = "Cho'gall will have your heads"
 end
 
 --------------------------------------------------------------------------------
 -- Initialization
 --
 
 function mod:GetOptions()
-	return {83908, 83603, 83707, 83710, "berserk"}
+	return {
+		83908, -- Malevolent Strikes
+		{84030, "CASTBAR"}, -- Paralysis
+		83707, -- Scorching Breath
+		83710, -- Furious Roar
+		"berserk",
+	},nil,{
+		[83908] = L.strikes_message, -- Malevolent Strikes (Strikes)
+		[83707] = CL.breath, -- Scorching Breath (Breath)
+	}
 end
 
 function mod:OnBossEnable()
 	self:Log("SPELL_CAST_START", "FuriousRoar", 83710)
 	self:Log("SPELL_AURA_APPLIED", "Paralysis", 84030) -- used with Slate Dragon active
 	self:Log("SPELL_AURA_APPLIED_DOSE", "MalevolentStrikes", 83908) -- used with Slate Dragon ready
-	self:Log("SPELL_CAST_START", "Breath", 83707) -- used by Proto-Behemoth with whelps ready
+	self:Log("SPELL_CAST_START", "ScorchingBreath", 83707) -- used by Proto-Behemoth with whelps ready
 
 	-- No boss frames..
-	self:BossYell("Engage", L["engage_yell"])
+	self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
 end
 
 function mod:OnEngage()
@@ -48,27 +54,35 @@ end
 -- Event Handlers
 --
 
+function mod:CHAT_MSG_MONSTER_YELL(_, msg)
+	if msg:find(L.engage_yell_trigger, nil, true) then
+		self:Engage()
+	end
+end
+
 function mod:FuriousRoar(args)
-	self:MessageOld(args.spellId, "red")
-	self:Bar(args.spellId, 25)
+	self:Message(args.spellId, "orange")
+	self:CDBar(args.spellId, 25)
+	self:PlaySound(args.spellId, "info")
 end
 
 -- Slate Dragon: Stone Touch (83603), 35 sec internal cd, resulting in Paralysis, 12 sec stun
 -- Next Stone Touch after 23 sec, hence delaying Furious Roar if less then 12 sec left
 function mod:Paralysis(args)
-	self:MessageOld(83603, "yellow", nil, args.spellId)
-	self:Bar(83603, 12, CL["cast"]:format(args.spellName), args.spellId)
-	self:Bar(83603, 35, args.spellId)
+	self:Message(args.spellId, "yellow")
+	self:CastBar(args.spellId, 12)
+	self:Bar(args.spellId, 35)
+	self:PlaySound(args.spellId, "long")
 end
 
 function mod:MalevolentStrikes(args)
-	if args.amount > (self:Heroic() and 5 or 10) then -- 8% in heroic, 6% in normal, announce around 50-60% reduced healing
-		self:StackMessageOld(args.spellId, args.destName, args.amount, "orange", "info", L["strikes_message"])
+	if args.amount >= (self:Heroic() and 6 or 8) then -- 8% in heroic, 6% in normal, announce around 50-60% reduced healing
+		self:StackMessage(args.spellId, "purple", args.destName, args.amount, self:Heroic() and 7 or 10, L.strikes_message)
 	end
 end
 
-function mod:Breath(args)
-	self:MessageOld(args.spellId, "yellow", nil, L["breath_message"])
-	self:Bar(args.spellId, 20, L["breath_bar"])
+function mod:ScorchingBreath(args)
+	self:Message(args.spellId, "red", CL.breath)
+	self:CDBar(args.spellId, 20, CL.breath)
+	self:PlaySound(args.spellId, "alert")
 end
-
diff --git a/Bastion/Locales/deDE.lua b/Bastion/Locales/deDE.lua
@@ -1,6 +1,13 @@
 
-local L = BigWigs:NewBossLocale("Cho'gall", "deDE")
+local L = BigWigs:NewBossLocale("Halfus Wyrmbreaker", "deDE")
 if not L then return end
+if L then
+	L.strikes_message = "Stöße"
+
+	L.engage_yell_trigger = "Cho'gall wird eure Köpfe fordern! ALLE!"
+end
+
+L = BigWigs:NewBossLocale("Cho'gall", "deDE")
 if L then
 	L.orders = "Schatten- / Flammenbefehl"
 	L.orders_desc = "Warnt, wenn Cho'gall zwischen Befehle des Schattens und Flammenbefehl wechselt."
@@ -46,16 +53,6 @@ if L then
 	L.twilight_shift = "Verschiebung"
 end
 
-L = BigWigs:NewBossLocale("Halfus Wyrmbreaker", "deDE")
-if L then
-	L.strikes_message = "Stöße"
-
-	L.breath_message = "Atem kommt!"
-	L.breath_bar = "~Atem"
-
-	L.engage_yell = "Cho'gall wird eure Köpfe fordern! ALLE!"
-end
-
 L = BigWigs:NewBossLocale("Sinestra", "deDE")
 if L then
 	L.whelps = "Welpen"