diff options
Diffstat (limited to 'src/server/scripts/Outland')
4 files changed, 16 insertions, 6 deletions
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index b4d721396bf..31a6d8dbc51 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -25,6 +25,8 @@ #include "SpellScript.h" #include "TemporarySummon.h" +Position const Executioner = { 152.8524f, -83.63912f, 2.021005f, 0.06981317f }; + class at_nethekurse_exit : public AreaTriggerScript { public: diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index b1ec4de98c4..1bf9b822b31 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -91,7 +91,7 @@ enum SHActions ACTION_EXECUTIONER_TAUNT = 1 }; -Position const Executioner = { 152.8524f, -83.63912f, 2.021005f, 0.06981317f }; +extern Position const Executioner; struct FactionSpawnerHelper { diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 53f792336f5..0686e27c8a2 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -73,7 +73,17 @@ public: struct npc_maghar_captiveAI : public EscortAI { - npc_maghar_captiveAI(Creature* creature) : EscortAI(creature) { Reset(); } + npc_maghar_captiveAI(Creature* creature) : EscortAI(creature) + { + Initialize(); + } + + void Initialize() + { + ChainLightningTimer = 1000; + HealTimer = 0; + FrostShockTimer = 6000; + } uint32 ChainLightningTimer; uint32 HealTimer; @@ -81,9 +91,7 @@ public: void Reset() override { - ChainLightningTimer = 1000; - HealTimer = 0; - FrostShockTimer = 6000; + Initialize(); } void JustEngagedWith(Unit* /*who*/) override diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index de8146baf60..e0339e8d9c3 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -365,7 +365,7 @@ public: npc_enslaved_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) { Tapped = false; - Reset(); + FlyTimer = 10 * IN_MILLISECONDS; } void Reset() override |