Scripts/TheBarrens: Fix "The Escape" (863)

This commit is contained in:
Aokromes committed 2018-02-16 02:21:09 +01:00
1 parent 140cdb4185
commit 0aacb75d73
1 file changed
+36 -46
@@ -535,25 +535,13 @@ public:
IsPostEvent = false;
PostEventTimer = 1000;
PostEventCount = 0;
me->SetReactState(REACT_DEFENSIVE);
}
bool IsPostEvent;
uint32 PostEventTimer;
uint32 PostEventCount;
void Reset() override
{
if (!HasEscortState(STATE_ESCORT_ESCORTING))
{
if (me->GetStandState() == UNIT_STAND_STATE_DEAD)
me->SetStandState(UNIT_STAND_STATE_STAND);
IsPostEvent = false;
PostEventTimer = 1000;
PostEventCount = 0;
}
}
void WaypointReached(uint32 waypointId) override
{
switch (waypointId)
@@ -607,43 +595,44 @@ public:
void UpdateEscortAI(uint32 Diff) override
{
if (!UpdateVictim())
if (UpdateVictim())
{
if (IsPostEvent)
{
if (PostEventTimer <= Diff)
{
switch (PostEventCount)
{
case 0:
Talk(SAY_PROGRESS_2);
break;
case 1:
Talk(SAY_PROGRESS_3);
break;
case 2:
Talk(SAY_END);
break;
case 3:
if (Player* player = GetPlayerForEscort())
{
player->GroupEventHappens(QUEST_ESCAPE, me);
me->SummonCreature(NPC_PILOT_WIZZ, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
}
break;
}
++PostEventCount;
PostEventTimer = 5000;
}
else
PostEventTimer -= Diff;
}
DoMeleeAttackIfReady();
return;
}
DoMeleeAttackIfReady();
if (!IsPostEvent)
return;
if (PostEventTimer > Diff)
{
PostEventTimer -= Diff;
return;
}
switch (PostEventCount)
{
case 0:
Talk(SAY_PROGRESS_2);
break;
case 1:
Talk(SAY_PROGRESS_3);
break;
case 2:
Talk(SAY_END);
break;
case 3:
if (Player* player = GetPlayerForEscort())
{
player->GroupEventHappens(QUEST_ESCAPE, me);
me->DespawnOrUnsummon(Minutes(3));
me->SummonCreature(NPC_PILOT_WIZZ, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
}
break;
}
++PostEventCount;
PostEventTimer = 5000;
}
void QuestAccept(Player* player, Quest const* quest) override
@@ -652,6 +641,7 @@ public:
{
me->SetFaction(FACTION_RATCHET);
Talk(SAY_START);
SetDespawnAtEnd(false);
Start(true, false, player->GetGUID());
}
}