josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/kalimdor: Use proper headers to optimize compile, code style and general cleanup.

Browse Source 
Closes #6419 (pr)
This commit is contained in:
4m1g0
2012-05-19 15:11:09 +01:00
committed by Nay
parent 9474902479
commit 524e30e57b
27 changed files with 1114 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/tanaris.cpp
+155 -151
View File
@@ -33,7 +33,9 @@ npc_OOX17
npc_tooga
EndContentData */
#include "ScriptPCH.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "ScriptedEscortAI.h"
#include "ScriptedFollowerAI.h"
@@ -41,10 +43,13 @@ EndContentData */
## mob_aquementas
######*/
#define AGGRO_YELL_AQUE -1000350
enum Aquementas
{
AGGRO_YELL_AQUE = -1000350,
#define SPELL_AQUA_JET 13586
#define SPELL_FROST_SHOCK 15089
SPELL_AQUA_JET = 13586,
SPELL_FROST_SHOCK = 15089
};
class mob_aquementas : public CreatureScript
{
@@ -60,22 +65,22 @@ public:
{
mob_aquementasAI(Creature* creature) : ScriptedAI(creature) {}
uint32 SendItem_Timer;
uint32 SwitchFaction_Timer;
uint32 SendItemTimer;
uint32 SwitchFactionTimer;
bool isFriendly;
uint32 FrostShock_Timer;
uint32 AquaJet_Timer;
uint32 FrostShockTimer;
uint32 AquaJetTimer;
void Reset()
{
SendItem_Timer = 0;
SwitchFaction_Timer = 10000;
SendItemTimer = 0;
SwitchFactionTimer = 10000;
me->setFaction(35);
isFriendly = true;
AquaJet_Timer = 5000;
FrostShock_Timer = 1000;
AquaJetTimer = 5000;
FrostShockTimer = 1000;
}
void SendItem(Unit* receiver)
@@ -101,11 +106,11 @@ public:
{
if (isFriendly)
{
if (SwitchFaction_Timer <= diff)
if (SwitchFactionTimer <= diff)
{
me->setFaction(91);
isFriendly = false;
} else SwitchFaction_Timer -= diff;
} else SwitchFactionTimer -= diff;
}
if (!UpdateVictim())
@@ -113,25 +118,25 @@ public:
if (!isFriendly)
{
if (SendItem_Timer <= diff)
if (SendItemTimer <= diff)
{
if (me->getVictim()->GetTypeId() == TYPEID_PLAYER)
SendItem(me->getVictim());
SendItem_Timer = 5000;
} else SendItem_Timer -= diff;
SendItemTimer = 5000;
} else SendItemTimer -= diff;
}
if (FrostShock_Timer <= diff)
if (FrostShockTimer <= diff)
{
DoCast(me->getVictim(), SPELL_FROST_SHOCK);
FrostShock_Timer = 15000;
} else FrostShock_Timer -= diff;
FrostShockTimer = 15000;
} else FrostShockTimer -= diff;
if (AquaJet_Timer <= diff)
if (AquaJetTimer <= diff)
{
DoCast(me, SPELL_AQUA_JET);
AquaJet_Timer = 15000;
} else AquaJet_Timer -= diff;
AquaJetTimer = 15000;
} else AquaJetTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -143,20 +148,23 @@ public:
## npc_custodian_of_time
######*/
#define WHISPER_CUSTODIAN_1 -1000217
#define WHISPER_CUSTODIAN_2 -1000218
#define WHISPER_CUSTODIAN_3 -1000219
#define WHISPER_CUSTODIAN_4 -1000220
#define WHISPER_CUSTODIAN_5 -1000221
#define WHISPER_CUSTODIAN_6 -1000222
#define WHISPER_CUSTODIAN_7 -1000223
#define WHISPER_CUSTODIAN_8 -1000224
#define WHISPER_CUSTODIAN_9 -1000225
#define WHISPER_CUSTODIAN_10 -1000226
#define WHISPER_CUSTODIAN_11 -1000227
#define WHISPER_CUSTODIAN_12 -1000228
#define WHISPER_CUSTODIAN_13 -1000229
#define WHISPER_CUSTODIAN_14 -1000230
enum CustodianOfTime
{
WHISPER_CUSTODIAN_1 = -1000217,
WHISPER_CUSTODIAN_2 = -1000218,
WHISPER_CUSTODIAN_3 = -1000219,
WHISPER_CUSTODIAN_4 = -1000220,
WHISPER_CUSTODIAN_5 = -1000221,
WHISPER_CUSTODIAN_6 = -1000222,
WHISPER_CUSTODIAN_7 = -1000223,
WHISPER_CUSTODIAN_8 = -1000224,
WHISPER_CUSTODIAN_9 = -1000225,
WHISPER_CUSTODIAN_10 = -1000226,
WHISPER_CUSTODIAN_11 = -1000227,
WHISPER_CUSTODIAN_12 = -1000228,
WHISPER_CUSTODIAN_13 = -1000229,
WHISPER_CUSTODIAN_14 = -1000230
};
class npc_custodian_of_time : public CreatureScript
{
@@ -174,69 +182,68 @@ public:
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (waypointId)
if (Player* player = GetPlayerForEscort())
{
case 0:
DoScriptText(WHISPER_CUSTODIAN_1, me, player);
break;
case 1:
DoScriptText(WHISPER_CUSTODIAN_2, me, player);
break;
case 2:
DoScriptText(WHISPER_CUSTODIAN_3, me, player);
break;
case 3:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 5:
DoScriptText(WHISPER_CUSTODIAN_5, me, player);
break;
case 6:
DoScriptText(WHISPER_CUSTODIAN_6, me, player);
break;
case 7:
DoScriptText(WHISPER_CUSTODIAN_7, me, player);
break;
case 8:
DoScriptText(WHISPER_CUSTODIAN_8, me, player);
break;
case 9:
DoScriptText(WHISPER_CUSTODIAN_9, me, player);
break;
case 10:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 13:
DoScriptText(WHISPER_CUSTODIAN_10, me, player);
break;
case 14:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 16:
DoScriptText(WHISPER_CUSTODIAN_11, me, player);
break;
case 17:
DoScriptText(WHISPER_CUSTODIAN_12, me, player);
break;
case 18:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 22:
DoScriptText(WHISPER_CUSTODIAN_13, me, player);
break;
case 23:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 24:
DoScriptText(WHISPER_CUSTODIAN_14, me, player);
DoCast(player, 34883);
// below here is temporary workaround, to be removed when spell works properly
player->AreaExploredOrEventHappens(10277);
break;
switch (waypointId)
{
case 0:
DoScriptText(WHISPER_CUSTODIAN_1, me, player);
break;
case 1:
DoScriptText(WHISPER_CUSTODIAN_2, me, player);
break;
case 2:
DoScriptText(WHISPER_CUSTODIAN_3, me, player);
break;
case 3:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 5:
DoScriptText(WHISPER_CUSTODIAN_5, me, player);
break;
case 6:
DoScriptText(WHISPER_CUSTODIAN_6, me, player);
break;
case 7:
DoScriptText(WHISPER_CUSTODIAN_7, me, player);
break;
case 8:
DoScriptText(WHISPER_CUSTODIAN_8, me, player);
break;
case 9:
DoScriptText(WHISPER_CUSTODIAN_9, me, player);
break;
case 10:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 13:
DoScriptText(WHISPER_CUSTODIAN_10, me, player);
break;
case 14:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 16:
DoScriptText(WHISPER_CUSTODIAN_11, me, player);
break;
case 17:
DoScriptText(WHISPER_CUSTODIAN_12, me, player);
break;
case 18:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 22:
DoScriptText(WHISPER_CUSTODIAN_13, me, player);
break;
case 23:
DoScriptText(WHISPER_CUSTODIAN_4, me, player);
break;
case 24:
DoScriptText(WHISPER_CUSTODIAN_14, me, player);
DoCast(player, 34883);
// below here is temporary workaround, to be removed when spell works properly
player->AreaExploredOrEventHappens(10277);
break;
}
}
}
@@ -259,7 +266,7 @@ public:
}
void EnterCombat(Unit* /*who*/) {}
void Reset() { }
void Reset() {}
void UpdateAI(const uint32 diff)
{
@@ -416,7 +423,7 @@ public:
## npc_OOX17
######*/
enum e00X17
enum Npc00X17
{
//texts are signed for 7806
SAY_OOX_START = -1000287,
@@ -464,30 +471,29 @@ public:
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (waypointId)
if (Player* player = GetPlayerForEscort())
{
case 23:
me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, -8353.96f, -4442.79f, 10.10f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_OOX_AMBUSH, me);
break;
case 56:
me->SummonCreature(SPAWN_SECOND_1, -7510.07f, -4795.50f, 9.35f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_SECOND_2, -7515.07f, -4797.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_SECOND_2, -7518.07f, -4792.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_OOX_AMBUSH, me);
if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30))
DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff);
break;
case 86:
DoScriptText(SAY_OOX_END, me);
player->GroupEventHappens(Q_OOX17, me);
break;
switch (waypointId)
{
case 23:
me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, -8353.96f, -4442.79f, 10.10f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_OOX_AMBUSH, me);
break;
case 56:
me->SummonCreature(SPAWN_SECOND_1, -7510.07f, -4795.50f, 9.35f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_SECOND_2, -7515.07f, -4797.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_SECOND_2, -7518.07f, -4792.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_OOX_AMBUSH, me);
if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30))
DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff);
break;
case 86:
DoScriptText(SAY_OOX_END, me);
player->GroupEventHappens(Q_OOX17, me);
break;
}
}
}
@@ -509,7 +515,7 @@ public:
# npc_tooga
####*/
enum eTooga
enum Tooga
{
SAY_TOOG_THIRST = -1000391,
SAY_TOOG_WORRIED = -1000392,
@@ -527,7 +533,7 @@ enum eTooga
FACTION_TOOG_ESCORTEE = 113
};
const float m_afToWaterLoc[] = {-7032.664551f, -4906.199219f, -1.606446f};
Position const ToWaterLoc = {-7032.664551f, -4906.199219f, -1.606446f, 0.0f};
class npc_tooga : public CreatureScript
{
@@ -554,17 +560,17 @@ public:
{
npc_toogaAI(Creature* creature) : FollowerAI(creature) { }
uint32 m_uiCheckSpeechTimer;
uint32 m_uiPostEventTimer;
uint32 m_uiPhasePostEvent;
uint32 CheckSpeechTimer;
uint32 PostEventTimer;
uint32 PhasePostEvent;
uint64 TortaGUID;
void Reset()
{
m_uiCheckSpeechTimer = 2500;
m_uiPostEventTimer = 1000;
m_uiPhasePostEvent = 0;
CheckSpeechTimer = 2500;
PostEventTimer = 1000;
PhasePostEvent = 0;
TortaGUID = 0;
}
@@ -577,11 +583,9 @@ public:
{
if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE))
{
if (Player* player = GetLeaderForFollower())
{
if (player->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE)
player->GroupEventHappens(QUEST_TOOGA, me);
}
Player* player = GetLeaderForFollower();
if (player && player->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE)
player->GroupEventHappens(QUEST_TOOGA, me);
TortaGUID = who->GetGUID();
SetFollowComplete(true);
@@ -589,27 +593,27 @@ public:
}
}
void MovementInform(uint32 uiMotionType, uint32 uiPointId)
void MovementInform(uint32 MotionType, uint32 PointId)
{
FollowerAI::MovementInform(uiMotionType, uiPointId);
FollowerAI::MovementInform(MotionType, PointId);
if (uiMotionType != POINT_MOTION_TYPE)
if (MotionType != POINT_MOTION_TYPE)
return;
if (uiPointId == POINT_ID_TO_WATER)
if (PointId == POINT_ID_TO_WATER)
SetFollowComplete();
}
void UpdateFollowerAI(const uint32 uiDiff)
void UpdateFollowerAI(const uint32 Diff)
{
if (!UpdateVictim())
{
//we are doing the post-event, or...
if (HasFollowState(STATE_FOLLOW_POSTEVENT))
{
if (m_uiPostEventTimer <= uiDiff)
if (PostEventTimer <= Diff)
{
m_uiPostEventTimer = 5000;
PostEventTimer = 5000;
Unit* pTorta = Unit::GetUnit(*me, TortaGUID);
if (!pTorta || !pTorta->isAlive())
@@ -619,7 +623,7 @@ public:
return;
}
switch (m_uiPhasePostEvent)
switch (PhasePostEvent)
{
case 1:
DoScriptText(SAY_TOOG_POST_1, me);
@@ -638,27 +642,27 @@ public:
break;
case 6:
DoScriptText(SAY_TORT_POST_6, pTorta);
me->GetMotionMaster()->MovePoint(POINT_ID_TO_WATER, m_afToWaterLoc[0], m_afToWaterLoc[1], m_afToWaterLoc[2]);
me->GetMotionMaster()->MovePoint(POINT_ID_TO_WATER, ToWaterLoc);
break;
}
++m_uiPhasePostEvent;
++PhasePostEvent;
}
else
m_uiPostEventTimer -= uiDiff;
PostEventTimer -= Diff;
}
//...we are doing regular speech check
else if (HasFollowState(STATE_FOLLOW_INPROGRESS))
{
if (m_uiCheckSpeechTimer <= uiDiff)
if (CheckSpeechTimer <= Diff)
{
m_uiCheckSpeechTimer = 5000;
CheckSpeechTimer = 5000;
if (urand(0, 9) > 8)
DoScriptText(RAND(SAY_TOOG_THIRST, SAY_TOOG_WORRIED), me);
}
else
m_uiCheckSpeechTimer -= uiDiff;
CheckSpeechTimer -= Diff;
}
return;