Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Scripts/ScarletEnclave: fix Massacre at Light's Point mine cart escort to work again (tag #20310)"

Browse Source 
This reverts commit 6ff71dffbb.
This commit is contained in:
Treeston
2018-02-12 03:23:54 +01:00
committed by Aokromes
parent c83d9d3a4b
commit daa7c79f7e
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
View File

@@ -1056,6 +1056,11 @@ class npc_scarlet_miner_cart : public CreatureScript
if (Creature* miner = ObjectAccessor::GetCreature(*me, _minerGUID))
{
me->SetWalk(false);
// Not 100% correct, but movement is smooth. Sometimes miner walks faster
// than normal, this speed is fast enough to keep up at those times.
me->SetSpeedRate(MOVE_RUN, 1.25f);
me->GetMotionMaster()->MoveFollow(miner, 1.0f, 0);
}
}
@@ -1105,21 +1110,25 @@ class npc_scarlet_miner : public CreatureScript
{
npc_scarlet_minerAI(Creature* creature) : npc_escortAI(creature)
{
Initialize();
me->SetReactState(REACT_PASSIVE);
}
void InitializeAI() override
void Initialize()
{
carGUID.Clear();
IntroTimer = 0;
IntroPhase = 0;
carGUID.Clear();
playerGUID.Clear();
}
uint32 IntroTimer;
uint32 IntroPhase;
ObjectGuid carGUID;
ObjectGuid playerGUID;
void Reset() override
{
Initialize();
}
void IsSummonedBy(Unit* summoner) override
{
@@ -1161,12 +1170,9 @@ class npc_scarlet_miner : public CreatureScript
void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
{
playerGUID = guid;
}
void Reset() override
{
EscortAI::Reset();
InitWaypoint();
Start(false, false, guid);
SetDespawnAtFar(false);
}
void WaypointReached(uint32 waypointId) override
@@ -1196,16 +1202,6 @@ class npc_scarlet_miner : public CreatureScript
}
}
void JustAppeared() override
{
EscortAI::JustAppeared();
if (!playerGUID)
return;
InitWaypoint();
Start(false, false, playerGUID);
SetDespawnAtFar(false);
}
void UpdateAI(uint32 diff) override
{
if (IntroPhase)