aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorMalleus <31495586+hiMalleus@users.noreply.github.com>2017-10-28 21:35:05 +0100
committerAokromes <Aokromes@users.noreply.github.com>2017-10-28 22:35:05 +0200
commitcc894288b77299e9e73f322869f16c2791435104 (patch)
treeb0bd590dbc5f11cf42c98fa174bfec35e036ebcb /src/server/scripts/Northrend
parent48ecd81d614559c6f023aa8910a99901d9d794b5 (diff)
Script/Quests: Fix some missing NPC spells and quest credit
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/zone_borean_tundra.cpp8
-rw-r--r--src/server/scripts/Northrend/zone_grizzly_hills.cpp8
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 fd898a61d41..fae13e92fd1 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -602,6 +602,7 @@ public:
IntroTimer = 2000;
break;
case 41:
+ SetEscortPaused(true);
IntroPhase = 4;
IntroTimer = 2000;
break;
@@ -628,7 +629,7 @@ public:
IntroTimer = 7500;
break;
case 3:
- me->SetReactState(REACT_AGGRESSIVE);
+ me->SetReactState(REACT_DEFENSIVE);
IntroPhase = 0;
IntroTimer = 0;
break;
@@ -643,14 +644,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;
@@ -672,8 +671,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 de646c0c6a0..5b8bb0d3d8b 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -564,6 +564,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();
@@ -602,7 +607,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;
@@ -611,7 +616,6 @@ public:
if (!UpdateVictim())
return;
-
DoMeleeAttackIfReady();
}