Merge branch 'master' into patch-45

BigWigsMods · Dec 1, 2023 · 6978cbd · 6978cbd
2 parents 8a6ba01 + 68c5e0e
commit 6978cbd
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 14 deletions.
diff --git a/Legion/ArtifactScenarios/Locales/deDE.lua b/Legion/ArtifactScenarios/Locales/deDE.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "Erzmagier Xylem"
 	L.corruptingShadows = "Verderbende Schatten"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "deDE")

diff --git a/Legion/ArtifactScenarios/Locales/esES.lua b/Legion/ArtifactScenarios/Locales/esES.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "Archimago Xylem"
 	L.corruptingShadows = "Sombra corruptora"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "esES") or BigWigs:NewBossLocale("Agatha", "esMX")

diff --git a/Legion/ArtifactScenarios/Locales/frFR.lua b/Legion/ArtifactScenarios/Locales/frFR.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "Archimage Xylem"
 	L.corruptingShadows = "Ombres corruptrices"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "frFR")

diff --git a/Legion/ArtifactScenarios/Locales/itIT.lua b/Legion/ArtifactScenarios/Locales/itIT.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "Arcimago Xylem"
 	L.corruptingShadows = "Ombre Corrompenti"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "itIT")

diff --git a/Legion/ArtifactScenarios/Locales/koKR.lua b/Legion/ArtifactScenarios/Locales/koKR.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "대마법사 실렘"
 	L.corruptingShadows = "타락의 그림자"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "koKR")

diff --git a/Legion/ArtifactScenarios/Locales/ptBR.lua b/Legion/ArtifactScenarios/Locales/ptBR.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "Arquimago Tauriel"
 	L.corruptingShadows = "Sombras Corruptoras"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "ptBR")

diff --git a/Legion/ArtifactScenarios/Locales/ruRU.lua b/Legion/ArtifactScenarios/Locales/ruRU.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "Верховный маг Ксилем"
 	L.corruptingShadows = "Гибельная тень"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "ruRU")

diff --git a/Legion/ArtifactScenarios/Locales/zhCN.lua b/Legion/ArtifactScenarios/Locales/zhCN.lua
@@ -64,7 +64,8 @@ if L then
 	L.name = "大法师克希雷姆"
 	L.corruptingShadows = "腐蚀暗影"
 
-	L.warmup_trigger1 = "你太迟了，<class>！掌握了聚焦之虹，我就能直接从艾泽拉斯的魔网中抽取奥术能量来强化自身的法力！"  --猎人进本NPC喊的是猎人，<class>是任务插件Questie任务描述常用的。
+	L.warmup_trigger1 = "掌握了聚焦之虹" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "zhCN")

diff --git a/Legion/ArtifactScenarios/Locales/zhTW.lua b/Legion/ArtifactScenarios/Locales/zhTW.lua
@@ -64,7 +64,8 @@ if L then
 	-- L.name = "Archmage Xylem"
 	-- L.corruptingShadows = "Corrupting Shadows"
 
-	--L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
+	--L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	--L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 L = BigWigs:NewBossLocale("Agatha", "zhTW")

diff --git a/Legion/ArtifactScenarios/Xylem.lua b/Legion/ArtifactScenarios/Xylem.lua
@@ -1,4 +1,3 @@
-
 --------------------------------------------------------------------------------
 -- Module Declaration
 --
@@ -38,8 +37,8 @@ if L then
 	L.name = "Archmage Xylem"
 	L.corruptingShadows = "Corrupting Shadows"
 
-	L.warmup_trigger1 = "You are too late, warrior! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!"
-	-- L.warmup_trigger2 = "Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!"
+	L.warmup_trigger1 = "With the Focusing Iris under my control" -- You are too late, demon hunter! With the Focusing Iris under my control, I can siphon the arcane energy from Azeroth's ley lines directly into my magnificent self!
+	L.warmup_trigger2 = "Drained of magic, your world will be ripe" -- Drained of magic, your world will be ripe for destruction by my demon masters... and my power will be limitless!
 end
 
 --------------------------------------------------------------------------------
@@ -128,15 +127,19 @@ end
 -- Archmage Xylem
 
 function mod:Warmup(event, msg)
-	if msg == L.warmup_trigger1 then
+	if msg:find(L.warmup_trigger1, nil, true) then
+		self:UnregisterEvent(event)
+		self:Bar("warmup", 27.6, CL.active, "spell_mage_focusingcrystal")
+	elseif msg:find(L.warmup_trigger2, nil, true) then
 		self:UnregisterEvent(event)
-		self:Bar("warmup", 28, CL.active, "spell_mage_focusingcrystal")
+		self:Bar("warmup", 13.3, CL.active, "spell_mage_focusingcrystal")
 	end
 end
 
 function mod:UNIT_SPELLCAST_SUCCEEDED(_, _, _, spellId)
 	if spellId == 242015 then -- Blink
 		local spellName = self:SpellName(spellId)
+		self:StopBar(blinkSpells[blinkCount] and ("%s (%s)"):format(spellName, self:SpellName(blinkSpells[blinkCount])) or spellName)
 		self:MessageOld(242015, "yellow", nil, blinkSpells[blinkCount] and ("%s (%s)"):format(spellName, self:SpellName(blinkSpells[blinkCount])) or spellName)
 		blinkCount = blinkCount + 1
 		self:CDBar(242015, 26, blinkSpells[blinkCount] and ("%s (%s)"):format(spellName, self:SpellName(blinkSpells[blinkCount])) or spellName)