Zort(add cast for tree), ZS HM(remove Обезвоживание), Grul(Change tim…

…er for Echo)
Waini4 · Jun 26, 2024 · 65bdf63 · 65bdf63
1 parent 97f5be1
commit 65bdf63
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 27 deletions.
diff --git a/DBM-Gruul/Gruul.lua b/DBM-Gruul/Gruul.lua
@@ -16,7 +16,7 @@ mod:AddTimerLine(DBM_CORE_L.NORMAL_MODE)
 local specWarnRock                  = mod:NewSpecialWarningMove(36240)
 
 local timerEarthStrikeCD            = mod:NewCDTimer(133, 33525)
-local timerEchoCD                   = mod:NewCDTimer(18, 36297)
+local timerEchoCD                   = mod:NewCDTimer(15, 36297)
 local timerRockCD                   = mod:NewCDTimer(30, 36240)
 
 mod:AddTimerLine(DBM_CORE_L.HEROIC_MODE)

diff --git a/DBM-Serpentshrine/Tidewalker.lua b/DBM-Serpentshrine/Tidewalker.lua
@@ -35,7 +35,7 @@ local berserkTimer = mod:NewBerserkTimer(480)
 local warnVzglad     = mod:NewStackAnnounce(310136, 5, nil, "Tank") -- Взгляд
 local warnZemla      = mod:NewSoonAnnounce(310152, 2) -- Землетрясение
 local warnHwat       = mod:NewTargetAnnounce(310144, 3) -- Хватка
-local warnSuh        = mod:NewTargetAnnounce(310155, 3) -- Обезвоживание
+--local warnSuh        = mod:NewTargetAnnounce(310155, 3) -- Обезвоживание
 local warnKrik       = mod:NewSpellAnnounce(310151, 2) -- Земля
 local warnTop        = mod:NewSpellAnnounce(310140, 2) -- Топот
 local warnMon        = mod:NewSpellAnnounce(310137, 4) -- Топот
@@ -68,25 +68,6 @@ local graveTargets = {}
 local warned_preP1 = false
 local warned_preP2 = false
 local SuhTargets = {}
-local SuhIcons = 8
-
-do
-	-- local function sort_by_group(v1, v2)
-	-- 	return DBM:GetRaidSubgroup(UnitName(v1)) < DBM:GetRaidSubgroup(UnitName(v2))
-	-- end
-	function mod:SetSuhIcons()
-		table.sort(SuhTargets, function(v1, v2) return DBM:GetRaidSubgroup(v1) < DBM:GetRaidSubgroup(v2) end)
-		for _, v in ipairs(SuhTargets) do
-			if self.Options.SetIconOnSklepTargets then
-				self:SetIcon(UnitName(v), SuhIcons, 10)
-			end
-			SuhIcons = SuhIcons - 1
-		end
-		warnSuh:Show(table.concat(SuhTargets, "<, >"))
-		table.wipe(SuhTargets)
-		SuhIcons = 8
-	end
-end
 
 function mod:AnnounceGraves()
 	warnGraves:Show(table.concat(graveTargets, "<, >"))
@@ -175,8 +156,6 @@ function mod:SPELL_AURA_APPLIED(args) -- все хм --
 		timerHwatCD:Start()
 		warnHwat:Show(args.destName)
 	elseif spellId == 310155 then
-		SuhTargets[#SuhTargets + 1] = args.destName
-		self:ScheduleMethod(0.1, "SetSuhIcons")
 		timerSuhCD:Start()
 	elseif spellId == 310138 then
 		timerMonCD:Start()

diff --git a/DBM-WorldBoss/AWakingNightmare/Zort.lua b/DBM-WorldBoss/AWakingNightmare/Zort.lua
@@ -8,7 +8,7 @@ mod:SetUsedIcons(1, 2, 3, 4, 5, 6, 7, 8)
 mod:RegisterCombat("combat", 50702)
 
 mod:RegisterEventsInCombat(
-	"SPELL_CAST_START 307829 307820 307818 307817 308520 307852 308512 307845",
+	"SPELL_CAST_START 307829 307820 307818 307817 308520 307852 308512 307845 307844",
 	"SPELL_CAST_SUCCESS 308520 307834 318956",
 	"SPELL_AURA_APPLIED 307815 307839 307842 308512 307861 308517 308620 308515 307834 307833",
 	"SPELL_AURA_APPLIED_DOSE 307815 307839 307842 308512 308517 307861 308620 308515 307834 307833",
@@ -33,7 +33,7 @@ local warnSveaz               = mod:NewTargetAnnounce(308620, 3)
 --local warnShkval						= mod:NewCastAnnounce(307821, 3)
 -- local warnTraitor             = mod:NewCountAnnounce(307814, 2, nil, false)
 local warnInternalbleeding    = mod:NewStackAnnounce(307833, 2, nil, "Tank|Healer")
-local warnInternalbgPre       = mod:NewPreWarnAnnounce(307833, 5, nil, nil, "Tank|Healer")
+--local warnInternalbgPre       = mod:NewPreWarnAnnounce(307833, 5, nil, nil, "Tank|Healer")
 local specWarnBreathNightmare = mod:NewSpecialWarningDispel(308512, "RemoveDisease", nil, nil, 1, 6)
 
 local specWarnRazrsveaz       = mod:NewSpecialWarning("KnopSv", 3)
@@ -67,9 +67,11 @@ local timerAmonstrousblow     = mod:NewCDTimer(15, 307845)
 local timerCDChep             = mod:NewCDTimer(6, 308520)
 
 mod:AddTimerLine(DBM_COMMON_L.ADDS)
-local warnPriziv  = mod:NewCastAnnounce(307852, 3)
+local warnNightmare			  	= mod:NewCastAnnounce(307844, 2, 1, nil,"Tank")
+local warnPriziv  				= mod:NewCastAnnounce(307852, 3)
 -- local timerTrees  = mod:NewCDTimer(5, 307852, nil, nil, nil, 4)
-local timerPriziv = mod:NewCDTimer(120, 307852, nil, nil, nil, 4)
+local timerNightmare		  	= mod:NewCDTimer(10, 307844, nil, "Tank")
+local timerPriziv 				= mod:NewCDTimer(120, 307852, nil, nil, nil, 4)
 
 mod:AddSetIconOption("SetIconOnSveazTarget", 314606, true, true, { 5, 6, 7 })
 mod:AddSetIconOption("SetIconOnFlameTarget", 307839, true, true, { 1, 2 })
@@ -157,6 +159,9 @@ function mod:SPELL_CAST_START(args)
 		timerBreathNightmare:Start(stage == 5 and 30 or 42)
 	elseif args:IsSpellID(307845) then
 		timerAmonstrousblow:Start()
+		elseif args:IsSpellID(307844) and self:AntiSpam(2) then
+			warnNightmare:Show()
+            timerNightmare:Start()
 	end
 end