sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/ShadowLabyrinth): Boss spell timers correct values (#15984)

Browse Source 
* fix(Scripts/ShadowLabyrinth): fix boss timers

except Vorpil

currently done: hellmaw, blackheart

todo: murmur

* now done hellmaw

forgot to include

* added murmur timers

see title

* Apply suggestions from code review

---------

Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com>
This commit is contained in:
Dan
2023-04-18 03:00:58 +02:00
committed by GitHub
parent 689ba07971
commit e38b070239
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+6 -6
View File
@@ -98,21 +98,21 @@ struct boss_ambassador_hellmaw : public BossAI
} }
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_CORROSIVE, urand(5000, 10000)); events.ScheduleEvent(EVENT_SPELL_CORROSIVE, urand(23050, 30350));
scheduler.Schedule(5s, 10s, [this](TaskContext context) scheduler.Schedule(23050ms, 30350ms, [this](TaskContext context)
{ {
DoCastVictim(SPELL_CORROSIVE_ACID); DoCastVictim(SPELL_CORROSIVE_ACID);
context.Repeat(15s, 25s); context.Repeat(23050ms, 30350ms);
}).Schedule(15s, 20s, [this](TaskContext context) }).Schedule(23s, 33s, [this](TaskContext context)
{ {
DoCastAOE(SPELL_FEAR); DoCastAOE(SPELL_FEAR);
context.Repeat(20s, 35s); context.Repeat(23s, 33s);
}); });
if (IsHeroic()) if (IsHeroic())
{ {
scheduler.Schedule(5min, [this](TaskContext) scheduler.Schedule(3min, [this](TaskContext)
{ {
DoCastSelf(SPELL_ENRAGE, true); DoCastSelf(SPELL_ENRAGE, true);
}); });
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+5 -5
View File
@@ -85,10 +85,10 @@ public:
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_INCITE, 20000); events.ScheduleEvent(EVENT_SPELL_INCITE, 24000);
events.ScheduleEvent(EVENT_INCITE_WAIT, 15000); events.ScheduleEvent(EVENT_INCITE_WAIT, 15000);
events.ScheduleEvent(EVENT_SPELL_CHARGE, 0); events.ScheduleEvent(EVENT_SPELL_CHARGE, 0);
events.ScheduleEvent(EVENT_SPELL_KNOCKBACK, 15000); events.ScheduleEvent(EVENT_SPELL_KNOCKBACK, urand(16950, 26350));
if (instance) if (instance)
instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS);
@@ -127,18 +127,18 @@ public:
DoResetThreatList(); DoResetThreatList();
InciteChaos = true; InciteChaos = true;
events.DelayEvents(15000); events.DelayEvents(15000);
events.RepeatEvent(40000); events.RepeatEvent(urand(50000, 70000));
events.ScheduleEvent(EVENT_INCITE_WAIT, 15000); events.ScheduleEvent(EVENT_INCITE_WAIT, 15000);
break; break;
} }
case EVENT_SPELL_CHARGE: case EVENT_SPELL_CHARGE:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
me->CastSpell(target, SPELL_CHARGE, false); me->CastSpell(target, SPELL_CHARGE, false);
events.RepeatEvent(urand(15000, 25000)); events.RepeatEvent(urand(30000, 50000));
break; break;
case EVENT_SPELL_KNOCKBACK: case EVENT_SPELL_KNOCKBACK:
me->CastSpell(me, SPELL_WAR_STOMP, false); me->CastSpell(me, SPELL_WAR_STOMP, false);
events.RepeatEvent(urand(18000, 24000)); events.RepeatEvent(urand(16950, 26350));
break; break;
} }
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+9 -9
View File
@@ -129,7 +129,7 @@ struct boss_murmur : public BossAI
{ {
_JustEngagedWith(); _JustEngagedWith();
scheduler.Schedule(30s, [this](TaskContext context) scheduler.Schedule(28s, [this](TaskContext context)
{ {
Talk(EMOTE_SONIC_BOOM); Talk(EMOTE_SONIC_BOOM);
DoCastAOE(DUNGEON_MODE(SPELL_SONIC_BOOM_CAST_N, SPELL_SONIC_BOOM_CAST_H)); DoCastAOE(DUNGEON_MODE(SPELL_SONIC_BOOM_CAST_N, SPELL_SONIC_BOOM_CAST_H));
@@ -139,11 +139,11 @@ struct boss_murmur : public BossAI
DoCastAOE(DUNGEON_MODE(SPELL_SONIC_BOOM_EFFECT_N, SPELL_SONIC_BOOM_EFFECT_H), true); DoCastAOE(DUNGEON_MODE(SPELL_SONIC_BOOM_EFFECT_N, SPELL_SONIC_BOOM_EFFECT_H), true);
}); });
context.Repeat(28500ms); context.Repeat(34s, 40s);
}).Schedule(8s, 20s, [this](TaskContext context) }).Schedule(14600ms, 25500ms, [this](TaskContext context)
{ {
DoCastRandomTarget(DUNGEON_MODE(SPELL_MURMURS_TOUCH_N, SPELL_MURMURS_TOUCH_H)); DoCastRandomTarget(DUNGEON_MODE(SPELL_MURMURS_TOUCH_N, SPELL_MURMURS_TOUCH_H));
context.Repeat(25s, 35s); context.Repeat(14600ms, 25500ms);
}).Schedule(15s, 30s, [this](TaskContext context) }).Schedule(15s, 30s, [this](TaskContext context)
{ {
if (DoCastRandomTarget(SPELL_MAGNETIC_PULL, 0, 80.0f) == SPELL_CAST_OK) if (DoCastRandomTarget(SPELL_MAGNETIC_PULL, 0, 80.0f) == SPELL_CAST_OK)
@@ -165,7 +165,7 @@ struct boss_murmur : public BossAI
if (ShouldCastResonance()) if (ShouldCastResonance())
{ {
DoCastAOE(SPELL_RESONANCE); DoCastAOE(SPELL_RESONANCE);
context.Repeat(5s); context.Repeat(6s, 18s);
} }
}); });
} }
@@ -176,14 +176,14 @@ struct boss_murmur : public BossAI
if (IsHeroic()) if (IsHeroic())
{ {
scheduler.Schedule(15s, [this](TaskContext context) scheduler.Schedule(5s, [this](TaskContext context)
{ {
DoCastAOE(SPELL_THUNDERING_STORM); DoCastAOE(SPELL_THUNDERING_STORM);
context.Repeat(15s); context.Repeat(6050ms, 10s);
}).Schedule(10s, [this](TaskContext context) }).Schedule(3650ms, 9150ms, [this](TaskContext context)
{ {
DoCastVictim(SPELL_SONIC_SHOCK); DoCastVictim(SPELL_SONIC_SHOCK);
context.Repeat(10s, 20s); context.Repeat(9150ms, 10s);
}); });
} }