aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/ZulAman
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-07-04 22:09:24 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-07-04 22:11:47 +0200
commitb4d4e04f53b447a7b6cfba1c7161d9c987260265 (patch)
tree7a0663903f4394731795433cc0d2814634f3d8ef /src/server/scripts/EasternKingdoms/ZulAman
parent85db1fc9434e7eca4ee53ca8c645e14c187911cb (diff)
Scripts/Misc: Rename creatures with mob_ / mobs_ in npc_
Note: Have fun :P
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ZulAman')
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp16
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp14
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp76
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp14
5 files changed, 62 insertions, 62 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 1edc669e548..d4769d48efe 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -60,7 +60,7 @@ enum Says
enum Misc
{
- MOB_SOARING_EAGLE = 24858,
+ NPC_SOARING_EAGLE = 24858,
SE_LOC_X_MAX = 400,
SE_LOC_X_MIN = 335,
SE_LOC_Y_MAX = 1435,
@@ -325,7 +325,7 @@ class boss_akilzon : public CreatureScript
if (z > 95)
z = 95.0f - urand(0, 5);
}
- Creature* creature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Creature* creature = me->SummonCreature(NPC_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (creature)
{
creature->AddThreat(me->GetVictim(), 1.0f);
@@ -363,14 +363,14 @@ class boss_akilzon : public CreatureScript
}
};
-class mob_akilzon_eagle : public CreatureScript
+class npc_akilzon_eagle : public CreatureScript
{
public:
- mob_akilzon_eagle() : CreatureScript("mob_akilzon_eagle") { }
+ npc_akilzon_eagle() : CreatureScript("npc_akilzon_eagle") { }
- struct mob_akilzon_eagleAI : public ScriptedAI
+ struct npc_akilzon_eagleAI : public ScriptedAI
{
- mob_akilzon_eagleAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_akilzon_eagleAI(Creature* creature) : ScriptedAI(creature) { }
uint32 EagleSwoop_Timer;
bool arrived;
@@ -440,13 +440,13 @@ class mob_akilzon_eagle : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_akilzon_eagleAI(creature);
+ return new npc_akilzon_eagleAI(creature);
}
};
void AddSC_boss_akilzon()
{
new boss_akilzon();
- new mob_akilzon_eagle();
+ new npc_akilzon_eagle();
}
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index 142bc46a1f1..dd75b80488b 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -348,18 +348,18 @@ class boss_halazzi : public CreatureScript
};
// Spirits Lynx AI
-class mob_halazzi_lynx : public CreatureScript
+class npc_halazzi_lynx : public CreatureScript
{
public:
- mob_halazzi_lynx()
- : CreatureScript("mob_halazzi_lynx")
+ npc_halazzi_lynx()
+ : CreatureScript("npc_halazzi_lynx")
{
}
- struct mob_halazzi_lynxAI : public ScriptedAI
+ struct npc_halazzi_lynxAI : public ScriptedAI
{
- mob_halazzi_lynxAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_halazzi_lynxAI(Creature* creature) : ScriptedAI(creature) {}
uint32 FrenzyTimer;
uint32 shredder_timer;
@@ -408,14 +408,14 @@ class mob_halazzi_lynx : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_halazzi_lynxAI(creature);
+ return new npc_halazzi_lynxAI(creature);
}
};
void AddSC_boss_halazzi()
{
new boss_halazzi();
- new mob_halazzi_lynx();
+ new npc_halazzi_lynx();
}
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index 5b5d1ce4bb1..5965cadf814 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -46,7 +46,7 @@ EndScriptData */
#define SPELL_DRAIN_POWER 44131
#define SPELL_SIPHON_SOUL 43501
-#define MOB_TEMP_TRIGGER 23920
+#define NPC_TEMP_TRIGGER 23920
//Defines for various powers he uses after using soul drain
@@ -402,7 +402,7 @@ class boss_hexlord_malacrass : public CreatureScript
if (SiphonSoul_Timer <= diff)
{
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true);
- Unit* trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
+ Unit* trigger = DoSpawnCreature(NPC_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
if (!target || !trigger)
{
EnterEvadeMode();
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 267e58e9d4c..3b8e3d5fdb2 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -57,10 +57,10 @@ enum eEnums
SPELL_FIRE_BOMB_DAMAGE = 42630,
// --Summons
- MOB_AMANI_HATCHER = 23818,
- MOB_HATCHLING = 23598, // 42493
- MOB_EGG = 23817,
- MOB_FIRE_BOMB = 23920,
+ NPC_AMANI_HATCHER = 23818,
+ NPC_HATCHLING = 23598, // 42493
+ NPC_EGG = 23817,
+ NPC_FIRE_BOMB = 23920,
// -- Hatcher Spells
SPELL_HATCH_EGG = 42471, // 43734
@@ -205,9 +205,9 @@ class boss_janalai : public CreatureScript
for (uint8 j = 0; j < WallNum; j++)
{
if (WallNum == 3)
- wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0], FireWallCoords[i][1]+5*(j-1), FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
+ wall = me->SummonCreature(NPC_FIRE_BOMB, FireWallCoords[i][0], FireWallCoords[i][1]+5*(j-1), FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
else
- wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0]-2+4*j, FireWallCoords[i][1], FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
+ wall = me->SummonCreature(NPC_FIRE_BOMB, FireWallCoords[i][0]-2+4*j, FireWallCoords[i][1], FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
if (wall) wall->CastSpell(wall, SPELL_FIRE_WALL, true);
}
}
@@ -221,7 +221,7 @@ class boss_janalai : public CreatureScript
dx = float(irand(-area_dx/2, area_dx/2));
dy = float(irand(-area_dy/2, area_dy/2));
- Creature* bomb = DoSpawnCreature(MOB_FIRE_BOMB, dx, dy, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
+ Creature* bomb = DoSpawnCreature(NPC_FIRE_BOMB, dx, dy, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
if (bomb)
FireBombGUIDs[i] = bomb->GetGUID();
}
@@ -239,7 +239,7 @@ class boss_janalai : public CreatureScript
Cell cell(pair);
cell.SetNoCreate();
- Trinity::AllCreaturesOfEntryInRange check(me, MOB_EGG, 100);
+ Trinity::AllCreaturesOfEntryInRange check(me, NPC_EGG, 100);
Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, templist, check);
TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher);
@@ -272,7 +272,7 @@ class boss_janalai : public CreatureScript
Cell cell(pair);
cell.SetNoCreate();
- Trinity::AllCreaturesOfEntryInRange check(me, MOB_FIRE_BOMB, 100);
+ Trinity::AllCreaturesOfEntryInRange check(me, NPC_FIRE_BOMB, 100);
Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, templist, check);
TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher);
@@ -407,8 +407,8 @@ class boss_janalai : public CreatureScript
if (HatchAllEggs(0))
{
Talk(SAY_SUMMON_HATCHER);
- me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[0][0][0], hatcherway[0][0][1], hatcherway[0][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
- me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[1][0][0], hatcherway[1][0][1], hatcherway[1][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+ me->SummonCreature(NPC_AMANI_HATCHER, hatcherway[0][0][0], hatcherway[0][0][1], hatcherway[0][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+ me->SummonCreature(NPC_AMANI_HATCHER, hatcherway[1][0][0], hatcherway[1][0][1], hatcherway[1][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
HatcherTimer = 90000;
}
else
@@ -441,18 +441,18 @@ class boss_janalai : public CreatureScript
}
};
-class mob_janalai_firebomb : public CreatureScript
+class npc_janalai_firebomb : public CreatureScript
{
public:
- mob_janalai_firebomb()
- : CreatureScript("mob_janalai_firebomb")
+ npc_janalai_firebomb()
+ : CreatureScript("npc_janalai_firebomb")
{
}
- struct mob_janalai_firebombAI : public ScriptedAI
+ struct npc_janalai_firebombAI : public ScriptedAI
{
- mob_janalai_firebombAI(Creature* creature) : ScriptedAI(creature){}
+ npc_janalai_firebombAI(Creature* creature) : ScriptedAI(creature){}
void Reset() {}
@@ -473,22 +473,22 @@ class mob_janalai_firebomb : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_janalai_firebombAI(creature);
+ return new npc_janalai_firebombAI(creature);
}
};
-class mob_janalai_hatcher : public CreatureScript
+class npc_janalai_hatcher : public CreatureScript
{
public:
- mob_janalai_hatcher()
- : CreatureScript("mob_janalai_hatcher")
+ npc_janalai_hatcher()
+ : CreatureScript("npc_janalai_hatcher")
{
}
- struct mob_janalai_hatcherAI : public ScriptedAI
+ struct npc_janalai_hatcherAI : public ScriptedAI
{
- mob_janalai_hatcherAI(Creature* creature) : ScriptedAI(creature)
+ npc_janalai_hatcherAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
}
@@ -605,22 +605,22 @@ class mob_janalai_hatcher : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_janalai_hatcherAI(creature);
+ return new npc_janalai_hatcherAI(creature);
}
};
-class mob_janalai_hatchling : public CreatureScript
+class npc_janalai_hatchling : public CreatureScript
{
public:
- mob_janalai_hatchling()
- : CreatureScript("mob_janalai_hatchling")
+ npc_janalai_hatchling()
+ : CreatureScript("npc_janalai_hatchling")
{
}
- struct mob_janalai_hatchlingAI : public ScriptedAI
+ struct npc_janalai_hatchlingAI : public ScriptedAI
{
- mob_janalai_hatchlingAI(Creature* creature) : ScriptedAI(creature)
+ npc_janalai_hatchlingAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
}
@@ -664,23 +664,23 @@ class mob_janalai_hatchling : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_janalai_hatchlingAI(creature);
+ return new npc_janalai_hatchlingAI(creature);
}
};
-class mob_janalai_egg : public CreatureScript
+class npc_janalai_egg : public CreatureScript
{
public:
- mob_janalai_egg(): CreatureScript("mob_janalai_egg") {}
+ npc_janalai_egg(): CreatureScript("npc_janalai_egg") {}
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_janalai_eggAI(creature);
+ return new npc_janalai_eggAI(creature);
}
- struct mob_janalai_eggAI : public ScriptedAI
+ struct npc_janalai_eggAI : public ScriptedAI
{
- mob_janalai_eggAI(Creature* creature) : ScriptedAI(creature){}
+ npc_janalai_eggAI(Creature* creature) : ScriptedAI(creature){}
void Reset() {}
@@ -700,9 +700,9 @@ public:
void AddSC_boss_janalai()
{
new boss_janalai();
- new mob_janalai_firebomb();
- new mob_janalai_hatcher();
- new mob_janalai_hatchling();
- new mob_janalai_egg();
+ new npc_janalai_firebomb();
+ new npc_janalai_hatcher();
+ new npc_janalai_hatchling();
+ new npc_janalai_egg();
}
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 77f45754745..49df46df95c 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -559,18 +559,18 @@ class boss_zuljin : public CreatureScript
}
};
-class mob_zuljin_vortex : public CreatureScript
+class npc_zuljin_vortex : public CreatureScript
{
public:
- mob_zuljin_vortex()
- : CreatureScript("mob_zuljin_vortex")
+ npc_zuljin_vortex()
+ : CreatureScript("npc_zuljin_vortex")
{
}
- struct mob_zuljin_vortexAI : public ScriptedAI
+ struct npc_zuljin_vortexAI : public ScriptedAI
{
- mob_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() {}
@@ -592,13 +592,13 @@ class mob_zuljin_vortex : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_zuljin_vortexAI(creature);
+ return new npc_zuljin_vortexAI(creature);
}
};
void AddSC_boss_zuljin()
{
new boss_zuljin();
- new mob_zuljin_vortex();
+ new npc_zuljin_vortex();
}