fix(Scripts/Ulduar): fix Saronite Animus not engaging combat (#26501)

This commit is contained in:
Andrew
2026-07-06 06:00:39 -03:00
committed by GitHub
parent fee9709b3e
commit 28f803a828
3 changed files with 10 additions and 6 deletions
@@ -65,7 +65,6 @@ enum VezaxNpcs
{ {
// NPC_VEZAX = 33271, // NPC_VEZAX = 33271,
// NPC_VEZAX_BUNNY = 33500, // NPC_VEZAX_BUNNY = 33500,
NPC_SARONITE_ANIMUS = 33524,
}; };
enum VezaxGOs enum VezaxGOs
@@ -368,11 +367,7 @@ struct npc_ulduar_saronite_animus : public ScriptedAI
npc_ulduar_saronite_animus(Creature* creature) : ScriptedAI(creature) npc_ulduar_saronite_animus(Creature* creature) : ScriptedAI(creature)
{ {
_instance = creature->GetInstanceScript(); _instance = creature->GetInstanceScript();
if (_instance)
if (Creature* vezax = _instance->GetCreature(BOSS_VEZAX))
vezax->AI()->JustSummoned(me);
timer = 0; timer = 0;
me->SetInCombatWithZone();
} }
InstanceScript* _instance; InstanceScript* _instance;
@@ -389,7 +384,8 @@ struct npc_ulduar_saronite_animus : public ScriptedAI
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
UpdateVictim(); if (!UpdateVictim())
return;
timer += diff; timer += diff;
if (timer >= 2000) if (timer >= 2000)
@@ -165,6 +165,12 @@ ObjectData const gameobjectData[] =
{ 0, 0 } { 0, 0 }
}; };
ObjectData const summonData[] =
{
{ NPC_SARONITE_ANIMUS, BOSS_VEZAX }, // summoned by a Saronite Vapor, not Vezax
{ 0, 0 }
};
BossBoundaryData const boundaries = BossBoundaryData const boundaries =
{ {
{ BOSS_LEVIATHAN, new RectangleBoundary(130.0f, 450.0f, -170.0f, 110.0f) }, { BOSS_LEVIATHAN, new RectangleBoundary(130.0f, 450.0f, -170.0f, 110.0f) },
@@ -189,6 +195,7 @@ public:
SetPersistentDataCount(MAX_PERSISTENT_DATA); SetPersistentDataCount(MAX_PERSISTENT_DATA);
LoadDoorData(doorData); LoadDoorData(doorData);
LoadObjectData(creatureData, gameobjectData); LoadObjectData(creatureData, gameobjectData);
LoadSummonData(summonData);
LoadBossBoundaries(boundaries); LoadBossBoundaries(boundaries);
Initialize(); Initialize();
}; };
@@ -172,6 +172,7 @@ enum UlduarNPCs
NPC_THORIM = 32865, NPC_THORIM = 32865,
NPC_FREYA = 32906, NPC_FREYA = 32906,
NPC_VEZAX = 33271, NPC_VEZAX = 33271,
NPC_SARONITE_ANIMUS = 33524,
NPC_SARA = 33134, NPC_SARA = 33134,
NPC_YOGGSARON = 33288, NPC_YOGGSARON = 33288,
NPC_BRAIN_OF_YOGG_SARON = 33890, NPC_BRAIN_OF_YOGG_SARON = 33890,