From d069fe5dac356731be77a392d7ff715f880a0034 Mon Sep 17 00:00:00 2001 From: Alethrion <54462221+Alethrion@users.noreply.github.com> Date: Sat, 6 Jan 2024 13:23:46 -0500 Subject: [PATCH] fix(Scripts/SSC): Update Hydross Mark Timers (#18114) * Scheduler_Fix * Thanks_Bench * Thanks_Again_Bench * Thanks_elthehablo * Stupid_Last_Line --- .../boss_hydross_the_unstable.cpp | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index c2bbfeaec..1423cc949 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -145,24 +145,25 @@ struct boss_hydross_the_unstable : public BossAI me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); DoCastSelf(SPELL_CORRUPTION, true); - scheduler.Schedule(0s, GROUP_ABILITIES, [this](TaskContext) + scheduler.Schedule(15s, GROUP_ABILITIES, [this](TaskContext) { DoCastSelf(SPELL_MARK_OF_CORRUPTION1); - }).Schedule(15s, GROUP_ABILITIES, [this](TaskContext) - { - DoCastSelf(SPELL_MARK_OF_CORRUPTION2); }).Schedule(30s, GROUP_ABILITIES, [this](TaskContext) { - DoCastSelf(SPELL_MARK_OF_CORRUPTION3); + DoCastSelf(SPELL_MARK_OF_CORRUPTION2); }).Schedule(45s, GROUP_ABILITIES, [this](TaskContext) { - DoCastSelf(SPELL_MARK_OF_CORRUPTION4); + DoCastSelf(SPELL_MARK_OF_CORRUPTION3); }).Schedule(60s, GROUP_ABILITIES, [this](TaskContext) { - DoCastSelf(SPELL_MARK_OF_CORRUPTION5); + DoCastSelf(SPELL_MARK_OF_CORRUPTION4); }).Schedule(75s, GROUP_ABILITIES, [this](TaskContext) + { + DoCastSelf(SPELL_MARK_OF_CORRUPTION5); + }).Schedule(90s, GROUP_ABILITIES, [this](TaskContext context) { DoCastSelf(SPELL_MARK_OF_CORRUPTION6); + context.Repeat(15s); }).Schedule(12150ms, GROUP_ABILITIES, [this](TaskContext context) { DoCastRandomTarget(SPELL_VILE_SLUDGE, 0, 0.0f, true, true); @@ -176,24 +177,25 @@ struct boss_hydross_the_unstable : public BossAI me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false); me->RemoveAurasDueToSpell(SPELL_CORRUPTION); - scheduler.Schedule(0s, GROUP_ABILITIES, [this](TaskContext) + scheduler.Schedule(15s, GROUP_ABILITIES, [this](TaskContext) { DoCastSelf(SPELL_MARK_OF_HYDROSS1); - }).Schedule(15s, GROUP_ABILITIES, [this](TaskContext) - { - DoCastSelf(SPELL_MARK_OF_HYDROSS2); }).Schedule(30s, GROUP_ABILITIES, [this](TaskContext) { - DoCastSelf(SPELL_MARK_OF_HYDROSS3); + DoCastSelf(SPELL_MARK_OF_HYDROSS2); }).Schedule(45s, GROUP_ABILITIES, [this](TaskContext) { - DoCastSelf(SPELL_MARK_OF_HYDROSS4); + DoCastSelf(SPELL_MARK_OF_HYDROSS3); }).Schedule(60s, GROUP_ABILITIES, [this](TaskContext) { - DoCastSelf(SPELL_MARK_OF_HYDROSS5); + DoCastSelf(SPELL_MARK_OF_HYDROSS4); }).Schedule(75s, GROUP_ABILITIES, [this](TaskContext) + { + DoCastSelf(SPELL_MARK_OF_HYDROSS5); + }).Schedule(90s, GROUP_ABILITIES, [this](TaskContext context) { DoCastSelf(SPELL_MARK_OF_HYDROSS6); + context.Repeat(15s); }).Schedule(12150ms, GROUP_ABILITIES, [this](TaskContext context) { DoCastRandomTarget(SPELL_WATER_TOMB, 0, 0.0f, true, true);