aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland/HellfireCitadel
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/Outland/HellfireCitadel
parent85db1fc9434e7eca4ee53ca8c645e14c187911cb (diff)
Scripts/Misc: Rename creatures with mob_ / mobs_ in npc_
Note: Have fun :P
Diffstat (limited to 'src/server/scripts/Outland/HellfireCitadel')
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp16
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp14
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp44
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp32
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp18
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp30
6 files changed, 77 insertions, 77 deletions
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index f491c5d4c9a..31e66c380d2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -25,7 +25,7 @@ EndScriptData */
/* ContentData
boss_kelidan_the_breaker
-mob_shadowmoon_channeler
+npc_shadowmoon_channeler
EndContentData */
#include "ScriptMgr.h"
@@ -280,7 +280,7 @@ class boss_kelidan_the_breaker : public CreatureScript
};
/*######
-## mob_shadowmoon_channeler
+## npc_shadowmoon_channeler
######*/
enum eShadowmoon
@@ -292,15 +292,15 @@ enum eShadowmoon
SPELL_CHANNELING = 39123
};
-class mob_shadowmoon_channeler : public CreatureScript
+class npc_shadowmoon_channeler : public CreatureScript
{
public:
- mob_shadowmoon_channeler() : CreatureScript("mob_shadowmoon_channeler") {}
+ npc_shadowmoon_channeler() : CreatureScript("npc_shadowmoon_channeler") {}
- struct mob_shadowmoon_channelerAI : public ScriptedAI
+ struct npc_shadowmoon_channelerAI : public ScriptedAI
{
- mob_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){}
+ npc_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){}
uint32 ShadowBolt_Timer;
uint32 MarkOfShadow_Timer;
@@ -373,13 +373,13 @@ class mob_shadowmoon_channeler : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_shadowmoon_channelerAI(creature);
+ return new npc_shadowmoon_channelerAI(creature);
}
};
void AddSC_boss_kelidan_the_breaker()
{
new boss_kelidan_the_breaker();
- new mob_shadowmoon_channeler();
+ new npc_shadowmoon_channeler();
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 033d8e4c85e..cee8a2e840e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -460,17 +460,17 @@ class boss_vazruden_the_herald : public CreatureScript
}
};
-class mob_hellfire_sentry : public CreatureScript
+class npc_hellfire_sentry : public CreatureScript
{
public:
- mob_hellfire_sentry()
- : CreatureScript("mob_hellfire_sentry")
+ npc_hellfire_sentry()
+ : CreatureScript("npc_hellfire_sentry")
{
}
- struct mob_hellfire_sentryAI : public ScriptedAI
+ struct npc_hellfire_sentryAI : public ScriptedAI
{
- mob_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) {}
uint32 KidneyShot_Timer;
@@ -506,7 +506,7 @@ class mob_hellfire_sentry : public CreatureScript
};
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_hellfire_sentryAI(creature);
+ return new npc_hellfire_sentryAI(creature);
}
};
void AddSC_boss_vazruden_the_herald()
@@ -514,6 +514,6 @@ void AddSC_boss_vazruden_the_herald()
new boss_vazruden_the_herald();
new boss_vazruden();
new boss_nazan();
- new mob_hellfire_sentry();
+ new npc_hellfire_sentry();
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 21b77525ea3..8ad34033e5c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -49,10 +49,10 @@ enum eEmotes
enum eCreatures
{
- MOB_MAGTHERIDON = 17257,
- MOB_ROOM = 17516,
- MOB_CHANNELLER = 17256,
- MOB_ABYSSAL = 17454,
+ NPC_MAGTHERIDON = 17257,
+ NPC_ROOM = 17516,
+ NPC_CHANNELLER = 17256,
+ NPC_ABYSSAL = 17454,
};
enum eSpells
@@ -87,18 +87,18 @@ enum eSpells
typedef std::map<uint64, uint64> CubeMap;
-class mob_abyssal : public CreatureScript
+class npc_abyssal : public CreatureScript
{
public:
- mob_abyssal()
- : CreatureScript("mob_abyssal")
+ npc_abyssal()
+ : CreatureScript("npc_abyssal")
{
}
- struct mob_abyssalAI : public ScriptedAI
+ struct npc_abyssalAI : public ScriptedAI
{
- mob_abyssalAI(Creature* creature) : ScriptedAI(creature)
+ npc_abyssalAI(Creature* creature) : ScriptedAI(creature)
{
trigger = 0;
Despawn_Timer = 60000;
@@ -189,7 +189,7 @@ class mob_abyssal : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_abyssalAI(creature);
+ return new npc_abyssalAI(creature);
}
};
@@ -405,10 +405,10 @@ class boss_magtheridon : public CreatureScript
{
float x, y, z;
target->GetPosition(x, y, z);
- Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Creature* summon = me->SummonCreature(NPC_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (summon)
{
- CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(2);
+ CAST_AI(npc_abyssal::npc_abyssalAI, summon->AI())->SetTrigger(2);
DoCast(summon, SPELL_BLAZE_TARGET, true);
summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
@@ -439,9 +439,9 @@ class boss_magtheridon : public CreatureScript
{
float x, y, z;
target->GetPosition(x, y, z);
- Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Creature* summon = me->SummonCreature(NPC_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (summon)
- CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1);
+ CAST_AI(npc_abyssal::npc_abyssalAI, summon->AI())->SetTrigger(1);
}
Debris_Timer = 10000;
}
@@ -459,18 +459,18 @@ class boss_magtheridon : public CreatureScript
}
};
-class mob_hellfire_channeler : public CreatureScript
+class npc_hellfire_channeler : public CreatureScript
{
public:
- mob_hellfire_channeler()
- : CreatureScript("mob_hellfire_channeler")
+ npc_hellfire_channeler()
+ : CreatureScript("npc_hellfire_channeler")
{
}
- struct mob_hellfire_channelerAI : public ScriptedAI
+ struct npc_hellfire_channelerAI : public ScriptedAI
{
- mob_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature)
+ npc_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
}
@@ -574,7 +574,7 @@ class mob_hellfire_channeler : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_hellfire_channelerAI(creature);
+ return new npc_hellfire_channelerAI(creature);
}
};
@@ -614,8 +614,8 @@ public:
void AddSC_boss_magtheridon()
{
new boss_magtheridon();
- new mob_hellfire_channeler();
- new mob_abyssal();
+ new npc_hellfire_channeler();
+ new npc_abyssal();
new go_manticron_cube();
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index f53748d0aa4..b3408ed6c49 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -25,8 +25,8 @@ EndScriptData */
/* ContentData
boss_grand_warlock_nethekurse
-mob_fel_orc_convert
-mob_lesser_shadow_fissure
+npc_fel_orc_convert
+npc_lesser_shadow_fissure
EndContentData */
#include "ScriptMgr.h"
@@ -285,18 +285,18 @@ class boss_grand_warlock_nethekurse : public CreatureScript
}
};
-class mob_fel_orc_convert : public CreatureScript
+class npc_fel_orc_convert : public CreatureScript
{
public:
- mob_fel_orc_convert()
- : CreatureScript("mob_fel_orc_convert")
+ npc_fel_orc_convert()
+ : CreatureScript("npc_fel_orc_convert")
{
}
- struct mob_fel_orc_convertAI : public ScriptedAI
+ struct npc_fel_orc_convertAI : public ScriptedAI
{
- mob_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature)
+ npc_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
}
@@ -363,23 +363,23 @@ class mob_fel_orc_convert : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_fel_orc_convertAI(creature);
+ return new npc_fel_orc_convertAI(creature);
}
};
//NOTE: this Creature are also summoned by other spells, for different creatures
-class mob_lesser_shadow_fissure : public CreatureScript
+class npc_lesser_shadow_fissure : public CreatureScript
{
public:
- mob_lesser_shadow_fissure()
- : CreatureScript("mob_lesser_shadow_fissure")
+ npc_lesser_shadow_fissure()
+ : CreatureScript("npc_lesser_shadow_fissure")
{
}
- struct mob_lesser_shadow_fissureAI : public ScriptedAI
+ struct npc_lesser_shadow_fissureAI : public ScriptedAI
{
- mob_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() { }
void MoveInLineOfSight(Unit* /*who*/) {}
@@ -389,14 +389,14 @@ class mob_lesser_shadow_fissure : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_lesser_shadow_fissureAI (creature);
+ return new npc_lesser_shadow_fissureAI (creature);
}
};
void AddSC_boss_grand_warlock_nethekurse()
{
new boss_grand_warlock_nethekurse();
- new mob_fel_orc_convert();
- new mob_lesser_shadow_fissure();
+ new npc_fel_orc_convert();
+ new npc_lesser_shadow_fissure();
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 89a585e415f..82ee361b657 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -24,7 +24,7 @@ SDCategory: Hellfire Citadel, Shattered Halls
EndScriptData */
/* ContentData
-mob_omrogg_heads
+npc_omrogg_heads
boss_warbringer_omrogg
EndContentData */
@@ -102,18 +102,18 @@ static Yell KillingDelay[]=
{11, NPC_LEFT_HEAD},
};
-class mob_omrogg_heads : public CreatureScript
+class npc_omrogg_heads : public CreatureScript
{
public:
- mob_omrogg_heads()
- : CreatureScript("mob_omrogg_heads")
+ npc_omrogg_heads()
+ : CreatureScript("npc_omrogg_heads")
{
}
- struct mob_omrogg_headsAI : public ScriptedAI
+ struct npc_omrogg_headsAI : public ScriptedAI
{
- mob_omrogg_headsAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_omrogg_headsAI(Creature* creature) : ScriptedAI(creature) {}
bool DeathYell;
uint32 Death_Timer;
@@ -146,7 +146,7 @@ class mob_omrogg_heads : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
- return new mob_omrogg_headsAI(creature);
+ return new npc_omrogg_headsAI(creature);
}
};
@@ -306,7 +306,7 @@ class boss_warbringer_omrogg : public CreatureScript
pLeftHead->AI()->Talk(YELL_DIE_L);
- CAST_AI(mob_omrogg_heads::mob_omrogg_headsAI, pRightHead->ToCreature()->AI())->DoDeathYell();
+ CAST_AI(npc_omrogg_heads::npc_omrogg_headsAI, pRightHead->ToCreature()->AI())->DoDeathYell();
if (instance)
instance->SetData(TYPE_OMROGG, DONE);
@@ -423,6 +423,6 @@ class boss_warbringer_omrogg : public CreatureScript
void AddSC_boss_warbringer_omrogg()
{
new boss_warbringer_omrogg();
- new mob_omrogg_heads();
+ new npc_omrogg_heads();
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index c8fa8948e5a..882cc3a0d3f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -45,10 +45,10 @@ enum eSpells
enum eCreatures
{
- MOB_SHATTERED_ASSASSIN = 17695,
- MOB_HEARTHEN_GUARD = 17621,
- MOB_SHARPSHOOTER_GUARD = 17622,
- MOB_REAVER_GUARD = 17623,
+ NPC_SHATTERED_ASSASSIN = 17695,
+ NPC_HEARTHEN_GUARD = 17621,
+ NPC_SHARPSHOOTER_GUARD = 17622,
+ NPC_REAVER_GUARD = 17623,
};
#define TARGET_NUM 5
@@ -115,13 +115,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
switch (summoned->GetEntry())
{
- case MOB_HEARTHEN_GUARD:
- case MOB_SHARPSHOOTER_GUARD:
- case MOB_REAVER_GUARD:
+ case NPC_HEARTHEN_GUARD:
+ case NPC_SHARPSHOOTER_GUARD:
+ case NPC_REAVER_GUARD:
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
adds.push_back(summoned->GetGUID());
break;
- case MOB_SHATTERED_ASSASSIN:
+ case NPC_SHATTERED_ASSASSIN:
assassins.push_back(summoned->GetGUID());
break;
}
@@ -188,10 +188,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript
}
void SpawnAssassin()
{
- me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
- me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
- me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
- me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
}
void UpdateAI(uint32 diff)
@@ -279,13 +279,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript
switch (urand(0, 2))
{
case 0:
- me->SummonCreature(MOB_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ me->SummonCreature(NPC_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
case 1:
- me->SummonCreature(MOB_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ me->SummonCreature(NPC_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
case 2:
- me->SummonCreature(MOB_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ me->SummonCreature(NPC_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
}
}