Core/Movement: merged smooth waypoint movement. Followup commits will be merged soon (tm)

This commit is contained in:
Ovahlord committed 2018-08-02 15:38:35 +02:00
1 parent d59a20701e
commit c808b981f7
88 files changed
+1301 -1396

No files matched your search

+1
View File
@@ -33,6 +33,7 @@ EndScriptData */
#include "PhasingHandler.h"
#include "Player.h"
#include "RBAC.h"
#include "WaypointDefines.h"
#include "WaypointManager.h"
#include "WorldSession.h"
@@ -571,9 +571,9 @@ Position const RazPathCorla[] =
{ 273.4479f, 816.1007f, 95.95034f }
};
struct npc_raz_the_crazed : public npc_escortAI
struct npc_raz_the_crazed : public EscortAI
{
npc_raz_the_crazed(Creature* creature) : npc_escortAI(creature), _instance(creature->GetInstanceScript())
npc_raz_the_crazed(Creature* creature) : EscortAI(creature), _instance(creature->GetInstanceScript())
{
SetCombatMovement(false);
}
@@ -627,7 +627,7 @@ struct npc_raz_the_crazed : public npc_escortAI
AddWaypoint(i, RazPathCorla[i].GetPositionX(), RazPathCorla[i].GetPositionY(), RazPathCorla[i].GetPositionZ());
}
void WaypointReached(uint32 id) override
void WaypointReached(uint32 id, uint32 /*pathId*/) override
{
if (id == 10 && _instance->GetData(DATA_RAZ_LAST_AREA_INDEX) == RAZ_AREA_INDEX_ROMOGG)
{
@@ -129,9 +129,9 @@ class npc_grimstone : public CreatureScript
public:
npc_grimstone() : CreatureScript("npc_grimstone") { }
struct npc_grimstoneAI : public npc_escortAI
struct npc_grimstoneAI : public EscortAI
{
npc_grimstoneAI(Creature* creature) : npc_escortAI(creature)
npc_grimstoneAI(Creature* creature) : EscortAI(creature)
{
Initialize();
instance = creature->GetInstanceScript();
@@ -196,7 +196,7 @@ public:
MobDeath_Timer = 2500;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -343,7 +343,7 @@ public:
}
if (CanWalk)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
};
@@ -509,9 +509,9 @@ class npc_rocknot : public CreatureScript
public:
npc_rocknot() : CreatureScript("npc_rocknot") { }
struct npc_rocknotAI : public npc_escortAI
struct npc_rocknotAI : public EscortAI
{
npc_rocknotAI(Creature* creature) : npc_escortAI(creature)
npc_rocknotAI(Creature* creature) : EscortAI(creature)
{
Initialize();
instance = creature->GetInstanceScript();
@@ -542,7 +542,7 @@ class npc_rocknot : public CreatureScript
go->SetGoState((GOState)state);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -598,7 +598,7 @@ class npc_rocknot : public CreatureScript
else BreakDoor_Timer -= diff;
}
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
void QuestReward(Player* /*player*/, Quest const* quest, uint32 /*opt*/) override
@@ -623,8 +623,7 @@ class npc_rocknot : public CreatureScript
me->AI()->Talk(SAY_GOT_BEER);
me->CastSpell(me, SPELL_DRUNKEN_RAGE, false);
if (npc_escortAI* escortAI = CAST_AI(npc_rocknot::npc_rocknotAI, me->AI()))
escortAI->Start(false, false);
Start(false, false);
}
}
}
@@ -89,9 +89,9 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
public:
npc_blastmaster_emi_shortfuse() : CreatureScript("npc_blastmaster_emi_shortfuse") { }
struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI
struct npc_blastmaster_emi_shortfuseAI : public EscortAI
{
npc_blastmaster_emi_shortfuseAI(Creature* creature) : npc_escortAI(creature)
npc_blastmaster_emi_shortfuseAI(Creature* creature) : EscortAI(creature)
{
instance = creature->GetInstanceScript();
creature->RestoreFaction();
@@ -221,7 +221,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
//just in case
if (GetPlayerForEscort())
@@ -131,9 +131,9 @@ class npc_barnes : public CreatureScript
public:
npc_barnes() : CreatureScript("npc_barnes") { }
struct npc_barnesAI : public npc_escortAI
struct npc_barnesAI : public EscortAI
{
npc_barnesAI(Creature* creature) : npc_escortAI(creature)
npc_barnesAI(Creature* creature) : EscortAI(creature)
{
Initialize();
RaidWiped = false;
@@ -184,7 +184,7 @@ public:
void JustEngagedWith(Unit* /*who*/) override { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -288,7 +288,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (HasEscortState(STATE_ESCORT_PAUSED))
{
@@ -1110,9 +1110,9 @@ class npc_scarlet_miner : public CreatureScript
public:
npc_scarlet_miner() : CreatureScript("npc_scarlet_miner") { }
struct npc_scarlet_minerAI : public npc_escortAI
struct npc_scarlet_minerAI : public EscortAI
{
npc_scarlet_minerAI(Creature* creature) : npc_escortAI(creature)
npc_scarlet_minerAI(Creature* creature) : EscortAI(creature)
{
Initialize();
me->SetReactState(REACT_PASSIVE);
@@ -1141,7 +1141,7 @@ class npc_scarlet_miner : public CreatureScript
void InitWaypoint()
{
AddWaypoint(1, 2389.03f, -5902.74f, 109.014f, 5000);
AddWaypoint(1, 2389.03f, -5902.74f, 109.014f, 0.f, 5000);
AddWaypoint(2, 2341.812012f, -5900.484863f, 102.619743f);
AddWaypoint(3, 2306.561279f, -5901.738281f, 91.792419f);
AddWaypoint(4, 2300.098389f, -5912.618652f, 86.014885f);
@@ -1160,7 +1160,7 @@ class npc_scarlet_miner : public CreatureScript
AddWaypoint(14, 2172.516602f, -6146.752441f, 1.074235f);
AddWaypoint(15, 2138.918457f, -6158.920898f, 1.342926f);
AddWaypoint(16, 2129.866699f, -6174.107910f, 4.380779f);
AddWaypoint(17, 2117.709473f, -6193.830078f, 13.3542f, 10000);
AddWaypoint(17, 2117.709473f, -6193.830078f, 13.3542f, 0.f, 10000);
}
else
{
@@ -1168,7 +1168,7 @@ class npc_scarlet_miner : public CreatureScript
AddWaypoint(14, 2234.265625f, -6163.741211f, 0.916021f);
AddWaypoint(15, 2268.071777f, -6158.750977f, 1.822252f);
AddWaypoint(16, 2270.028320f, -6176.505859f, 6.340538f);
AddWaypoint(17, 2271.739014f, -6195.401855f, 13.3542f, 10000);
AddWaypoint(17, 2271.739014f, -6195.401855f, 13.3542f, 0.f, 10000);
}
}
@@ -1179,7 +1179,7 @@ class npc_scarlet_miner : public CreatureScript
SetDespawnAtFar(false);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -1229,7 +1229,7 @@ class npc_scarlet_miner : public CreatureScript
else
IntroTimer -= diff;
}
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
};
@@ -201,9 +201,9 @@ class npc_koltira_deathweaver : public CreatureScript
public:
npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { }
struct npc_koltira_deathweaverAI : public npc_escortAI
struct npc_koltira_deathweaverAI : public EscortAI
{
npc_koltira_deathweaverAI(Creature* creature) : npc_escortAI(creature)
npc_koltira_deathweaverAI(Creature* creature) : EscortAI(creature)
{
Initialize();
me->SetReactState(REACT_DEFENSIVE);
@@ -228,7 +228,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -281,7 +281,7 @@ public:
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
if (HasEscortState(STATE_ESCORT_PAUSED))
{
@@ -278,9 +278,9 @@ public:
return new npc_highlord_darion_mograineAI(creature);
}
struct npc_highlord_darion_mograineAI : public npc_escortAI
struct npc_highlord_darion_mograineAI : public EscortAI
{
npc_highlord_darion_mograineAI(Creature* creature) : npc_escortAI(creature)
npc_highlord_darion_mograineAI(Creature* creature) : EscortAI(creature)
{
Reset();
}
@@ -457,7 +457,7 @@ public:
SetEscortPaused(bOnHold);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -575,12 +575,12 @@ public:
void EnterEvadeMode(EvadeReason why) override
{
if (!bIsBattle)//do not reset self if we are in battle
npc_escortAI::EnterEvadeMode(why);
EscortAI::EnterEvadeMode(why);
}
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!bIsBattle)
{
@@ -149,9 +149,9 @@ public:
return new npc_scarlet_traineeAI(creature);
}
struct npc_scarlet_traineeAI : public npc_escortAI
struct npc_scarlet_traineeAI : public EscortAI
{
npc_scarlet_traineeAI(Creature* creature) : npc_escortAI(creature)
npc_scarlet_traineeAI(Creature* creature) : EscortAI(creature)
{
Start_Timer = urand(1000, 6000);
}
@@ -159,7 +159,6 @@ public:
uint32 Start_Timer;
void Reset() override { }
void WaypointReached(uint32 /*waypointId*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
@@ -173,7 +172,7 @@ public:
} else Start_Timer -= diff;
}
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
};
};
@@ -65,11 +65,11 @@ class npc_professor_phizzlethorpe : public CreatureScript
public:
npc_professor_phizzlethorpe() : CreatureScript("npc_professor_phizzlethorpe") { }
struct npc_professor_phizzlethorpeAI : public npc_escortAI
struct npc_professor_phizzlethorpeAI : public EscortAI
{
npc_professor_phizzlethorpeAI(Creature* creature) : npc_escortAI(creature) { }
npc_professor_phizzlethorpeAI(Creature* creature) : EscortAI(creature) { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -112,7 +112,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE)
{
Talk(SAY_PROGRESS_1, player);
npc_escortAI::Start(false, false, player->GetGUID(), quest);
EscortAI::Start(false, false, player->GetGUID(), quest);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
}
}
@@ -143,7 +143,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
break;
}
}
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
EventMap events;
@@ -61,11 +61,11 @@ class npc_ranger_lilatha : public CreatureScript
public:
npc_ranger_lilatha() : CreatureScript("npc_ranger_lilatha") { }
struct npc_ranger_lilathaAI : public npc_escortAI
struct npc_ranger_lilathaAI : public EscortAI
{
npc_ranger_lilathaAI(Creature* creature) : npc_escortAI(creature) { }
npc_ranger_lilathaAI(Creature* creature) : EscortAI(creature) { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -53,9 +53,9 @@ class npc_oox09hl : public CreatureScript
public:
npc_oox09hl() : CreatureScript("npc_oox09hl") { }
struct npc_oox09hlAI : public npc_escortAI
struct npc_oox09hlAI : public EscortAI
{
npc_oox09hlAI(Creature* creature) : npc_escortAI(creature) { }
npc_oox09hlAI(Creature* creature) : EscortAI(creature) { }
void Reset() override { }
@@ -79,11 +79,11 @@ public:
me->SetStandState(UNIT_STAND_STATE_STAND);
me->SetFaction(player->GetTeam() == ALLIANCE ? FACTION_ESCORTEE_A_PASSIVE : FACTION_ESCORTEE_H_PASSIVE);
Talk(SAY_OOX_START, player);
npc_escortAI::Start(false, false, player->GetGUID(), quest);
EscortAI::Start(false, false, player->GetGUID(), quest);
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -101,7 +101,7 @@ public:
}
}
void WaypointStart(uint32 pointId) override
void WaypointStarted(uint32 pointId, uint32 /*pathId*/) override
{
switch (pointId)
{
@@ -62,11 +62,11 @@ class npc_deathstalker_erland : public CreatureScript
public:
npc_deathstalker_erland() : CreatureScript("npc_deathstalker_erland") { }
struct npc_deathstalker_erlandAI : public npc_escortAI
struct npc_deathstalker_erlandAI : public EscortAI
{
npc_deathstalker_erlandAI(Creature* creature) : npc_escortAI(creature) { }
npc_deathstalker_erlandAI(Creature* creature) : EscortAI(creature) { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -56,9 +56,9 @@ public:
return new npc_tapoke_slim_jahnAI(creature);
}
struct npc_tapoke_slim_jahnAI : public npc_escortAI
struct npc_tapoke_slim_jahnAI : public EscortAI
{
npc_tapoke_slim_jahnAI(Creature* creature) : npc_escortAI(creature)
npc_tapoke_slim_jahnAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -76,7 +76,7 @@ public:
Initialize();
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -222,16 +222,16 @@ class npc_morridune : public CreatureScript
public:
npc_morridune() : CreatureScript("npc_morridune") { }
struct npc_morriduneAI : public npc_escortAI
struct npc_morriduneAI : public EscortAI
{
npc_morriduneAI(Creature* creature) : npc_escortAI(creature)
npc_morriduneAI(Creature* creature) : EscortAI(creature)
{
Talk(SAY_MORRIDUNE_1);
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
Start(false);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -93,7 +93,7 @@ public:
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7)
{
@@ -115,8 +115,8 @@ public:
{
if (IsEvent)
{
//Must update npc_escortAI
npc_escortAI::UpdateAI(diff);
//Must update EscortAI
EscortAI::UpdateAI(diff);
if (!go)
{
go = true;
@@ -97,7 +97,7 @@ public:
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && instance)
{
@@ -119,8 +119,8 @@ public:
{
if (IsEvent)
{
//Must update npc_escortAI
npc_escortAI::UpdateAI(diff);
//Must update EscortAI
EscortAI::UpdateAI(diff);
if (!go)
{
go = true;
@@ -219,10 +219,6 @@ public:
{
}
void WaypointReached(uint32 /*waypointId*/) override
{
}
void MoveInLineOfSight(Unit* who) override
{
@@ -92,7 +92,7 @@ public:
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && instance)
{
@@ -114,8 +114,8 @@ public:
{
if (IsEvent)
{
//Must update npc_escortAI
npc_escortAI::UpdateAI(diff);
//Must update EscortAI
EscortAI::UpdateAI(diff);
if (!go)
{
go = true;
@@ -86,7 +86,7 @@ public:
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && instance)
{
@@ -108,8 +108,8 @@ public:
{
if (IsEvent)
{
//Must update npc_escortAI
npc_escortAI::UpdateAI(diff);
//Must update EscortAI
EscortAI::UpdateAI(diff);
if (!go)
{
go = true;
@@ -316,7 +316,7 @@ float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde
{5545.43f, -2647.82f, 1483.05f, 5.38848f, 0, 0, 0.432578f, -0.901596f}
};
hyjalAI::hyjalAI(Creature* creature) : npc_escortAI(creature), Summons(me)
hyjalAI::hyjalAI(Creature* creature) : EscortAI(creature), Summons(me)
{
Initialize();
instance = creature->GetInstanceScript();
@@ -448,7 +448,7 @@ void hyjalAI::MoveInLineOfSight(Unit* who)
if (IsDummy)
return;
npc_escortAI::MoveInLineOfSight(who);
EscortAI::MoveInLineOfSight(who);
}
void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
@@ -932,7 +932,7 @@ void hyjalAI::RespawnNearPos(float x, float y)
Cell::VisitGridObjects(x, y, me->GetMap(), worker, me->GetGridActivationRange());
}
void hyjalAI::WaypointReached(uint32 waypointId)
void hyjalAI::WaypointReached(uint32 waypointId, uint32 /*pathId*/)
{
if (waypointId == 1 || (waypointId == 0 && me->GetEntry() == THRALL))
{
@@ -981,7 +981,7 @@ void hyjalAI::WaypointReached(uint32 waypointId)
}
void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (WaitForTeleport)
{
if (TeleportTimer <= diff)
@@ -115,7 +115,7 @@ enum YellId
DEATH = 6, // Used on death
};
struct hyjalAI : public npc_escortAI
struct hyjalAI : public EscortAI
{
hyjalAI(Creature* creature);
@@ -144,7 +144,7 @@ struct hyjalAI : public npc_escortAI
void SummonedCreatureDespawn(Creature* summoned) override;
void HideNearPos(float x, float y);
void RespawnNearPos(float x, float y);
void WaypointReached(uint32 waypointId) override;
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override;
void DoOverrun(uint32 faction, const uint32 diff);
void MoveInLineOfSight(Unit* who) override;
@@ -175,7 +175,7 @@ float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the
{5429.91f, -2718.44f, 1493.42f}//20 end 2
};
hyjal_trashAI::hyjal_trashAI(Creature* creature) : npc_escortAI(creature)
hyjal_trashAI::hyjal_trashAI(Creature* creature) : EscortAI(creature)
{
instance = creature->GetInstanceScript();
IsEvent = false;
@@ -442,7 +442,7 @@ public:
void JustEngagedWith(Unit* /*who*/) override { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 0 && !IsOverrun)
{
@@ -495,7 +495,7 @@ public:
if (!CanMove)return;
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (IsEvent)
{
if (!go)
@@ -550,7 +550,7 @@ public:
KnockDownTimer = 10000;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -583,7 +583,7 @@ public:
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (IsEvent)
{
if (!go)
@@ -648,7 +648,7 @@ public:
RandomMove = false;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -682,7 +682,7 @@ public:
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (IsEvent)
{
if (!go)
@@ -758,7 +758,7 @@ public:
summons.Despawn(summon);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -802,7 +802,7 @@ public:
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (IsEvent)
{
@@ -870,7 +870,7 @@ public:
ShellTimer = 50000 + rand32() % 10000;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -895,7 +895,7 @@ public:
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (IsEvent)
{
if (!go)
@@ -965,7 +965,7 @@ public:
WebTimer = 20000 + rand32() % 5000;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -990,7 +990,7 @@ public:
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (IsEvent)
{
if (!go)
@@ -1050,7 +1050,7 @@ public:
ManaBurnTimer = 9000 + rand32() % 5000;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -1075,7 +1075,7 @@ public:
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (IsEvent)
{
if (!go)
@@ -1143,7 +1143,7 @@ public:
me->SetDisableGravity(true);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 2 && !IsOverrun)
{
@@ -1177,7 +1177,7 @@ public:
if (IsEvent || IsOverrun)
{
ENSURE_AI(hyjal_trashAI, me->AI())->SetCanAttack(false);
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
if (IsEvent)
@@ -1264,7 +1264,7 @@ public:
me->SetDisableGravity(true);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == 2 && !IsOverrun)
{
@@ -1294,7 +1294,7 @@ public:
if (IsEvent || IsOverrun)
{
ENSURE_AI(hyjal_trashAI, me->AI())->SetCanAttack(false);
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
if (IsEvent)
@@ -21,7 +21,7 @@
#include "hyjal.h"
#include "ScriptedEscortAI.h"
struct hyjal_trashAI : public npc_escortAI
struct hyjal_trashAI : public EscortAI
{
hyjal_trashAI(Creature* creature);
@@ -258,9 +258,9 @@ class npc_arthas : public CreatureScript
public:
npc_arthas() : CreatureScript("npc_arthas") { }
struct npc_arthasAI : public npc_escortAI
struct npc_arthasAI : public EscortAI
{
npc_arthasAI(Creature* creature) : npc_escortAI(creature)
npc_arthasAI(Creature* creature) : EscortAI(creature)
{
Initialize();
instance = creature->GetInstanceScript();
@@ -336,7 +336,7 @@ public:
void AttackStart(Unit* who) override
{
if (who && !who->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC))
npc_escortAI::AttackStart(who);
EscortAI::AttackStart(who);
}
void JustEngagedWith(Unit* /*who*/) override
@@ -391,7 +391,7 @@ public:
++step;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -511,7 +511,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (bStepping)
{
@@ -901,7 +901,7 @@ public:
}
}
else if (instance->GetBossState(bossEvent) == FAIL)
npc_escortAI::EnterEvadeMode();
EscortAI::EnterEvadeMode();
else
phaseTimer = 10000;
break;
@@ -1061,7 +1061,7 @@ public:
JumpToNextStep(15000);
}
else if (instance->GetBossState(DATA_EPOCH) == FAIL)
npc_escortAI::EnterEvadeMode();
EscortAI::EnterEvadeMode();
else
phaseTimer = 10000;
break;
@@ -1106,7 +1106,7 @@ public:
JumpToNextStep(1000);
}
else if (instance->GetBossState(DATA_MAL_GANIS) == FAIL)
npc_escortAI::EnterEvadeMode();
EscortAI::EnterEvadeMode();
else
phaseTimer = 10000;
break;
@@ -198,9 +198,9 @@ class npc_thrall_old_hillsbrad : public CreatureScript
public:
npc_thrall_old_hillsbrad() : CreatureScript("npc_thrall_old_hillsbrad") { }
struct npc_thrall_old_hillsbradAI : public npc_escortAI
struct npc_thrall_old_hillsbradAI : public EscortAI
{
npc_thrall_old_hillsbradAI(Creature* creature) : npc_escortAI(creature)
npc_thrall_old_hillsbradAI(Creature* creature) : EscortAI(creature)
{
Initialize();
instance = creature->GetInstanceScript();
@@ -301,7 +301,7 @@ public:
return true;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -438,7 +438,7 @@ public:
if (Creature* Taretha = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_TARETHA)))
{
if (Player* player = GetPlayerForEscort())
ENSURE_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, player->GetGUID());
ENSURE_AI(EscortAI, (Taretha->AI()))->Start(false, true, player->GetGUID());
}
//kill credit Creature for quest
@@ -539,7 +539,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!UpdateVictim())
return;
@@ -576,9 +576,9 @@ class npc_taretha : public CreatureScript
public:
npc_taretha() : CreatureScript("npc_taretha") { }
struct npc_tarethaAI : public npc_escortAI
struct npc_tarethaAI : public EscortAI
{
npc_tarethaAI(Creature* creature) : npc_escortAI(creature)
npc_tarethaAI(Creature* creature) : EscortAI(creature)
{
instance = creature->GetInstanceScript();
}
@@ -623,7 +623,7 @@ public:
return true;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -641,7 +641,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
};
@@ -47,9 +47,9 @@ class npc_willix : public CreatureScript
public:
npc_willix() : CreatureScript("npc_willix") { }
struct npc_willixAI : public npc_escortAI
struct npc_willixAI : public EscortAI
{
npc_willixAI(Creature* creature) : npc_escortAI(creature) { }
npc_willixAI(Creature* creature) : EscortAI(creature) { }
void QuestAccept(Player* player, Quest const* quest) override
{
@@ -61,7 +61,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 pathId) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -75,9 +75,9 @@ class npc_disciple_of_naralex : public CreatureScript
public:
npc_disciple_of_naralex() : CreatureScript("npc_disciple_of_naralex") { }
struct npc_disciple_of_naralexAI : public npc_escortAI
struct npc_disciple_of_naralexAI : public EscortAI
{
npc_disciple_of_naralexAI(Creature* creature) : npc_escortAI(creature)
npc_disciple_of_naralexAI(Creature* creature) : EscortAI(creature)
{
instance = creature->GetInstanceScript();
eventTimer = 0;
@@ -130,7 +130,7 @@ public:
return true;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -185,7 +185,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (currentEvent != DATA_NARALEX_PART3)
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (eventTimer <= diff)
{
+10 -10
View File
@@ -63,9 +63,9 @@ class npc_ruul_snowhoof : public CreatureScript
public:
npc_ruul_snowhoof() : CreatureScript("npc_ruul_snowhoof") { }
struct npc_ruul_snowhoofAI : public npc_escortAI
struct npc_ruul_snowhoofAI : public EscortAI
{
npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) { }
npc_ruul_snowhoofAI(Creature* creature) : EscortAI(creature) { }
void Reset() override
{
@@ -85,11 +85,11 @@ public:
if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
{
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
npc_escortAI::Start(true, false, player->GetGUID());
EscortAI::Start(true, false, player->GetGUID());
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -120,7 +120,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
};
@@ -180,9 +180,9 @@ class npc_muglash : public CreatureScript
public:
npc_muglash() : CreatureScript("npc_muglash") { }
struct npc_muglashAI : public npc_escortAI
struct npc_muglashAI : public EscortAI
{
npc_muglashAI(Creature* creature) : npc_escortAI(creature)
npc_muglashAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -228,11 +228,11 @@ public:
{
Talk(SAY_MUG_START1);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
npc_escortAI::Start(true, false, player->GetGUID());
EscortAI::Start(true, false, player->GetGUID());
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (Player* player = GetPlayerForEscort())
{
@@ -290,7 +290,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!me->GetVictim())
{
@@ -347,9 +347,9 @@ class npc_magwin : public CreatureScript
public:
npc_magwin() : CreatureScript("npc_magwin") { }
struct npc_magwinAI : public npc_escortAI
struct npc_magwinAI : public EscortAI
{
npc_magwinAI(Creature* creature) : npc_escortAI(creature) { }
npc_magwinAI(Creature* creature) : EscortAI(creature) { }
void Reset() override
{
@@ -370,7 +370,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (Player* player = GetPlayerForEscort())
{
@@ -409,7 +409,7 @@ public:
break;
case EVENT_START_ESCORT:
if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
npc_escortAI::Start(true, false, player->GetGUID());
EscortAI::Start(true, false, player->GetGUID());
_events.ScheduleEvent(EVENT_STAND, Seconds(2));
break;
case EVENT_STAND: // Remove kneel standstate. Using a separate delayed event because it causes unwanted delay before starting waypoint movement.
@@ -427,7 +427,7 @@ public:
}
}
npc_escortAI::UpdateEscortAI(diff);
EscortAI::UpdateEscortAI(diff);
}
private:
@@ -362,9 +362,9 @@ class npc_demolitionist_legoso : public CreatureScript
public:
npc_demolitionist_legoso() : CreatureScript("npc_demolitionist_legoso") { }
struct npc_demolitionist_legosoAI : public npc_escortAI
struct npc_demolitionist_legosoAI : public EscortAI
{
npc_demolitionist_legosoAI(Creature* creature) : npc_escortAI(creature)
npc_demolitionist_legosoAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -473,7 +473,7 @@ public:
if (HasEscortState(STATE_ESCORT_NONE))
return;
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (_phase)
{
@@ -717,7 +717,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
+7 -7
View File
@@ -72,11 +72,11 @@ public:
return new npc_custodian_of_timeAI(creature);
}
struct npc_custodian_of_timeAI : public npc_escortAI
struct npc_custodian_of_timeAI : public EscortAI
{
npc_custodian_of_timeAI(Creature* creature) : npc_escortAI(creature) { }
npc_custodian_of_timeAI(Creature* creature) : EscortAI(creature) { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*override*/) override
{
if (Player* player = GetPlayerForEscort())
{
@@ -166,7 +166,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
};
@@ -200,9 +200,9 @@ public:
return new npc_OOX17AI(creature);
}
struct npc_OOX17AI : public npc_escortAI
struct npc_OOX17AI : public EscortAI
{
npc_OOX17AI(Creature* creature) : npc_escortAI(creature) { }
npc_OOX17AI(Creature* creature) : EscortAI(creature) { }
void QuestAccept(Player* player, Quest const* quest) override
{
@@ -217,7 +217,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (Player* player = GetPlayerForEscort())
{
@@ -104,9 +104,9 @@ public:
return new npc_giltharesAI(creature);
}
struct npc_giltharesAI : public npc_escortAI
struct npc_giltharesAI : public EscortAI
{
npc_giltharesAI(Creature* creature) : npc_escortAI(creature) { }
npc_giltharesAI(Creature* creature) : EscortAI(creature) { }
void QuestAccept(Player* player, const Quest* quest) override
{
@@ -123,7 +123,7 @@ public:
void Reset() override { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -530,9 +530,9 @@ class npc_wizzlecrank_shredder : public CreatureScript
public:
npc_wizzlecrank_shredder() : CreatureScript("npc_wizzlecrank_shredder") { }
struct npc_wizzlecrank_shredderAI : public npc_escortAI
struct npc_wizzlecrank_shredderAI : public EscortAI
{
npc_wizzlecrank_shredderAI(Creature* creature) : npc_escortAI(creature)
npc_wizzlecrank_shredderAI(Creature* creature) : EscortAI(creature)
{
IsPostEvent = false;
PostEventTimer = 1000;
@@ -544,7 +544,7 @@ public:
uint32 PostEventTimer;
uint32 PostEventCount;
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -567,7 +567,7 @@ public:
}
}
void WaypointStart(uint32 PointId) override
void WaypointStarted(uint32 PointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
@@ -268,9 +268,9 @@ public:
return new npc_ranshallaAI(creature);
}
struct npc_ranshallaAI : public npc_escortAI, private DialogueHelper
struct npc_ranshallaAI : public EscortAI, private DialogueHelper
{
npc_ranshallaAI(Creature* creature) : npc_escortAI(creature),
npc_ranshallaAI(Creature* creature) : EscortAI(creature),
DialogueHelper(introDialogue)
{
Initialize();
@@ -365,7 +365,7 @@ public:
StartNextDialogueText(SAY_PRIESTESS_ALTAR_3);
}
void WaypointReached(uint32 pointId) override
void WaypointReached(uint32 pointId, uint32 /*pathId*/) override
{
switch (pointId)
{
@@ -552,7 +552,7 @@ public:
if (events.ExecuteEvent() == EVENT_RESUME)
StartNextDialogueText(SAY_PRIESTESS_ALTAR_3);
npc_escortAI::UpdateEscortAI(diff);
EscortAI::UpdateEscortAI(diff);
}
private:
EventMap events;
@@ -505,9 +505,9 @@ public:
npc_argent_soldier() : CreatureScript("npc_argent_soldier") { }
// THIS AI NEEDS MORE IMPROVEMENTS
struct npc_argent_soldierAI : public npc_escortAI
struct npc_argent_soldierAI : public EscortAI
{
npc_argent_soldierAI(Creature* creature) : npc_escortAI(creature)
npc_argent_soldierAI(Creature* creature) : EscortAI(creature)
{
instance = creature->GetInstanceScript();
me->SetReactState(REACT_DEFENSIVE);
@@ -519,7 +519,7 @@ public:
uint8 uiWaypoint;
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*path*/) override
{
if (waypointId == 0)
{
@@ -592,7 +592,7 @@ public:
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
if (!UpdateVictim())
return;
@@ -354,18 +354,18 @@ class npc_black_knight_skeletal_gryphon : public CreatureScript
public:
npc_black_knight_skeletal_gryphon() : CreatureScript("npc_black_knight_skeletal_gryphon") { }
struct npc_black_knight_skeletal_gryphonAI : public npc_escortAI
struct npc_black_knight_skeletal_gryphonAI : public EscortAI
{
npc_black_knight_skeletal_gryphonAI(Creature* creature) : npc_escortAI(creature)
npc_black_knight_skeletal_gryphonAI(Creature* creature) : EscortAI(creature)
{
Start(false, true);
}
void WaypointReached(uint32 /*waypointId*/) override { }
void WaypointReached(uint32 /*waypointId*/, uint32 /*pathId*/) override { }
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
UpdateVictim();
}
@@ -152,9 +152,9 @@ class generic_vehicleAI_toc5 : public CreatureScript
public:
generic_vehicleAI_toc5() : CreatureScript("generic_vehicleAI_toc5") { }
struct generic_vehicleAI_toc5AI : public npc_escortAI
struct generic_vehicleAI_toc5AI : public EscortAI
{
generic_vehicleAI_toc5AI(Creature* creature) : npc_escortAI(creature)
generic_vehicleAI_toc5AI(Creature* creature) : EscortAI(creature)
{
Initialize();
SetDespawnAtEnd(false);
@@ -212,7 +212,7 @@ public:
Start(false, true);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -239,7 +239,7 @@ public:
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
if (!UpdateVictim())
return;
@@ -964,9 +964,9 @@ class npc_crok_scourgebane : public CreatureScript
public:
npc_crok_scourgebane() : CreatureScript("npc_crok_scourgebane") { }
struct npc_crok_scourgebaneAI : public npc_escortAI
struct npc_crok_scourgebaneAI : public EscortAI
{
npc_crok_scourgebaneAI(Creature* creature) : npc_escortAI(creature),
npc_crok_scourgebaneAI(Creature* creature) : EscortAI(creature),
_instance(creature->GetInstanceScript()), _respawnTime(creature->GetRespawnDelay()),
_corpseDelay(creature->GetCorpseDelay())
{
@@ -1048,7 +1048,7 @@ class npc_crok_scourgebane : public CreatureScript
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -1080,7 +1080,7 @@ class npc_crok_scourgebane : public CreatureScript
}
}
void WaypointStart(uint32 waypointId) override
void WaypointStarted(uint32 waypointId, uint32 /*pathId*/) override
{
_currentWPid = waypointId;
switch (waypointId)
@@ -271,9 +271,9 @@ class npc_brann_hos : public CreatureScript
public:
npc_brann_hos() : CreatureScript("npc_brann_hos") { }
struct npc_brann_hosAI : public npc_escortAI
struct npc_brann_hosAI : public EscortAI
{
npc_brann_hosAI(Creature* creature) : npc_escortAI(creature)
npc_brann_hosAI(Creature* creature) : EscortAI(creature)
{
Initialize();
instance = creature->GetInstanceScript();
@@ -350,7 +350,7 @@ public:
lDwarfGUIDList.clear();
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -973,9 +973,9 @@ class npc_mimirons_inferno : public CreatureScript
public:
npc_mimirons_inferno() : CreatureScript("npc_mimirons_inferno") { }
struct npc_mimirons_infernoAI : public npc_escortAI
struct npc_mimirons_infernoAI : public EscortAI
{
npc_mimirons_infernoAI(Creature* creature) : npc_escortAI(creature)
npc_mimirons_infernoAI(Creature* creature) : EscortAI(creature)
{
Initialize();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -988,7 +988,7 @@ public:
infernoTimer = 2000;
}
void WaypointReached(uint32 /*waypointId*/) override
void WaypointReached(uint32 /*waypointId*/, uint32 /*pathId*/) override
{
}
@@ -1002,7 +1002,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!HasEscortState(STATE_ESCORT_ESCORTING))
Start(false, true, ObjectGuid::Empty, nullptr, false, true);
@@ -820,9 +820,9 @@ class npc_violet_hold_teleportation_portal_intro : public CreatureScript
}
};
struct violet_hold_trashAI : public npc_escortAI
struct violet_hold_trashAI : public EscortAI
{
violet_hold_trashAI(Creature* creature) : npc_escortAI(creature)
violet_hold_trashAI(Creature* creature) : EscortAI(creature)
{
_instance = creature->GetInstanceScript();
@@ -898,7 +898,7 @@ struct violet_hold_trashAI : public npc_escortAI
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId == _lastWaypointId)
CreatureStartAttackDoor();
@@ -906,7 +906,7 @@ struct violet_hold_trashAI : public npc_escortAI
void JustEngagedWith(Unit* who) override
{
npc_escortAI::JustEngagedWith(who);
EscortAI::JustEngagedWith(who);
ScheduledTasks();
}
@@ -919,7 +919,7 @@ struct violet_hold_trashAI : public npc_escortAI
return;
_scheduler.Update(diff,
std::bind(&npc_escortAI::DoMeleeAttackIfReady, this));
std::bind(&EscortAI::DoMeleeAttackIfReady, this));
}
virtual void ScheduledTasks() { }
@@ -573,9 +573,9 @@ class npc_lurgglbr : public CreatureScript
public:
npc_lurgglbr() : CreatureScript("npc_lurgglbr") { }
struct npc_lurgglbrAI : public npc_escortAI
struct npc_lurgglbrAI : public EscortAI
{
npc_lurgglbrAI(Creature* creature) : npc_escortAI(creature)
npc_lurgglbrAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -595,7 +595,7 @@ class npc_lurgglbr : public CreatureScript
Initialize();
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -660,7 +660,7 @@ class npc_lurgglbr : public CreatureScript
}
} else IntroTimer -= diff;
}
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!UpdateVictim())
return;
@@ -794,9 +794,9 @@ class npc_thassarian : public CreatureScript
public:
npc_thassarian() : CreatureScript("npc_thassarian") { }
struct npc_thassarianAI : public npc_escortAI
struct npc_thassarianAI : public EscortAI
{
npc_thassarianAI(Creature* creature) : npc_escortAI(creature)
npc_thassarianAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -838,7 +838,7 @@ public:
Initialize();
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -873,7 +873,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (arthasInPosition && talbotInPosition)
{
@@ -1642,9 +1642,9 @@ class npc_mootoo_the_younger : public CreatureScript
public:
npc_mootoo_the_younger() : CreatureScript("npc_mootoo_the_younger") { }
struct npc_mootoo_the_youngerAI : public npc_escortAI
struct npc_mootoo_the_youngerAI : public EscortAI
{
npc_mootoo_the_youngerAI(Creature* creature) : npc_escortAI(creature) { }
npc_mootoo_the_youngerAI(Creature* creature) : EscortAI(creature) { }
void QuestAccept(Player* player, Quest const* quest) override
{
@@ -1676,7 +1676,7 @@ public:
player->FailQuest(QUEST_ESCAPING_THE_MIST);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -1731,9 +1731,9 @@ class npc_bonker_togglevolt : public CreatureScript
public:
npc_bonker_togglevolt() : CreatureScript("npc_bonker_togglevolt") { }
struct npc_bonker_togglevoltAI : public npc_escortAI
struct npc_bonker_togglevoltAI : public EscortAI
{
npc_bonker_togglevoltAI(Creature* creature) : npc_escortAI(creature)
npc_bonker_togglevoltAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -1781,7 +1781,7 @@ public:
else Bonker_agro=0;
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -63,9 +63,9 @@ class npc_emily : public CreatureScript
public:
npc_emily() : CreatureScript("npc_emily") { }
struct npc_emilyAI : public npc_escortAI
struct npc_emilyAI : public EscortAI
{
npc_emilyAI(Creature* creature) : npc_escortAI(creature) { }
npc_emilyAI(Creature* creature) : EscortAI(creature) { }
void JustSummoned(Creature* summoned) override
{
@@ -75,7 +75,7 @@ public:
summoned->AI()->AttackStart(me->GetVictim());
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -79,9 +79,9 @@ class npc_apothecary_hanes : public CreatureScript
public:
npc_apothecary_hanes() : CreatureScript("npc_apothecary_hanes") { }
struct npc_Apothecary_HanesAI : public npc_escortAI
struct npc_Apothecary_HanesAI : public EscortAI
{
npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature)
npc_Apothecary_HanesAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -138,7 +138,7 @@ public:
if (GetAttack() && UpdateVictim())
DoMeleeAttackIfReady();
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (me->IsInCombat())
return;
@@ -161,7 +161,7 @@ public:
events.Reset();
me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
me->SetReactState(REACT_AGGRESSIVE);
ENSURE_AI(npc_escortAI, (me->AI()))->Start(true, true, _player);
ENSURE_AI(EscortAI, (me->AI()))->Start(true, true, _player);
break;
case EVENT_TALK_1:
if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
@@ -207,7 +207,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -271,9 +271,9 @@ class npc_plaguehound_tracker : public CreatureScript
public:
npc_plaguehound_tracker() : CreatureScript("npc_plaguehound_tracker") { }
struct npc_plaguehound_trackerAI : public npc_escortAI
struct npc_plaguehound_trackerAI : public EscortAI
{
npc_plaguehound_trackerAI(Creature* creature) : npc_escortAI(creature) { }
npc_plaguehound_trackerAI(Creature* creature) : EscortAI(creature) { }
void Reset() override
{
@@ -291,7 +291,7 @@ public:
Start(false, false, summonerGUID);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
if (waypointId != 26)
return;
@@ -72,9 +72,9 @@ class npc_engineer_helice : public CreatureScript
public:
npc_engineer_helice() : CreatureScript("npc_engineer_helice") { }
struct npc_engineer_heliceAI : public npc_escortAI
struct npc_engineer_heliceAI : public EscortAI
{
npc_engineer_heliceAI(Creature* creature) : npc_escortAI(creature)
npc_engineer_heliceAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -86,7 +86,7 @@ public:
uint32 m_uiChatTimer;
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
@@ -141,7 +141,7 @@ public:
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
if (HasEscortState(STATE_ESCORT_ESCORTING))
{
@@ -47,11 +47,11 @@ class npc_injured_goblin : public CreatureScript
public:
npc_injured_goblin() : CreatureScript("npc_injured_goblin") { }
struct npc_injured_goblinAI : public npc_escortAI
struct npc_injured_goblinAI : public EscortAI
{
npc_injured_goblinAI(Creature* creature) : npc_escortAI(creature) { }
npc_injured_goblinAI(Creature* creature) : EscortAI(creature) { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -81,7 +81,7 @@ class npc_injured_goblin : public CreatureScript
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
if (!UpdateVictim())
return;
DoMeleeAttackIfReady();
@@ -345,9 +345,9 @@ class npc_icefang : public CreatureScript
public:
npc_icefang() : CreatureScript("npc_icefang") { }
struct npc_icefangAI : public npc_escortAI
struct npc_icefangAI : public EscortAI
{
npc_icefangAI(Creature* creature) : npc_escortAI(creature) { }
npc_icefangAI(Creature* creature) : EscortAI(creature) { }
void AttackStart(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
@@ -362,13 +362,13 @@ public:
}
}
void WaypointReached(uint32 /*waypointId*/) override { }
void WaypointReached(uint32 /*waypointId*/, uint32 /*pathId*/) override { }
void JustDied(Unit* /*killer*/) override { }
void OnCharmed(bool /*apply*/) override { }
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!UpdateVictim())
return;
@@ -57,9 +57,9 @@ class boss_ambassador_hellmaw : public CreatureScript
public:
boss_ambassador_hellmaw() : CreatureScript("boss_ambassador_hellmaw") { }
struct boss_ambassador_hellmawAI : public npc_escortAI
struct boss_ambassador_hellmawAI : public EscortAI
{
boss_ambassador_hellmawAI(Creature* creature) : npc_escortAI(creature)
boss_ambassador_hellmawAI(Creature* creature) : EscortAI(creature)
{
_instance = creature->GetInstanceScript();
_intro = false;
@@ -86,10 +86,10 @@ class boss_ambassador_hellmaw : public CreatureScript
if (me->HasAura(SPELL_BANISH))
return;
npc_escortAI::MoveInLineOfSight(who);
EscortAI::MoveInLineOfSight(who);
}
void WaypointReached(uint32 /*waypointId*/) override
void WaypointReached(uint32 /*waypointId*/, uint32 /*pathId*/) override
{
}
@@ -152,9 +152,9 @@ class npc_ancestral_wolf : public CreatureScript
public:
npc_ancestral_wolf() : CreatureScript("npc_ancestral_wolf") { }
struct npc_ancestral_wolfAI : public npc_escortAI
struct npc_ancestral_wolfAI : public EscortAI
{
npc_ancestral_wolfAI(Creature* creature) : npc_escortAI(creature)
npc_ancestral_wolfAI(Creature* creature) : EscortAI(creature)
{
if (creature->GetOwner() && creature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
Start(false, false, creature->GetOwner()->GetGUID());
@@ -172,11 +172,11 @@ public:
// Override Evade Mode event, recast buff that was removed by standard handler
void EnterEvadeMode(EvadeReason why) override
{
npc_escortAI::EnterEvadeMode(why);
EscortAI::EnterEvadeMode(why);
DoCast(me, SPELL_ANCESTRAL_WOLF_BUFF, true);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -260,9 +260,9 @@ class npc_wounded_blood_elf : public CreatureScript
public:
npc_wounded_blood_elf() : CreatureScript("npc_wounded_blood_elf") { }
struct npc_wounded_blood_elfAI : public npc_escortAI
struct npc_wounded_blood_elfAI : public EscortAI
{
npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) { }
npc_wounded_blood_elfAI(Creature* creature) : EscortAI(creature) { }
void Reset() override { }
@@ -282,11 +282,11 @@ public:
if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
{
me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
npc_escortAI::Start(true, false, player->GetGUID());
EscortAI::Start(true, false, player->GetGUID());
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
+8 -8
View File
@@ -78,9 +78,9 @@ public:
return new npc_maghar_captiveAI(creature);
}
struct npc_maghar_captiveAI : public npc_escortAI
struct npc_maghar_captiveAI : public EscortAI
{
npc_maghar_captiveAI(Creature* creature) : npc_escortAI(creature) { Reset(); }
npc_maghar_captiveAI(Creature* creature) : EscortAI(creature) { Reset(); }
uint32 ChainLightningTimer;
uint32 HealTimer;
@@ -125,7 +125,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -177,7 +177,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!UpdateVictim())
return;
@@ -438,9 +438,9 @@ public:
return new npc_kurenai_captiveAI(creature);
}
struct npc_kurenai_captiveAI : public npc_escortAI
struct npc_kurenai_captiveAI : public EscortAI
{
npc_kurenai_captiveAI(Creature* creature) : npc_escortAI(creature)
npc_kurenai_captiveAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -493,7 +493,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
switch (waypointId)
{
@@ -557,7 +557,7 @@ public:
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
if (!UpdateVictim())
return;
@@ -500,9 +500,9 @@ class npc_bessy : public CreatureScript
return new npc_bessyAI(creature);
}
struct npc_bessyAI : public npc_escortAI
struct npc_bessyAI : public EscortAI
{
npc_bessyAI(Creature* creature) : npc_escortAI(creature) { }
npc_bessyAI(Creature* creature) : EscortAI(creature) { }
void QuestAccept(Player* player, Quest const* quest) override
{
@@ -520,7 +520,7 @@ class npc_bessy : public CreatureScript
player->FailQuest(Q_ALMABTRIEB);
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -581,9 +581,9 @@ public:
return new npc_maxx_a_million_escortAI(creature);
}
struct npc_maxx_a_million_escortAI : public npc_escortAI
struct npc_maxx_a_million_escortAI : public EscortAI
{
npc_maxx_a_million_escortAI(Creature* creature) : npc_escortAI(creature)
npc_maxx_a_million_escortAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -602,7 +602,7 @@ public:
Initialize();
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -636,7 +636,7 @@ public:
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
if (bTake)
{
@@ -601,9 +601,9 @@ public:
return new npc_earthmender_wildaAI(creature);
}
struct npc_earthmender_wildaAI : public npc_escortAI
struct npc_earthmender_wildaAI : public EscortAI
{
npc_earthmender_wildaAI(Creature* creature) : npc_escortAI(creature)
npc_earthmender_wildaAI(Creature* creature) : EscortAI(creature)
{
Initialize();
}
@@ -630,7 +630,7 @@ public:
Initialize();
}
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -723,7 +723,7 @@ public:
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
EscortAI::UpdateAI(uiDiff);
if (!UpdateVictim())
return;
@@ -74,12 +74,12 @@ public:
return new npc_kservantAI(creature);
}
struct npc_kservantAI : public npc_escortAI
struct npc_kservantAI : public EscortAI
{
public:
npc_kservantAI(Creature* creature) : npc_escortAI(creature) { }
npc_kservantAI(Creature* creature) : EscortAI(creature) { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -376,11 +376,11 @@ class npc_isla_starmane : public CreatureScript
public:
npc_isla_starmane() : CreatureScript("npc_isla_starmane") { }
struct npc_isla_starmaneAI : public npc_escortAI
struct npc_isla_starmaneAI : public EscortAI
{
npc_isla_starmaneAI(Creature* creature) : npc_escortAI(creature) { }
npc_isla_starmaneAI(Creature* creature) : EscortAI(creature) { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
@@ -179,13 +179,13 @@ class npc_kayra_longmane : public CreatureScript
public:
npc_kayra_longmane() : CreatureScript("npc_kayra_longmane") { }
struct npc_kayra_longmaneAI : public npc_escortAI
struct npc_kayra_longmaneAI : public EscortAI
{
npc_kayra_longmaneAI(Creature* creature) : npc_escortAI(creature) { }
npc_kayra_longmaneAI(Creature* creature) : EscortAI(creature) { }
void Reset() override { }
void WaypointReached(uint32 waypointId) override
void WaypointReached(uint32 waypointId, uint32 /*override*/) override
{
Player* player = GetPlayerForEscort();
if (!player)
+4 -4
View File
@@ -1034,9 +1034,9 @@ class npc_garments_of_quests : public CreatureScript
public:
npc_garments_of_quests() : CreatureScript("npc_garments_of_quests") { }
struct npc_garments_of_questsAI : public npc_escortAI
struct npc_garments_of_questsAI : public EscortAI
{
npc_garments_of_questsAI(Creature* creature) : npc_escortAI(creature)
npc_garments_of_questsAI(Creature* creature) : EscortAI(creature)
{
switch (me->GetEntry())
{
@@ -1124,7 +1124,7 @@ public:
}
}
void WaypointReached(uint32 /*waypointId*/) override
void WaypointReached(uint32 /*waypointId*/, uint32 /*pathId*/) override
{
}
@@ -1159,7 +1159,7 @@ public:
RunAwayTimer -= diff;
}
npc_escortAI::UpdateAI(diff);
EscortAI::UpdateAI(diff);
}
};