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

fix(Scripts/SunwellPlateau): Correct Singularity behavior in Entropius encounter (#21892)

Browse Source
This commit is contained in:
blinkysc
2025-04-11 13:45:28 -05:00
committed by GitHub
parent 3f08610f84
commit 12693ff3f2
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+21 -11
View File
@@ -48,7 +48,7 @@ enum Spells
//Black Hole Spells //Black Hole Spells
SPELL_BLACK_HOLE_SUMMON_VISUAL = 46242, SPELL_BLACK_HOLE_SUMMON_VISUAL = 46242,
SPELL_BLACK_HOLE_SUMMON_VISUAL2 = 46248, SPELL_BLACK_HOLE_SUMMON_VISUAL2 = 46247,
SPELL_BLACK_HOLE_VISUAL2 = 46235, SPELL_BLACK_HOLE_VISUAL2 = 46235,
SPELL_BLACK_HOLE_PASSIVE = 46228, SPELL_BLACK_HOLE_PASSIVE = 46228,
SPELL_BLACK_HOLE_EFFECT = 46230 SPELL_BLACK_HOLE_EFFECT = 46230
@@ -169,6 +169,7 @@ struct boss_entropius : public ScriptedAI
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
DoMeleeAttackIfReady();
scheduler.Update(diff); scheduler.Update(diff);
} }
}; };
@@ -180,26 +181,35 @@ struct npc_singularity : public NullCreatureAI
void Reset() override void Reset() override
{ {
me->DespawnOrUnsummon(18000); me->DespawnOrUnsummon(18000);
DoCastSelf(SPELL_BLACK_HOLE_SUMMON_VISUAL, true);
DoCastSelf(SPELL_BLACK_HOLE_SUMMON_VISUAL2, true); me->m_Events.AddEventAtOffset([&] {
DoCastSelf(SPELL_BLACK_HOLE_SUMMON_VISUAL, true);
}, 2s);
me->m_Events.AddEventAtOffset([&] {
DoCastSelf(SPELL_BLACK_HOLE_SUMMON_VISUAL2, true);
}, 4s);
me->m_Events.AddEventAtOffset([&] {
DoCastSelf(SPELL_BLACK_HOLE_SUMMON_VISUAL, true);
}, 6s);
me->m_Events.AddEventAtOffset([&] {
DoCastSelf(SPELL_BLACK_HOLE_VISUAL2, true);
DoCastSelf(SPELL_BLACK_HOLE_PASSIVE, true);
}, 8s);
me->m_Events.AddEventAtOffset([&] { me->m_Events.AddEventAtOffset([&] {
me->KillSelf(); me->KillSelf();
}, 17s); }, 17s);
me->m_Events.AddEventAtOffset([&] { scheduler.Schedule(8s, [this](TaskContext context)
me->RemoveAurasDueToSpell(SPELL_BLACK_HOLE_SUMMON_VISUAL2);
DoCastSelf(SPELL_BLACK_HOLE_VISUAL2, true);
DoCastSelf(SPELL_BLACK_HOLE_PASSIVE, true);
}, 3500ms);
scheduler.Schedule(5s, [this](TaskContext context)
{ {
auto const& playerList = me->GetMap()->GetPlayers(); auto const& playerList = me->GetMap()->GetPlayers();
for (auto const& playerRef : playerList) for (auto const& playerRef : playerList)
{ {
if (Player* player = playerRef.GetSource()) if (Player* player = playerRef.GetSource())
if (me->GetDistance2d(player) < 15.0f && player->GetPositionZ() < 72.0f && player->IsAlive() && !player->HasAura(SPELL_BLACK_HOLE_EFFECT)) if (me->IsWithinLOSInMap(player) && player->IsAlive() && !player->HasAura(SPELL_BLACK_HOLE_EFFECT))
{ {
me->GetMotionMaster()->MovePoint(0, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), false, true); me->GetMotionMaster()->MovePoint(0, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), false, true);
context.Repeat(); context.Repeat();