diff options
Diffstat (limited to 'src/server/scripts/Northrend')
46 files changed, 757 insertions, 757 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 24335c0e469..725dd88f137 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -177,14 +177,14 @@ public: } }; -class mob_amanitar_mushrooms : public CreatureScript +class npc_amanitar_mushrooms : public CreatureScript { public: - mob_amanitar_mushrooms() : CreatureScript("mob_amanitar_mushrooms") { } + npc_amanitar_mushrooms() : CreatureScript("npc_amanitar_mushrooms") { } - struct mob_amanitar_mushroomsAI : public ScriptedAI + struct npc_amanitar_mushroomsAI : public ScriptedAI { - mob_amanitar_mushroomsAI(Creature* creature) : ScriptedAI(creature) {} + npc_amanitar_mushroomsAI(Creature* creature) : ScriptedAI(creature) {} EventMap events; @@ -242,12 +242,12 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_amanitar_mushroomsAI(creature); + return new npc_amanitar_mushroomsAI(creature); } }; void AddSC_boss_amanitar() { new boss_amanitar(); - new mob_amanitar_mushrooms(); + new npc_amanitar_mushrooms(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index a9fad9c5451..900d975f4bf 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -193,14 +193,14 @@ class boss_elder_nadox : public CreatureScript } }; -class mob_ahnkahar_nerubian : public CreatureScript +class npc_ahnkahar_nerubian : public CreatureScript { public: - mob_ahnkahar_nerubian() : CreatureScript("mob_ahnkahar_nerubian") { } + npc_ahnkahar_nerubian() : CreatureScript("npc_ahnkahar_nerubian") { } - struct mob_ahnkahar_nerubianAI : public ScriptedAI + struct npc_ahnkahar_nerubianAI : public ScriptedAI { - mob_ahnkahar_nerubianAI(Creature* creature) : ScriptedAI(creature) { } + npc_ahnkahar_nerubianAI(Creature* creature) : ScriptedAI(creature) { } EventMap events; @@ -244,19 +244,19 @@ class mob_ahnkahar_nerubian : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_ahnkahar_nerubianAI(creature); + return new npc_ahnkahar_nerubianAI(creature); } }; //HACK: No, AI. Replace with proper db content? -class mob_nadox_eggs : public CreatureScript +class npc_nadox_eggs : public CreatureScript { public: - mob_nadox_eggs() : CreatureScript("mob_nadox_eggs") { } + npc_nadox_eggs() : CreatureScript("npc_nadox_eggs") { } - struct mob_nadox_eggsAI : public ScriptedAI + struct npc_nadox_eggsAI : public ScriptedAI { - mob_nadox_eggsAI(Creature* creature) : ScriptedAI(creature) + npc_nadox_eggsAI(Creature* creature) : ScriptedAI(creature) { creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); creature->UpdateAllStats(); @@ -271,7 +271,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_nadox_eggsAI(creature); + return new npc_nadox_eggsAI(creature); } }; @@ -335,8 +335,8 @@ public: void AddSC_boss_elder_nadox() { new boss_elder_nadox(); - new mob_ahnkahar_nerubian(); - new mob_nadox_eggs(); + new npc_ahnkahar_nerubian(); + new npc_nadox_eggs(); new spell_elder_nadox_guardian(); new achievement_respect_your_elders(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 6c7a434ac14..21a019dc17d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -43,7 +43,7 @@ enum Spells enum Creatures { - MOB_TWISTED_VISAGE = 30625 + NPC_TWISTED_VISAGE = 30625 }; @@ -127,7 +127,7 @@ public: if (!player || !player->IsAlive()) continue; // Summon clone - if (Unit* summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Unit* summon = me->SummonCreature(NPC_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) { // clone player->CastSpell(summon, SPELL_CLONE_PLAYER, true); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index f2bdf829494..d6d079eac17 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -342,14 +342,14 @@ public: } }; -class mob_jedoga_initiand : public CreatureScript +class npc_jedoga_initiand : public CreatureScript { public: - mob_jedoga_initiand() : CreatureScript("mob_jedoga_initiand") { } + npc_jedoga_initiand() : CreatureScript("npc_jedoga_initiand") { } - struct mob_jedoga_initiandAI : public ScriptedAI + struct npc_jedoga_initiandAI : public ScriptedAI { - mob_jedoga_initiandAI(Creature* creature) : ScriptedAI(creature) + npc_jedoga_initiandAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -505,7 +505,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_jedoga_initiandAI(creature); + return new npc_jedoga_initiandAI(creature); } }; @@ -617,7 +617,7 @@ class achievement_volunteer_work : public AchievementCriteriaScript void AddSC_boss_jedoga_shadowseeker() { new boss_jedoga_shadowseeker(); - new mob_jedoga_initiand(); + new npc_jedoga_initiand(); new npc_jedogas_aufseher_trigger(); new achievement_volunteer_work(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 35c158c1d1a..72bae8c17d4 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -334,14 +334,14 @@ public: } }; -class mob_taldaram_flamesphere : public CreatureScript +class npc_taldaram_flamesphere : public CreatureScript { public: - mob_taldaram_flamesphere() : CreatureScript("mob_taldaram_flamesphere") { } + npc_taldaram_flamesphere() : CreatureScript("npc_taldaram_flamesphere") { } - struct mob_taldaram_flamesphereAI : public ScriptedAI + struct npc_taldaram_flamesphereAI : public ScriptedAI { - mob_taldaram_flamesphereAI(Creature* creature) : ScriptedAI(creature) + npc_taldaram_flamesphereAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -381,7 +381,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_taldaram_flamesphereAI(creature); + return new npc_taldaram_flamesphereAI(creature); } }; @@ -425,6 +425,6 @@ public: void AddSC_boss_taldaram() { new boss_taldaram(); - new mob_taldaram_flamesphere(); + new npc_taldaram_flamesphere(); new prince_taldaram_sphere(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 43d4f1bfdd9..d5072eee741 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -54,9 +54,9 @@ enum Spells enum Mobs { - MOB_SKITTERING_SWARMER = 28735, - MOB_SKITTERING_SWARMER_CONTROLLER = 32593, - MOB_SKITTERING_INFECTIOR = 28736 + NPC_SKITTERING_SWARMER = 28735, + NPC_SKITTERING_SWARMER_CONTROLLER = 32593, + NPC_SKITTERING_INFECTIOR = 28736 }; enum Yells @@ -120,22 +120,22 @@ public: void Summon() { - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_INFECTIOR, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_INFECTIOR, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_INFECTIOR, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); } void UpdateAI(uint32 diff) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index eca287a2be4..84fad199958 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -976,19 +976,19 @@ struct dummy_dragonAI : public ScriptedAI ## Mob Tenebron ######*/ -class mob_tenebron : public CreatureScript +class npc_tenebron : public CreatureScript { public: - mob_tenebron() : CreatureScript("mob_tenebron") { } + npc_tenebron() : CreatureScript("npc_tenebron") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_tenebronAI(creature); + return new npc_tenebronAI(creature); } - struct mob_tenebronAI : public dummy_dragonAI + struct npc_tenebronAI : public dummy_dragonAI { - mob_tenebronAI(Creature* creature) : dummy_dragonAI(creature) {} + npc_tenebronAI(Creature* creature) : dummy_dragonAI(creature) {} uint32 m_uiShadowBreathTimer; uint32 m_uiShadowFissureTimer; @@ -1065,19 +1065,19 @@ public: ## Mob Shadron ######*/ -class mob_shadron : public CreatureScript +class npc_shadron : public CreatureScript { public: - mob_shadron() : CreatureScript("mob_shadron") { } + npc_shadron() : CreatureScript("npc_shadron") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_shadronAI(creature); + return new npc_shadronAI(creature); } - struct mob_shadronAI : public dummy_dragonAI + struct npc_shadronAI : public dummy_dragonAI { - mob_shadronAI(Creature* creature) : dummy_dragonAI(creature) {} + npc_shadronAI(Creature* creature) : dummy_dragonAI(creature) {} uint32 m_uiShadowBreathTimer; uint32 m_uiShadowFissureTimer; @@ -1169,19 +1169,19 @@ public: ## Mob Vesperon ######*/ -class mob_vesperon : public CreatureScript +class npc_vesperon : public CreatureScript { public: - mob_vesperon() : CreatureScript("mob_vesperon") { } + npc_vesperon() : CreatureScript("npc_vesperon") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_vesperonAI(creature); + return new npc_vesperonAI(creature); } - struct mob_vesperonAI : public dummy_dragonAI + struct npc_vesperonAI : public dummy_dragonAI { - mob_vesperonAI(Creature* creature) : dummy_dragonAI(creature) {} + npc_vesperonAI(Creature* creature) : dummy_dragonAI(creature) {} uint32 m_uiShadowBreathTimer; uint32 m_uiShadowFissureTimer; @@ -1264,19 +1264,19 @@ public: ## Mob Acolyte of Shadron ######*/ -class mob_acolyte_of_shadron : public CreatureScript +class npc_acolyte_of_shadron : public CreatureScript { public: - mob_acolyte_of_shadron() : CreatureScript("mob_acolyte_of_shadron") { } + npc_acolyte_of_shadron() : CreatureScript("npc_acolyte_of_shadron") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_acolyte_of_shadronAI(creature); + return new npc_acolyte_of_shadronAI(creature); } - struct mob_acolyte_of_shadronAI : public ScriptedAI + struct npc_acolyte_of_shadronAI : public ScriptedAI { - mob_acolyte_of_shadronAI(Creature* creature) : ScriptedAI(creature) + npc_acolyte_of_shadronAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -1315,7 +1315,7 @@ public: Creature* Shadron = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON)); if (Shadron) { - (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(npc_shadron::npc_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; } Creature* pDebuffTarget = NULL; @@ -1374,19 +1374,19 @@ public: ## Mob Acolyte of Vesperon ######*/ -class mob_acolyte_of_vesperon : public CreatureScript +class npc_acolyte_of_vesperon : public CreatureScript { public: - mob_acolyte_of_vesperon() : CreatureScript("mob_acolyte_of_vesperon") { } + npc_acolyte_of_vesperon() : CreatureScript("npc_acolyte_of_vesperon") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_acolyte_of_vesperonAI(creature); + return new npc_acolyte_of_vesperonAI(creature); } - struct mob_acolyte_of_vesperonAI : public ScriptedAI + struct npc_acolyte_of_vesperonAI : public ScriptedAI { - mob_acolyte_of_vesperonAI(Creature* creature) : ScriptedAI(creature) + npc_acolyte_of_vesperonAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -1413,7 +1413,7 @@ public: { Creature* pVesperon = instance->instance->GetCreature(instance->GetData64(DATA_VESPERON)); if (pVesperon) - (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; + (CAST_AI(npc_vesperon::npc_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; if (pVesperon && pVesperon->IsAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); @@ -1469,19 +1469,19 @@ public: ## Mob Twilight Eggs ######*/ -class mob_twilight_eggs : public CreatureScript +class npc_twilight_eggs : public CreatureScript { public: - mob_twilight_eggs() : CreatureScript("mob_twilight_eggs") { } + npc_twilight_eggs() : CreatureScript("npc_twilight_eggs") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_twilight_eggsAI(creature); + return new npc_twilight_eggsAI(creature); } - struct mob_twilight_eggsAI : public ScriptedAI + struct npc_twilight_eggsAI : public ScriptedAI { - mob_twilight_eggsAI(Creature* creature) : ScriptedAI(creature) + npc_twilight_eggsAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); instance = creature->GetInstanceScript(); @@ -1524,7 +1524,7 @@ public: { Creature* Tenebron = instance->instance->GetCreature(instance->GetData64(DATA_TENEBRON)); if (Tenebron) - (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(npc_tenebron::npc_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); } else @@ -1641,19 +1641,19 @@ public: ## Mob Twilight Whelps ######*/ -class mob_twilight_whelp : public CreatureScript +class npc_twilight_whelp : public CreatureScript { public: - mob_twilight_whelp() : CreatureScript("mob_twilight_whelp") { } + npc_twilight_whelp() : CreatureScript("npc_twilight_whelp") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_twilight_whelpAI(creature); + return new npc_twilight_whelpAI(creature); } - struct mob_twilight_whelpAI : public ScriptedAI + struct npc_twilight_whelpAI : public ScriptedAI { - mob_twilight_whelpAI(Creature* creature) : ScriptedAI(creature) + npc_twilight_whelpAI(Creature* creature) : ScriptedAI(creature) { Reset(); } @@ -1751,15 +1751,15 @@ class achievement_twilight_zone : public AchievementCriteriaScript void AddSC_boss_sartharion() { new boss_sartharion(); - new mob_vesperon(); - new mob_shadron(); - new mob_tenebron(); - new mob_acolyte_of_shadron(); - new mob_acolyte_of_vesperon(); - new mob_twilight_eggs(); + new npc_vesperon(); + new npc_shadron(); + new npc_tenebron(); + new npc_acolyte_of_shadron(); + new npc_acolyte_of_vesperon(); + new npc_twilight_eggs(); new npc_flame_tsunami(); new npc_twilight_fissure(); - new mob_twilight_whelp(); + new npc_twilight_whelp(); new achievement_twilight_assist(); new achievement_twilight_duo(); new achievement_twilight_zone(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 30f02ced9a0..5852d323c6e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -428,14 +428,14 @@ class boss_anubarak_trial : public CreatureScript }; }; -class mob_swarm_scarab : public CreatureScript +class npc_swarm_scarab : public CreatureScript { public: - mob_swarm_scarab() : CreatureScript("mob_swarm_scarab") { } + npc_swarm_scarab() : CreatureScript("npc_swarm_scarab") { } - struct mob_swarm_scarabAI : public ScriptedAI + struct npc_swarm_scarabAI : public ScriptedAI { - mob_swarm_scarabAI(Creature* creature) : ScriptedAI(creature) + npc_swarm_scarabAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); } @@ -496,18 +496,18 @@ class mob_swarm_scarab : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_swarm_scarabAI(creature); + return new npc_swarm_scarabAI(creature); }; }; -class mob_nerubian_burrower : public CreatureScript +class npc_nerubian_burrower : public CreatureScript { public: - mob_nerubian_burrower() : CreatureScript("mob_nerubian_burrower") { } + npc_nerubian_burrower() : CreatureScript("npc_nerubian_burrower") { } - struct mob_nerubian_burrowerAI : public ScriptedAI + struct npc_nerubian_burrowerAI : public ScriptedAI { - mob_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature) + npc_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); } @@ -585,18 +585,18 @@ class mob_nerubian_burrower : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_nerubian_burrowerAI(creature); + return new npc_nerubian_burrowerAI(creature); }; }; -class mob_frost_sphere : public CreatureScript +class npc_frost_sphere : public CreatureScript { public: - mob_frost_sphere() : CreatureScript("mob_frost_sphere") { } + npc_frost_sphere() : CreatureScript("npc_frost_sphere") { } - struct mob_frost_sphereAI : public ScriptedAI + struct npc_frost_sphereAI : public ScriptedAI { - mob_frost_sphereAI(Creature* creature) : ScriptedAI(creature) + npc_frost_sphereAI(Creature* creature) : ScriptedAI(creature) { } @@ -658,18 +658,18 @@ class mob_frost_sphere : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_frost_sphereAI(creature); + return new npc_frost_sphereAI(creature); }; }; -class mob_anubarak_spike : public CreatureScript +class npc_anubarak_spike : public CreatureScript { public: - mob_anubarak_spike() : CreatureScript("mob_anubarak_spike") { } + npc_anubarak_spike() : CreatureScript("npc_anubarak_spike") { } - struct mob_anubarak_spikeAI : public ScriptedAI + struct npc_anubarak_spikeAI : public ScriptedAI { - mob_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature) + npc_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature) { } @@ -805,7 +805,7 @@ class mob_anubarak_spike : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_anubarak_spikeAI(creature); + return new npc_anubarak_spikeAI(creature); }; }; @@ -886,10 +886,10 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader void AddSC_boss_anubarak_trial() { new boss_anubarak_trial(); - new mob_swarm_scarab(); - new mob_nerubian_burrower(); - new mob_anubarak_spike(); - new mob_frost_sphere(); + new npc_swarm_scarab(); + new npc_nerubian_burrower(); + new npc_anubarak_spike(); + new npc_frost_sphere(); new spell_impale(); new spell_anubarak_leeching_swarm(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index c8cab5e6c98..bf1d354deb6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -750,14 +750,14 @@ struct boss_faction_championsAI : public BossAI /******************************************************************** HEALERS ********************************************************************/ -class mob_toc_druid : public CreatureScript +class npc_toc_druid : public CreatureScript { public: - mob_toc_druid() : CreatureScript("mob_toc_druid") { } + npc_toc_druid() : CreatureScript("npc_toc_druid") { } - struct mob_toc_druidAI : public boss_faction_championsAI + struct npc_toc_druidAI : public boss_faction_championsAI { - mob_toc_druidAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} + npc_toc_druidAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} void Reset() { @@ -839,18 +839,18 @@ class mob_toc_druid : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_druidAI (creature); + return new npc_toc_druidAI (creature); } }; -class mob_toc_shaman : public CreatureScript +class npc_toc_shaman : public CreatureScript { public: - mob_toc_shaman() : CreatureScript("mob_toc_shaman") { } + npc_toc_shaman() : CreatureScript("npc_toc_shaman") { } - struct mob_toc_shamanAI : public boss_faction_championsAI + struct npc_toc_shamanAI : public boss_faction_championsAI { - mob_toc_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} + npc_toc_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} void Reset() { @@ -932,18 +932,18 @@ class mob_toc_shaman : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_shamanAI (creature); + return new npc_toc_shamanAI (creature); } }; -class mob_toc_paladin : public CreatureScript +class npc_toc_paladin : public CreatureScript { public: - mob_toc_paladin() : CreatureScript("mob_toc_paladin") { } + npc_toc_paladin() : CreatureScript("npc_toc_paladin") { } - struct mob_toc_paladinAI : public boss_faction_championsAI + struct npc_toc_paladinAI : public boss_faction_championsAI { - mob_toc_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} + npc_toc_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} void Reset() { @@ -1036,18 +1036,18 @@ class mob_toc_paladin : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_paladinAI (creature); + return new npc_toc_paladinAI (creature); } }; -class mob_toc_priest : public CreatureScript +class npc_toc_priest : public CreatureScript { public: - mob_toc_priest() : CreatureScript("mob_toc_priest") { } + npc_toc_priest() : CreatureScript("npc_toc_priest") { } - struct mob_toc_priestAI : public boss_faction_championsAI + struct npc_toc_priestAI : public boss_faction_championsAI { - mob_toc_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} + npc_toc_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} void Reset() { @@ -1121,21 +1121,21 @@ class mob_toc_priest : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_priestAI (creature); + return new npc_toc_priestAI (creature); } }; /******************************************************************** RANGED ********************************************************************/ -class mob_toc_shadow_priest : public CreatureScript +class npc_toc_shadow_priest : public CreatureScript { public: - mob_toc_shadow_priest() : CreatureScript("mob_toc_shadow_priest") { } + npc_toc_shadow_priest() : CreatureScript("npc_toc_shadow_priest") { } - struct mob_toc_shadow_priestAI : public boss_faction_championsAI + struct npc_toc_shadow_priestAI : public boss_faction_championsAI { - mob_toc_shadow_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} + npc_toc_shadow_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} void Reset() { @@ -1219,18 +1219,18 @@ class mob_toc_shadow_priest : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_shadow_priestAI (creature); + return new npc_toc_shadow_priestAI (creature); } }; -class mob_toc_warlock : public CreatureScript +class npc_toc_warlock : public CreatureScript { public: - mob_toc_warlock() : CreatureScript("mob_toc_warlock") { } + npc_toc_warlock() : CreatureScript("npc_toc_warlock") { } - struct mob_toc_warlockAI : public boss_faction_championsAI + struct npc_toc_warlockAI : public boss_faction_championsAI { - mob_toc_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} + npc_toc_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} void Reset() { @@ -1310,18 +1310,18 @@ class mob_toc_warlock : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_warlockAI (creature); + return new npc_toc_warlockAI (creature); } }; -class mob_toc_mage : public CreatureScript +class npc_toc_mage : public CreatureScript { public: - mob_toc_mage() : CreatureScript("mob_toc_mage") { } + npc_toc_mage() : CreatureScript("npc_toc_mage") { } - struct mob_toc_mageAI : public boss_faction_championsAI + struct npc_toc_mageAI : public boss_faction_championsAI { - mob_toc_mageAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} + npc_toc_mageAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} void Reset() { @@ -1404,18 +1404,18 @@ class mob_toc_mage : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_mageAI (creature); + return new npc_toc_mageAI (creature); } }; -class mob_toc_hunter : public CreatureScript +class npc_toc_hunter : public CreatureScript { public: - mob_toc_hunter() : CreatureScript("mob_toc_hunter") { } + npc_toc_hunter() : CreatureScript("npc_toc_hunter") { } - struct mob_toc_hunterAI : public boss_faction_championsAI + struct npc_toc_hunterAI : public boss_faction_championsAI { - mob_toc_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} + npc_toc_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} void Reset() { @@ -1506,18 +1506,18 @@ class mob_toc_hunter : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_hunterAI (creature); + return new npc_toc_hunterAI (creature); } }; -class mob_toc_boomkin : public CreatureScript +class npc_toc_boomkin : public CreatureScript { public: - mob_toc_boomkin() : CreatureScript("mob_toc_boomkin") { } + npc_toc_boomkin() : CreatureScript("npc_toc_boomkin") { } - struct mob_toc_boomkinAI : public boss_faction_championsAI + struct npc_toc_boomkinAI : public boss_faction_championsAI { - mob_toc_boomkinAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} + npc_toc_boomkinAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} void Reset() { @@ -1598,21 +1598,21 @@ class mob_toc_boomkin : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_boomkinAI (creature); + return new npc_toc_boomkinAI (creature); } }; /******************************************************************** MELEE ********************************************************************/ -class mob_toc_warrior : public CreatureScript +class npc_toc_warrior : public CreatureScript { public: - mob_toc_warrior() : CreatureScript("mob_toc_warrior") { } + npc_toc_warrior() : CreatureScript("npc_toc_warrior") { } - struct mob_toc_warriorAI : public boss_faction_championsAI + struct npc_toc_warriorAI : public boss_faction_championsAI { - mob_toc_warriorAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} + npc_toc_warriorAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} void Reset() { @@ -1702,18 +1702,18 @@ class mob_toc_warrior : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_warriorAI (creature); + return new npc_toc_warriorAI (creature); } }; -class mob_toc_dk : public CreatureScript +class npc_toc_dk : public CreatureScript { public: - mob_toc_dk() : CreatureScript("mob_toc_dk") { } + npc_toc_dk() : CreatureScript("npc_toc_dk") { } - struct mob_toc_dkAI : public boss_faction_championsAI + struct npc_toc_dkAI : public boss_faction_championsAI { - mob_toc_dkAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} + npc_toc_dkAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} void Reset() { @@ -1798,18 +1798,18 @@ class mob_toc_dk : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_dkAI (creature); + return new npc_toc_dkAI (creature); } }; -class mob_toc_rogue : public CreatureScript +class npc_toc_rogue : public CreatureScript { public: - mob_toc_rogue() : CreatureScript("mob_toc_rogue") { } + npc_toc_rogue() : CreatureScript("npc_toc_rogue") { } - struct mob_toc_rogueAI : public boss_faction_championsAI + struct npc_toc_rogueAI : public boss_faction_championsAI { - mob_toc_rogueAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} + npc_toc_rogueAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} void Reset() { @@ -1903,18 +1903,18 @@ class mob_toc_rogue : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_rogueAI (creature); + return new npc_toc_rogueAI (creature); } }; -class mob_toc_enh_shaman : public CreatureScript +class npc_toc_enh_shaman : public CreatureScript { public: - mob_toc_enh_shaman() : CreatureScript("mob_toc_enh_shaman") { } + npc_toc_enh_shaman() : CreatureScript("npc_toc_enh_shaman") { } - struct mob_toc_enh_shamanAI : public boss_faction_championsAI + struct npc_toc_enh_shamanAI : public boss_faction_championsAI { - mob_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} + npc_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} void Reset() { @@ -2029,18 +2029,18 @@ class mob_toc_enh_shaman : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_enh_shamanAI (creature); + return new npc_toc_enh_shamanAI (creature); } }; -class mob_toc_retro_paladin : public CreatureScript +class npc_toc_retro_paladin : public CreatureScript { public: - mob_toc_retro_paladin() : CreatureScript("mob_toc_retro_paladin") { } + npc_toc_retro_paladin() : CreatureScript("npc_toc_retro_paladin") { } - struct mob_toc_retro_paladinAI : public boss_faction_championsAI + struct npc_toc_retro_paladinAI : public boss_faction_championsAI { - mob_toc_retro_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} + npc_toc_retro_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} void Reset() { @@ -2135,18 +2135,18 @@ class mob_toc_retro_paladin : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_retro_paladinAI (creature); + return new npc_toc_retro_paladinAI (creature); } }; -class mob_toc_pet_warlock : public CreatureScript +class npc_toc_pet_warlock : public CreatureScript { public: - mob_toc_pet_warlock() : CreatureScript("mob_toc_pet_warlock") { } + npc_toc_pet_warlock() : CreatureScript("npc_toc_pet_warlock") { } - struct mob_toc_pet_warlockAI : public boss_faction_championsAI + struct npc_toc_pet_warlockAI : public boss_faction_championsAI { - mob_toc_pet_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} + npc_toc_pet_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} void Reset() { @@ -2187,18 +2187,18 @@ class mob_toc_pet_warlock : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_pet_warlockAI (creature); + return new npc_toc_pet_warlockAI (creature); } }; -class mob_toc_pet_hunter : public CreatureScript +class npc_toc_pet_hunter : public CreatureScript { public: - mob_toc_pet_hunter() : CreatureScript("mob_toc_pet_hunter") { } + npc_toc_pet_hunter() : CreatureScript("npc_toc_pet_hunter") { } - struct mob_toc_pet_hunterAI : public boss_faction_championsAI + struct npc_toc_pet_hunterAI : public boss_faction_championsAI { - mob_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} + npc_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} void Reset() { @@ -2227,7 +2227,7 @@ class mob_toc_pet_hunter : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_pet_hunterAI (creature); + return new npc_toc_pet_hunterAI (creature); } }; @@ -2388,22 +2388,22 @@ class spell_toc_heroism : public SpellScriptLoader void AddSC_boss_faction_champions() { new boss_toc_champion_controller(); - new mob_toc_druid(); - new mob_toc_shaman(); - new mob_toc_paladin(); - new mob_toc_priest(); - new mob_toc_shadow_priest(); - new mob_toc_mage(); - new mob_toc_warlock(); - new mob_toc_hunter(); - new mob_toc_boomkin(); - new mob_toc_warrior(); - new mob_toc_dk(); - new mob_toc_rogue(); - new mob_toc_enh_shaman(); - new mob_toc_retro_paladin(); - new mob_toc_pet_warlock(); - new mob_toc_pet_hunter(); + new npc_toc_druid(); + new npc_toc_shaman(); + new npc_toc_paladin(); + new npc_toc_priest(); + new npc_toc_shadow_priest(); + new npc_toc_mage(); + new npc_toc_warlock(); + new npc_toc_hunter(); + new npc_toc_boomkin(); + new npc_toc_warrior(); + new npc_toc_dk(); + new npc_toc_rogue(); + new npc_toc_enh_shaman(); + new npc_toc_retro_paladin(); + new npc_toc_pet_warlock(); + new npc_toc_pet_hunter(); new spell_faction_champion_warl_unstable_affliction(); new spell_faction_champion_death_grip(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 74324d6c515..795e675b12c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -218,14 +218,14 @@ class boss_jaraxxus : public CreatureScript } }; -class mob_legion_flame : public CreatureScript +class npc_legion_flame : public CreatureScript { public: - mob_legion_flame() : CreatureScript("mob_legion_flame") { } + npc_legion_flame() : CreatureScript("npc_legion_flame") { } - struct mob_legion_flameAI : public ScriptedAI + struct npc_legion_flameAI : public ScriptedAI { - mob_legion_flameAI(Creature* creature) : ScriptedAI(creature) + npc_legion_flameAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); _instance = creature->GetInstanceScript(); @@ -250,18 +250,18 @@ class mob_legion_flame : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_legion_flameAI(creature); + return new npc_legion_flameAI(creature); } }; -class mob_infernal_volcano : public CreatureScript +class npc_infernal_volcano : public CreatureScript { public: - mob_infernal_volcano() : CreatureScript("mob_infernal_volcano") { } + npc_infernal_volcano() : CreatureScript("npc_infernal_volcano") { } - struct mob_infernal_volcanoAI : public ScriptedAI + struct npc_infernal_volcanoAI : public ScriptedAI { - mob_infernal_volcanoAI(Creature* creature) : ScriptedAI(creature), _summons(me) + npc_infernal_volcanoAI(Creature* creature) : ScriptedAI(creature), _summons(me) { SetCombatMovement(false); } @@ -304,18 +304,18 @@ class mob_infernal_volcano : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_infernal_volcanoAI(creature); + return new npc_infernal_volcanoAI(creature); } }; -class mob_fel_infernal : public CreatureScript +class npc_fel_infernal : public CreatureScript { public: - mob_fel_infernal() : CreatureScript("mob_fel_infernal") { } + npc_fel_infernal() : CreatureScript("npc_fel_infernal") { } - struct mob_fel_infernalAI : public ScriptedAI + struct npc_fel_infernalAI : public ScriptedAI { - mob_fel_infernalAI(Creature* creature) : ScriptedAI(creature) + npc_fel_infernalAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); } @@ -355,18 +355,18 @@ class mob_fel_infernal : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_fel_infernalAI(creature); + return new npc_fel_infernalAI(creature); } }; -class mob_nether_portal : public CreatureScript +class npc_nether_portal : public CreatureScript { public: - mob_nether_portal() : CreatureScript("mob_nether_portal") { } + npc_nether_portal() : CreatureScript("npc_nether_portal") { } - struct mob_nether_portalAI : public ScriptedAI + struct npc_nether_portalAI : public ScriptedAI { - mob_nether_portalAI(Creature* creature) : ScriptedAI(creature), _summons(me) + npc_nether_portalAI(Creature* creature) : ScriptedAI(creature), _summons(me) { } @@ -408,18 +408,18 @@ class mob_nether_portal : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_nether_portalAI(creature); + return new npc_nether_portalAI(creature); } }; -class mob_mistress_of_pain : public CreatureScript +class npc_mistress_of_pain : public CreatureScript { public: - mob_mistress_of_pain() : CreatureScript("mob_mistress_of_pain") { } + npc_mistress_of_pain() : CreatureScript("npc_mistress_of_pain") { } - struct mob_mistress_of_painAI : public ScriptedAI + struct npc_mistress_of_painAI : public ScriptedAI { - mob_mistress_of_painAI(Creature* creature) : ScriptedAI(creature) + npc_mistress_of_painAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); if (_instance) @@ -488,7 +488,7 @@ class mob_mistress_of_pain : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_mistress_of_painAI(creature); + return new npc_mistress_of_painAI(creature); } }; @@ -592,11 +592,11 @@ class spell_mistress_kiss_area : public SpellScriptLoader void AddSC_boss_jaraxxus() { new boss_jaraxxus(); - new mob_legion_flame(); - new mob_infernal_volcano(); - new mob_fel_infernal(); - new mob_nether_portal(); - new mob_mistress_of_pain(); + new npc_legion_flame(); + new npc_infernal_volcano(); + new npc_fel_infernal(); + new npc_nether_portal(); + new npc_mistress_of_pain(); new spell_mistress_kiss(); new spell_mistress_kiss_area(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 21c3c983c64..2804f7c0adf 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -288,14 +288,14 @@ class boss_gormok : public CreatureScript } }; -class mob_snobold_vassal : public CreatureScript +class npc_snobold_vassal : public CreatureScript { public: - mob_snobold_vassal() : CreatureScript("mob_snobold_vassal") { } + npc_snobold_vassal() : CreatureScript("npc_snobold_vassal") { } - struct mob_snobold_vassalAI : public ScriptedAI + struct npc_snobold_vassalAI : public ScriptedAI { - mob_snobold_vassalAI(Creature* creature) : ScriptedAI(creature) + npc_snobold_vassalAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); if (_instance) @@ -457,7 +457,7 @@ class mob_snobold_vassal : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_snobold_vassalAI(creature); + return new npc_snobold_vassalAI(creature); } }; @@ -786,14 +786,14 @@ class boss_dreadscale : public CreatureScript } }; -class mob_slime_pool : public CreatureScript +class npc_slime_pool : public CreatureScript { public: - mob_slime_pool() : CreatureScript("mob_slime_pool") { } + npc_slime_pool() : CreatureScript("npc_slime_pool") { } - struct mob_slime_poolAI : public ScriptedAI + struct npc_slime_poolAI : public ScriptedAI { - mob_slime_poolAI(Creature* creature) : ScriptedAI(creature) + npc_slime_poolAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); } @@ -823,7 +823,7 @@ class mob_slime_pool : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_slime_poolAI(creature); + return new npc_slime_poolAI(creature); } }; @@ -1147,13 +1147,13 @@ class boss_icehowl : public CreatureScript void AddSC_boss_northrend_beasts() { new boss_gormok(); - new mob_snobold_vassal(); + new npc_snobold_vassal(); new npc_firebomb(); new spell_gormok_fire_bomb(); new boss_acidmaw(); new boss_dreadscale(); - new mob_slime_pool(); + new npc_slime_pool(); new boss_icehowl(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index fe2897295ce..d6d9db6bfb7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -490,14 +490,14 @@ class boss_eydis : public CreatureScript } }; -class mob_essence_of_twin : public CreatureScript +class npc_essence_of_twin : public CreatureScript { public: - mob_essence_of_twin() : CreatureScript("mob_essence_of_twin") { } + npc_essence_of_twin() : CreatureScript("npc_essence_of_twin") { } - struct mob_essence_of_twinAI : public ScriptedAI + struct npc_essence_of_twinAI : public ScriptedAI { - mob_essence_of_twinAI(Creature* creature) : ScriptedAI(creature) { } + npc_essence_of_twinAI(Creature* creature) : ScriptedAI(creature) { } uint32 GetData(uint32 data) const { @@ -520,7 +520,7 @@ class mob_essence_of_twin : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_essence_of_twinAI(creature); + return new npc_essence_of_twinAI(creature); }; bool OnGossipHello(Player* player, Creature* creature) @@ -532,9 +532,9 @@ class mob_essence_of_twin : public CreatureScript } }; -struct mob_unleashed_ballAI : public ScriptedAI +struct npc_unleashed_ballAI : public ScriptedAI { - mob_unleashed_ballAI(Creature* creature) : ScriptedAI(creature) + npc_unleashed_ballAI(Creature* creature) : ScriptedAI(creature) { } @@ -585,14 +585,14 @@ struct mob_unleashed_ballAI : public ScriptedAI uint32 RangeCheckTimer; }; -class mob_unleashed_dark : public CreatureScript +class npc_unleashed_dark : public CreatureScript { public: - mob_unleashed_dark() : CreatureScript("mob_unleashed_dark") { } + npc_unleashed_dark() : CreatureScript("npc_unleashed_dark") { } - struct mob_unleashed_darkAI : public mob_unleashed_ballAI + struct npc_unleashed_darkAI : public npc_unleashed_ballAI { - mob_unleashed_darkAI(Creature* creature) : mob_unleashed_ballAI(creature) {} + npc_unleashed_darkAI(Creature* creature) : npc_unleashed_ballAI(creature) {} void UpdateAI(uint32 diff) { @@ -613,18 +613,18 @@ class mob_unleashed_dark : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_unleashed_darkAI(creature); + return new npc_unleashed_darkAI(creature); } }; -class mob_unleashed_light : public CreatureScript +class npc_unleashed_light : public CreatureScript { public: - mob_unleashed_light() : CreatureScript("mob_unleashed_light") { } + npc_unleashed_light() : CreatureScript("npc_unleashed_light") { } - struct mob_unleashed_lightAI : public mob_unleashed_ballAI + struct npc_unleashed_lightAI : public npc_unleashed_ballAI { - mob_unleashed_lightAI(Creature* creature) : mob_unleashed_ballAI(creature) {} + npc_unleashed_lightAI(Creature* creature) : npc_unleashed_ballAI(creature) {} void UpdateAI(uint32 diff) { @@ -645,18 +645,18 @@ class mob_unleashed_light : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_unleashed_lightAI(creature); + return new npc_unleashed_lightAI(creature); } }; -class mob_bullet_controller : public CreatureScript +class npc_bullet_controller : public CreatureScript { public: - mob_bullet_controller() : CreatureScript("mob_bullet_controller") { } + npc_bullet_controller() : CreatureScript("npc_bullet_controller") { } - struct mob_bullet_controllerAI : public ScriptedAI + struct npc_bullet_controllerAI : public ScriptedAI { - mob_bullet_controllerAI(Creature* creature) : ScriptedAI(creature) + npc_bullet_controllerAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); } @@ -674,7 +674,7 @@ class mob_bullet_controller : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_bullet_controllerAI(creature); + return new npc_bullet_controllerAI(creature); } }; @@ -881,10 +881,10 @@ void AddSC_boss_twin_valkyr() { new boss_fjola(); new boss_eydis(); - new mob_unleashed_light(); - new mob_unleashed_dark(); - new mob_essence_of_twin(); - new mob_bullet_controller(); + new npc_unleashed_light(); + new npc_unleashed_dark(); + new npc_essence_of_twin(); + new npc_bullet_controller(); new spell_powering_up(); new spell_valkyr_essences(); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index b6f6d7fcb23..98f467b0bba 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -192,14 +192,14 @@ class boss_bronjahm : public CreatureScript } }; -class mob_corrupted_soul_fragment : public CreatureScript +class npc_corrupted_soul_fragment : public CreatureScript { public: - mob_corrupted_soul_fragment() : CreatureScript("mob_corrupted_soul_fragment") { } + npc_corrupted_soul_fragment() : CreatureScript("npc_corrupted_soul_fragment") { } - struct mob_corrupted_soul_fragmentAI : public ScriptedAI + struct npc_corrupted_soul_fragmentAI : public ScriptedAI { - mob_corrupted_soul_fragmentAI(Creature* creature) : ScriptedAI(creature) + npc_corrupted_soul_fragmentAI(Creature* creature) : ScriptedAI(creature) { instance = me->GetInstanceScript(); } @@ -231,7 +231,7 @@ class mob_corrupted_soul_fragment : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_corrupted_soul_fragmentAI(creature); + return new npc_corrupted_soul_fragmentAI(creature); } }; @@ -409,7 +409,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader void AddSC_boss_bronjahm() { new boss_bronjahm(); - new mob_corrupted_soul_fragment(); + new npc_corrupted_soul_fragment(); new spell_bronjahm_magic_bane(); new spell_bronjahm_consume_soul(); new spell_bronjahm_soulstorm_channel(); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 42d912e2bd2..48498b4dbeb 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -38,14 +38,14 @@ enum eEvents EVENT_TACTICAL_BLINK = 2, }; -class mob_ymirjar_flamebearer : public CreatureScript +class npc_ymirjar_flamebearer : public CreatureScript { public: - mob_ymirjar_flamebearer() : CreatureScript("mob_ymirjar_flamebearer") { } + npc_ymirjar_flamebearer() : CreatureScript("npc_ymirjar_flamebearer") { } - struct mob_ymirjar_flamebearerAI: public ScriptedAI + struct npc_ymirjar_flamebearerAI: public ScriptedAI { - mob_ymirjar_flamebearerAI(Creature* creature) : ScriptedAI(creature) + npc_ymirjar_flamebearerAI(Creature* creature) : ScriptedAI(creature) { } @@ -99,18 +99,18 @@ class mob_ymirjar_flamebearer : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_ymirjar_flamebearerAI(creature); + return new npc_ymirjar_flamebearerAI(creature); } }; -class mob_iceborn_protodrake : public CreatureScript +class npc_iceborn_protodrake : public CreatureScript { public: - mob_iceborn_protodrake() : CreatureScript("mob_iceborn_protodrake") { } + npc_iceborn_protodrake() : CreatureScript("npc_iceborn_protodrake") { } - struct mob_iceborn_protodrakeAI: public ScriptedAI + struct npc_iceborn_protodrakeAI: public ScriptedAI { - mob_iceborn_protodrakeAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit()) + npc_iceborn_protodrakeAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit()) { ASSERT(_vehicle); } @@ -148,18 +148,18 @@ class mob_iceborn_protodrake : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_iceborn_protodrakeAI(creature); + return new npc_iceborn_protodrakeAI(creature); } }; -class mob_geist_ambusher : public CreatureScript +class npc_geist_ambusher : public CreatureScript { public: - mob_geist_ambusher() : CreatureScript("mob_geist_ambusher") { } + npc_geist_ambusher() : CreatureScript("npc_geist_ambusher") { } - struct mob_geist_ambusherAI: public ScriptedAI + struct npc_geist_ambusherAI: public ScriptedAI { - mob_geist_ambusherAI(Creature* creature) : ScriptedAI(creature) + npc_geist_ambusherAI(Creature* creature) : ScriptedAI(creature) { } @@ -201,18 +201,18 @@ class mob_geist_ambusher : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_geist_ambusherAI(creature); + return new npc_geist_ambusherAI(creature); } }; -class spell_trash_mob_glacial_strike : public SpellScriptLoader +class spell_trash_npc_glacial_strike : public SpellScriptLoader { public: - spell_trash_mob_glacial_strike() : SpellScriptLoader("spell_trash_mob_glacial_strike") { } + spell_trash_npc_glacial_strike() : SpellScriptLoader("spell_trash_npc_glacial_strike") { } - class spell_trash_mob_glacial_strike_AuraScript : public AuraScript + class spell_trash_npc_glacial_strike_AuraScript : public AuraScript { - PrepareAuraScript(spell_trash_mob_glacial_strike_AuraScript); + PrepareAuraScript(spell_trash_npc_glacial_strike_AuraScript); void PeriodicTick(AuraEffect const* /*aurEff*/) { @@ -225,20 +225,20 @@ class spell_trash_mob_glacial_strike : public SpellScriptLoader void Register() { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_trash_mob_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_trash_npc_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT); } }; AuraScript* GetAuraScript() const { - return new spell_trash_mob_glacial_strike_AuraScript(); + return new spell_trash_npc_glacial_strike_AuraScript(); } }; void AddSC_pit_of_saron() { - new mob_ymirjar_flamebearer(); - new mob_iceborn_protodrake(); - new mob_geist_ambusher(); - new spell_trash_mob_glacial_strike(); + new npc_ymirjar_flamebearer(); + new npc_iceborn_protodrake(); + new npc_geist_ambusher(); + new spell_trash_npc_glacial_strike(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 2f252a91050..71c4c1b4f41 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -210,19 +210,19 @@ public: }; -class mob_slad_ran_constrictor : public CreatureScript +class npc_slad_ran_constrictor : public CreatureScript { public: - mob_slad_ran_constrictor() : CreatureScript("mob_slad_ran_constrictor") { } + npc_slad_ran_constrictor() : CreatureScript("npc_slad_ran_constrictor") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_slad_ran_constrictorAI (creature); + return new npc_slad_ran_constrictorAI (creature); } - struct mob_slad_ran_constrictorAI : public ScriptedAI + struct npc_slad_ran_constrictorAI : public ScriptedAI { - mob_slad_ran_constrictorAI(Creature* creature) : ScriptedAI(creature) {} + npc_slad_ran_constrictorAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiGripOfSladRanTimer; @@ -263,19 +263,19 @@ public: }; -class mob_slad_ran_viper : public CreatureScript +class npc_slad_ran_viper : public CreatureScript { public: - mob_slad_ran_viper() : CreatureScript("mob_slad_ran_viper") { } + npc_slad_ran_viper() : CreatureScript("npc_slad_ran_viper") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_slad_ran_viperAI (creature); + return new npc_slad_ran_viperAI (creature); } - struct mob_slad_ran_viperAI : public ScriptedAI + struct npc_slad_ran_viperAI : public ScriptedAI { - mob_slad_ran_viperAI(Creature* creature) : ScriptedAI(creature) {} + npc_slad_ran_viperAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiVenomousBiteTimer; @@ -322,7 +322,7 @@ class achievement_snakes_whyd_it_have_to_be_snakes : public AchievementCriteriaS void AddSC_boss_slad_ran() { new boss_slad_ran(); - new mob_slad_ran_constrictor(); - new mob_slad_ran_viper(); + new npc_slad_ran_constrictor(); + new npc_slad_ran_viper(); new achievement_snakes_whyd_it_have_to_be_snakes(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index a1695ee245d..1228c4d72e1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -25,7 +25,7 @@ enum Anubrekhan SAY_GREET = 1, SAY_SLAY = 2, - MOB_CRYPT_GUARD = 16573 + NPC_CRYPT_GUARD = 16573 }; const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f}; @@ -85,11 +85,11 @@ public: // otherwise, after a wipe, they respawn where boss was at wipe moment. pos = me->GetHomePosition(); pos.m_positionY -= 10.0f; - me->SummonCreature(MOB_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN); + me->SummonCreature(NPC_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN); pos = me->GetHomePosition(); pos.m_positionY += 10.0f; - me->SummonCreature(MOB_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN); + me->SummonCreature(NPC_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN); } } @@ -138,7 +138,7 @@ public: BossAI::SummonedCreatureDespawn(summon); // check if it is an actual killed guard - if (!me->IsAlive() || summon->IsAlive() || summon->GetEntry() != MOB_CRYPT_GUARD) + if (!me->IsAlive() || summon->IsAlive() || summon->GetEntry() != NPC_CRYPT_GUARD) return; summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID()); @@ -166,12 +166,12 @@ public: case EVENT_LOCUST: /// @todo Add Text DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25)); - DoSummon(MOB_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN); + DoSummon(NPC_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_LOCUST, 90000); break; case EVENT_SPAWN_GUARDIAN_NORMAL: /// @todo Add Text - DoSummon(MOB_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN); + DoSummon(NPC_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN); break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 316ddee540c..3283d2b32b2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -179,14 +179,14 @@ class boss_faerlina : public CreatureScript } }; -class mob_faerlina_add : public CreatureScript +class npc_faerlina_add : public CreatureScript { public: - mob_faerlina_add() : CreatureScript("mob_faerlina_add") { } + npc_faerlina_add() : CreatureScript("npc_faerlina_add") { } - struct mob_faerlina_addAI : public ScriptedAI + struct npc_faerlina_addAI : public ScriptedAI { - mob_faerlina_addAI(Creature* creature) : ScriptedAI(creature), + npc_faerlina_addAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } @@ -212,7 +212,7 @@ class mob_faerlina_add : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_faerlina_addAI(creature); + return new npc_faerlina_addAI(creature); } }; @@ -230,6 +230,6 @@ class achievement_momma_said_knock_you_out : public AchievementCriteriaScript void AddSC_boss_faerlina() { new boss_faerlina(); - new mob_faerlina_add(); + new npc_faerlina_add(); new achievement_momma_said_knock_you_out(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 013bfe91987..2ca4214ceed 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -62,7 +62,7 @@ const Position WaypointPositions[12] = {2517.8f, -2896.6f, 241.28f, 2.315f}, }; -const uint32 MOB_HORSEMEN[] = {16064, 16065, 30549, 16063}; +const uint32 NPC_HORSEMEN[] = {16064, 16065, 30549, 16063}; const uint32 SPELL_MARK[] = {28832, 28833, 28834, 28835}; #define SPELL_PRIMARY(i) RAID_MODE(SPELL_PRIMARY_N[i], SPELL_PRIMARY_H[i]) const uint32 SPELL_PRIMARY_N[] = {28884, 28863, 28882, 28883}; @@ -98,7 +98,7 @@ public: { id = Horsemen(0); for (uint8 i = 0; i < 4; ++i) - if (me->GetEntry() == MOB_HORSEMEN[i]) + if (me->GetEntry() == NPC_HORSEMEN[i]) id = Horsemen(i); caster = (id == HORSEMEN_LADY || id == HORSEMEN_SIR); encounterActionReset = false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 9a20dbcf498..bc489eff438 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -25,7 +25,7 @@ #define SPELL_BERSERK 26662 #define SPELL_INFECTED_WOUND 29306 -#define MOB_ZOMBIE 16360 +#define NPC_ZOMBIE 16360 const Position PosSummon[3] = { @@ -66,7 +66,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (who->GetEntry() == MOB_ZOMBIE && me->IsWithinDistInMap(who, 7)) + if (who->GetEntry() == NPC_ZOMBIE && me->IsWithinDistInMap(who, 7)) { SetGazeOn(who); /// @todo use a script text @@ -88,7 +88,7 @@ public: void JustSummoned(Creature* summon) { - if (summon->GetEntry() == MOB_ZOMBIE) + if (summon->GetEntry() == NPC_ZOMBIE) summon->AI()->AttackStart(me); summons.Summon(summon); } @@ -124,13 +124,13 @@ public: break; case EVENT_SUMMON: for (int32 i = 0; i < RAID_MODE(1, 2); ++i) - DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1, 3)]); + DoSummon(NPC_ZOMBIE, PosSummon[rand() % RAID_MODE(1, 3)]); events.ScheduleEvent(EVENT_SUMMON, 10000); break; } } - if (me->GetVictim() && me->GetVictim()->GetEntry() == MOB_ZOMBIE) + if (me->GetVictim() && me->GetVictim()->GetEntry() == NPC_ZOMBIE) { if (me->IsWithinMeleeRange(me->GetVictim())) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index bad5429e547..18fe6ca0553 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -48,13 +48,13 @@ enum Spells enum Creatures { - MOB_LIVE_TRAINEE = 16124, - MOB_LIVE_KNIGHT = 16125, - MOB_LIVE_RIDER = 16126, - MOB_DEAD_TRAINEE = 16127, - MOB_DEAD_KNIGHT = 16148, - MOB_DEAD_RIDER = 16150, - MOB_DEAD_HORSE = 16149 + NPC_LIVE_TRAINEE = 16124, + NPC_LIVE_KNIGHT = 16125, + NPC_LIVE_RIDER = 16126, + NPC_DEAD_TRAINEE = 16127, + NPC_DEAD_KNIGHT = 16148, + NPC_DEAD_RIDER = 16150, + NPC_DEAD_HORSE = 16149 }; struct Waves { uint32 entry, time, mode; }; @@ -63,37 +63,37 @@ struct Waves { uint32 entry, time, mode; }; // but this is handled in DoGothikSummon function const Waves waves[] = { - {MOB_LIVE_TRAINEE, 20000, 1}, - {MOB_LIVE_TRAINEE, 20000, 1}, - {MOB_LIVE_TRAINEE, 10000, 1}, - {MOB_LIVE_KNIGHT, 10000, 1}, - {MOB_LIVE_TRAINEE, 15000, 1}, - {MOB_LIVE_KNIGHT, 5000, 1}, - {MOB_LIVE_TRAINEE, 20000, 1}, - {MOB_LIVE_TRAINEE, 0, 1}, - {MOB_LIVE_KNIGHT, 10000, 1}, - {MOB_LIVE_TRAINEE, 10000, 2}, - {MOB_LIVE_RIDER, 10000, 0}, - {MOB_LIVE_RIDER, 5000, 2}, - {MOB_LIVE_TRAINEE, 5000, 0}, - {MOB_LIVE_TRAINEE, 15000, 2}, - {MOB_LIVE_KNIGHT, 15000, 0}, - {MOB_LIVE_TRAINEE, 0, 0}, - {MOB_LIVE_RIDER, 10000, 1}, - {MOB_LIVE_KNIGHT, 10000, 1}, - {MOB_LIVE_TRAINEE, 10000, 0}, - {MOB_LIVE_RIDER, 10000, 2}, - {MOB_LIVE_TRAINEE, 0, 2}, - {MOB_LIVE_RIDER, 5000, 1}, - {MOB_LIVE_TRAINEE, 0, 2}, - {MOB_LIVE_KNIGHT, 5000, 1}, - {MOB_LIVE_RIDER, 0, 2}, - {MOB_LIVE_TRAINEE, 20000, 1}, - {MOB_LIVE_RIDER, 0, 1}, - {MOB_LIVE_KNIGHT, 0, 1}, - {MOB_LIVE_TRAINEE, 25000, 2}, - {MOB_LIVE_TRAINEE, 15000, 0}, - {MOB_LIVE_TRAINEE, 25000, 0}, + {NPC_LIVE_TRAINEE, 20000, 1}, + {NPC_LIVE_TRAINEE, 20000, 1}, + {NPC_LIVE_TRAINEE, 10000, 1}, + {NPC_LIVE_KNIGHT, 10000, 1}, + {NPC_LIVE_TRAINEE, 15000, 1}, + {NPC_LIVE_KNIGHT, 5000, 1}, + {NPC_LIVE_TRAINEE, 20000, 1}, + {NPC_LIVE_TRAINEE, 0, 1}, + {NPC_LIVE_KNIGHT, 10000, 1}, + {NPC_LIVE_TRAINEE, 10000, 2}, + {NPC_LIVE_RIDER, 10000, 0}, + {NPC_LIVE_RIDER, 5000, 2}, + {NPC_LIVE_TRAINEE, 5000, 0}, + {NPC_LIVE_TRAINEE, 15000, 2}, + {NPC_LIVE_KNIGHT, 15000, 0}, + {NPC_LIVE_TRAINEE, 0, 0}, + {NPC_LIVE_RIDER, 10000, 1}, + {NPC_LIVE_KNIGHT, 10000, 1}, + {NPC_LIVE_TRAINEE, 10000, 0}, + {NPC_LIVE_RIDER, 10000, 2}, + {NPC_LIVE_TRAINEE, 0, 2}, + {NPC_LIVE_RIDER, 5000, 1}, + {NPC_LIVE_TRAINEE, 0, 2}, + {NPC_LIVE_KNIGHT, 5000, 1}, + {NPC_LIVE_RIDER, 0, 2}, + {NPC_LIVE_TRAINEE, 20000, 1}, + {NPC_LIVE_RIDER, 0, 1}, + {NPC_LIVE_KNIGHT, 0, 1}, + {NPC_LIVE_TRAINEE, 25000, 2}, + {NPC_LIVE_TRAINEE, 15000, 0}, + {NPC_LIVE_TRAINEE, 25000, 0}, {0, 0, 1}, }; @@ -258,28 +258,28 @@ class boss_gothik : public CreatureScript { switch (entry) { - case MOB_LIVE_TRAINEE: + case NPC_LIVE_TRAINEE: { if (Creature* liveTrigger = Unit::GetCreature(*me, LiveTriggerGUID[0])) - DoSummon(MOB_LIVE_TRAINEE, liveTrigger, 1); + DoSummon(NPC_LIVE_TRAINEE, liveTrigger, 1); if (Creature* liveTrigger1 = Unit::GetCreature(*me, LiveTriggerGUID[1])) - DoSummon(MOB_LIVE_TRAINEE, liveTrigger1, 1); + DoSummon(NPC_LIVE_TRAINEE, liveTrigger1, 1); if (Creature* liveTrigger2 = Unit::GetCreature(*me, LiveTriggerGUID[2])) - DoSummon(MOB_LIVE_TRAINEE, liveTrigger2, 1); + DoSummon(NPC_LIVE_TRAINEE, liveTrigger2, 1); break; } - case MOB_LIVE_KNIGHT: + case NPC_LIVE_KNIGHT: { if (Creature* liveTrigger3 = Unit::GetCreature(*me, LiveTriggerGUID[3])) - DoSummon(MOB_LIVE_KNIGHT, liveTrigger3, 1); + DoSummon(NPC_LIVE_KNIGHT, liveTrigger3, 1); if (Creature* liveTrigger5 = Unit::GetCreature(*me, LiveTriggerGUID[5])) - DoSummon(MOB_LIVE_KNIGHT, liveTrigger5, 1); + DoSummon(NPC_LIVE_KNIGHT, liveTrigger5, 1); break; } - case MOB_LIVE_RIDER: + case NPC_LIVE_RIDER: { if (Creature* liveTrigger4 = Unit::GetCreature(*me, LiveTriggerGUID[4])) - DoSummon(MOB_LIVE_RIDER, liveTrigger4, 1); + DoSummon(NPC_LIVE_RIDER, liveTrigger4, 1); break; } } @@ -288,24 +288,24 @@ class boss_gothik : public CreatureScript { switch (entry) { - case MOB_LIVE_TRAINEE: + case NPC_LIVE_TRAINEE: { if (Creature* liveTrigger = Unit::GetCreature(*me, LiveTriggerGUID[4])) - DoSummon(MOB_LIVE_TRAINEE, liveTrigger, 1); + DoSummon(NPC_LIVE_TRAINEE, liveTrigger, 1); if (Creature* liveTrigger2 = Unit::GetCreature(*me, LiveTriggerGUID[4])) - DoSummon(MOB_LIVE_TRAINEE, liveTrigger2, 1); + DoSummon(NPC_LIVE_TRAINEE, liveTrigger2, 1); break; } - case MOB_LIVE_KNIGHT: + case NPC_LIVE_KNIGHT: { if (Creature* liveTrigger5 = Unit::GetCreature(*me, LiveTriggerGUID[4])) - DoSummon(MOB_LIVE_KNIGHT, liveTrigger5, 1); + DoSummon(NPC_LIVE_KNIGHT, liveTrigger5, 1); break; } - case MOB_LIVE_RIDER: + case NPC_LIVE_RIDER: { if (Creature* liveTrigger4 = Unit::GetCreature(*me, LiveTriggerGUID[4])) - DoSummon(MOB_LIVE_RIDER, liveTrigger4, 1); + DoSummon(NPC_LIVE_RIDER, liveTrigger4, 1); break; } } @@ -381,14 +381,14 @@ class boss_gothik : public CreatureScript switch (spell->Id) { case SPELL_INFORM_DEAD_TRAINEE: - DoSummon(MOB_DEAD_TRAINEE, target, 0); + DoSummon(NPC_DEAD_TRAINEE, target, 0); break; case SPELL_INFORM_DEAD_KNIGHT: - DoSummon(MOB_DEAD_KNIGHT, target, 0); + DoSummon(NPC_DEAD_KNIGHT, target, 0); break; case SPELL_INFORM_DEAD_RIDER: - DoSummon(MOB_DEAD_RIDER, target, 1.0f); - DoSummon(MOB_DEAD_HORSE, target, 1.0f); + DoSummon(NPC_DEAD_RIDER, target, 1.0f); + DoSummon(NPC_DEAD_HORSE, target, 1.0f); break; } } @@ -504,14 +504,14 @@ class boss_gothik : public CreatureScript } }; -class mob_gothik_minion : public CreatureScript +class npc_gothik_minion : public CreatureScript { public: - mob_gothik_minion() : CreatureScript("mob_gothik_minion") { } + npc_gothik_minion() : CreatureScript("npc_gothik_minion") { } - struct mob_gothik_minionAI : public CombatAI + struct npc_gothik_minionAI : public CombatAI { - mob_gothik_minionAI(Creature* creature) : CombatAI(creature) + npc_gothik_minionAI(Creature* creature) : CombatAI(creature) { liveSide = IN_LIVE_SIDE(me); } @@ -588,7 +588,7 @@ class mob_gothik_minion : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_gothik_minionAI(creature); + return new npc_gothik_minionAI(creature); } }; @@ -621,6 +621,6 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader void AddSC_boss_gothik() { new boss_gothik(); - new mob_gothik_minion(); + new npc_gothik_minion(); new spell_gothik_shadow_bolt_volley(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 9e369fa83bb..e8991be4dfc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -41,7 +41,7 @@ enum Events enum CreatureId { - MOB_FALLOUT_SLIME = 16290 + NPC_FALLOUT_SLIME = 16290 }; class boss_grobbulus : public CreatureScript @@ -74,7 +74,7 @@ public: { if (spell->Id == uint32(SPELL_SLIME_SPRAY)) { - if (TempSummon* slime = me->SummonCreature(MOB_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (TempSummon* slime = me->SummonCreature(NPC_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) DoZoneInCombat(slime); } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 4c807c515e1..ae04de9db0f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -35,8 +35,8 @@ enum Spells enum Creatures { - MOB_WEB_WRAP = 16486, - MOB_SPIDERLING = 17055, + NPC_WEB_WRAP = 16486, + NPC_SPIDERLING = 17055, }; #define MAX_POS_WRAP 3 @@ -111,7 +111,7 @@ public: target->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); uint8 pos = rand()%MAX_POS_WRAP; target->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20); - if (Creature* wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* wrap = DoSummon(NPC_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) wrap->AI()->SetGUID(target->GetGUID()); } } @@ -137,7 +137,7 @@ public: /// @todo Add missing text uint8 amount = urand(8, 10); for (uint8 i = 0; i < amount; ++i) - DoSummon(MOB_SPIDERLING, me, 0, TEMPSUMMON_CORPSE_DESPAWN); + DoSummon(NPC_SPIDERLING, me, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_SUMMON, 40000); break; } @@ -149,19 +149,19 @@ public: }; -class mob_webwrap : public CreatureScript +class npc_webwrap : public CreatureScript { public: - mob_webwrap() : CreatureScript("mob_webwrap") { } + npc_webwrap() : CreatureScript("npc_webwrap") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_webwrapAI (creature); + return new npc_webwrapAI (creature); } - struct mob_webwrapAI : public NullCreatureAI + struct npc_webwrapAI : public NullCreatureAI { - mob_webwrapAI(Creature* creature) : NullCreatureAI(creature), victimGUID(0) {} + npc_webwrapAI(Creature* creature) : NullCreatureAI(creature), victimGUID(0) {} uint64 victimGUID; @@ -186,5 +186,5 @@ public: void AddSC_boss_maexxna() { new boss_maexxna(); - new mob_webwrap(); + new npc_webwrap(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index d0034628424..09f80482e75 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -32,9 +32,9 @@ enum Noth SPELL_CRIPPLE = 29212, // 25-man: 54814 SPELL_TELEPORT = 29216, - MOB_WARRIOR = 16984, - MOB_CHAMPION = 16983, - MOB_GUARDIAN = 16981 + NPC_WARRIOR = 16984, + NPC_CHAMPION = 16983, + NPC_GUARDIAN = 16981 }; #define SPELL_BLINK RAND(29208, 29209, 29210, 29211) @@ -162,7 +162,7 @@ public: return; case EVENT_WARRIOR: Talk(SAY_SUMMON); - SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3)); + SummonUndead(NPC_WARRIOR, RAID_MODE(2, 3)); events.ScheduleEvent(EVENT_WARRIOR, 30000); return; case EVENT_BLINK: @@ -185,12 +185,12 @@ public: Talk(SAY_SUMMON); switch (balconyCount) { - case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; - case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(1, 2)); break; - case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2, 4)); break; - default:SummonUndead(MOB_CHAMPION, RAID_MODE(5, 10)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(5, 10));break; + case 0: SummonUndead(NPC_CHAMPION, RAID_MODE(2, 4)); break; + case 1: SummonUndead(NPC_CHAMPION, RAID_MODE(1, 2)); + SummonUndead(NPC_GUARDIAN, RAID_MODE(1, 2)); break; + case 2: SummonUndead(NPC_GUARDIAN, RAID_MODE(2, 4)); break; + default:SummonUndead(NPC_CHAMPION, RAID_MODE(5, 10)); + SummonUndead(NPC_GUARDIAN, RAID_MODE(5, 10));break; } ++waveCount; events.ScheduleEvent(waveCount < 2 ? EVENT_WAVE : EVENT_GROUND, urand(30000, 45000)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 2b681750573..7a086ac95e6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -278,19 +278,19 @@ public: }; -class mob_stalagg : public CreatureScript +class npc_stalagg : public CreatureScript { public: - mob_stalagg() : CreatureScript("mob_stalagg") { } + npc_stalagg() : CreatureScript("npc_stalagg") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_stalaggAI(creature); + return new npc_stalaggAI(creature); } - struct mob_stalaggAI : public ScriptedAI + struct npc_stalaggAI : public ScriptedAI { - mob_stalaggAI(Creature* creature) : ScriptedAI(creature) + npc_stalaggAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -372,19 +372,19 @@ public: }; -class mob_feugen : public CreatureScript +class npc_feugen : public CreatureScript { public: - mob_feugen() : CreatureScript("mob_feugen") { } + npc_feugen() : CreatureScript("npc_feugen") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_feugenAI(creature); + return new npc_feugenAI(creature); } - struct mob_feugenAI : public ScriptedAI + struct npc_feugenAI : public ScriptedAI { - mob_feugenAI(Creature* creature) : ScriptedAI(creature) + npc_feugenAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -568,8 +568,8 @@ class achievement_polarity_switch : public AchievementCriteriaScript void AddSC_boss_thaddius() { new boss_thaddius(); - new mob_stalagg(); - new mob_feugen(); + new npc_stalagg(); + new npc_feugen(); new spell_thaddius_pos_neg_charge(); new spell_thaddius_polarity_shift(); new achievement_polarity_switch(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 8d1420ce12e..2f79f138f42 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -32,8 +32,8 @@ enum Spells enum Adds { - MOB_CRAZED_MANA_WRAITH = 26746, - MOB_CHAOTIC_RIFT = 26918 + NPC_CRAZED_MANA_WRAITH = 26746, + NPC_CHAOTIC_RIFT = 26918 }; enum Yells @@ -120,7 +120,7 @@ class boss_anomalus : public CreatureScript void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) { - if (summoned->GetEntry() == MOB_CHAOTIC_RIFT) + if (summoned->GetEntry() == NPC_CHAOTIC_RIFT) chaosTheory = false; } @@ -157,7 +157,7 @@ class boss_anomalus : public CreatureScript Phase = 1; Talk(SAY_SHIELD); DoCast(me, SPELL_RIFT_SHIELD); - if (Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) + if (Creature* Rift = me->SummonCreature(NPC_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) { //DoCast(Rift, SPELL_CHARGE_RIFT); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -186,14 +186,14 @@ class boss_anomalus : public CreatureScript } }; -class mob_chaotic_rift : public CreatureScript +class npc_chaotic_rift : public CreatureScript { public: - mob_chaotic_rift() : CreatureScript("mob_chaotic_rift") { } + npc_chaotic_rift() : CreatureScript("npc_chaotic_rift") { } - struct mob_chaotic_riftAI : public ScriptedAI + struct npc_chaotic_riftAI : public ScriptedAI { - mob_chaotic_riftAI(Creature* creature) : ScriptedAI(creature) + npc_chaotic_riftAI(Creature* creature) : ScriptedAI(creature) { instance = me->GetInstanceScript(); SetCombatMovement(false); @@ -234,7 +234,7 @@ class mob_chaotic_rift : public CreatureScript if (uiSummonCrazedManaWraithTimer <= diff) { - if (Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX() + 1, me->GetPositionY() + 1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) + if (Creature* Wraith = me->SummonCreature(NPC_CRAZED_MANA_WRAITH, me->GetPositionX() + 1, me->GetPositionY() + 1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) Wraith->AI()->AttackStart(target); Creature* Anomalus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ANOMALUS)); @@ -250,7 +250,7 @@ class mob_chaotic_rift : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_chaotic_riftAI(creature); + return new npc_chaotic_riftAI(creature); } }; @@ -277,6 +277,6 @@ class achievement_chaos_theory : public AchievementCriteriaScript void AddSC_boss_anomalus() { new boss_anomalus(); - new mob_chaotic_rift(); + new npc_chaotic_rift(); new achievement_chaos_theory(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 7bf6bb247fa..248a039b228 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -36,9 +36,9 @@ enum Spells enum Creatures { - MOB_FIRE_MAGUS = 26928, - MOB_FROST_MAGUS = 26930, - MOB_ARCANE_MAGUS = 26929 + NPC_FIRE_MAGUS = 26928, + NPC_FROST_MAGUS = 26930, + NPC_ARCANE_MAGUS = 26929 }; enum Yells @@ -168,17 +168,17 @@ public: { switch (entry) { - case MOB_FIRE_MAGUS: + case NPC_FIRE_MAGUS: { Summoned->CastSpell(Summoned, SPELL_FIRE_MAGUS_VISUAL, false); break; } - case MOB_FROST_MAGUS: + case NPC_FROST_MAGUS: { Summoned->CastSpell(Summoned, SPELL_FROST_MAGUS_VISUAL, false); break; } - case MOB_ARCANE_MAGUS: + case NPC_ARCANE_MAGUS: { Summoned->CastSpell(Summoned, SPELL_ARCANE_MAGUS_VISUAL, false); break; @@ -263,9 +263,9 @@ public: me->RemoveAllAuras(); me->SetVisible(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS); - uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS); - uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS); + uiFireMagusGUID = SplitPersonality(NPC_FIRE_MAGUS); + uiFrostMagusGUID = SplitPersonality(NPC_FROST_MAGUS); + uiArcaneMagusGUID = SplitPersonality(NPC_ARCANE_MAGUS); bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; @@ -280,9 +280,9 @@ public: me->RemoveAllAuras(); me->SetVisible(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS); - uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS); - uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS); + uiFireMagusGUID = SplitPersonality(NPC_FIRE_MAGUS); + uiFrostMagusGUID = SplitPersonality(NPC_FROST_MAGUS); + uiArcaneMagusGUID = SplitPersonality(NPC_ARCANE_MAGUS); bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index f5ea71c1928..08072e7f7a3 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -369,22 +369,22 @@ public: }; /*###### -## mob_stormforged_lieutenant +## npc_stormforged_lieutenant ######*/ -class mob_stormforged_lieutenant : public CreatureScript +class npc_stormforged_lieutenant : public CreatureScript { public: - mob_stormforged_lieutenant() : CreatureScript("mob_stormforged_lieutenant") { } + npc_stormforged_lieutenant() : CreatureScript("npc_stormforged_lieutenant") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_stormforged_lieutenantAI(creature); + return new npc_stormforged_lieutenantAI(creature); } - struct mob_stormforged_lieutenantAI : public ScriptedAI + struct npc_stormforged_lieutenantAI : public ScriptedAI { - mob_stormforged_lieutenantAI(Creature* creature) : ScriptedAI(creature) + npc_stormforged_lieutenantAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -450,5 +450,5 @@ public: void AddSC_boss_bjarngrim() { new boss_bjarngrim(); - new mob_stormforged_lieutenant(); + new npc_stormforged_lieutenant(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 80ebb702fed..cc6e1079b5d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -291,22 +291,22 @@ public: }; /*###### -## mob_spark_of_ionar +## npc_spark_of_ionar ######*/ -class mob_spark_of_ionar : public CreatureScript +class npc_spark_of_ionar : public CreatureScript { public: - mob_spark_of_ionar() : CreatureScript("mob_spark_of_ionar") { } + npc_spark_of_ionar() : CreatureScript("npc_spark_of_ionar") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_spark_of_ionarAI(creature); + return new npc_spark_of_ionarAI(creature); } - struct mob_spark_of_ionarAI : public ScriptedAI + struct npc_spark_of_ionarAI : public ScriptedAI { - mob_spark_of_ionarAI(Creature* creature) : ScriptedAI(creature) + npc_spark_of_ionarAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -379,5 +379,5 @@ public: void AddSC_boss_ionar() { new boss_ionar(); - new mob_spark_of_ionar(); + new npc_spark_of_ionar(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 9635049131f..71333571cf3 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -356,21 +356,21 @@ public: }; /*###### -## mob_molten_golem +## npc_molten_golem ######*/ -class mob_molten_golem : public CreatureScript +class npc_molten_golem : public CreatureScript { public: - mob_molten_golem() : CreatureScript("mob_molten_golem") { } + npc_molten_golem() : CreatureScript("npc_molten_golem") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_molten_golemAI(creature); + return new npc_molten_golemAI(creature); } - struct mob_molten_golemAI : public ScriptedAI + struct npc_molten_golemAI : public ScriptedAI { - mob_molten_golemAI(Creature* creature) : ScriptedAI(creature) { } + npc_molten_golemAI(Creature* creature) : ScriptedAI(creature) { } bool m_bIsFrozen; @@ -468,6 +468,6 @@ class achievement_shatter_resistant : public AchievementCriteriaScript void AddSC_boss_volkhan() { new boss_volkhan(); - new mob_molten_golem(); + new npc_molten_golem(); new achievement_shatter_resistant(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 83dc49556b4..377a9363fad 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -247,19 +247,19 @@ public: }; -class mob_malformed_ooze : public CreatureScript +class npc_malformed_ooze : public CreatureScript { public: - mob_malformed_ooze() : CreatureScript("mob_malformed_ooze") { } + npc_malformed_ooze() : CreatureScript("npc_malformed_ooze") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_malformed_oozeAI(creature); + return new npc_malformed_oozeAI(creature); } - struct mob_malformed_oozeAI : public ScriptedAI + struct npc_malformed_oozeAI : public ScriptedAI { - mob_malformed_oozeAI(Creature* creature) : ScriptedAI(creature) {} + npc_malformed_oozeAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiMergeTimer; @@ -290,19 +290,19 @@ public: }; -class mob_iron_sludge : public CreatureScript +class npc_iron_sludge : public CreatureScript { public: - mob_iron_sludge() : CreatureScript("mob_iron_sludge") { } + npc_iron_sludge() : CreatureScript("npc_iron_sludge") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_iron_sludgeAI(creature); + return new npc_iron_sludgeAI(creature); } - struct mob_iron_sludgeAI : public ScriptedAI + struct npc_iron_sludgeAI : public ScriptedAI { - mob_iron_sludgeAI(Creature* creature) : ScriptedAI(creature) + npc_iron_sludgeAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -342,7 +342,7 @@ class achievement_abuse_the_ooze : public AchievementCriteriaScript void AddSC_boss_sjonnir() { new boss_sjonnir(); - new mob_malformed_ooze(); - new mob_iron_sludge(); + new npc_malformed_ooze(); + new npc_iron_sludge(); new achievement_abuse_the_ooze(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 3b9f3125154..ebc72f91938 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -127,19 +127,19 @@ static Position SpawnLocations[]= {960.748f, 382.944f, 208.374f, 0.0f}, }; -class mob_tribuna_controller : public CreatureScript +class npc_tribuna_controller : public CreatureScript { public: - mob_tribuna_controller() : CreatureScript("mob_tribuna_controller") { } + npc_tribuna_controller() : CreatureScript("npc_tribuna_controller") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_tribuna_controllerAI(creature); + return new npc_tribuna_controllerAI(creature); } - struct mob_tribuna_controllerAI : public ScriptedAI + struct npc_tribuna_controllerAI : public ScriptedAI { - mob_tribuna_controllerAI(Creature* creature) : ScriptedAI(creature) + npc_tribuna_controllerAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); SetCombatMovement(false); @@ -352,7 +352,7 @@ public: { if (!creature->IsAlive()) creature->Respawn(); - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, creature->AI())->UpdateFacesList(); + CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, creature->AI())->UpdateFacesList(); uiControllerGUID = creature->GetGUID(); } break; @@ -475,7 +475,7 @@ public: if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bKaddrakActivated = true; + CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bKaddrakActivated = true; JumpToNextStep(5000); break; case 9: @@ -499,7 +499,7 @@ public: if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bMarnakActivated = true; + CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bMarnakActivated = true; JumpToNextStep(10000); break; case 13: @@ -531,7 +531,7 @@ public: if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bAbedneumActivated = true; + CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bAbedneumActivated = true; JumpToNextStep(5000); break; case 19: @@ -755,6 +755,6 @@ class achievement_brann_spankin_new : public AchievementCriteriaScript void AddSC_halls_of_stone() { new npc_brann_hos(); - new mob_tribuna_controller(); + new npc_tribuna_controller(); new achievement_brann_spankin_new(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index f26e2ec5f51..984f96c1461 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -446,14 +446,14 @@ class boss_xt002 : public CreatureScript * *///---------------------------------------------------- -class mob_xt002_heart : public CreatureScript +class npc_xt002_heart : public CreatureScript { public: - mob_xt002_heart() : CreatureScript("mob_xt002_heart") { } + npc_xt002_heart() : CreatureScript("npc_xt002_heart") { } - struct mob_xt002_heartAI : public ScriptedAI + struct npc_xt002_heartAI : public ScriptedAI { - mob_xt002_heartAI(Creature* creature) : ScriptedAI(creature), + npc_xt002_heartAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { SetCombatMovement(false); @@ -477,7 +477,7 @@ class mob_xt002_heart : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_xt002_heartAI(creature); + return new npc_xt002_heartAI(creature); } }; @@ -486,19 +486,19 @@ class mob_xt002_heart : public CreatureScript * XS-013 SCRAPBOT * *///---------------------------------------------------- -class mob_scrapbot : public CreatureScript +class npc_scrapbot : public CreatureScript { public: - mob_scrapbot() : CreatureScript("mob_scrapbot") { } + npc_scrapbot() : CreatureScript("npc_scrapbot") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_scrapbotAI(creature); + return new npc_scrapbotAI(creature); } - struct mob_scrapbotAI : public ScriptedAI + struct npc_scrapbotAI : public ScriptedAI { - mob_scrapbotAI(Creature* creature) : ScriptedAI(creature) + npc_scrapbotAI(Creature* creature) : ScriptedAI(creature) { _instance = me->GetInstanceScript(); } @@ -543,19 +543,19 @@ class mob_scrapbot : public CreatureScript * XM-024 PUMMELLER * *///---------------------------------------------------- -class mob_pummeller : public CreatureScript +class npc_pummeller : public CreatureScript { public: - mob_pummeller() : CreatureScript("mob_pummeller") { } + npc_pummeller() : CreatureScript("npc_pummeller") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_pummellerAI(creature); + return new npc_pummellerAI(creature); } - struct mob_pummellerAI : public ScriptedAI + struct npc_pummellerAI : public ScriptedAI { - mob_pummellerAI(Creature* creature) : ScriptedAI(creature) + npc_pummellerAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); } @@ -645,19 +645,19 @@ class BoomEvent : public BasicEvent Creature* _me; }; -class mob_boombot : public CreatureScript +class npc_boombot : public CreatureScript { public: - mob_boombot() : CreatureScript("mob_boombot") { } + npc_boombot() : CreatureScript("npc_boombot") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_boombotAI(creature); + return new npc_boombotAI(creature); } - struct mob_boombotAI : public ScriptedAI + struct npc_boombotAI : public ScriptedAI { - mob_boombotAI(Creature* creature) : ScriptedAI(creature) + npc_boombotAI(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); } @@ -724,19 +724,19 @@ class mob_boombot : public CreatureScript * LIFE SPARK * *///---------------------------------------------------- -class mob_life_spark : public CreatureScript +class npc_life_spark : public CreatureScript { public: - mob_life_spark() : CreatureScript("mob_life_spark") { } + npc_life_spark() : CreatureScript("npc_life_spark") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_life_sparkAI(creature); + return new npc_life_sparkAI(creature); } - struct mob_life_sparkAI : public ScriptedAI + struct npc_life_sparkAI : public ScriptedAI { - mob_life_sparkAI(Creature* creature) : ScriptedAI(creature) + npc_life_sparkAI(Creature* creature) : ScriptedAI(creature) { } @@ -1093,12 +1093,12 @@ class achievement_nerf_gravity_bombs : public AchievementCriteriaScript void AddSC_boss_xt002() { - new mob_xt002_heart(); - new mob_scrapbot(); - new mob_pummeller(); - new mob_boombot(); + new npc_xt002_heart(); + new npc_scrapbot(); + new npc_pummeller(); + new npc_boombot(); - new mob_life_spark(); + new npc_life_spark(); new boss_xt002(); new spell_xt002_searing_light_spawn_life_spark(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 51d3913a084..6dcd915e4ee 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -40,9 +40,9 @@ enum Yells enum Creatures { - MOB_INGVAR_HUMAN = 23954, - MOB_ANNHYLDE_THE_CALLER = 24068, - MOB_INGVAR_UNDEAD = 23980, + NPC_INGVAR_HUMAN = 23954, + NPC_ANNHYLDE_THE_CALLER = 24068, + NPC_INGVAR_UNDEAD = 23980, }; enum Events @@ -113,7 +113,7 @@ public: void Reset() { if (bIsUndead) - me->UpdateEntry(MOB_INGVAR_HUMAN); + me->UpdateEntry(NPC_INGVAR_HUMAN); bIsUndead = false; @@ -160,7 +160,7 @@ public: void StartZombiePhase() { bIsUndead = true; - me->UpdateEntry(MOB_INGVAR_UNDEAD); + me->UpdateEntry(NPC_INGVAR_UNDEAD); events.ScheduleEvent(EVENT_JUST_TRANSFORMED, 2 * IN_MILLISECONDS, 0, PHASE_EVENT); Talk(YELL_AGGRO_2); @@ -183,8 +183,8 @@ public: if (instance) { - // Ingvar has MOB_INGVAR_UNDEAD id in this moment, so we have to update encounter state for his original id - instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, MOB_INGVAR_HUMAN, me); + // Ingvar has NPC_INGVAR_UNDEAD id in this moment, so we have to update encounter state for his original id + instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_INGVAR_HUMAN, me); instance->SetData(DATA_INGVAR_EVENT, DONE); } } @@ -286,19 +286,19 @@ enum eSpells SPELL_INGVAR_TRANSFORM = 42796 }; -class mob_annhylde_the_caller : public CreatureScript +class npc_annhylde_the_caller : public CreatureScript { public: - mob_annhylde_the_caller() : CreatureScript("mob_annhylde_the_caller") { } + npc_annhylde_the_caller() : CreatureScript("npc_annhylde_the_caller") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_annhylde_the_callerAI (creature); + return new npc_annhylde_the_callerAI (creature); } - struct mob_annhylde_the_callerAI : public ScriptedAI + struct npc_annhylde_the_callerAI : public ScriptedAI { - mob_annhylde_the_callerAI(Creature* creature) : ScriptedAI(creature) + npc_annhylde_the_callerAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -398,19 +398,19 @@ enum eShadowAxe POINT_TARGET = 28 }; -class mob_ingvar_throw_dummy : public CreatureScript +class npc_ingvar_throw_dummy : public CreatureScript { public: - mob_ingvar_throw_dummy() : CreatureScript("mob_ingvar_throw_dummy") { } + npc_ingvar_throw_dummy() : CreatureScript("npc_ingvar_throw_dummy") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ingvar_throw_dummyAI (creature); + return new npc_ingvar_throw_dummyAI (creature); } - struct mob_ingvar_throw_dummyAI : public ScriptedAI + struct npc_ingvar_throw_dummyAI : public ScriptedAI { - mob_ingvar_throw_dummyAI(Creature* creature) : ScriptedAI(creature) + npc_ingvar_throw_dummyAI(Creature* creature) : ScriptedAI(creature) { } @@ -449,6 +449,6 @@ public: void AddSC_boss_ingvar_the_plunderer() { new boss_ingvar_the_plunderer(); - new mob_annhylde_the_caller(); - new mob_ingvar_throw_dummy(); + new npc_annhylde_the_caller(); + new npc_ingvar_throw_dummy(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 40f704d4588..77935949957 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -43,20 +43,20 @@ enum eEnums YELL_DALRONN_SKA_DIEDFIRST = 4, //Spells of Skarvald and his Ghost - MOB_SKARVALD_THE_CONSTRUCTOR = 24200, + NPC_SKARVALD_THE_CONSTRUCTOR = 24200, SPELL_CHARGE = 43651, SPELL_STONE_STRIKE = 48583, SPELL_SUMMON_SKARVALD_GHOST = 48613, SPELL_ENRAGE = 48193, - MOB_SKARVALD_GHOST = 27390, + NPC_SKARVALD_GHOST = 27390, //Spells of Dalronn and his Ghost - MOB_DALRONN_THE_CONTROLLER = 24201, + NPC_DALRONN_THE_CONTROLLER = 24201, SPELL_SHADOW_BOLT = 43649, H_SPELL_SHADOW_BOLT = 59575, H_SPELL_SUMMON_SKELETONS = 52611, SPELL_DEBILITATE = 43650, SPELL_SUMMON_DALRONN_GHOST = 48612, - MOB_DALRONN_GHOST = 27389 + NPC_DALRONN_GHOST = 27389 }; class SkarvaldChargePredicate @@ -108,7 +108,7 @@ public: Check_Timer = 5000; Enraged = false; - ghost = (me->GetEntry() == MOB_SKARVALD_GHOST); + ghost = (me->GetEntry() == NPC_SKARVALD_GHOST); if (!ghost && instance) { Unit* dalronn = Unit::GetUnit(*me, instance->GetData64(DATA_DALRONN)); @@ -161,7 +161,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true); - Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); + Creature* temp = me->SummonCreature(NPC_SKARVALD_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -275,7 +275,7 @@ public: Skarvald_isDead = false; AggroYell_Timer = 0; - ghost = me->GetEntry() == MOB_DALRONN_GHOST; + ghost = me->GetEntry() == NPC_DALRONN_GHOST; if (!ghost && instance) { Unit* skarvald = Unit::GetUnit(*me, instance->GetData64(DATA_SKARVALD)); @@ -321,7 +321,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true); - Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); + Creature* temp = me->SummonCreature(NPC_DALRONN_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 12fc9604474..c1d12c63a0b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -55,7 +55,7 @@ enum Yells enum Creatures { - MOB_STASIS_CONTROLLER = 26688 + NPC_STASIS_CONTROLLER = 26688 }; struct Locations @@ -133,19 +133,19 @@ public: { instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); - Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FRENZIED_WORGEN)); + Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_FRENZIED_WORGEN)); if (temp && !temp->IsAlive()) temp->Respawn(); - temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); + temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_FEROCIOUS_RHINO)); if (temp && !temp->IsAlive()) temp->Respawn(); - temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); + temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_MASSIVE_JORMUNGAR)); if (temp && !temp->IsAlive()) temp->Respawn(); - temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); + temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_RAVENOUS_FURBOLG)); if (temp && !temp->IsAlive()) temp->Respawn(); @@ -189,7 +189,7 @@ public: if (!UpdateVictim()) return; - Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); + Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_ORB) : 0); if (temp && temp->IsAlive()) temp->DisappearAndDie(); @@ -220,7 +220,7 @@ public: //Talk(SAY_DEATH); if (instance) instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); - Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); + Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_ORB) : 0); if (temp && temp->IsAlive()) temp->DisappearAndDie(); } @@ -235,7 +235,7 @@ public: if (currentPhase == PHASE_NONE) { instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); - me->SummonCreature(MOB_STASIS_CONTROLLER, moveLocs[5].x, moveLocs[5].y, moveLocs[5].z, 0, TEMPSUMMON_CORPSE_DESPAWN); + me->SummonCreature(NPC_STASIS_CONTROLLER, moveLocs[5].x, moveLocs[5].y, moveLocs[5].z, 0, TEMPSUMMON_CORPSE_DESPAWN); } Phase move = PHASE_NONE; if (AddCount >= DUNGEON_MODE(2, 4)) @@ -243,7 +243,7 @@ public: else move = Sequence[AddCount++]; //send orb to summon spot - Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); + Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_ORB) : 0); if (pOrb && pOrb->IsAlive()) { if (currentPhase == PHASE_NONE) @@ -272,19 +272,19 @@ enum RavenousSpells SPELL_TERRIFYING_ROAR = 48144 }; -class mob_ravenous_furbolg : public CreatureScript +class npc_ravenous_furbolg : public CreatureScript { public: - mob_ravenous_furbolg() : CreatureScript("mob_ravenous_furbolg") { } + npc_ravenous_furbolg() : CreatureScript("npc_ravenous_furbolg") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ravenous_furbolgAI (creature); + return new npc_ravenous_furbolgAI (creature); } - struct mob_ravenous_furbolgAI : public ScriptedAI + struct npc_ravenous_furbolgAI : public ScriptedAI { - mob_ravenous_furbolgAI(Creature* creature) : ScriptedAI(creature) + npc_ravenous_furbolgAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -385,19 +385,19 @@ enum FrenziedSpells SPELL_ENRAGE_2 = 48142 }; -class mob_frenzied_worgen : public CreatureScript +class npc_frenzied_worgen : public CreatureScript { public: - mob_frenzied_worgen() : CreatureScript("mob_frenzied_worgen") { } + npc_frenzied_worgen() : CreatureScript("npc_frenzied_worgen") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_frenzied_worgenAI (creature); + return new npc_frenzied_worgenAI (creature); } - struct mob_frenzied_worgenAI : public ScriptedAI + struct npc_frenzied_worgenAI : public ScriptedAI { - mob_frenzied_worgenAI(Creature* creature) : ScriptedAI(creature) + npc_frenzied_worgenAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -501,19 +501,19 @@ enum FerociousSpells SPELL_STOMP = 48131 }; -class mob_ferocious_rhino : public CreatureScript +class npc_ferocious_rhino : public CreatureScript { public: - mob_ferocious_rhino() : CreatureScript("mob_ferocious_rhino") { } + npc_ferocious_rhino() : CreatureScript("npc_ferocious_rhino") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ferocious_rhinoAI (creature); + return new npc_ferocious_rhinoAI (creature); } - struct mob_ferocious_rhinoAI : public ScriptedAI + struct npc_ferocious_rhinoAI : public ScriptedAI { - mob_ferocious_rhinoAI(Creature* creature) : ScriptedAI(creature) + npc_ferocious_rhinoAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -621,19 +621,19 @@ enum MassiveAdds CREATURE_JORMUNGAR_WORM = 27228 }; -class mob_massive_jormungar : public CreatureScript +class npc_massive_jormungar : public CreatureScript { public: - mob_massive_jormungar() : CreatureScript("mob_massive_jormungar") { } + npc_massive_jormungar() : CreatureScript("npc_massive_jormungar") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_massive_jormungarAI (creature); + return new npc_massive_jormungarAI (creature); } - struct mob_massive_jormungarAI : public ScriptedAI + struct npc_massive_jormungarAI : public ScriptedAI { - mob_massive_jormungarAI(Creature* creature) : ScriptedAI(creature) + npc_massive_jormungarAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -727,19 +727,19 @@ public: }; -class mob_palehoof_orb : public CreatureScript +class npc_palehoof_orb : public CreatureScript { public: - mob_palehoof_orb() : CreatureScript("mob_palehoof_orb") { } + npc_palehoof_orb() : CreatureScript("npc_palehoof_orb") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_palehoof_orbAI (creature); + return new npc_palehoof_orbAI (creature); } - struct mob_palehoof_orbAI : public ScriptedAI + struct npc_palehoof_orbAI : public ScriptedAI { - mob_palehoof_orbAI(Creature* creature) : ScriptedAI(creature) + npc_palehoof_orbAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -770,10 +770,10 @@ public: Creature* pNext = NULL; switch (currentPhase) { - case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; - case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; - case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; - case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; + case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FRENZIED_WORGEN) : 0); break; + case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_RAVENOUS_FURBOLG) : 0); break; + case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_MASSIVE_JORMUNGAR) : 0); break; + case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FEROCIOUS_RHINO) : 0); break; case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; default: break; } @@ -801,10 +801,10 @@ public: Creature* pNext = NULL; switch (id) { - case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; - case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; - case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; - case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; + case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FRENZIED_WORGEN) : 0); break; + case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_RAVENOUS_FURBOLG) : 0); break; + case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_MASSIVE_JORMUNGAR) : 0); break; + case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FEROCIOUS_RHINO) : 0); break; case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; default: break; } @@ -842,10 +842,10 @@ public: void AddSC_boss_palehoof() { new boss_palehoof(); - new mob_ravenous_furbolg(); - new mob_frenzied_worgen(); - new mob_ferocious_rhino(); - new mob_massive_jormungar(); - new mob_palehoof_orb(); + new npc_ravenous_furbolg(); + new npc_frenzied_worgen(); + new npc_ferocious_rhino(); + new npc_massive_jormungar(); + new npc_palehoof_orb(); new go_palehoof_sphere(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index 3024a6e7962..0174f5a0f43 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -112,12 +112,12 @@ public: case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = creature->GetGUID(); break; case BOSS_SKADI_RUTHLESS: uiSkadiTheRuthless = creature->GetGUID(); break; case BOSS_KING_YMIRON: uiKingYmiron = creature->GetGUID(); break; - case MOB_FRENZIED_WORGEN: uiFrenziedWorgen = creature->GetGUID(); break; - case MOB_RAVENOUS_FURBOLG: uiRavenousFurbolg = creature->GetGUID(); break; - case MOB_MASSIVE_JORMUNGAR: uiMassiveJormungar = creature->GetGUID(); break; - case MOB_FEROCIOUS_RHINO: uiFerociousRhino = creature->GetGUID(); break; - case MOB_SVALA: uiSvala = creature->GetGUID(); break; - case MOB_PALEHOOF_ORB: uiPalehoofOrb = creature->GetGUID(); break; + case NPC_FRENZIED_WORGEN: uiFrenziedWorgen = creature->GetGUID(); break; + case NPC_RAVENOUS_FURBOLG: uiRavenousFurbolg = creature->GetGUID(); break; + case NPC_MASSIVE_JORMUNGAR: uiMassiveJormungar = creature->GetGUID(); break; + case NPC_FEROCIOUS_RHINO: uiFerociousRhino = creature->GetGUID(); break; + case NPC_SVALA: uiSvala = creature->GetGUID(); break; + case NPC_PALEHOOF_ORB: uiPalehoofOrb = creature->GetGUID(); break; } } @@ -200,11 +200,11 @@ public: case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof; case DATA_SKADI_THE_RUTHLESS: return uiSkadiTheRuthless; case DATA_KING_YMIRON: return uiKingYmiron; - case DATA_MOB_FRENZIED_WORGEN: return uiFrenziedWorgen; - case DATA_MOB_RAVENOUS_FURBOLG: return uiRavenousFurbolg; - case DATA_MOB_MASSIVE_JORMUNGAR: return uiMassiveJormungar; - case DATA_MOB_FEROCIOUS_RHINO: return uiFerociousRhino; - case DATA_MOB_ORB: return uiPalehoofOrb; + case DATA_NPC_FRENZIED_WORGEN: return uiFrenziedWorgen; + case DATA_NPC_RAVENOUS_FURBOLG: return uiRavenousFurbolg; + case DATA_NPC_MASSIVE_JORMUNGAR: return uiMassiveJormungar; + case DATA_NPC_FEROCIOUS_RHINO: return uiFerociousRhino; + case DATA_NPC_ORB: return uiPalehoofOrb; case DATA_SVALA: return uiSvala; case DATA_GORTOK_PALEHOOF_SPHERE: return uiGortokPalehoofSphere; case DATA_SACRIFICED_PLAYER: return uiSacrificedPlayer; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 37113661dad..4331b4378be 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -31,13 +31,13 @@ enum Data64 DATA_SVALA_SORROWGRAVE, DATA_GORTOK_PALEHOOF, DATA_SKADI_THE_RUTHLESS, - DATA_MOB_GRAUF, + DATA_NPC_GRAUF, DATA_KING_YMIRON, - DATA_MOB_FRENZIED_WORGEN, - DATA_MOB_RAVENOUS_FURBOLG, - DATA_MOB_MASSIVE_JORMUNGAR, - DATA_MOB_FEROCIOUS_RHINO, - DATA_MOB_ORB, + DATA_NPC_FRENZIED_WORGEN, + DATA_NPC_RAVENOUS_FURBOLG, + DATA_NPC_MASSIVE_JORMUNGAR, + DATA_NPC_FEROCIOUS_RHINO, + DATA_NPC_ORB, DATA_GORTOK_PALEHOOF_SPHERE, DATA_SACRIFICED_PLAYER }; @@ -48,12 +48,12 @@ enum eCreatures BOSS_GORTOK_PALEHOOF = 26687, BOSS_SKADI_RUTHLESS = 26693, BOSS_KING_YMIRON = 26861, - MOB_FRENZIED_WORGEN = 26683, - MOB_RAVENOUS_FURBOLG = 26684, - MOB_MASSIVE_JORMUNGAR = 26685, - MOB_FEROCIOUS_RHINO = 26686, - MOB_SVALA = 29281, - MOB_PALEHOOF_ORB = 26688 + NPC_FRENZIED_WORGEN = 26683, + NPC_RAVENOUS_FURBOLG = 26684, + NPC_MASSIVE_JORMUNGAR = 26685, + NPC_FEROCIOUS_RHINO = 26686, + NPC_SVALA = 29281, + NPC_PALEHOOF_ORB = 26688 }; #endif diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index a4ea8649ff9..417b0bdd7fc 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -130,14 +130,14 @@ class boss_archavon : public CreatureScript /*###### ## Mob Archavon Warder ######*/ -class mob_archavon_warder : public CreatureScript +class npc_archavon_warder : public CreatureScript { public: - mob_archavon_warder() : CreatureScript("mob_archavon_warder") { } + npc_archavon_warder() : CreatureScript("npc_archavon_warder") { } - struct mob_archavon_warderAI : public ScriptedAI //npc 32353 + struct npc_archavon_warderAI : public ScriptedAI //npc 32353 { - mob_archavon_warderAI(Creature* creature) : ScriptedAI(creature) + npc_archavon_warderAI(Creature* creature) : ScriptedAI(creature) { } @@ -194,12 +194,12 @@ class mob_archavon_warder : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_archavon_warderAI(creature); + return new npc_archavon_warderAI(creature); } }; void AddSC_boss_archavon() { new boss_archavon(); - new mob_archavon_warder(); + new npc_archavon_warder(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index d2d6a4b648f..ad8d4d6edf2 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -52,7 +52,7 @@ enum Events }; //Creatures -#define MOB_TEMPEST_MINION 33998 +#define NPC_TEMPEST_MINION 33998 #define MAX_TEMPEST_MINIONS 4 @@ -83,7 +83,7 @@ class boss_emalon : public CreatureScript _Reset(); for (uint8 i = 0; i < MAX_TEMPEST_MINIONS; ++i) - me->SummonCreature(MOB_TEMPEST_MINION, TempestMinions[i], TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(NPC_TEMPEST_MINION, TempestMinions[i], TEMPSUMMON_CORPSE_DESPAWN, 0); } void JustSummoned(Creature* summoned) @@ -173,14 +173,14 @@ class boss_emalon : public CreatureScript /*###### ## Tempest Minion ######*/ -class mob_tempest_minion : public CreatureScript +class npc_tempest_minion : public CreatureScript { public: - mob_tempest_minion() : CreatureScript("mob_tempest_minion") { } + npc_tempest_minion() : CreatureScript("npc_tempest_minion") { } - struct mob_tempest_minionAI : public ScriptedAI + struct npc_tempest_minionAI : public ScriptedAI { - mob_tempest_minionAI(Creature* creature) : ScriptedAI(creature) + npc_tempest_minionAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -197,7 +197,7 @@ class mob_tempest_minion : public CreatureScript { if (emalon->IsAlive()) { - emalon->SummonCreature(MOB_TEMPEST_MINION, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + emalon->SummonCreature(NPC_TEMPEST_MINION, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); Talk(EMOTE_MINION_RESPAWN); } } @@ -266,12 +266,12 @@ class mob_tempest_minion : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_tempest_minionAI(creature); + return new npc_tempest_minionAI(creature); } }; void AddSC_boss_emalon() { new boss_emalon(); - new mob_tempest_minion(); + new npc_tempest_minion(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index d6db736b82c..7feadad02e1 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -125,14 +125,14 @@ class boss_koralon : public CreatureScript /*###### ## Mob Flame Warder ######*/ -class mob_flame_warder : public CreatureScript +class npc_flame_warder : public CreatureScript { public: - mob_flame_warder() : CreatureScript("mob_flame_warder") { } + npc_flame_warder() : CreatureScript("npc_flame_warder") { } - struct mob_flame_warderAI : public ScriptedAI + struct npc_flame_warderAI : public ScriptedAI { - mob_flame_warderAI(Creature* creature) : ScriptedAI(creature) + npc_flame_warderAI(Creature* creature) : ScriptedAI(creature) { } @@ -186,12 +186,12 @@ class mob_flame_warder : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_flame_warderAI(creature); + return new npc_flame_warderAI(creature); } }; void AddSC_boss_koralon() { new boss_koralon(); - new mob_flame_warder(); + new npc_flame_warder(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 3068049e322..4309f188b10 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -50,7 +50,7 @@ enum Events }; // Mob Frozen Orb -#define MOB_FROZEN_ORB 38456 // 1 in 10 mode and 3 in 25 mode +#define NPC_FROZEN_ORB 38456 // 1 in 10 mode and 3 in 25 mode class boss_toravon : public CreatureScript { @@ -119,14 +119,14 @@ class boss_toravon : public CreatureScript /*###### ## Mob Frost Warder ######*/ -class mob_frost_warder : public CreatureScript +class npc_frost_warder : public CreatureScript { public: - mob_frost_warder() : CreatureScript("mob_frost_warder") { } + npc_frost_warder() : CreatureScript("npc_frost_warder") { } - struct mob_frost_warderAI : public ScriptedAI + struct npc_frost_warderAI : public ScriptedAI { - mob_frost_warderAI(Creature* creature) : ScriptedAI(creature) {} + npc_frost_warderAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -167,21 +167,21 @@ class mob_frost_warder : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_frost_warderAI(creature); + return new npc_frost_warderAI(creature); } }; /*###### ## Mob Frozen Orb ######*/ -class mob_frozen_orb : public CreatureScript +class npc_frozen_orb : public CreatureScript { public: - mob_frozen_orb() : CreatureScript("mob_frozen_orb") { } + npc_frozen_orb() : CreatureScript("npc_frozen_orb") { } - struct mob_frozen_orbAI : public ScriptedAI + struct npc_frozen_orbAI : public ScriptedAI { - mob_frozen_orbAI(Creature* creature) : ScriptedAI(creature) + npc_frozen_orbAI(Creature* creature) : ScriptedAI(creature) { } @@ -222,21 +222,21 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_frozen_orbAI(creature); + return new npc_frozen_orbAI(creature); } }; /*###### ## Mob Frozen Orb Stalker ######*/ -class mob_frozen_orb_stalker : public CreatureScript +class npc_frozen_orb_stalker : public CreatureScript { public: - mob_frozen_orb_stalker() : CreatureScript("mob_frozen_orb_stalker") { } + npc_frozen_orb_stalker() : CreatureScript("npc_frozen_orb_stalker") { } - struct mob_frozen_orb_stalkerAI : public ScriptedAI + struct npc_frozen_orb_stalkerAI : public ScriptedAI { - mob_frozen_orb_stalkerAI(Creature* creature) : ScriptedAI(creature) + npc_frozen_orb_stalkerAI(Creature* creature) : ScriptedAI(creature) { creature->SetVisible(false); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_DISABLE_MOVE); @@ -275,14 +275,14 @@ class mob_frozen_orb_stalker : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_frozen_orb_stalkerAI(creature); + return new npc_frozen_orb_stalkerAI(creature); } }; void AddSC_boss_toravon() { new boss_toravon(); - new mob_frost_warder(); - new mob_frozen_orb(); - new mob_frozen_orb_stalker(); + new npc_frost_warder(); + new npc_frozen_orb(); + new npc_frozen_orb_stalker(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 5e69959732f..b4bd30449cc 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -258,19 +258,19 @@ enum GuardSpells SPELL_STRIKE = 14516 }; -class mob_erekem_guard : public CreatureScript +class npc_erekem_guard : public CreatureScript { public: - mob_erekem_guard() : CreatureScript("mob_erekem_guard") { } + npc_erekem_guard() : CreatureScript("npc_erekem_guard") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_erekem_guardAI (creature); + return new npc_erekem_guardAI (creature); } - struct mob_erekem_guardAI : public ScriptedAI + struct npc_erekem_guardAI : public ScriptedAI { - mob_erekem_guardAI(Creature* creature) : ScriptedAI(creature) + npc_erekem_guardAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -336,5 +336,5 @@ public: void AddSC_boss_erekem() { new boss_erekem(); - new mob_erekem_guard(); + new npc_erekem_guard(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 6be02886512..8fc5dfcadc8 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -331,19 +331,19 @@ public: }; -class mob_ichor_globule : public CreatureScript +class npc_ichor_globule : public CreatureScript { public: - mob_ichor_globule() : CreatureScript("mob_ichor_globule") { } + npc_ichor_globule() : CreatureScript("npc_ichor_globule") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ichor_globuleAI (creature); + return new npc_ichor_globuleAI (creature); } - struct mob_ichor_globuleAI : public ScriptedAI + struct npc_ichor_globuleAI : public ScriptedAI { - mob_ichor_globuleAI(Creature* creature) : ScriptedAI(creature) + npc_ichor_globuleAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -418,6 +418,6 @@ class achievement_dehydration : public AchievementCriteriaScript void AddSC_boss_ichoron() { new boss_ichoron(); - new mob_ichor_globule(); + new npc_ichor_globule(); new achievement_dehydration(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 1546db45b7a..cce7776cecc 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -223,19 +223,19 @@ public: }; -class mob_ethereal_sphere : public CreatureScript +class npc_ethereal_sphere : public CreatureScript { public: - mob_ethereal_sphere() : CreatureScript("mob_ethereal_sphere") { } + npc_ethereal_sphere() : CreatureScript("npc_ethereal_sphere") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ethereal_sphereAI (creature); + return new npc_ethereal_sphereAI (creature); } - struct mob_ethereal_sphereAI : public ScriptedAI + struct npc_ethereal_sphereAI : public ScriptedAI { - mob_ethereal_sphereAI(Creature* creature) : ScriptedAI(creature) + npc_ethereal_sphereAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -303,5 +303,5 @@ public: void AddSC_boss_xevozz() { new boss_xevozz(); - new mob_ethereal_sphere(); + new npc_ethereal_sphere(); } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index b1a9a3c7deb..de0aee10bfe 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -417,19 +417,19 @@ public: }; -class mob_azure_saboteur : public CreatureScript +class npc_azure_saboteur : public CreatureScript { public: - mob_azure_saboteur() : CreatureScript("mob_azure_saboteur") { } + npc_azure_saboteur() : CreatureScript("npc_azure_saboteur") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_saboteurAI (creature); + return new npc_azure_saboteurAI (creature); } - struct mob_azure_saboteurAI : public npc_escortAI + struct npc_azure_saboteurAI : public npc_escortAI { - mob_azure_saboteurAI(Creature* creature):npc_escortAI(creature) + npc_azure_saboteurAI(Creature* creature):npc_escortAI(creature) { instance = creature->GetInstanceScript(); bHasGotMovingPoints = false; @@ -802,19 +802,19 @@ struct violet_hold_trashAI : public npc_escortAI }; -class mob_azure_invader : public CreatureScript +class npc_azure_invader : public CreatureScript { public: - mob_azure_invader() : CreatureScript("mob_azure_invader") { } + npc_azure_invader() : CreatureScript("npc_azure_invader") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_invaderAI (creature); + return new npc_azure_invaderAI (creature); } - struct mob_azure_invaderAI : public violet_hold_trashAI + struct npc_azure_invaderAI : public violet_hold_trashAI { - mob_azure_invaderAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_invaderAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -880,19 +880,19 @@ public: }; -class mob_azure_binder : public CreatureScript +class npc_azure_binder : public CreatureScript { public: - mob_azure_binder() : CreatureScript("mob_azure_binder") { } + npc_azure_binder() : CreatureScript("npc_azure_binder") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_binderAI (creature); + return new npc_azure_binderAI (creature); } - struct mob_azure_binderAI : public violet_hold_trashAI + struct npc_azure_binderAI : public violet_hold_trashAI { - mob_azure_binderAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_binderAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -958,19 +958,19 @@ public: }; -class mob_azure_mage_slayer : public CreatureScript +class npc_azure_mage_slayer : public CreatureScript { public: - mob_azure_mage_slayer() : CreatureScript("mob_azure_mage_slayer") { } + npc_azure_mage_slayer() : CreatureScript("npc_azure_mage_slayer") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_mage_slayerAI (creature); + return new npc_azure_mage_slayerAI (creature); } - struct mob_azure_mage_slayerAI : public violet_hold_trashAI + struct npc_azure_mage_slayerAI : public violet_hold_trashAI { - mob_azure_mage_slayerAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_mage_slayerAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -1018,19 +1018,19 @@ public: }; -class mob_azure_raider : public CreatureScript +class npc_azure_raider : public CreatureScript { public: - mob_azure_raider() : CreatureScript("mob_azure_raider") { } + npc_azure_raider() : CreatureScript("npc_azure_raider") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_raiderAI (creature); + return new npc_azure_raiderAI (creature); } - struct mob_azure_raiderAI : public violet_hold_trashAI + struct npc_azure_raiderAI : public violet_hold_trashAI { - mob_azure_raiderAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_raiderAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -1070,19 +1070,19 @@ public: }; -class mob_azure_stalker : public CreatureScript +class npc_azure_stalker : public CreatureScript { public: - mob_azure_stalker() : CreatureScript("mob_azure_stalker") { } + npc_azure_stalker() : CreatureScript("npc_azure_stalker") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_stalkerAI (creature); + return new npc_azure_stalkerAI (creature); } - struct mob_azure_stalkerAI : public violet_hold_trashAI + struct npc_azure_stalkerAI : public violet_hold_trashAI { - mob_azure_stalkerAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_stalkerAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -1134,14 +1134,14 @@ public: }; -class mob_azure_spellbreaker : public CreatureScript +class npc_azure_spellbreaker : public CreatureScript { public: - mob_azure_spellbreaker() : CreatureScript("mob_azure_spellbreaker") { } + npc_azure_spellbreaker() : CreatureScript("npc_azure_spellbreaker") { } - struct mob_azure_spellbreakerAI : public violet_hold_trashAI + struct npc_azure_spellbreakerAI : public violet_hold_trashAI { - mob_azure_spellbreakerAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_spellbreakerAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -1209,23 +1209,23 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_spellbreakerAI (creature); + return new npc_azure_spellbreakerAI (creature); } }; -class mob_azure_captain : public CreatureScript +class npc_azure_captain : public CreatureScript { public: - mob_azure_captain() : CreatureScript("mob_azure_captain") { } + npc_azure_captain() : CreatureScript("npc_azure_captain") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_captainAI (creature); + return new npc_azure_captainAI (creature); } - struct mob_azure_captainAI : public violet_hold_trashAI + struct npc_azure_captainAI : public violet_hold_trashAI { - mob_azure_captainAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_captainAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -1265,19 +1265,19 @@ public: }; -class mob_azure_sorceror : public CreatureScript +class npc_azure_sorceror : public CreatureScript { public: - mob_azure_sorceror() : CreatureScript("mob_azure_sorceror") { } + npc_azure_sorceror() : CreatureScript("npc_azure_sorceror") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_sorcerorAI (creature); + return new npc_azure_sorcerorAI (creature); } - struct mob_azure_sorcerorAI : public violet_hold_trashAI + struct npc_azure_sorcerorAI : public violet_hold_trashAI { - mob_azure_sorcerorAI(Creature* creature) : violet_hold_trashAI(creature) + npc_azure_sorcerorAI(Creature* creature) : violet_hold_trashAI(creature) { instance = creature->GetInstanceScript(); } @@ -1326,13 +1326,13 @@ void AddSC_violet_hold() { new npc_sinclari_vh(); new npc_teleportation_portal_vh(); - new mob_azure_invader(); - new mob_azure_spellbreaker(); - new mob_azure_binder(); - new mob_azure_mage_slayer(); - new mob_azure_captain(); - new mob_azure_sorceror(); - new mob_azure_raider(); - new mob_azure_stalker(); - new mob_azure_saboteur(); + new npc_azure_invader(); + new npc_azure_spellbreaker(); + new npc_azure_binder(); + new npc_azure_mage_slayer(); + new npc_azure_captain(); + new npc_azure_sorceror(); + new npc_azure_raider(); + new npc_azure_stalker(); + new npc_azure_saboteur(); } diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index b0678c74695..acd241c8eaf 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -29,7 +29,7 @@ npc_corastrasza npc_jenny npc_sinkhole_kill_credit npc_khunok_the_behemoth -mob_nerubar_victim +npc_nerubar_victim npc_keristrasza npc_nesingwary_trapper npc_lurgglbr @@ -336,7 +336,7 @@ public: }; /*###### -## mob_nerubar_victim +## npc_nerubar_victim ######*/ #define WARSONG_PEON 25270 @@ -346,14 +346,14 @@ const uint32 nerubarVictims[3] = 45526, 45527, 45514 }; -class mob_nerubar_victim : public CreatureScript +class npc_nerubar_victim : public CreatureScript { public: - mob_nerubar_victim() : CreatureScript("mob_nerubar_victim") { } + npc_nerubar_victim() : CreatureScript("npc_nerubar_victim") { } - struct mob_nerubar_victimAI : public ScriptedAI + struct npc_nerubar_victimAI : public ScriptedAI { - mob_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) {} + npc_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} @@ -381,7 +381,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_nerubar_victimAI(creature); + return new npc_nerubar_victimAI(creature); } }; @@ -2510,7 +2510,7 @@ void AddSC_borean_tundra() new npc_keristrasza(); new npc_corastrasza(); new npc_iruk(); - new mob_nerubar_victim(); + new npc_nerubar_victim(); new npc_jenny(); new npc_fezzix_geartwist(); new npc_nesingwary_trapper(); |