BlackwingLair: Tweaks for SoD

BlackwingLair/Firemaw.lua

@@ -72,9 +72,9 @@ function mod:FlameBuffetApplied(args)
 end
 
 function mod:StaticElectricityApplied(args)
-	if self:Me(args.destGUID) and args.amount >= 4 and args.amount % 2 == 0 then
+	if self:Me(args.destGUID) and args.amount >= 6 and (args.amount % 2 == 0 or args.amount > 8) then -- 6,8,9,10
 		self:StackMessage(args.spellId, "blue", args.destName, args.amount, 8)
-		if args.amount >= 6 then
+		if args.amount >= 8 then
 			self:PlaySound(args.spellId, "warning", nil, args.destName)
 		end
 	end

BlackwingLair/Flamegor.lua

@@ -6,6 +6,9 @@ local mod, CL = BigWigs:NewBoss("Flamegor", 469, 1534)
 if not mod then return end
 mod:RegisterEnableMob(11981)
 mod:SetEncounterID(615)
+if mod:GetSeason() == 2 then
+	mod:SetRespawnTime(30)
+end
 
 --------------------------------------------------------------------------------
 -- Locals

BlackwingLair/Locales/deDE.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "deDE")
 if L then
 	L.wyrmguard_overseer = "Wyrmwache der Todeskrallen / Aufseher der Todeskrallen" -- NPC 12460 / 12461
+	L.sandstorm = "Sandsturm"
 
 	--L.target_vulnerability = "Target Vulnerability Warnings"
 	--L.target_vulnerability_desc = "When your target is a Death Talon Wyrmguard or a Death Talon Overseer, show a warning for what vulnerability it has."
 	--L.target_vulnerability_message = "Target Vulnerability: %s"
 	L.detect_magic_missing_message = "Magie entdecken is missing from your target"
 	L.detect_magic_warning = "A Mage must cast \124cff71d5ff\124Hspell:2855:0\124h[Magie entdecken]\124h\124r on your target for vulnerability warnings to work."
+
+	L.warlock = "Hexenmeister der Pechschwingen" -- NPC 12459
 end

BlackwingLair/Locales/esES.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "esES")
 if L then
 	L.wyrmguard_overseer = "Vermiguardia Garramortal / Sobrestante Garramortal" -- NPC 12460 / 12461
+	L.sandstorm = "Tormenta de arena"
 
 	L.target_vulnerability = "Anuncios de vulnerabilidad de objetivo"
 	L.target_vulnerability_desc = "Cuando tu objetivo es un Vermiguardia Garramortal o un Sobrestante Garramortal, muestra un anuncio sobre qué vulnerabilidad tiene."
 	L.target_vulnerability_message = "Vulnerabilidad de objetivo: %s"
 	L.detect_magic_missing_message = "Falta Detectar magia en tu objetivo"
 	L.detect_magic_warning = "Un mago debe lanzar \124cff71d5ff\124Hspell:2855:0\124h[Detectar magia]\124h\124r en tu objetivo para que funcionen los anuncios de vulnerabilidad."
+
+	L.warlock = "Brujo Alanegra" -- NPC 12459
 end

BlackwingLair/Locales/esMX.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "esMX")
 if L then
 	L.wyrmguard_overseer = "Vermiguardia Garramortal / Sobrestante Garramortal" -- NPC 12460 / 12461
+	L.sandstorm = "Tormenta de arena"
 
 	L.target_vulnerability = "Anuncios de vulnerabilidad de objetivo"
 	L.target_vulnerability_desc = "Cuando tu objetivo es un Vermiguardia Garramortal o un Sobrestante Garramortal, muestra un anuncio sobre qué vulnerabilidad tiene."
 	L.target_vulnerability_message = "Vulnerabilidad de objetivo: %s"
 	L.detect_magic_missing_message = "Falta Detectar magia en tu objetivo"
 	L.detect_magic_warning = "Un mago debe lanzar \124cff71d5ff\124Hspell:2855:0\124h[Detectar magia]\124h\124r en tu objetivo para que funcionen los anuncios de vulnerabilidad."
+
+	L.warlock = "Brujo Alanegra" -- NPC 12459
 end

BlackwingLair/Locales/frFR.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "frFR")
 if L then
 	L.wyrmguard_overseer = "Garde wyrm Griffemort / Surveillant Griffemort" -- NPC 12460 / 12461
+	L.sandstorm = "Tempête de sable"
 
 	L.target_vulnerability = "Avertissements de vulnérabilité de la cible"
 	L.target_vulnerability_desc = "Lorsque votre cible est un Garde wyrm Griffemort ou un Surveillant Griffemort, affichez un avertissement pour indiquer sa vulnérabilité."
 	L.target_vulnerability_message = "Vulnérabilité de la cible: %s"
 	L.detect_magic_missing_message = "Détection de la magie est absente de votre cible"
 	L.detect_magic_warning = "Un mage doit incanter \124cff71d5ff\124Hspell:2855:0\124h[Détection de la magie]\124h\124r sur votre cible pour que les avertissements de vulnérabilité fonctionnent."
+
+	L.warlock = "Démoniste de l'Aile noire" -- NPC 12459
 end

BlackwingLair/Locales/itIT.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "itIT")
 if L then
 	L.wyrmguard_overseer = "Guardiadragoni dell'Artiglio della Morte / Sovrintendente dell'Artiglio della Morte" -- NPC 12460 / 12461
+	L.sandstorm = "Tempesta di Sabbia"
 
 	--L.target_vulnerability = "Target Vulnerability Warnings"
 	--L.target_vulnerability_desc = "When your target is a Death Talon Wyrmguard or a Death Talon Overseer, show a warning for what vulnerability it has."
 	--L.target_vulnerability_message = "Target Vulnerability: %s"
 	--L.detect_magic_missing_message = "Detect Magic is missing from your target"
 	--L.detect_magic_warning = "A Mage must cast \124cff71d5ff\124Hspell:2855:0\124h[Detect Magic]\124h\124r on your target for vulnerability warnings to work."
+
+	L.warlock = "Stregone dell'Ala Nera" -- NPC 12459
 end

BlackwingLair/Locales/koKR.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "koKR")
 if L then
 	L.wyrmguard_overseer = "죽음의발톱 고룡수호병 / 죽음의발톱 감독관" -- NPC 12460 / 12461
+	L.sandstorm = "모래폭풍"
 
 	--L.target_vulnerability = "Target Vulnerability Warnings"
 	--L.target_vulnerability_desc = "When your target is a Death Talon Wyrmguard or a Death Talon Overseer, show a warning for what vulnerability it has."
 	--L.target_vulnerability_message = "Target Vulnerability: %s"
 	L.detect_magic_missing_message = "마법 감지 is missing from your target"
 	L.detect_magic_warning = "A Mage must cast \124cff71d5ff\124Hspell:2855:0\124h[마법 감지]\124h\124r on your target for vulnerability warnings to work."
+
+	L.warlock = "검은날개 흑마법사" -- NPC 12459
 end

BlackwingLair/Locales/ptBR.lua

@@ -64,10 +64,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "ptBR")
 if L then
 	L.wyrmguard_overseer = "Serpeguarda Garra da Morte / Feitor Garra da Morte" -- NPC 12460 / 12461
+	L.sandstorm = "Tempestade de Areia"
 
 	L.target_vulnerability = "Avisos de vulnerabilidade do alvo"
 	L.target_vulnerability_desc = "Quando o seu alvo é um Serpeguarda Garra da Morte ou um Feitor Garra da Morte, mostra um aviso sobre qual vulnerabilidade ele possui."
 	L.target_vulnerability_message = "Vulnerabilidade do alvo: %s"
 	L.detect_magic_missing_message = "Detectar Magia está ausente do seu alvo"
 	L.detect_magic_warning = "Um mago precisa lançar \124cff71d5ff\124Hspell:2855:0\124h[Detectar Magia]\124h\124r no seu alvo para que os avisos de vulnerabilidade funcionem."
+
+	L.warlock = "Bruxo Asa Negra" -- NPC 12459
 end

BlackwingLair/Locales/ruRU.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "ruRU")
 if L then
 	L.wyrmguard_overseer = "Змеестраж Когтя Смерти / Надзиратель Когтя Смерти" -- NPC 12460 / 12461
+	L.sandstorm = "Песчаная буря"
 
 	--L.target_vulnerability = "Target Vulnerability Warnings"
 	--L.target_vulnerability_desc = "When your target is a Death Talon Wyrmguard or a Death Talon Overseer, show a warning for what vulnerability it has."
 	--L.target_vulnerability_message = "Target Vulnerability: %s"
 	L.detect_magic_missing_message = "Распознавание магии is missing from your target"
 	L.detect_magic_warning = "A Mage must cast \124cff71d5ff\124Hspell:2855:0\124h[Распознавание магии]\124h\124r on your target for vulnerability warnings to work."
+
+	L.warlock = "Чернокнижник Крыла Тьмы" -- NPC 12459
 end

BlackwingLair/Locales/zhCN.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "zhCN")
 if L then
 	L.wyrmguard_overseer = "黑翼龙人护卫 / 黑翼监工" -- NPC 12460 / 12461
+	L.sandstorm = "沙尘暴"
 
 	L.target_vulnerability = "目标弱点警报"
 	L.target_vulnerability_desc = "当你的目标是黑翼龙人护卫/黑翼监工时，显示它的弱点警报。"
 	L.target_vulnerability_message = "目标弱点: %s"
 	L.detect_magic_missing_message = "目标缺少侦测魔法"
 	L.detect_magic_warning = "法师必须对你的目标施放\124cff71d5ff\124Hspell:2855:0\124h[侦测魔法]\124h\124r，弱点警报才会有效。"
+
+	L.warlock = "黑翼管理者" -- NPC 12459
 end

BlackwingLair/Locales/zhTW.lua

@@ -63,10 +63,13 @@ end
 L = BigWigs:NewBossLocale("Blackwing Lair Trash", "zhTW")
 if L then
 	--L.wyrmguard_overseer = "Death Talon Wyrmguard / Death Talon Overseer" -- NPC 12460 / 12461
+	--L.sandstorm = "Sandstorm"
 
 	--L.target_vulnerability = "Target Vulnerability Warnings"
 	--L.target_vulnerability_desc = "When your target is a Death Talon Wyrmguard or a Death Talon Overseer, show a warning for what vulnerability it has."
 	--L.target_vulnerability_message = "Target Vulnerability: %s"
 	--L.detect_magic_missing_message = "Detect Magic is missing from your target"
 	--L.detect_magic_warning = "A Mage must cast \124cff71d5ff\124Hspell:2855:0\124h[Detect Magic]\124h\124r on your target for vulnerability warnings to work."
+
+	--L.warlock = "Blackwing Warlock" -- NPC 12459
 end

BlackwingLair/Razorgore.lua

@@ -37,18 +37,31 @@ function mod:GetOptions()
 	return {
 		14515, -- Dominate Mind
 		{23023, "ICON"}, -- Conflagration
-		367873, -- Blinding Ash
-		366909, -- Ruby Flames
-		367740, -- Creeping Chill
 		"eggs",
 		"stages",
 	},nil,{
 		[14515] = CL.mind_control, -- Dominate Mind (Mind Control)
-		[367873] = CL.underyou:format(CL.fire), -- Blinding Ash (Fire under YOU)
-		[366909] = CL.underyou:format(CL.fire), -- Ruby Flames (Fire under YOU)
 	}
 end
 
+if mod:GetSeason() == 2 then
+	function mod:GetOptions()
+		return {
+			14515, -- Dominate Mind
+			{23023, "ICON"}, -- Conflagration
+			367873, -- Blinding Ash
+			366909, -- Ruby Flames
+			367740, -- Creeping Chill
+			"eggs",
+			"stages",
+		},nil,{
+			[14515] = CL.mind_control, -- Dominate Mind (Mind Control)
+			[367873] = CL.underyou:format(CL.fire), -- Blinding Ash (Fire under YOU)
+			[366909] = CL.underyou:format(CL.fire), -- Ruby Flames (Fire under YOU)
+		}
+	end
+end
+
 function mod:OnBossEnable()
 	self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
 
@@ -118,10 +131,12 @@ function mod:DestroyEgg()
 end
 
 function mod:Conflagration(args)
-	self:TargetMessage(args.spellId, "orange", args.destName)
-	self:TargetBar(args.spellId, 10, args.destName)
-	self:PrimaryIcon(args.spellId, args.destName)
-	self:PlaySound(args.spellId, "info", nil, args.destName)
+	if self:Player(args.destFlags) then -- Players only, can apply to enemy NPCs
+		self:TargetMessage(args.spellId, "orange", args.destName)
+		self:TargetBar(args.spellId, 10, args.destName)
+		self:PrimaryIcon(args.spellId, args.destName)
+		self:PlaySound(args.spellId, "info", nil, args.destName)
+	end
 end
 
 function mod:ConflagrationOver(args)