diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index 2effe40b86..abe629d563 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -47,7 +47,8 @@ enum AZCreatureIds NPC_DALLIAH = 20885, NPC_SOCCOTHRATES = 20886, NPC_MELLICHAR = 20904, // skyriss will kill this unit - NPC_ALPHA_POD_TARGET = 21436 + NPC_ALPHA_POD_TARGET = 21436, + NPC_MILLHOUSE = 20977 }; enum AZGameObjectIds @@ -62,10 +63,15 @@ enum AZGameObjectIds GO_WARDENS_SHIELD = 184802 // shield 'protecting' mellichar }; -template -AI* GetArcatrazAI(Creature* creature) +enum AZSpellIds { - return GetInstanceAI(creature, ArcatrazScriptName); + SPELL_QID_10886 = 39564 +}; + +template +inline AI* GetArcatrazAI(T* obj) +{ + return GetInstanceAI(obj, ArcatrazScriptName); } #endif // ARCATRAZ_H diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index e1a6c8c7a2..71f60c731c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -46,6 +46,8 @@ class instance_arcatraz : public InstanceMapScript void OnCreatureCreate(Creature* creature) override { + InstanceScript::OnCreatureCreate(creature); + switch (creature->GetEntry()) { case NPC_DALLIAH: @@ -57,6 +59,9 @@ class instance_arcatraz : public InstanceMapScript case NPC_MELLICHAR: MellicharGUID = creature->GetGUID(); break; + case NPC_MILLHOUSE: + MillhouseGUID = creature->GetGUID(); + break; default: break; } @@ -179,6 +184,15 @@ class instance_arcatraz : public InstanceMapScript SetData(DATA_WARDEN_4, NOT_STARTED); SetData(DATA_WARDEN_5, NOT_STARTED); } + else if (state == DONE) + { + if (!instance->IsHeroic()) + break; + + if (Creature* millhouse = instance->GetCreature(MillhouseGUID)) + if (millhouse->IsAlive()) + DoCastSpellOnPlayers(SPELL_QID_10886); + } break; default: break; @@ -192,6 +206,7 @@ class instance_arcatraz : public InstanceMapScript ObjectGuid StasisPodGUIDs[5]; ObjectGuid MellicharGUID; ObjectGuid WardensShieldGUID; + ObjectGuid MillhouseGUID; uint8 ConversationState; uint8 StasisPodStates[5];