diff options
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/zone_borean_tundra.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_grizzly_hills.cpp | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 6590046a80e..3cb7d03631b 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -599,6 +599,7 @@ public: IntroTimer = 2000; break; case 41: + SetEscortPaused(true); IntroPhase = 4; IntroTimer = 2000; break; @@ -625,7 +626,7 @@ public: IntroTimer = 7500; break; case 3: - me->SetReactState(REACT_AGGRESSIVE); + me->SetReactState(REACT_DEFENSIVE); IntroPhase = 0; IntroTimer = 0; break; @@ -640,14 +641,12 @@ public: IntroPhase = 6; IntroTimer = 2500; break; - case 6: if (Player* player = GetPlayerForEscort()) player->AreaExploredOrEventHappens(QUEST_ESCAPE_WINTERFIN_CAVERNS); IntroPhase = 7; IntroTimer = 2500; break; - case 7: me->DespawnOrUnsummon(); IntroPhase = 0; @@ -669,8 +668,7 @@ public: if (GameObject* go = me->FindNearestGameObject(GO_CAGE, 5.0f)) { go->SetRespawnTime(0); - go->SetGoType(GAMEOBJECT_TYPE_BUTTON); - go->UseDoorOrButton(20); + go->UseDoorOrButton(20000); } Start(true, false, player->GetGUID()); diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 6394ffffaf2..29722dae326 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -559,6 +559,11 @@ public: { npc_venture_co_stragglerAI(Creature* creature) : ScriptedAI(creature) { } + void EnterCombat(Unit* /*who*/) override + { + _events.ScheduleEvent(EVENT_CHOP, Seconds(3), Seconds(6)); + } + void Reset() override { _playerGUID.Clear(); @@ -597,7 +602,7 @@ public: case EVENT_CHOP: if (UpdateVictim()) DoCastVictim(SPELL_CHOP); - _events.ScheduleEvent(EVENT_CHOP, 10000, 12000); + _events.Repeat(Seconds(10), Seconds(12)); break; default: break; @@ -606,7 +611,6 @@ public: if (!UpdateVictim()) return; - DoMeleeAttackIfReady(); } |