BT - Ork [ remove gtfo :) ], Magtheridon-[~pull timer]

Waini4 · Aug 22, 2024 · d8ea30d · d8ea30d
1 parent d66e233
commit d8ea30d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/DBM-BlackTemple/Bloodboil.lua b/DBM-BlackTemple/Bloodboil.lua
@@ -20,8 +20,8 @@ mod:RegisterEventsInCombat(
 --TODO, verify blood is in combat log like that, otherwise have to use playerdebuffstacks frame instead
 --local warnFilth			= mod:NewTargetAnnounce(373742, 3)
 
-local specWarnGTFO		= mod:NewSpecialWarningGTFO(373744, nil, nil, nil, 4, 8)
-local specWarnFilth		= mod:NewSpecialWarningStack(373742, nil, 14, nil, nil, 2, 2)
+--local specWarnGTFO		= mod:NewSpecialWarningGTFO(373744, nil, nil, nil, 4, 8)
+local specWarnFilth		= mod:NewSpecialWarningStack(373742, nil, 18, nil, nil, 2, 2)
 local specWarnBlood		= mod:NewSpecialWarningStack(373749, nil, 2, nil, nil, 1, 2)
 --local specWarnRage		= mod:NewSpecialWarningYou(40604, nil, nil, nil, 1, 2)
 local yellFilth			= mod:NewCountYell(373742)
@@ -31,17 +31,17 @@ local timerStrikeCD		= mod:NewCDTimer(6, 373745, nil, "Tank", 2, 5, nil, DBM_COM
 
 --local berserkTimer		= mod:NewBerserkTimer(600)
 
-mod:AddSetIconOption("SetIconOnFilth", 373742, true, true, { 2, 3, 4, 5, 6, 7, 8})
+--mod:AddSetIconOption("SetIconOnFilth", 373742, true, true, { 2, 3, 4, 5, 6, 7, 8})
 mod:AddInfoFrameOption(373742)
 mod:AddInfoFrameOption(373747)
 local ApofStack = DBM:GetSpellInfoNew(373747)
 local FilthBuff = DBM:GetSpellInfoNew(373742)
 mod:AddRangeFrameOption(8, nil, true)
-mod.vb.Filth = 8
+--mod.vb.Filth = 8
 
 
 function mod:OnCombatStart(delay)
-	self.vb.Filth = 8
+--	self.vb.Filth = 8
 	if self.Options.InfoFrame and not self:IsTank() then
 		DBM.InfoFrame:SetHeader(FilthBuff)
 		DBM.InfoFrame:Show(30, "playerdebuffstacks", FilthBuff, 2)
@@ -75,30 +75,31 @@ function mod:SPELL_AURA_APPLIED(args)
 	local spellId = args.spellId
 	local amount = args.amount or 1
 	if spellId == 373742 then
-		if amount >= 14 then
+		if amount >= 18 then
 			if args:IsPlayer() and self:AntiSpam(2) then
 				specWarnFilth:Show(amount)
 				yellFilth:Yell(amount)
 			end
-			if self.Options.SetIconOnFilth then
+		--[[	if self.Options.SetIconOnFilth then
 				self:SetIcon(args.destName, self.vb.Filth)
 				self.vb.Filth = self.vb.Filth - 1
 				if self.vb.Filth < 2 then
 					self.vb.Filth = 8
 				end
-			end
+			end]]
 		end
 	elseif spellId == 373749 then
 		if amount >= 2 and args:IsPlayer() and self:AntiSpam(2) then
 			specWarnBlood:Show(amount)
 		end
-	elseif spellId == 373744 and self:AntiSpam(2) then
-		specWarnGTFO:Show(args.spellName)
+	--elseif spellId == 373744 and self:AntiSpam(2) then
+	--	specWarnGTFO:Show(args.spellName)
 	end
 end
 mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
 --mod.SPELL_AURA_REFRESH = mod.SPELL_AURA_APPLIED
 
+--[[
 function mod:SPELL_AURA_REMOVED(args)
 	local spellId = args.spellId
 	if spellId == 373742 then
@@ -107,3 +108,4 @@ function mod:SPELL_AURA_REMOVED(args)
 		end
 	end
 end
+]]
diff --git a/DBM-Magtheridon/Magtheridon.lua b/DBM-Magtheridon/Magtheridon.lua
@@ -52,7 +52,7 @@ local specWarnHandOfMagt        = mod:NewSpecialWarningSpell(305131, nil, nil, n
 local specWarnDevastatingStrike = mod:NewSpecialWarningYou(305134, "Tank", nil, nil, nil, 1, 2) --Оповещение на экран о получении сокрушительного удара
 
 local berserkTimer				= mod:NewBerserkTimer(600)
-local timerPull   				= mod:NewTimer(120, "Pull", 305131, nil, nil, 6) -- Пулл босса
+local timerPull   				= mod:NewTimer(9, "Pull", 305131, nil, nil, 6) -- Пулл босса
 
 local warnPhase3Soon			= mod:NewPrePhaseAnnounce(3)
 local warnPhase3				= mod:NewPhaseAnnounce(3)
@@ -129,7 +129,7 @@ function mod:OnCombatStart(delay)
 end
 
 function mod:CHAT_MSG_MONSTER_EMOTE(msg)
-    if msg == L.YellPullAcolytes or msg:find(L.YellPullAcolytes) then
+    if msg == L.YellPullShort or msg:find(L.YellPullShort) then
 		timerPull:Start()
 	end
 end

diff --git a/DBM-Magtheridon/localization.ru.lua b/DBM-Magtheridon/localization.ru.lua
@@ -23,6 +23,7 @@ L:SetOptionLocalization{
 
 L:SetMiscLocalization{
 	YellPullAcolytes 		= "Сдерживающая сила |3-1(%s) начинает ослабевать!",
+	YellPullShort 			= "|3-2(%s) удалось почти освободиться от пут!",
 	YellPullAcolytes2		= "Вы думаете, что ваша жалкая магия будет удерживать меня вечно?",
 	YellPhase2 				= "Меня так просто не возьмешь! Пусть стены темницы содрогнутся... и падут!",
 	YellHand				= "Печать Магтеридона на мне!",