diff options
Diffstat (limited to 'src')
150 files changed, 3519 insertions, 2753 deletions
diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp index 49cf797761a..49cf797761a 100755..100644 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index e2fae8a8042..5ffc7053ddb 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -127,6 +127,8 @@ void AddSC_boss_quatermasterzigris(); void AddSC_boss_pyroguard_emberseer(); void AddSC_boss_gyth(); void AddSC_boss_rend_blackhand(); +void AddSC_boss_gizrul_the_slavener(); +void AddSC_boss_urok_doomhowl(); void AddSC_instance_blackrock_spire(); void AddSC_boss_razorgore(); //Blackwing lair void AddSC_boss_vaelastrasz(); @@ -329,7 +331,7 @@ void AddSC_boss_sartura(); void AddSC_boss_skeram(); void AddSC_boss_twinemperors(); void AddSC_boss_ouro(); -void AddSC_mob_anubisath_sentinel(); +void AddSC_npc_anubisath_sentinel(); void AddSC_instance_temple_of_ahnqiraj(); void AddSC_wailing_caverns(); //Wailing caverns void AddSC_instance_wailing_caverns(); @@ -769,6 +771,8 @@ void AddEasternKingdomsScripts() AddSC_boss_pyroguard_emberseer(); AddSC_boss_gyth(); AddSC_boss_rend_blackhand(); + AddSC_boss_gizrul_the_slavener(); + AddSC_boss_urok_doomhowl(); AddSC_instance_blackrock_spire(); AddSC_boss_razorgore(); //Blackwing lair AddSC_boss_vaelastrasz(); @@ -976,7 +980,7 @@ void AddKalimdorScripts() AddSC_boss_skeram(); AddSC_boss_twinemperors(); AddSC_boss_ouro(); - AddSC_mob_anubisath_sentinel(); + AddSC_npc_anubisath_sentinel(); AddSC_instance_temple_of_ahnqiraj(); AddSC_wailing_caverns(); //Wailing caverns AddSC_instance_wailing_caverns(); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 9e7d0418905..88e897a0723 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -490,7 +490,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) if (needConsume) for (uint32 i = 0; i < doses; ++i) - unitTarget->RemoveAuraFromStack(spellId); + unitTarget->RemoveAuraFromStack(spellId, m_caster->GetGUID()); damage *= doses; damage += int32(player->GetTotalAttackPowerValue(BASE_ATTACK) * 0.09f * combo); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 5f05f21b1de..081e717254d 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -77,14 +77,14 @@ SpellPair const _auraPairs[MAX_SPELL_PAIRS] = { NPC_ICEBLOOD_WARMASTER, SPELL_ICEBLOOD_WARMASTER } }; -class mob_av_marshal_or_warmaster : public CreatureScript +class npc_av_marshal_or_warmaster : public CreatureScript { public: - mob_av_marshal_or_warmaster() : CreatureScript("mob_av_marshal_or_warmaster") { } + npc_av_marshal_or_warmaster() : CreatureScript("npc_av_marshal_or_warmaster") { } - struct mob_av_marshal_or_warmasterAI : public ScriptedAI + struct npc_av_marshal_or_warmasterAI : public ScriptedAI { - mob_av_marshal_or_warmasterAI(Creature* creature) : ScriptedAI(creature) { } + npc_av_marshal_or_warmasterAI(Creature* creature) : ScriptedAI(creature) { } void Reset() { @@ -172,11 +172,11 @@ class mob_av_marshal_or_warmaster : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_av_marshal_or_warmasterAI(creature); + return new npc_av_marshal_or_warmasterAI(creature); } }; void AddSC_alterac_valley() { - new mob_av_marshal_or_warmaster(); + new npc_av_marshal_or_warmaster(); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index d5eafbb17a6..c8de8e163d8 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -43,14 +43,14 @@ enum WaterElementalSpells SPELL_WATERBOLT = 46983 }; -class mob_water_elemental : public CreatureScript +class npc_water_elemental : public CreatureScript { public: - mob_water_elemental() : CreatureScript("mob_water_elemental") { } + npc_water_elemental() : CreatureScript("npc_water_elemental") { } - struct mob_water_elementalAI : public ScriptedAI + struct npc_water_elementalAI : public ScriptedAI { - mob_water_elementalAI(Creature* creature) : ScriptedAI(creature) {} + npc_water_elementalAI(Creature* creature) : ScriptedAI(creature) {} uint32 waterBoltTimer; uint64 balindaGUID; @@ -88,7 +88,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_water_elementalAI(creature); + return new npc_water_elementalAI(creature); } }; @@ -134,7 +134,7 @@ public: void JustSummoned(Creature* summoned) { - CAST_AI(mob_water_elemental::mob_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID(); + CAST_AI(npc_water_elemental::npc_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID(); summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); summoned->setFaction(me->getFaction()); summons.Summon(summoned); @@ -205,5 +205,5 @@ public: void AddSC_boss_balinda() { new boss_balinda; - new mob_water_elemental; + new npc_water_elemental; }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index cded76874c7..8fe2778451b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -54,7 +54,7 @@ enum eGrimstone NPC_THELDREN = 16059, //4 or 6 in total? 1+2+1 / 2+2+2 / 3+3. Depending on this, code should be changed. - MAX_MOB_AMOUNT = 4 + MAX_NPC_AMOUNT = 4 }; uint32 RingMob[]= @@ -152,7 +152,7 @@ public: MobCount = 0; MobDeath_Timer = 0; - for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i) + for (uint8 i = 0; i < MAX_NPC_AMOUNT; ++i) RingMobGUID[i] = 0; RingBossGUID = 0; @@ -168,7 +168,7 @@ public: ++MobCount; - if (MobCount == MAX_MOB_AMOUNT) + if (MobCount == MAX_NPC_AMOUNT) MobDeath_Timer = 2500; } @@ -246,7 +246,7 @@ public: return; } - for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i) + for (uint8 i = 0; i < MAX_NPC_AMOUNT; ++i) { Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]); if (mob && !mob->IsAlive() && mob->isDead()) @@ -339,7 +339,7 @@ public: }; }; -// mob_phalanx +// npc_phalanx enum PhalanxSpells { SPELL_THUNDERCLAP = 8732, @@ -347,19 +347,19 @@ enum PhalanxSpells SPELL_MIGHTYBLOW = 14099 }; -class mob_phalanx : public CreatureScript +class npc_phalanx : public CreatureScript { public: - mob_phalanx() : CreatureScript("mob_phalanx") { } + npc_phalanx() : CreatureScript("npc_phalanx") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_phalanxAI (creature); + return new npc_phalanxAI (creature); } - struct mob_phalanxAI : public ScriptedAI + struct npc_phalanxAI : public ScriptedAI { - mob_phalanxAI(Creature* creature) : ScriptedAI(creature) {} + npc_phalanxAI(Creature* creature) : ScriptedAI(creature) {} uint32 ThunderClap_Timer; uint32 FireballVolley_Timer; @@ -680,7 +680,7 @@ public: #define SAY_WINDSOR_4_3 "Good work! We're almost there, $N. This way." #define SAY_WINDSOR_6 "This is it, $N. My stuff should be in that room. Cover me, I'm going in!" #define SAY_WINDSOR_9 "Ah, there it is!" -#define MOB_ENTRY_REGINALD_WINDSOR 9682 +#define NPC_REGINALD_WINDSOR 9682 /* Player* playerStart; @@ -778,7 +778,7 @@ public: me->SetVisible(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(NPC_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0); instance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); break; } @@ -859,8 +859,8 @@ public: #define SAY_REGINALD_WINDSOR_14_2 "Excellent work, $N. Let's find the exit. I think I know the way. Follow me!" #define SAY_REGINALD_WINDSOR_20_1 "We made it!" #define SAY_REGINALD_WINDSOR_20_2 "Meet me at Maxwell's encampment. We'll go over the next stages of the plan there and figure out a way to decode my tablets without the decryption ring." -#define MOB_ENTRY_SHILL_DINGER 9678 -#define MOB_ENTRY_CREST_KILLER 9680 +#define NPC_SHILL_DINGER 9678 +#define NPC_CREST_KILLER 9680 /* int wp = 0; @@ -1328,7 +1328,7 @@ void AddSC_blackrock_depths() new go_shadowforge_brazier(); new at_ring_of_law(); new npc_grimstone(); - new mob_phalanx(); + new npc_phalanx(); new npc_kharan_mighthammer(); new npc_lokhtos_darkbargainer(); new npc_rocknot(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h index ccd96ef81d2..5c34a30912a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h @@ -24,13 +24,13 @@ uint32 const EncounterCount = 22; enum DataTypes { - DATA_OMOKK = 0, + DATA_HIGHLORD_OMOKK = 0, DATA_SHADOW_HUNTER_VOSHGAJIN = 1, DATA_WARMASTER_VOONE = 2, DATA_MOTHER_SMOLDERWEB = 3, - DATA_UROK_DOOMHOWL = 4, // not scripted + DATA_UROK_DOOMHOWL = 4, DATA_QUARTERMASTER_ZIGRIS = 5, - DATA_GIZRUL_THE_SLAVENER = 6, // not scripted + DATA_GIZRUL_THE_SLAVENER = 6, DATA_HALYCON = 7, DATA_OVERLORD_WYRMTHALAK = 8, DATA_PYROGAURD_EMBERSEER = 9, @@ -51,7 +51,7 @@ enum DataTypes enum CreaturesIds { - NPC_OMOKK = 9196, + NPC_HIGHLORD_OMOKK = 9196, NPC_SHADOW_HUNTER_VOSHGAJIN = 9236, NPC_WARMASTER_VOONE = 9237, NPC_MOTHER_SMOLDERWEB = 10596, @@ -69,8 +69,7 @@ enum CreaturesIds NPC_BLACKHAND_SUMMONER = 9818, NPC_BLACKHAND_VETERAN = 9819, NPC_BLACKHAND_INCARCERATOR = 10316, - NPC_LORD_VICTOR_NEFARIUS = 10162, - NPC_REND_BLACKHAND = 10429 + NPC_LORD_VICTOR_NEFARIUS = 10162 }; enum AdditionalData @@ -111,7 +110,9 @@ enum GameObjectsIds GO_EMBERSEER_RUNE_6 = 175271, GO_EMBERSEER_RUNE_7 = 175272, // For Gyth event - GO_DR_PORTCULLIS = 175185 + GO_DR_PORTCULLIS = 175185, + GO_PORTCULLIS_ACTIVE = 164726, + GO_PORTCULLIS_TOBOSSROOMS = 175186 }; #endif diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp new file mode 100644 index 00000000000..e0b4d6cab18 --- /dev/null +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.h" +#include "TemporarySummon.h" + +enum Spells +{ + SPELL_FATAL_BITE = 16495, + SPELL_INFECTED_BITE = 16128, + SPELL_FRENZY = 8269 +}; + +enum Paths +{ + GIZRUL_PATH = 402450 +}; + +enum Events +{ + EVENT_FATAL_BITE = 1, + EVENT_INFECTED_BITE = 2, + EVENT_FRENZY = 3 +}; + +class boss_gizrul_the_slavener : public CreatureScript +{ +public: + boss_gizrul_the_slavener() : CreatureScript("boss_gizrul_the_slavener") { } + + struct boss_gizrul_the_slavenerAI : public BossAI + { + boss_gizrul_the_slavenerAI(Creature* creature) : BossAI(creature, DATA_GIZRUL_THE_SLAVENER) {} + + void Reset() + { + _Reset(); + } + + void IsSummonedBy(Unit* /*summoner*/) + { + me->GetMotionMaster()->MovePath(GIZRUL_PATH, false); + } + + void EnterCombat(Unit* /*who*/) + { + _EnterCombat(); + events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000)); + events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000)); + } + + void JustDied(Unit* /*killer*/) + { + _JustDied(); + } + + void UpdateAI(uint32 diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_FATAL_BITE: + DoCastVictim(SPELL_FATAL_BITE); + events.ScheduleEvent(EVENT_FATAL_BITE, urand(8000,10000)); + break; + case EVENT_INFECTED_BITE: + DoCast(me, SPELL_INFECTED_BITE); + events.ScheduleEvent(EVENT_FATAL_BITE, urand(8000,10000)); + break; + default: + break; + } + } + DoMeleeAttackIfReady(); + } + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new boss_gizrul_the_slavenerAI(creature); + } +}; + +void AddSC_boss_gizrul_the_slavener() +{ + new boss_gizrul_the_slavener(); +} diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp index 75e9ad6a140..f20798d64fb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp @@ -29,13 +29,21 @@ enum Spells SPELL_SUMMON_REND = 16328 // Summons Rend near death }; +enum Misc +{ + NEFARIUS_PATH_2 = 1379671, + NEFARIUS_PATH_3 = 1379672, + GYTH_PATH_1 = 1379681, +}; + enum Events { EVENT_CORROSIVE_ACID = 1, EVENT_FREEZE = 2, EVENT_FLAME_BREATH = 3, EVENT_KNOCK_AWAY = 4, - EVENT_SUMMONED = 5, + EVENT_SUMMONED_1 = 5, + EVENT_SUMMONED_2 = 6 }; class boss_gyth : public CreatureScript @@ -51,7 +59,6 @@ public: void Reset() { - _Reset(); SummonedRend = false; if (instance->GetBossState(DATA_GYTH) == IN_PROGRESS) { @@ -67,23 +74,28 @@ public: events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(8000, 16000)); events.ScheduleEvent(EVENT_FREEZE, urand(8000, 16000)); events.ScheduleEvent(EVENT_FLAME_BREATH, urand(8000, 16000)); - events.ScheduleEvent(EVENT_FLAME_BREATH, urand(12000, 18000)); + events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(12000, 18000)); } void JustDied(Unit* /*killer*/) { - _JustDied(); + instance->SetBossState(DATA_GYTH, DONE); } - void IsSummonedBy(Unit* /*summoner*/) + void SetData(uint32 /*type*/, uint32 data) { - events.ScheduleEvent(EVENT_SUMMONED, 8000); + switch (data) + { + case 1: + events.ScheduleEvent(EVENT_SUMMONED_1, 1000); + break; + default: + break; + } } void UpdateAI(uint32 diff) { - if (!UpdateVictim()) - return; if (!SummonedRend && HealthBelowPct(5)) { @@ -92,16 +104,38 @@ public: SummonedRend = true; } + if (!UpdateVictim()) + { + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SUMMONED_1: + me->AddAura(SPELL_REND_MOUNTS, me); + if (GameObject* portcullis = me->FindNearestGameObject(GO_DR_PORTCULLIS, 40.0f)) + portcullis->UseDoorOrButton(); + if (Creature* victor = me->FindNearestCreature(NPC_LORD_VICTOR_NEFARIUS, 75.0f, true)) + victor->AI()->SetData(1, 1); + events.ScheduleEvent(EVENT_SUMMONED_2, 2000); + break; + case EVENT_SUMMONED_2: + me->GetMotionMaster()->MovePath(GYTH_PATH_1, false); + break; + default: + break; + } + } + return; + } + events.Update(diff); while (uint32 eventId = events.ExecuteEvent()) { switch (eventId) { - case EVENT_SUMMONED: - DoCast(me, SPELL_REND_MOUNTS); - // Load Path - break; case EVENT_CORROSIVE_ACID: DoCast(me, SPELL_CORROSIVE_ACID); events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(10000, 16000)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp index 887506bc4f9..71c3efdfda2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -22,34 +21,32 @@ enum Spells { - SPELL_CROWDPUMMEL = 10887, - SPELL_MIGHTYBLOW = 14099, + SPELL_REND = 13738, + SPELL_THRASH = 3391, +}; + +enum Says +{ + EMOTE_DEATH = 0 }; enum Events { - EVENT_CROWD_PUMMEL = 1, - EVENT_MIGHTY_BLOW = 2, + EVENT_REND = 1, + EVENT_THRASH = 2, }; -const Position SummonLocation = { -169.839f, -324.961f, 64.401f, 3.124f }; +const Position SummonLocation = { -167.9561f, -411.7844f, 76.23057f, 1.53589f }; class boss_halycon : public CreatureScript { public: boss_halycon() : CreatureScript("boss_halycon") { } - CreatureAI* GetAI(Creature* creature) const - { - return new boss_halyconAI(creature); - } - struct boss_halyconAI : public BossAI { boss_halyconAI(Creature* creature) : BossAI(creature, DATA_HALYCON) {} - bool Summoned; - void Reset() { _Reset(); @@ -59,13 +56,16 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - events.ScheduleEvent(EVENT_CROWD_PUMMEL, 8 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, 14 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_REND, urand(17000,20000)); + events.ScheduleEvent(EVENT_THRASH, urand(10000,12000)); } void JustDied(Unit* /*killer*/) { - _JustDied(); + me->SummonCreature(NPC_GIZRUL_THE_SLAVENER, SummonLocation, TEMPSUMMON_TIMED_DESPAWN, 300000); + Talk(EMOTE_DEATH); + + Summoned = true; } void UpdateAI(uint32 diff) @@ -73,13 +73,6 @@ public: if (!UpdateVictim()) return; - //Summon Gizrul - if (!Summoned && HealthBelowPct(25)) - { - me->SummonCreature(NPC_GIZRUL_THE_SLAVENER, SummonLocation, TEMPSUMMON_TIMED_DESPAWN, 300 * IN_MILLISECONDS); - Summoned = true; - } - events.Update(diff); if (me->HasUnitState(UNIT_STATE_CASTING)) @@ -89,20 +82,27 @@ public: { switch (eventId) { - case EVENT_CROWD_PUMMEL: - DoCastVictim(SPELL_CROWDPUMMEL); - events.ScheduleEvent(EVENT_CROWD_PUMMEL, 14 * IN_MILLISECONDS); + case EVENT_REND: + DoCastVictim(SPELL_REND); + events.ScheduleEvent(EVENT_REND, urand(8000,10000)); + break; + case EVENT_THRASH: + DoCast(me, SPELL_THRASH); break; - case EVENT_MIGHTY_BLOW: - DoCastVictim(SPELL_MIGHTYBLOW); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, 10 * IN_MILLISECONDS); + default: break; } } DoMeleeAttackIfReady(); } + private: + bool Summoned; }; + CreatureAI* GetAI(Creature* creature) const + { + return new boss_halyconAI(creature); + } }; void AddSC_boss_halycon() diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp index 4cba989d737..3bd46be1c1b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp @@ -22,24 +22,14 @@ enum Spells { - SPELL_WARSTOMP = 24375, - SPELL_CLEAVE = 15579, - SPELL_STRIKE = 18368, - SPELL_REND = 18106, - SPELL_SUNDERARMOR = 24317, - SPELL_KNOCKAWAY = 20686, - SPELL_SLOW = 22356, + SPELL_FRENZY = 8269, + SPELL_KNOCK_AWAY = 10101 }; enum Events { - EVENT_WARSTOMP = 1, - EVENT_CLEAVE = 2, - EVENT_STRIKE = 3, - EVENT_REND = 4, - EVENT_SUNDER_ARMOR = 5, - EVENT_KNOCK_AWAY = 6, - EVENT_SLOW = 7, + EVENT_FRENZY = 1, + EVENT_KNOCK_AWAY = 2 }; class boss_highlord_omokk : public CreatureScript @@ -54,7 +44,7 @@ public: struct boss_highlordomokkAI : public BossAI { - boss_highlordomokkAI(Creature* creature) : BossAI(creature, DATA_OMOKK) {} + boss_highlordomokkAI(Creature* creature) : BossAI(creature, DATA_HIGHLORD_OMOKK) {} void Reset() { @@ -64,13 +54,8 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - events.ScheduleEvent(EVENT_WARSTOMP, 15 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_CLEAVE, 6 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_STRIKE, 10 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_REND, 14 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_SUNDER_ARMOR, 2 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_KNOCK_AWAY, 18 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_SLOW, 24 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_FRENZY, 20000); + events.ScheduleEvent(EVENT_KNOCK_AWAY, 18000); } void JustDied(Unit* /*killer*/) @@ -92,33 +77,15 @@ public: { switch (eventId) { - case EVENT_WARSTOMP: - DoCastVictim(SPELL_WARSTOMP); - events.ScheduleEvent(EVENT_WARSTOMP, 14 * IN_MILLISECONDS); - break; - case EVENT_CLEAVE: - DoCastVictim(SPELL_CLEAVE); - events.ScheduleEvent(EVENT_CLEAVE, 8 * IN_MILLISECONDS); - break; - case EVENT_STRIKE: - DoCastVictim(SPELL_STRIKE); - events.ScheduleEvent(EVENT_STRIKE, 10 * IN_MILLISECONDS); - break; - case EVENT_REND: - DoCastVictim(SPELL_REND); - events.ScheduleEvent(EVENT_REND, 18 * IN_MILLISECONDS); - break; - case EVENT_SUNDER_ARMOR: - DoCastVictim(SPELL_SUNDERARMOR); - events.ScheduleEvent(EVENT_SUNDER_ARMOR, 25 * IN_MILLISECONDS); + case EVENT_FRENZY: + DoCastVictim(SPELL_FRENZY); + events.ScheduleEvent(EVENT_FRENZY, 60000); break; case EVENT_KNOCK_AWAY: - DoCastVictim(SPELL_KNOCKAWAY); - events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS); + DoCastVictim(SPELL_KNOCK_AWAY); + events.ScheduleEvent(EVENT_KNOCK_AWAY, 12000); break; - case EVENT_SLOW: - DoCastVictim(SPELL_SLOW); - events.ScheduleEvent(EVENT_SLOW, 18 * IN_MILLISECONDS); + default: break; } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp index 24a1fbad457..fdf3f0066ba 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -85,12 +85,10 @@ public: events.Reset(); // Apply auras on spawn and reset // DoCast(me, SPELL_FIRE_SHIELD_TRIGGER); // Need to find this in old DBC if possible - - instance->SetBossState(DATA_PYROGAURD_EMBERSEER, NOT_STARTED); me->RemoveAura(SPELL_EMBERSEER_FULL_STRENGTH); me->RemoveAura(SPELL_EMBERSEER_GROWING); me->RemoveAura(SPELL_EMBERSEER_GROWING_TRIGGER); - events.ScheduleEvent(EVENT_RESPAWN, 1000); + events.ScheduleEvent(EVENT_RESPAWN, 5000); // Hack for missing trigger spell events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000); @@ -209,52 +207,56 @@ public: void UpdateAI(uint32 diff) { - events.Update(diff); - - while (uint32 eventId = events.ExecuteEvent()) + if (!UpdateVictim()) { - switch (eventId) + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) { - case EVENT_RESPAWN: + switch (eventId) { - // Respawn all Blackhand Incarcerators - std::list<Creature*> creatureList; - GetCreatureListWithEntryInGrid(creatureList, me, NPC_BLACKHAND_INCARCERATOR, 35.0f); - for (std::list<Creature*>::iterator itr = creatureList.begin(); itr != creatureList.end(); ++itr) - if (Creature* creatureList = *itr) - { - if (!creatureList->IsAlive()) + case EVENT_RESPAWN: + { + // Respawn all Blackhand Incarcerators + std::list<Creature*> creatureList; + GetCreatureListWithEntryInGrid(creatureList, me, NPC_BLACKHAND_INCARCERATOR, 35.0f); + for (std::list<Creature*>::iterator itr = creatureList.begin(); itr != creatureList.end(); ++itr) + if (Creature* creatureList = *itr) { - creatureList->Respawn(); + if (!creatureList->IsAlive()) + { + creatureList->Respawn(); + } + creatureList->AI()->SetData(1, 2); } - creatureList->AI()->SetData(1, 2); - } - break; - } - case EVENT_PRE_FIGHT_1: - { - // Set data on all Blackhand Incarcerators - std::list<Creature*> creatureList; - GetCreatureListWithEntryInGrid(creatureList, me, NPC_BLACKHAND_INCARCERATOR, 35.0f); - for (std::list<Creature*>::iterator itr = creatureList.begin(); itr != creatureList.end(); ++itr) + me->AddAura(SPELL_ENCAGED_EMBERSEER, me); + instance->SetBossState(DATA_PYROGAURD_EMBERSEER, NOT_STARTED); + break; + } + case EVENT_PRE_FIGHT_1: { - if (Creature* creatureList = *itr) - creatureList->AI()->SetData(1, 1); + // Set data on all Blackhand Incarcerators + std::list<Creature*> creatureList; + GetCreatureListWithEntryInGrid(creatureList, me, NPC_BLACKHAND_INCARCERATOR, 35.0f); + for (std::list<Creature*>::iterator itr = creatureList.begin(); itr != creatureList.end(); ++itr) + { + if (Creature* creatureList = *itr) + creatureList->AI()->SetData(1, 1); + } + events.ScheduleEvent(EVENT_PRE_FIGHT_2, 32000); + break; } - events.ScheduleEvent(EVENT_PRE_FIGHT_2, 32000); - break; - } - case EVENT_PRE_FIGHT_2: - me->CastSpell(me, SPELL_FREEZE_ANIM); - me->CastSpell(me, SPELL_EMBERSEER_GROWING); - Talk(EMOTE_ONE_STACK); - break; - case EVENT_FIRE_SHIELD: - // #### Spell isn't doing any damage ??? #### - DoCast(me, SPELL_FIRE_SHIELD); - events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000); - break; - case EVENT_PLAYER_CHECK: + case EVENT_PRE_FIGHT_2: + me->CastSpell(me, SPELL_FREEZE_ANIM); + me->CastSpell(me, SPELL_EMBERSEER_GROWING); + Talk(EMOTE_ONE_STACK); + break; + case EVENT_FIRE_SHIELD: + // #### Spell isn't doing any damage ??? #### + DoCast(me, SPELL_FIRE_SHIELD); + events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000); + break; + case EVENT_PLAYER_CHECK: { // Check to see if all players in instance have aura SPELL_EMBERSEER_START before starting event bool _hasAura = true; @@ -269,32 +271,40 @@ public: events.ScheduleEvent(EVENT_PRE_FIGHT_1, 1000); instance->SetBossState(DATA_PYROGAURD_EMBERSEER, IN_PROGRESS); } - break; + break; } - case EVENT_ENTER_COMBAT: - AttackStart(me->SelectNearestPlayer(30.0f)); + case EVENT_ENTER_COMBAT: + AttackStart(me->SelectNearestPlayer(30.0f)); + break; + default: + break; + } + } + return; + } + + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_FIRE_SHIELD: + DoCast(me, SPELL_FIRE_SHIELD); + events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000); break; case EVENT_FIRENOVA: - if (UpdateVictim()) - { - DoCast(me, SPELL_FIRENOVA); + DoCast(me, SPELL_FIRENOVA); events.ScheduleEvent(EVENT_FIRENOVA, 6000); - } break; case EVENT_FLAMEBUFFET: - if (UpdateVictim()) - { - DoCast(me, SPELL_FLAMEBUFFET); + DoCast(me, SPELL_FLAMEBUFFET); events.ScheduleEvent(EVENT_FLAMEBUFFET, 14000); - } break; case EVENT_PYROBLAST: - if (UpdateVictim()) - { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target, SPELL_PYROBLAST); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_PYROBLAST); events.ScheduleEvent(EVENT_PYROBLAST, 15000); - } break; default: break; @@ -355,7 +365,7 @@ public: if (data == 1 && value == 2) { - _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 5000); + _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1000); } } @@ -364,18 +374,28 @@ public: // Used to close doors if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) Emberseer->AI()->SetData(1, 2); - me->CallForHelp(60.0f); + + // Had to do this because CallForHelp will ignore any npcs without LOS + std::list<Creature*> creatureList; + GetCreatureListWithEntryInGrid(creatureList, me, NPC_BLACKHAND_INCARCERATOR, 60.0f); + for (std::list<Creature*>::iterator itr = creatureList.begin(); itr != creatureList.end(); ++itr) + { + if (Creature* creatureList = *itr) + creatureList->SetInCombatWithZone(); // AI()->AttackStart(me->GetVictim()); + } + _events.ScheduleEvent(EVENT_STRIKE, urand(8000, 16000)); _events.ScheduleEvent(EVENT_ENCAGE, urand(10000, 20000)); - me->CallForHelp(60.0f); // double call because not all are aggroing on first call. } void UpdateAI(uint32 diff) { - _events.Update(diff); + if (!UpdateVictim()) { + _events.Update(diff); + while (uint32 eventId = _events.ExecuteEvent()) { switch (eventId) @@ -391,6 +411,8 @@ public: return; } + _events.Update(diff); + while (uint32 eventId = _events.ExecuteEvent()) { switch (eventId) diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp index f735159afb6..fec82982504 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -39,11 +38,6 @@ class quartermaster_zigris : public CreatureScript public: quartermaster_zigris() : CreatureScript("quartermaster_zigris") { } - CreatureAI* GetAI(Creature* creature) const - { - return new boss_quatermasterzigrisAI(creature); - } - struct boss_quatermasterzigrisAI : public BossAI { boss_quatermasterzigrisAI(Creature* creature) : BossAI(creature, DATA_QUARTERMASTER_ZIGRIS) {} @@ -56,8 +50,8 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - events.ScheduleEvent(EVENT_SHOOT, 1 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_STUN_BOMB, 16 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_SHOOT, 1000); + events.ScheduleEvent(EVENT_STUN_BOMB, 16000); } void JustDied(Unit* /*killer*/) @@ -85,13 +79,18 @@ public: break; case EVENT_STUN_BOMB: DoCastVictim(SPELL_STUNBOMB); - events.ScheduleEvent(EVENT_STUN_BOMB, 14 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_STUN_BOMB, 14000); break; } } DoMeleeAttackIfReady(); } }; + + CreatureAI* GetAI(Creature* creature) const + { + return new boss_quatermasterzigrisAI(creature); + } }; void AddSC_boss_quatermasterzigris() diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp index 42518988e63..eca24289945 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp @@ -27,7 +27,7 @@ enum Spells SPELL_CLEAVE = 15284, SPELL_MORTAL_STRIKE = 16856, SPELL_FRENZY = 8269, - SPELL_KNOCKDOWN = 13360 // On spawn during Gyth fight + SPELL_KNOCKDOWN = 13360 // On spawn during Gyth fight }; enum Says @@ -37,16 +37,16 @@ enum Says SAY_BLACKHAND_2 = 1, EMOTE_BLACKHAND_DISMOUNT = 2, // Victor Nefarius - SAY_NEFARIUS_1 = 0, - SAY_NEFARIUS_2 = 1, - SAY_NEFARIUS_3 = 2, - SAY_NEFARIUS_4 = 3, - SAY_NEFARIUS_5 = 4, - SAY_NEFARIUS_6 = 5, - SAY_NEFARIUS_7 = 6, - SAY_NEFARIUS_8 = 7, - SAY_NEFARIUS_9 = 8, - SAY_NEFARIUS_10 = 9, + SAY_NEFARIUS_0 = 0, + SAY_NEFARIUS_1 = 1, + SAY_NEFARIUS_2 = 2, + SAY_NEFARIUS_3 = 3, + SAY_NEFARIUS_4 = 4, + SAY_NEFARIUS_5 = 5, + SAY_NEFARIUS_6 = 6, + SAY_NEFARIUS_7 = 7, + SAY_NEFARIUS_8 = 8, + SAY_NEFARIUS_9 = 9, }; enum Adds @@ -55,6 +55,16 @@ enum Adds NPC_CHROMATIC_DRAGONSPAWN = 10447, NPC_BLACKHAND_DRAGON_HANDLER = 10742 }; + +enum Misc +{ + NEFARIUS_PATH_1 = 1379670, + NEFARIUS_PATH_2 = 1379671, + NEFARIUS_PATH_3 = 1379672, + REND_PATH_1 = 1379680, + REND_PATH_2 = 1379681, +}; + /* struct Wave { @@ -106,19 +116,45 @@ static Wave Wave6[]= // 27 sec { 10442, 212.2642f, -430.7648f, 110.9807f, 5.934119f } }; */ + +Position const GythLoc = { 211.762f, -397.5885f, 111.1817f, 4.747295f }; +Position const Teleport1Loc = { 194.2993f, -474.0814f, 121.4505f, -0.01225555f }; +Position const Teleport2Loc = { 216.485f, -434.93f, 110.888f, -0.01225555f }; + enum Events { - EVENT_WHIRLWIND = 1, - EVENT_CLEAVE = 2, - EVENT_MORTAL_STRIKE = 3, - - EVENT_GYTH_1 = 5, - EVENT_GYTH_2 = 6, - EVENT_GYTH_3 = 7, - EVENT_GYTH_4 = 8, - EVENT_GYTH_5 = 9, - EVENT_GYTH_6 = 10, - EVENT_PORTCULLIS = 11, + EVENT_START_1 = 1, + EVENT_START_2 = 2, + EVENT_START_3 = 3, + EVENT_START_4 = 4, + EVENT_TURN_TO_REND = 5, + EVENT_TURN_TO_PLAYER = 6, + EVENT_TURN_TO_FACING_1 = 7, + EVENT_TURN_TO_FACING_2 = 8, + EVENT_TURN_TO_FACING_3 = 9, + EVENT_WAVE_1 = 10, + EVENT_WAVE_2 = 11, + EVENT_WAVE_3 = 12, + EVENT_WAVE_4 = 13, + EVENT_WAVE_5 = 14, + EVENT_WAVE_6 = 15, + EVENT_WAVES_TEXT_1 = 16, + EVENT_WAVES_TEXT_2 = 17, + EVENT_WAVES_TEXT_3 = 18, + EVENT_WAVES_TEXT_4 = 19, + EVENT_WAVES_TEXT_5 = 20, + EVENT_WAVES_COMPLETE_TEXT_1 = 21, + EVENT_WAVES_COMPLETE_TEXT_2 = 22, + EVENT_WAVES_COMPLETE_TEXT_3 = 23, + EVENT_WAVES_EMOTE_1 = 24, + EVENT_WAVES_EMOTE_2 = 25, + EVENT_PATH_REND = 26, + EVENT_PATH_NEFARIUS = 27, + EVENT_TELEPORT_1 = 28, + EVENT_TELEPORT_2 = 29, + EVENT_WHIRLWIND = 30, + EVENT_CLEAVE = 31, + EVENT_MORTAL_STRIKE = 32, }; class boss_rend_blackhand : public CreatureScript @@ -133,53 +169,66 @@ public: void Reset() { _Reset(); - _gythEvent = false; - _victorGUID = 0; - _portcullisGUID = 0; + gythEvent = false; + victorGUID = 0; } void EnterCombat(Unit* /*who*/) { _EnterCombat(); - events.ScheduleEvent(EVENT_WHIRLWIND, 13000); - events.ScheduleEvent(EVENT_CLEAVE, 15000); - events.ScheduleEvent(EVENT_MORTAL_STRIKE, 17000); + events.ScheduleEvent(EVENT_WHIRLWIND, urand (13000, 15000)); + events.ScheduleEvent(EVENT_CLEAVE, urand (15000, 17000)); + events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand (17000, 19000)); } void JustDied(Unit* /*killer*/) { _JustDied(); - // Do data set on victor + if (Creature* victor = me->FindNearestCreature(NPC_LORD_VICTOR_NEFARIUS, 75.0f, true)) + victor->AI()->SetData(1, 2); } void SetData(uint32 type, uint32 data) { if (instance && type == AREATRIGGER && data == AREATRIGGER_BLACKROCK_STADIUM) { - if (!_gythEvent) + if (!gythEvent) { - _gythEvent = true; + gythEvent = true; if (Creature* victor = me->FindNearestCreature(NPC_LORD_VICTOR_NEFARIUS, 5.0f, true)) - _victorGUID = victor->GetGUID(); + victorGUID = victor->GetGUID(); if (GameObject* portcullis = me->FindNearestGameObject(GO_DR_PORTCULLIS, 50.0f)) - _portcullisGUID = portcullis->GetGUID(); + portcullisGUID = portcullis->GetGUID(); - if (Creature* victor = me->GetCreature(*me, _victorGUID)) - { - if (Unit* player = victor->SelectNearestPlayer(40.0f)) - victor->SetInFront(player); - } + events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0); + events.ScheduleEvent(EVENT_START_1, 1000); } + } + } - events.ScheduleEvent(EVENT_GYTH_1, 1000); + void MovementInform(uint32 type, uint32 id) + { + if (type == WAYPOINT_MOTION_TYPE) + { + switch (id) + { + case 5: + events.ScheduleEvent(EVENT_TELEPORT_1, 2000); + break; + case 11: + if (Creature* gyth = me->FindNearestCreature(NPC_GYTH, 10.0f, true)) + gyth->AI()->SetData(1, 1); + me->DespawnOrUnsummon(1000); + break; + } } } void UpdateAI(uint32 diff) { - if (_gythEvent) + if (gythEvent) { events.Update(diff); @@ -187,28 +236,161 @@ public: { switch (eventId) { - case EVENT_GYTH_1: - if (Creature* victor = me->GetCreature(*me, _victorGUID)) - victor->AI()->Talk(SAY_NEFARIUS_1); - events.ScheduleEvent(EVENT_GYTH_2, 4000); + case EVENT_START_1: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_0); + events.ScheduleEvent(EVENT_START_2, 4000); break; - case EVENT_GYTH_2: - if (Creature* victor = me->GetCreature(*me, _victorGUID)) + case EVENT_START_2: + events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0); + if (Creature* victor = me->GetCreature(*me, victorGUID)) victor->HandleEmoteCommand(EMOTE_ONESHOT_POINT); - events.ScheduleEvent(EVENT_GYTH_3, 4000); + events.ScheduleEvent(EVENT_START_3, 4000); + break; + case EVENT_START_3: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_1); + events.ScheduleEvent(EVENT_WAVE_1, 2000); + events.ScheduleEvent(EVENT_TURN_TO_REND, 4000); + events.ScheduleEvent(EVENT_WAVES_TEXT_1, 20000); + break; + case EVENT_TURN_TO_REND: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + { + victor->SetFacingToObject(me); + victor->HandleEmoteCommand(EMOTE_ONESHOT_TALK); + } + break; + case EVENT_TURN_TO_PLAYER: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + if (Unit* player = victor->SelectNearestPlayer(60.0f)) + victor->SetFacingToObject(player); + break; + case EVENT_TURN_TO_FACING_1: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->SetFacingTo(1.518436f); + break; + case EVENT_TURN_TO_FACING_2: + me->SetFacingTo(1.658063f); + break; + case EVENT_TURN_TO_FACING_3: + me->SetFacingTo(1.500983f); + break; + case EVENT_WAVES_EMOTE_1: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->HandleEmoteCommand(EMOTE_ONESHOT_QUESTION); + break; + case EVENT_WAVES_EMOTE_2: + me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); + break; + case EVENT_WAVES_TEXT_1: + events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0); + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_2); + me->HandleEmoteCommand(EMOTE_ONESHOT_TALK); + events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000); + events.ScheduleEvent(EVENT_WAVES_EMOTE_1, 5000); + events.ScheduleEvent(EVENT_WAVE_2, 2000); + events.ScheduleEvent(EVENT_WAVES_TEXT_2, 20000); break; - case EVENT_GYTH_3: - if (Creature* victor = me->GetCreature(*me, _victorGUID)) - victor->AI()->Talk(SAY_NEFARIUS_2); - events.ScheduleEvent(EVENT_PORTCULLIS, 2000); - events.ScheduleEvent(EVENT_GYTH_4, 4000); + case EVENT_WAVES_TEXT_2: + events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0); + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_3); + events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000); + events.ScheduleEvent(EVENT_WAVE_3, 2000); + events.ScheduleEvent(EVENT_WAVES_TEXT_3, 20000); break; - case EVENT_GYTH_4: - if (Creature* victor = me->GetCreature(*me, _victorGUID)) - victor->SetInFront(me); + case EVENT_WAVES_TEXT_3: + events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0); + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_4); + events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000); + events.ScheduleEvent(EVENT_WAVE_4, 2000); + events.ScheduleEvent(EVENT_WAVES_TEXT_4, 20000); break; - case EVENT_PORTCULLIS: - if (GameObject* portcullis = me->FindNearestGameObject(GO_DR_PORTCULLIS, 50.0f)) + case EVENT_WAVES_TEXT_4: + Talk(SAY_BLACKHAND_1); + events.ScheduleEvent(EVENT_WAVES_EMOTE_2, 4000); + events.ScheduleEvent(EVENT_TURN_TO_FACING_3, 8000); + events.ScheduleEvent(EVENT_WAVE_5, 2000); + events.ScheduleEvent(EVENT_WAVES_TEXT_5, 20000); + break; + case EVENT_WAVES_TEXT_5: + events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0); + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_5); + events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000); + events.ScheduleEvent(EVENT_WAVE_6, 2000); + events.ScheduleEvent(EVENT_WAVES_COMPLETE_TEXT_1, 20000); + break; + case EVENT_WAVES_COMPLETE_TEXT_1: + events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0); + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_6); + events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000); + events.ScheduleEvent(EVENT_WAVES_COMPLETE_TEXT_2, 13000); + break; + case EVENT_WAVES_COMPLETE_TEXT_2: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_7); + Talk(SAY_BLACKHAND_2); + events.ScheduleEvent(EVENT_PATH_REND, 1000); + events.ScheduleEvent(EVENT_WAVES_COMPLETE_TEXT_3, 4000); + break; + case EVENT_WAVES_COMPLETE_TEXT_3: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->AI()->Talk(SAY_NEFARIUS_8); + events.ScheduleEvent(EVENT_PATH_NEFARIUS, 1000); + events.ScheduleEvent(EVENT_PATH_REND, 1000); + break; + case EVENT_PATH_NEFARIUS: + if (Creature* victor = me->GetCreature(*me, victorGUID)) + victor->GetMotionMaster()->MovePath(NEFARIUS_PATH_1, true); + break; + case EVENT_PATH_REND: + me->GetMotionMaster()->MovePath(REND_PATH_1, false); + break; + case EVENT_TELEPORT_1: + me->NearTeleportTo(194.2993f, -474.0814f, 121.4505f, -0.01225555f); + events.ScheduleEvent(EVENT_TELEPORT_2, 50000); + break; + case EVENT_TELEPORT_2: + me->NearTeleportTo(216.485f, -434.93f, 110.888f, -0.01225555f); + me->SummonCreature(NPC_GYTH, 211.762f, -397.5885f, 111.1817f, 4.747295f); + break; + case EVENT_WAVE_1: + if (GameObject* portcullis = me->GetMap()->GetGameObject(portcullisGUID)) + portcullis->UseDoorOrButton(); + // move wave + break; + case EVENT_WAVE_2: + // spawn wave + if (GameObject* portcullis = me->GetMap()->GetGameObject(portcullisGUID)) + portcullis->UseDoorOrButton(); + // move wave + break; + case EVENT_WAVE_3: + // spawn wave + if (GameObject* portcullis = me->GetMap()->GetGameObject(portcullisGUID)) + portcullis->UseDoorOrButton(); + // move wave + break; + case EVENT_WAVE_4: + // spawn wave + if (GameObject* portcullis = me->GetMap()->GetGameObject(portcullisGUID)) + portcullis->UseDoorOrButton(); + // move wave + break; + case EVENT_WAVE_5: + // spawn wave + if (GameObject* portcullis = me->GetMap()->GetGameObject(portcullisGUID)) + portcullis->UseDoorOrButton(); + // move wave + break; + case EVENT_WAVE_6: + // spawn wave + if (GameObject* portcullis = me->GetMap()->GetGameObject(portcullisGUID)) portcullis->UseDoorOrButton(); // move wave break; @@ -236,21 +418,21 @@ public: break; case EVENT_CLEAVE: DoCastVictim(SPELL_CLEAVE); - events.ScheduleEvent(EVENT_CLEAVE, 10000); + events.ScheduleEvent(EVENT_CLEAVE, urand(10000, 14000)); break; case EVENT_MORTAL_STRIKE: DoCastVictim(SPELL_MORTAL_STRIKE); - events.ScheduleEvent(EVENT_MORTAL_STRIKE, 16000); + events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(14000, 16000)); break; } } DoMeleeAttackIfReady(); } - private: - bool _gythEvent; - uint64 _victorGUID; - uint64 _portcullisGUID; + private: + bool gythEvent; + uint64 victorGUID; + uint64 portcullisGUID; }; CreatureAI* GetAI(Creature* creature) const diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp new file mode 100644 index 00000000000..dd21d6ebdb0 --- /dev/null +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.h" + +enum Spells +{ + SPELL_REND = 16509, + SPELL_STRIKE = 15580, + SPELL_INTIMIDATING_ROAR = 16508 +}; + +enum Says +{ + SAY_SUMMON = 0, + SAY_AGGRO = 1, +}; + +enum Events +{ + EVENT_REND = 1, + EVENT_STRIKE = 2, + EVENT_INTIMIDATING_ROAR = 3 +}; + +class boss_urok_doomhowl : public CreatureScript +{ +public: + boss_urok_doomhowl() : CreatureScript("boss_urok_doomhowl") { } + + struct boss_urok_doomhowlAI : public BossAI + { + boss_urok_doomhowlAI(Creature* creature) : BossAI(creature, DATA_UROK_DOOMHOWL) {} + + void Reset() + { + _Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + _EnterCombat(); + events.ScheduleEvent(SPELL_REND, urand(17000,20000)); + events.ScheduleEvent(SPELL_STRIKE, urand(10000,12000)); + Talk(SAY_AGGRO); + } + + void JustDied(Unit* /*killer*/) + { + _JustDied(); + } + + void UpdateAI(uint32 diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case SPELL_REND: + DoCastVictim(SPELL_REND); + events.ScheduleEvent(SPELL_REND, urand(8000,10000)); + break; + case SPELL_STRIKE: + DoCastVictim(SPELL_STRIKE); + events.ScheduleEvent(SPELL_STRIKE, urand(8000,10000)); + break; + default: + break; + } + } + DoMeleeAttackIfReady(); + } + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new boss_urok_doomhowlAI(creature); + } +}; + +void AddSC_boss_urok_doomhowl() +{ + new boss_urok_doomhowl(); +} diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index 7b80f75255a..ff0ff496b5a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -46,31 +46,34 @@ public: instance_blackrock_spireMapScript(InstanceMap* map) : InstanceScript(map) { SetBossNumber(EncounterCount); - HighlordOmokk = 0; - ShadowHunterVoshgajin = 0; - WarMasterVoone = 0; - MotherSmolderweb = 0; - UrokDoomhowl = 0; - QuartermasterZigris = 0; - GizrultheSlavener = 0; - Halycon = 0; - OverlordWyrmthalak = 0; - PyroguardEmberseer = 0; - WarchiefRendBlackhand = 0; - Gyth = 0; - TheBeast = 0; - GeneralDrakkisath = 0; - go_emberseerin = 0; - go_doors = 0; - go_emberseerout = 0; - go_blackrockaltar = 0; + HighlordOmokk = 0; + ShadowHunterVoshgajin = 0; + WarMasterVoone = 0; + MotherSmolderweb = 0; + UrokDoomhowl = 0; + QuartermasterZigris = 0; + GizrultheSlavener = 0; + Halycon = 0; + OverlordWyrmthalak = 0; + PyroguardEmberseer = 0; + WarchiefRendBlackhand = 0; + Gyth = 0; + LordVictorNefarius = 0; + TheBeast = 0; + GeneralDrakkisath = 0; + go_emberseerin = 0; + go_doors = 0; + go_emberseerout = 0; + go_blackrockaltar = 0; + go_portcullis_active = 0; + go_portcullis_tobossrooms = 0; } void OnCreatureCreate(Creature* creature) { switch (creature->GetEntry()) { - case NPC_OMOKK: + case NPC_HIGHLORD_OMOKK: HighlordOmokk = creature->GetGUID(); break; case NPC_SHADOW_HUNTER_VOSHGAJIN: @@ -91,19 +94,21 @@ public: case NPC_GIZRUL_THE_SLAVENER: GizrultheSlavener = creature->GetGUID(); break; - case NPC_HALYCON: + case NPC_HALYCON: Halycon = creature->GetGUID(); break; - case NPC_OVERLORD_WYRMTHALAK: + case NPC_OVERLORD_WYRMTHALAK: OverlordWyrmthalak = creature->GetGUID(); break; - case NPC_PYROGAURD_EMBERSEER: + case NPC_PYROGAURD_EMBERSEER: PyroguardEmberseer = creature->GetGUID(); if (GetBossState(DATA_PYROGAURD_EMBERSEER) == DONE) creature->DisappearAndDie(); break; - case NPC_WARCHIEF_REND_BLACKHAND: + case NPC_WARCHIEF_REND_BLACKHAND: WarchiefRendBlackhand = creature->GetGUID(); + if (GetBossState(DATA_GYTH) == DONE) + creature->DisappearAndDie(); break; case NPC_GYTH: Gyth = creature->GetGUID(); @@ -114,9 +119,10 @@ public: case NPC_GENERAL_DRAKKISATH: GeneralDrakkisath = creature->GetGUID(); break; - case NPC_BLACKHAND_DREADWEAVER: - case NPC_BLACKHAND_SUMMONER: - case NPC_BLACKHAND_VETERAN: + case NPC_LORD_VICTOR_NEFARIUS: + LordVictorNefarius = creature->GetGUID(); + if (GetBossState(DATA_GYTH) == DONE) + creature->DisappearAndDie(); break; } } @@ -213,6 +219,18 @@ public: if (GetBossState(DATA_PYROGAURD_EMBERSEER) == DONE) HandleGameObject(0, false, go); break; + case GO_PORTCULLIS_ACTIVE: + go_portcullis_active = go->GetGUID(); + if (GetBossState(DATA_GYTH) == DONE) + HandleGameObject(0, true, go); + break; + case GO_PORTCULLIS_TOBOSSROOMS: + go_portcullis_tobossrooms = go->GetGUID(); + if (GetBossState(DATA_GYTH) == DONE) + HandleGameObject(0, true, go); + break; + default: + break; } } @@ -223,7 +241,7 @@ public: switch (type) { - case DATA_OMOKK: + case DATA_HIGHLORD_OMOKK: case DATA_SHADOW_HUNTER_VOSHGAJIN: case DATA_WARMASTER_VOONE: case DATA_MOTHER_SMOLDERWEB: @@ -281,7 +299,7 @@ public: { switch (type) { - case DATA_OMOKK: + case DATA_HIGHLORD_OMOKK: return HighlordOmokk; break; case DATA_SHADOW_HUNTER_VOSHGAJIN: @@ -374,6 +392,12 @@ public: case GO_EMBERSEER_RUNE_7: return go_emberseerrunes[6]; break; + case GO_PORTCULLIS_ACTIVE: + return go_portcullis_active; + break; + case GO_PORTCULLIS_TOBOSSROOMS: + return go_portcullis_tobossrooms; + break; } return 0; } @@ -437,7 +461,10 @@ public: { bool _mobAlive = false; rune = instance->GetGameObject(go_roomrunes[i]); - if (rune && rune->GetGoState() == GO_STATE_ACTIVE) + if (!rune) + continue; + + if (rune->GetGoState() == GO_STATE_ACTIVE) { for (uint8 ii = 0; ii < 5; ++ii) { @@ -551,6 +578,7 @@ public: uint64 PyroguardEmberseer; uint64 WarchiefRendBlackhand; uint64 Gyth; + uint64 LordVictorNefarius; uint64 TheBeast; uint64 GeneralDrakkisath; uint64 go_emberseerin; @@ -559,7 +587,9 @@ public: uint64 go_blackrockaltar; uint64 go_roomrunes[7]; uint64 go_emberseerrunes[7]; - uint64 runecreaturelist[7] [5]; + uint64 runecreaturelist[7][5]; + uint64 go_portcullis_active; + uint64 go_portcullis_tobossrooms; }; InstanceScript* GetInstanceScript(InstanceMap* map) const @@ -609,7 +639,7 @@ public: if (!instance) return false; - if (Creature* rend = player->FindNearestCreature(NPC_REND_BLACKHAND, 50.0f)) + if (Creature* rend = player->FindNearestCreature(NPC_WARCHIEF_REND_BLACKHAND, 50.0f)) { rend->AI()->SetData(AREATRIGGER, AREATRIGGER_BLACKROCK_STADIUM); return true; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index fde21c63840..97595e55b5e 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -34,14 +34,28 @@ enum Events EVENT_VEILOFSHADOW = 6, EVENT_CLEAVE = 7, EVENT_TAILLASH = 8, - EVENT_CLASSCALL = 9 + EVENT_CLASSCALL = 9, + // UBRS + EVENT_CHAOS_1 = 10, + EVENT_CHAOS_2 = 11, + EVENT_PATH_2 = 12, + EVENT_PATH_3 = 13, + EVENT_SUCCESS_1 = 14, + EVENT_SUCCESS_2 = 15, + EVENT_SUCCESS_3 = 16, }; enum Says { - SAY_GAMESBEGIN_1 = 11, - SAY_GAMESBEGIN_2 = 12, - // SAY_VAEL_INTRO = 13, Not used - when he corrupts Vaelastrasz + // Nefarius + // UBRS + SAY_CHAOS_SPELL = 9, + SAY_SUCCESS = 10, + SAY_FAILURE = 11, + // BWL + SAY_GAMESBEGIN_1 = 12, + SAY_GAMESBEGIN_2 = 13, + // SAY_VAEL_INTRO = 14, Not used - when he corrupts Vaelastrasz // Nefarian SAY_RANDOM = 0, @@ -67,6 +81,18 @@ enum Gossip GOSSIP_OPTION_ID = 0 }; +enum Paths +{ + NEFARIUS_PATH_2 = 1379671, + NEFARIUS_PATH_3 = 1379672 +}; + +enum GameObjects +{ + GO_PORTCULLIS_ACTIVE = 164726, + GO_PORTCULLIS_TOBOSSROOMS = 175186 +}; + enum Creatures { NPC_BRONZE_DRAKANOID = 14263, @@ -75,7 +101,9 @@ enum Creatures NPC_GREEN_DRAKANOID = 14262, NPC_BLACK_DRAKANOID = 14265, NPC_CHROMATIC_DRAKANOID = 14302, - NPC_BONE_CONSTRUCT = 14605 + NPC_BONE_CONSTRUCT = 14605, + // UBRS + NPC_GYTH = 10339 }; enum Spells @@ -192,8 +220,72 @@ public: void JustSummoned(Creature* /*summon*/) {} + void SetData(uint32 type, uint32 data) + { + if (instance && type == 1 && data == 1) + { + me->StopMoving(); + events.ScheduleEvent(EVENT_PATH_2, 9000); + } + + if (instance && type == 1 && data == 2) + { + events.ScheduleEvent(EVENT_SUCCESS_1, 5000); + } + } + void UpdateAI(uint32 diff) { + if (!UpdateVictim()) + { + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_PATH_2: + me->GetMotionMaster()->MovePath(NEFARIUS_PATH_2, false); + events.ScheduleEvent(EVENT_CHAOS_1, 7000); + break; + case EVENT_CHAOS_1: + if (Creature* gyth = me->FindNearestCreature(NPC_GYTH, 75.0f, true)) + { + me->SetFacingToObject(gyth); + Talk(SAY_CHAOS_SPELL); + } + events.ScheduleEvent(EVENT_CHAOS_2, 2000); + break; + case EVENT_CHAOS_2: + DoCast(SPELL_CHROMATIC_CHAOS); + me->SetFacingTo(1.570796f); + break; + case EVENT_SUCCESS_1: + if (Unit* player = me->SelectNearestPlayer(60.0f)) + { + me->SetFacingToObject(player); + Talk(SAY_SUCCESS); + if (GameObject* portcullis1 = me->FindNearestGameObject(GO_PORTCULLIS_ACTIVE, 65.0f)) + portcullis1->SetGoState(GO_STATE_ACTIVE); + if (GameObject* portcullis2 = me->FindNearestGameObject(GO_PORTCULLIS_TOBOSSROOMS, 80.0f)) + portcullis2->SetGoState(GO_STATE_ACTIVE); + } + events.ScheduleEvent(EVENT_SUCCESS_2, 4000); + break; + case EVENT_SUCCESS_2: + DoCast(me, SPELL_VAELASTRASZZ_SPAWN); + me->DespawnOrUnsummon(1000); + break; + case EVENT_PATH_3: + me->GetMotionMaster()->MovePath(NEFARIUS_PATH_3, false); + break; + default: + break; + } + } + return; + } + // Only do this if we haven't spawned nefarian yet if (UpdateVictim() && SpawnedAdds <= 42) { diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt index 37cd2359923..f4f835f5768 100644 --- a/src/server/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt @@ -126,6 +126,8 @@ set(scripts_STAT_SRCS EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp EasternKingdoms/BlackrockSpire/boss_the_beast.cpp + EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp + EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp EasternKingdoms/BlackrockSpire/blackrock_spire.h EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 998406e6d8c..c4cded87665 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -508,10 +508,10 @@ public: }; }; -class mob_aran_elemental : public CreatureScript +class npc_aran_elemental : public CreatureScript { public: - mob_aran_elemental() : CreatureScript("mob_aran_elemental") { } + npc_aran_elemental() : CreatureScript("npc_aran_elemental") { } CreatureAI* GetAI(Creature* creature) const { @@ -548,5 +548,5 @@ public: void AddSC_boss_shade_of_aran() { new boss_shade_of_aran(); - new mob_aran_elemental(); + new npc_aran_elemental(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index ea2793a1463..df291c161b2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -59,19 +59,19 @@ enum TerestianIllhoof }; -class mob_kilrek : public CreatureScript +class npc_kilrek : public CreatureScript { public: - mob_kilrek() : CreatureScript("mob_kilrek") { } + npc_kilrek() : CreatureScript("npc_kilrek") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_kilrekAI (creature); + return new npc_kilrekAI (creature); } - struct mob_kilrekAI : public ScriptedAI + struct npc_kilrekAI : public ScriptedAI { - mob_kilrekAI(Creature* creature) : ScriptedAI(creature) + npc_kilrekAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -130,19 +130,19 @@ public: }; }; -class mob_demon_chain : public CreatureScript +class npc_demon_chain : public CreatureScript { public: - mob_demon_chain() : CreatureScript("mob_demon_chain") { } + npc_demon_chain() : CreatureScript("npc_demon_chain") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_demon_chainAI(creature); + return new npc_demon_chainAI(creature); } - struct mob_demon_chainAI : public ScriptedAI + struct npc_demon_chainAI : public ScriptedAI { - mob_demon_chainAI(Creature* creature) : ScriptedAI(creature) {} + npc_demon_chainAI(Creature* creature) : ScriptedAI(creature) {} uint64 SacrificeGUID; @@ -167,19 +167,19 @@ public: }; }; -class mob_fiendish_portal : public CreatureScript +class npc_fiendish_portal : public CreatureScript { public: - mob_fiendish_portal() : CreatureScript("mob_fiendish_portal") { } + npc_fiendish_portal() : CreatureScript("npc_fiendish_portal") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_fiendish_portalAI (creature); + return new npc_fiendish_portalAI (creature); } - struct mob_fiendish_portalAI : public PassiveAI + struct npc_fiendish_portalAI : public PassiveAI { - mob_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){} + npc_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){} SummonList summons; @@ -203,19 +203,19 @@ public: #define SPELL_FIREBOLT 30050 // Blasts a target for 181-209 Fire damage. -class mob_fiendish_imp : public CreatureScript +class npc_fiendish_imp : public CreatureScript { public: - mob_fiendish_imp() : CreatureScript("mob_fiendish_imp") { } + npc_fiendish_imp() : CreatureScript("npc_fiendish_imp") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_fiendish_impAI (creature); + return new npc_fiendish_impAI (creature); } - struct mob_fiendish_impAI : public ScriptedAI + struct npc_fiendish_impAI : public ScriptedAI { - mob_fiendish_impAI(Creature* creature) : ScriptedAI(creature) {} + npc_fiendish_impAI(Creature* creature) : ScriptedAI(creature) {} uint32 FireboltTimer; @@ -285,7 +285,7 @@ public: { if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[i])) { - CAST_AI(mob_fiendish_portal::mob_fiendish_portalAI, pPortal->AI())->DespawnAllImp(); + CAST_AI(npc_fiendish_portal::npc_fiendish_portalAI, pPortal->AI())->DespawnAllImp(); pPortal->DespawnOrUnsummon(); } @@ -377,7 +377,7 @@ public: if (Creature* Chains = me->FindNearestCreature(CREATURE_DEMONCHAINS, 5000)) { - CAST_AI(mob_demon_chain::mob_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID(); + CAST_AI(npc_demon_chain::npc_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID(); Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true); Talk(SAY_SACRIFICE); SacrificeTimer = 30000; @@ -424,8 +424,8 @@ public: void AddSC_boss_terestian_illhoof() { new boss_terestian_illhoof(); - new mob_fiendish_imp(); - new mob_fiendish_portal(); - new mob_kilrek(); - new mob_demon_chain(); + new npc_fiendish_imp(); + new npc_fiendish_portal(); + new npc_kilrek(); + new npc_demon_chain(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index c23c282f7e6..17546c66e26 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -225,19 +225,19 @@ public: }; }; -class mob_tito : public CreatureScript +class npc_tito : public CreatureScript { public: - mob_tito() : CreatureScript("mob_tito") { } + npc_tito() : CreatureScript("npc_tito") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_titoAI(creature); + return new npc_titoAI(creature); } - struct mob_titoAI : public ScriptedAI + struct npc_titoAI : public ScriptedAI { - mob_titoAI(Creature* creature) : ScriptedAI(creature) {} + npc_titoAI(Creature* creature) : ScriptedAI(creature) {} uint64 DorotheeGUID; uint32 YipTimer; @@ -284,7 +284,7 @@ void boss_dorothee::boss_dorotheeAI::SummonTito() if (Creature* pTito = me->SummonCreature(CREATURE_TITO, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) { Talk(SAY_DOROTHEE_SUMMON); - CAST_AI(mob_tito::mob_titoAI, pTito->AI())->DorotheeGUID = me->GetGUID(); + CAST_AI(npc_tito::npc_titoAI, pTito->AI())->DorotheeGUID = me->GetGUID(); pTito->AI()->AttackStart(me->GetVictim()); SummonedTito = true; TitoDied = false; @@ -708,19 +708,19 @@ public: }; }; -class mob_cyclone : public CreatureScript +class npc_cyclone : public CreatureScript { public: - mob_cyclone() : CreatureScript("mob_cyclone") { } + npc_cyclone() : CreatureScript("npc_cyclone") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_cycloneAI(creature); + return new npc_cycloneAI(creature); } - struct mob_cycloneAI : public ScriptedAI + struct npc_cycloneAI : public ScriptedAI { - mob_cycloneAI(Creature* creature) : ScriptedAI(creature) {} + npc_cycloneAI(Creature* creature) : ScriptedAI(creature) {} uint32 MoveTimer; @@ -1520,8 +1520,8 @@ void AddSC_bosses_opera() new boss_tinhead(); new boss_roar(); new boss_crone(); - new mob_tito(); - new mob_cyclone(); + new npc_tito(); + new npc_cyclone(); new npc_grandmother(); new boss_bigbadwolf(); new boss_julianne(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 796eb22ae67..3c78c2daa7c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -453,7 +453,7 @@ public: #define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" #define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." -#define MOB_ARCANAGOS 17652 +#define NPC_ARCANAGOS 17652 #define SPELL_FIRE_BALL 30967 #define SPELL_UBER_FIREBALL 30971 #define SPELL_CONFLAGRATION_BLAST 30977 @@ -523,7 +523,7 @@ public: { Step = 1; EventStarted = true; - Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); + Creature* Arcanagos = me->SummonCreature(NPC_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); if (!Arcanagos) return; ArcanagosGUID = Arcanagos->GetGUID(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index dcb7acac7d6..619bc4e921c 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -432,19 +432,19 @@ public: }; }; -class mob_felkael_flamestrike : public CreatureScript +class npc_felkael_flamestrike : public CreatureScript { public: - mob_felkael_flamestrike() : CreatureScript("mob_felkael_flamestrike") { } + npc_felkael_flamestrike() : CreatureScript("npc_felkael_flamestrike") { } CreatureAI* GetAI(Creature* c) const { - return new mob_felkael_flamestrikeAI(c); + return new npc_felkael_flamestrikeAI(c); } - struct mob_felkael_flamestrikeAI : public ScriptedAI + struct npc_felkael_flamestrikeAI : public ScriptedAI { - mob_felkael_flamestrikeAI(Creature* creature) : ScriptedAI(creature) + npc_felkael_flamestrikeAI(Creature* creature) : ScriptedAI(creature) { } @@ -473,19 +473,19 @@ public: }; }; -class mob_felkael_phoenix : public CreatureScript +class npc_felkael_phoenix : public CreatureScript { public: - mob_felkael_phoenix() : CreatureScript("mob_felkael_phoenix") { } + npc_felkael_phoenix() : CreatureScript("npc_felkael_phoenix") { } CreatureAI* GetAI(Creature* c) const { - return new mob_felkael_phoenixAI(c); + return new npc_felkael_phoenixAI(c); } - struct mob_felkael_phoenixAI : public ScriptedAI + struct npc_felkael_phoenixAI : public ScriptedAI { - mob_felkael_phoenixAI(Creature* creature) : ScriptedAI(creature) + npc_felkael_phoenixAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -586,19 +586,19 @@ public: }; }; -class mob_felkael_phoenix_egg : public CreatureScript +class npc_felkael_phoenix_egg : public CreatureScript { public: - mob_felkael_phoenix_egg() : CreatureScript("mob_felkael_phoenix_egg") { } + npc_felkael_phoenix_egg() : CreatureScript("npc_felkael_phoenix_egg") { } CreatureAI* GetAI(Creature* c) const { - return new mob_felkael_phoenix_eggAI(c); + return new npc_felkael_phoenix_eggAI(c); } - struct mob_felkael_phoenix_eggAI : public ScriptedAI + struct npc_felkael_phoenix_eggAI : public ScriptedAI { - mob_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) {} + npc_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) {} uint32 HatchTimer; @@ -621,19 +621,19 @@ public: }; }; -class mob_arcane_sphere : public CreatureScript +class npc_arcane_sphere : public CreatureScript { public: - mob_arcane_sphere() : CreatureScript("mob_arcane_sphere") { } + npc_arcane_sphere() : CreatureScript("npc_arcane_sphere") { } CreatureAI* GetAI(Creature* c) const { - return new mob_arcane_sphereAI(c); + return new npc_arcane_sphereAI(c); } - struct mob_arcane_sphereAI : public ScriptedAI + struct npc_arcane_sphereAI : public ScriptedAI { - mob_arcane_sphereAI(Creature* creature) : ScriptedAI(creature) { Reset(); } + npc_arcane_sphereAI(Creature* creature) : ScriptedAI(creature) { Reset(); } uint32 DespawnTimer; uint32 ChangeTargetTimer; @@ -680,8 +680,8 @@ public: void AddSC_boss_felblood_kaelthas() { new boss_felblood_kaelthas(); - new mob_arcane_sphere(); - new mob_felkael_phoenix(); - new mob_felkael_phoenix_egg(); - new mob_felkael_flamestrike(); + new npc_arcane_sphere(); + new npc_felkael_phoenix(); + new npc_felkael_phoenix_egg(); + new npc_felkael_flamestrike(); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 56361e2fd54..687cc9d393c 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -1293,14 +1293,14 @@ public: }; /* -class mob_high_explosive_sheep : public CreatureScript +class npc_high_explosive_sheep : public CreatureScript { public: - mob_high_explosive_sheep() : CreatureScript("mob_high_explosive_sheep") { } + npc_high_explosive_sheep() : CreatureScript("npc_high_explosive_sheep") { } //CreatureAI* GetAI(Creature* creature) const //{ - // return new mob_high_explosive_sheepAI (creature); + // return new npc_high_explosive_sheepAI (creature); //}; }; */ @@ -1316,5 +1316,5 @@ void AddSC_boss_priestess_delrissa() new boss_garaxxas(); new boss_apoko(); new boss_zelfan(); - // new mob_high_explosive_sheep(); + // new npc_high_explosive_sheep(); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index e42582814fd..969a9abcbbf 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -320,19 +320,19 @@ public: }; }; -class mob_fel_crystal : public CreatureScript +class npc_fel_crystal : public CreatureScript { public: - mob_fel_crystal() : CreatureScript("mob_fel_crystal") { } + npc_fel_crystal() : CreatureScript("npc_fel_crystal") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_fel_crystalAI (creature); + return new npc_fel_crystalAI (creature); }; - struct mob_fel_crystalAI : public ScriptedAI + struct npc_fel_crystalAI : public ScriptedAI { - mob_fel_crystalAI(Creature* creature) : ScriptedAI(creature) {} + npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} @@ -368,5 +368,5 @@ public: void AddSC_boss_selin_fireheart() { new boss_selin_fireheart(); - new mob_fel_crystal(); + new npc_fel_crystal(); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 0872e5b9935..d9de112992b 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -196,19 +196,19 @@ public: }; }; -class mob_pure_energy : public CreatureScript +class npc_pure_energy : public CreatureScript { public: - mob_pure_energy() : CreatureScript("mob_pure_energy") { } + npc_pure_energy() : CreatureScript("npc_pure_energy") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_pure_energyAI (creature); + return new npc_pure_energyAI (creature); }; - struct mob_pure_energyAI : public ScriptedAI + struct npc_pure_energyAI : public ScriptedAI { - mob_pure_energyAI(Creature* creature) : ScriptedAI(creature) + npc_pure_energyAI(Creature* creature) : ScriptedAI(creature) { me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } @@ -233,5 +233,5 @@ public: void AddSC_boss_vexallus() { new boss_vexallus(); - new mob_pure_energy(); + new npc_pure_energy(); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp index aa563bf3180..562af075b98 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp @@ -101,14 +101,14 @@ class boss_garr : public CreatureScript } }; -class mob_firesworn : public CreatureScript +class npc_firesworn : public CreatureScript { public: - mob_firesworn() : CreatureScript("mob_firesworn") { } + npc_firesworn() : CreatureScript("npc_firesworn") { } - struct mob_fireswornAI : public ScriptedAI + struct npc_fireswornAI : public ScriptedAI { - mob_fireswornAI(Creature* creature) : ScriptedAI(creature) {} + npc_fireswornAI(Creature* creature) : ScriptedAI(creature) {} uint32 immolateTimer; @@ -149,12 +149,12 @@ class mob_firesworn : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_fireswornAI(creature); + return new npc_fireswornAI(creature); } }; void AddSC_boss_garr() { new boss_garr(); - new mob_firesworn(); + new npc_firesworn(); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp index 8ddc7dc01bd..7e798aa815e 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp @@ -122,14 +122,14 @@ class boss_golemagg : public CreatureScript } }; -class mob_core_rager : public CreatureScript +class npc_core_rager : public CreatureScript { public: - mob_core_rager() : CreatureScript("mob_core_rager") { } + npc_core_rager() : CreatureScript("npc_core_rager") { } - struct mob_core_ragerAI : public ScriptedAI + struct npc_core_ragerAI : public ScriptedAI { - mob_core_ragerAI(Creature* creature) : ScriptedAI(creature) + npc_core_ragerAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -179,12 +179,12 @@ class mob_core_rager : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_core_ragerAI(creature); + return new npc_core_ragerAI(creature); } }; void AddSC_boss_golemagg() { new boss_golemagg(); - new mob_core_rager(); + new npc_core_rager(); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 5e3ff1d4921..c67272ac068 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -310,14 +310,14 @@ class boss_ragnaros : public CreatureScript } }; -class mob_son_of_flame : public CreatureScript +class npc_son_of_flame : public CreatureScript { public: - mob_son_of_flame() : CreatureScript("mob_SonOfFlame") { } + npc_son_of_flame() : CreatureScript("npc_SonOfFlame") { } - struct mob_son_of_flameAI : public ScriptedAI //didnt work correctly in EAI for me... + struct npc_son_of_flameAI : public ScriptedAI //didnt work correctly in EAI for me... { - mob_son_of_flameAI(Creature* creature) : ScriptedAI(creature) + npc_son_of_flameAI(Creature* creature) : ScriptedAI(creature) { instance = me->GetInstanceScript(); } @@ -342,12 +342,12 @@ class mob_son_of_flame : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_son_of_flameAI(creature); + return new npc_son_of_flameAI(creature); } }; void AddSC_boss_ragnaros() { new boss_ragnaros(); - new mob_son_of_flame(); + new npc_son_of_flame(); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp index b4c2372a015..0a2ddb9c43d 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp @@ -133,14 +133,14 @@ class boss_sulfuron : public CreatureScript } }; -class mob_flamewaker_priest : public CreatureScript +class npc_flamewaker_priest : public CreatureScript { public: - mob_flamewaker_priest() : CreatureScript("mob_flamewaker_priest") { } + npc_flamewaker_priest() : CreatureScript("npc_flamewaker_priest") { } - struct mob_flamewaker_priestAI : public ScriptedAI + struct npc_flamewaker_priestAI : public ScriptedAI { - mob_flamewaker_priestAI(Creature* creature) : ScriptedAI(creature) + npc_flamewaker_priestAI(Creature* creature) : ScriptedAI(creature) { } @@ -205,12 +205,12 @@ class mob_flamewaker_priest : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_flamewaker_priestAI(creature); + return new npc_flamewaker_priestAI(creature); } }; void AddSC_boss_sulfuron() { new boss_sulfuron(); - new mob_flamewaker_priest(); + new npc_flamewaker_priest(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index a9374481b77..024ef01ce6d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -363,19 +363,19 @@ enum ScarletCourierEnum NPC_SCARLET_COURIER = 29076 }; -class mob_scarlet_courier : public CreatureScript +class npc_scarlet_courier : public CreatureScript { public: - mob_scarlet_courier() : CreatureScript("mob_scarlet_courier") { } + npc_scarlet_courier() : CreatureScript("npc_scarlet_courier") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_scarlet_courierAI (creature); + return new npc_scarlet_courierAI (creature); } - struct mob_scarlet_courierAI : public ScriptedAI + struct npc_scarlet_courierAI : public ScriptedAI { - mob_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) {} + npc_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiStage; uint32 uiStage_timer; @@ -455,19 +455,19 @@ enum valroth SPELL_SUMMON_VALROTH_REMAINS = 52929 }; -class mob_high_inquisitor_valroth : public CreatureScript +class npc_high_inquisitor_valroth : public CreatureScript { public: - mob_high_inquisitor_valroth() : CreatureScript("mob_high_inquisitor_valroth") { } + npc_high_inquisitor_valroth() : CreatureScript("npc_high_inquisitor_valroth") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_high_inquisitor_valrothAI (creature); + return new npc_high_inquisitor_valrothAI (creature); } - struct mob_high_inquisitor_valrothAI : public ScriptedAI + struct npc_high_inquisitor_valrothAI : public ScriptedAI { - mob_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) {} + npc_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiRenew_timer; uint32 uiInquisitor_Penance_timer; @@ -1013,8 +1013,8 @@ public: void AddSC_the_scarlet_enclave_c2() { new npc_crusade_persuaded(); - new mob_scarlet_courier(); + new npc_scarlet_courier(); new npc_koltira_deathweaver(); - new mob_high_inquisitor_valroth(); + new npc_high_inquisitor_valroth(); new npc_a_special_surprise(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index baac9609c57..4334242641c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -141,19 +141,19 @@ static char const* Text[]= #define EMOTE_LAUGHS "Headless Horseman laughs" // needs assigned to db. -class mob_wisp_invis : public CreatureScript +class npc_wisp_invis : public CreatureScript { public: - mob_wisp_invis() : CreatureScript("mob_wisp_invis") { } + npc_wisp_invis() : CreatureScript("npc_wisp_invis") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_wisp_invisAI (creature); + return new npc_wisp_invisAI (creature); } - struct mob_wisp_invisAI : public ScriptedAI + struct npc_wisp_invisAI : public ScriptedAI { - mob_wisp_invisAI(Creature* creature) : ScriptedAI(creature) + npc_wisp_invisAI(Creature* creature) : ScriptedAI(creature) { Creaturetype = delay = spell = spell2 = 0; } @@ -220,19 +220,19 @@ public: }; }; -class mob_head : public CreatureScript +class npc_head : public CreatureScript { public: - mob_head() : CreatureScript("mob_head") { } + npc_head() : CreatureScript("npc_head") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_headAI (creature); + return new npc_headAI (creature); } - struct mob_headAI : public ScriptedAI + struct npc_headAI : public ScriptedAI { - mob_headAI(Creature* creature) : ScriptedAI(creature) {} + npc_headAI(Creature* creature) : ScriptedAI(creature) {} uint64 bodyGUID; @@ -435,6 +435,7 @@ public: headGUID = 0; } + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); //if (instance) // instance->SetData(DATA_HORSEMAN_EVENT, NOT_STARTED); } @@ -467,7 +468,7 @@ public: case 1: { if (Creature* smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) - CAST_AI(mob_wisp_invis::mob_wisp_invisAI, smoke->AI())->SetType(3); + CAST_AI(npc_wisp_invis::npc_wisp_invisAI, smoke->AI())->SetType(3); DoCast(me, SPELL_RHYME_BIG); break; } @@ -519,7 +520,7 @@ public: SaySound(SAY_PLAYER_DEATH); //maybe possible when player dies from conflagration else if (Creature* Head = Unit::GetCreature((*me), headGUID)) - CAST_AI(mob_head::mob_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH); + CAST_AI(npc_head::npc_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH); } } @@ -571,7 +572,7 @@ public: if (Creature* flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) flame->CastSpell(flame, SPELL_BODY_FLAME, false); if (Creature* wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) - CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4); + CAST_AI(npc_wisp_invis::npc_wisp_invisAI, wisp->AI())->SetType(4); if (instance) instance->SetData(DATA_HORSEMAN_EVENT, DONE); @@ -692,7 +693,7 @@ public: if (burn <= diff) { if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) - CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2); + CAST_AI(npc_wisp_invis::npc_wisp_invisAI, flame->AI())->SetType(2); burned = true; } else burn -= diff; @@ -751,8 +752,8 @@ public: Creature* Head = Unit::GetCreature((*me), headGUID); if (Head && Head->IsAlive()) { - CAST_AI(mob_head::mob_headAI, Head->AI())->Phase = Phase; - CAST_AI(mob_head::mob_headAI, Head->AI())->Disappear(); + CAST_AI(npc_head::npc_headAI, Head->AI())->Phase = Phase; + CAST_AI(npc_head::npc_headAI, Head->AI())->Disappear(); } return; } @@ -777,19 +778,19 @@ public: }; }; -class mob_pulsing_pumpkin : public CreatureScript +class npc_pulsing_pumpkin : public CreatureScript { public: - mob_pulsing_pumpkin() : CreatureScript("mob_pulsing_pumpkin") { } + npc_pulsing_pumpkin() : CreatureScript("npc_pulsing_pumpkin") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_pulsing_pumpkinAI (creature); + return new npc_pulsing_pumpkinAI (creature); } - struct mob_pulsing_pumpkinAI : public ScriptedAI + struct npc_pulsing_pumpkinAI : public ScriptedAI { - mob_pulsing_pumpkinAI(Creature* creature) : ScriptedAI(creature) {} + npc_pulsing_pumpkinAI(Creature* creature) : ScriptedAI(creature) {} bool sprouted; uint64 debuffGUID; @@ -805,7 +806,7 @@ public: { debuff->SetDisplayId(me->GetDisplayId()); debuff->CastSpell(debuff, SPELL_PUMPKIN_AURA_GREEN, false); - CAST_AI(mob_wisp_invis::mob_wisp_invisAI, debuff->AI())->SetType(1); + CAST_AI(npc_wisp_invis::npc_wisp_invisAI, debuff->AI())->SetType(1); debuffGUID = debuff->GetGUID(); } sprouted = false; @@ -898,7 +899,7 @@ public: } }; -void mob_head::mob_headAI::Disappear() +void npc_head::npc_headAI::Disappear() { if (withbody) return; @@ -924,8 +925,8 @@ void mob_head::mob_headAI::Disappear() void AddSC_boss_headless_horseman() { new boss_headless_horseman(); - new mob_head(); - new mob_pulsing_pumpkin(); - new mob_wisp_invis(); + new npc_head(); + new npc_pulsing_pumpkin(); + new npc_wisp_invis(); new go_loosely_turned_soil(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 491cbf6ea11..ff0bc877686 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -129,19 +129,19 @@ public: }; }; -class mob_scarlet_trainee : public CreatureScript +class npc_scarlet_trainee : public CreatureScript { public: - mob_scarlet_trainee() : CreatureScript("mob_scarlet_trainee") { } + npc_scarlet_trainee() : CreatureScript("npc_scarlet_trainee") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_scarlet_traineeAI(creature); + return new npc_scarlet_traineeAI(creature); } - struct mob_scarlet_traineeAI : public npc_escortAI + struct npc_scarlet_traineeAI : public npc_escortAI { - mob_scarlet_traineeAI(Creature* creature) : npc_escortAI(creature) + npc_scarlet_traineeAI(Creature* creature) : npc_escortAI(creature) { Start_Timer = urand(1000, 6000); } @@ -171,5 +171,5 @@ public: void AddSC_boss_herod() { new boss_herod(); - new mob_scarlet_trainee(); + new npc_scarlet_trainee(); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 7a46483a897..d233b09bed2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -154,19 +154,19 @@ public: // Illusion of Jandice Barov Script -class mob_illusionofjandicebarov : public CreatureScript +class npc_illusionofjandicebarov : public CreatureScript { public: - mob_illusionofjandicebarov() : CreatureScript("mob_illusionofjandicebarov") { } + npc_illusionofjandicebarov() : CreatureScript("npc_illusionofjandicebarov") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_illusionofjandicebarovAI (creature); + return new npc_illusionofjandicebarovAI (creature); } - struct mob_illusionofjandicebarovAI : public ScriptedAI + struct npc_illusionofjandicebarovAI : public ScriptedAI { - mob_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature) {} + npc_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature) {} uint32 Cleave_Timer; @@ -205,5 +205,5 @@ public: void AddSC_boss_jandicebarov() { new boss_jandice_barov(); - new mob_illusionofjandicebarov(); + new npc_illusionofjandicebarov(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 396efc4bc7e..a8b981dc44f 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -25,9 +25,9 @@ EndScriptData */ /* ContentData go_gauntlet_gate -mob_freed_soul -mob_restless_soul -mobs_spectral_ghostly_citizen +npc_freed_soul +npc_restless_soul +npc_spectral_ghostly_citizen EndContentData */ #include "ScriptMgr.h" @@ -81,26 +81,26 @@ public: }; /*###### -## mob_freed_soul +## npc_freed_soul ######*/ enum FreedSoul { SAY_ZAPPED = 0 }; -class mob_freed_soul : public CreatureScript +class npc_freed_soul : public CreatureScript { public: - mob_freed_soul() : CreatureScript("mob_freed_soul") { } + npc_freed_soul() : CreatureScript("npc_freed_soul") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_freed_soulAI (creature); + return new npc_freed_soulAI (creature); } - struct mob_freed_soulAI : public ScriptedAI + struct npc_freed_soulAI : public ScriptedAI { - mob_freed_soulAI(Creature* creature) : ScriptedAI(creature) {} + npc_freed_soulAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -113,7 +113,7 @@ public: }; /*###### -## mob_restless_soul +## npc_restless_soul ######*/ #define SPELL_EGAN_BLASTER 17368 @@ -122,19 +122,19 @@ public: #define ENTRY_RESTLESS 11122 #define ENTRY_FREED 11136 -class mob_restless_soul : public CreatureScript +class npc_restless_soul : public CreatureScript { public: - mob_restless_soul() : CreatureScript("mob_restless_soul") { } + npc_restless_soul() : CreatureScript("npc_restless_soul") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_restless_soulAI (creature); + return new npc_restless_soulAI (creature); } - struct mob_restless_soulAI : public ScriptedAI + struct npc_restless_soulAI : public ScriptedAI { - mob_restless_soulAI(Creature* creature) : ScriptedAI(creature) {} + npc_restless_soulAI(Creature* creature) : ScriptedAI(creature) {} uint64 Tagger; uint32 Die_Timer; @@ -195,7 +195,7 @@ public: }; /*###### -## mobs_spectral_ghostly_citizen +## npc_spectral_ghostly_citizen ######*/ enum eGhostlyCitizenSpells @@ -204,19 +204,19 @@ enum eGhostlyCitizenSpells SPELL_SLAP = 6754 }; -class mobs_spectral_ghostly_citizen : public CreatureScript +class npc_spectral_ghostly_citizen : public CreatureScript { public: - mobs_spectral_ghostly_citizen() : CreatureScript("mobs_spectral_ghostly_citizen") { } + npc_spectral_ghostly_citizen() : CreatureScript("npc_spectral_ghostly_citizen") { } CreatureAI* GetAI(Creature* creature) const { - return new mobs_spectral_ghostly_citizenAI (creature); + return new npc_spectral_ghostly_citizenAI (creature); } - struct mobs_spectral_ghostly_citizenAI : public ScriptedAI + struct npc_spectral_ghostly_citizenAI : public ScriptedAI { - mobs_spectral_ghostly_citizenAI(Creature* creature) : ScriptedAI(creature) {} + npc_spectral_ghostly_citizenAI(Creature* creature) : ScriptedAI(creature) {} uint32 Die_Timer; bool Tagged; @@ -294,7 +294,7 @@ public: void AddSC_stratholme() { new go_gauntlet_gate(); - new mob_freed_soul(); - new mob_restless_soul(); - new mobs_spectral_ghostly_citizen(); + new npc_freed_soul(); + new npc_restless_soul(); + new npc_spectral_ghostly_citizen(); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index b9aef826738..31f93d70e00 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -294,7 +294,7 @@ public: for (uint8 i = 0; i<3; ++i) { target = SelectTarget(SELECT_TARGET_RANDOM, 0); - temp = DoSpawnCreature(MOB_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000); + temp = DoSpawnCreature(NPC_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000); if (temp && target) { temp->AddThreat(target, 1000000);//don't change target(healers) @@ -661,19 +661,19 @@ public: }; }; -class mob_shadow_image : public CreatureScript +class npc_shadow_image : public CreatureScript { public: - mob_shadow_image() : CreatureScript("mob_shadow_image") { } + npc_shadow_image() : CreatureScript("npc_shadow_image") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_shadow_imageAI (creature); + return new npc_shadow_imageAI (creature); }; - struct mob_shadow_imageAI : public ScriptedAI + struct npc_shadow_imageAI : public ScriptedAI { - mob_shadow_imageAI(Creature* creature) : ScriptedAI(creature) {} + npc_shadow_imageAI(Creature* creature) : ScriptedAI(creature) {} uint32 ShadowfuryTimer; uint32 KillTimer; @@ -745,5 +745,5 @@ void AddSC_boss_eredar_twins() { new boss_sacrolash(); new boss_alythess(); - new mob_shadow_image(); + new npc_shadow_image(); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 7db85b79d20..e7bc4d18a95 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -145,7 +145,7 @@ public: me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); - DespawnSummons(MOB_VAPOR_TRAIL); + DespawnSummons(NPC_VAPOR_TRAIL); me->setActive(false); if (instance) @@ -208,7 +208,7 @@ public: { float x, y, z; caster->GetPosition(x, y, z); - if (Unit* summon = me->SummonCreature(MOB_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) + if (Unit* summon = me->SummonCreature(NPC_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) { summon->SetMaxHealth(caster->GetMaxHealth()); summon->SetHealth(caster->GetMaxHealth()); @@ -221,7 +221,7 @@ public: void JustSummoned(Creature* summon) { - if (summon->GetEntry() == MOB_DEAD) + if (summon->GetEntry() == NPC_DEAD) { summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM)); DoZoneInCombat(summon); @@ -296,7 +296,7 @@ public: return; } - Creature* Vapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); + Creature* Vapor = me->SummonCreature(NPC_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); if (Vapor) { Vapor->AI()->AttackStart(target); @@ -310,7 +310,7 @@ public: } case 3: { - DespawnSummons(MOB_VAPOR_TRAIL); + DespawnSummons(NPC_VAPOR_TRAIL); //DoCast(me, SPELL_VAPOR_SELECT); need core support Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); @@ -324,7 +324,7 @@ public: } //target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support - Creature* pVapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); + Creature* pVapor = me->SummonCreature(NPC_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); if (pVapor) { if (pVapor->AI()) @@ -338,7 +338,7 @@ public: break; } case 4: - DespawnSummons(MOB_VAPOR_TRAIL); + DespawnSummons(NPC_VAPOR_TRAIL); events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1); break; case 5: @@ -469,7 +469,7 @@ public: float x, y, z; me->GetPosition(x, y, z); me->UpdateGroundPositionZ(x, y, z); - if (Creature* Fog = me->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000)) + if (Creature* Fog = me->SummonCreature(NPC_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000)) { Fog->RemoveAurasDueToSpell(SPELL_TRAIL_TRIGGER); Fog->CastSpell(Fog, SPELL_FOG_TRIGGER, true); @@ -499,10 +499,10 @@ public: for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { - if (entry == MOB_VAPOR_TRAIL && phase == PHASE_FLIGHT) + if (entry == NPC_VAPOR_TRAIL && phase == PHASE_FLIGHT) { (*i)->GetPosition(x, y, z); - me->SummonCreature(MOB_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); } (*i)->SetVisible(false); (*i)->setDeathState(JUST_DIED); @@ -513,19 +513,19 @@ public: }; }; -class mob_felmyst_vapor : public CreatureScript +class npc_felmyst_vapor : public CreatureScript { public: - mob_felmyst_vapor() : CreatureScript("mob_felmyst_vapor") { } + npc_felmyst_vapor() : CreatureScript("npc_felmyst_vapor") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_felmyst_vaporAI(creature); + return new npc_felmyst_vaporAI(creature); } - struct mob_felmyst_vaporAI : public ScriptedAI + struct npc_felmyst_vaporAI : public ScriptedAI { - mob_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature) + npc_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetSpeed(MOVE_RUN, 0.8f); @@ -545,19 +545,19 @@ public: }; }; -class mob_felmyst_trail : public CreatureScript +class npc_felmyst_trail : public CreatureScript { public: - mob_felmyst_trail() : CreatureScript("mob_felmyst_trail") { } + npc_felmyst_trail() : CreatureScript("npc_felmyst_trail") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_felmyst_trailAI(creature); + return new npc_felmyst_trailAI(creature); } - struct mob_felmyst_trailAI : public ScriptedAI + struct npc_felmyst_trailAI : public ScriptedAI { - mob_felmyst_trailAI(Creature* creature) : ScriptedAI(creature) + npc_felmyst_trailAI(Creature* creature) : ScriptedAI(creature) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_TRAIL_TRIGGER, true); @@ -575,6 +575,6 @@ public: void AddSC_boss_felmyst() { new boss_felmyst(); - new mob_felmyst_vapor(); - new mob_felmyst_trail(); + new npc_felmyst_vapor(); + new npc_felmyst_trail(); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index c24e5864fae..cce84e3714a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -627,7 +627,7 @@ public: void EnterCombat(Unit* /*who*/) { - if (Creature* Kalec = me->SummonCreature(MOB_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (Creature* Kalec = me->SummonCreature(NPC_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) { KalecGUID = Kalec->GetGUID(); me->CombatStart(Kalec); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index c0d7bb19b9d..9f4e8edc8cc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -382,19 +382,19 @@ public: }; //AI for Kil'jaeden Event Controller -class mob_kiljaeden_controller : public CreatureScript +class npc_kiljaeden_controller : public CreatureScript { public: - mob_kiljaeden_controller() : CreatureScript("mob_kiljaeden_controller") { } + npc_kiljaeden_controller() : CreatureScript("npc_kiljaeden_controller") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_kiljaeden_controllerAI (creature); + return new npc_kiljaeden_controllerAI (creature); } - struct mob_kiljaeden_controllerAI : public ScriptedAI + struct npc_kiljaeden_controllerAI : public ScriptedAI { - mob_kiljaeden_controllerAI(Creature* creature) : ScriptedAI(creature), summons(me) + npc_kiljaeden_controllerAI(Creature* creature) : ScriptedAI(creature), summons(me) { instance = creature->GetInstanceScript(); @@ -627,7 +627,7 @@ public: if (instance) { if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER))) - CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->Reset(); + CAST_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->Reset(); } } @@ -894,19 +894,19 @@ public: }; //AI for Hand of the Deceiver -class mob_hand_of_the_deceiver : public CreatureScript +class npc_hand_of_the_deceiver : public CreatureScript { public: - mob_hand_of_the_deceiver() : CreatureScript("mob_hand_of_the_deceiver") { } + npc_hand_of_the_deceiver() : CreatureScript("npc_hand_of_the_deceiver") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_hand_of_the_deceiverAI (creature); + return new npc_hand_of_the_deceiverAI (creature); } - struct mob_hand_of_the_deceiverAI : public ScriptedAI + struct npc_hand_of_the_deceiverAI : public ScriptedAI { - mob_hand_of_the_deceiverAI(Creature* creature) : ScriptedAI(creature) + npc_hand_of_the_deceiverAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -948,7 +948,7 @@ public: return; if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER))) - ++(CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount); + ++(CAST_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount); } void UpdateAI(uint32 diff) @@ -994,19 +994,19 @@ public: }; //AI for Felfire Portal -class mob_felfire_portal : public CreatureScript +class npc_felfire_portal : public CreatureScript { public: - mob_felfire_portal() : CreatureScript("mob_felfire_portal") { } + npc_felfire_portal() : CreatureScript("npc_felfire_portal") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_felfire_portalAI (creature); + return new npc_felfire_portalAI (creature); } - struct mob_felfire_portalAI : public ScriptedAI + struct npc_felfire_portalAI : public ScriptedAI { - mob_felfire_portalAI(Creature* creature) : ScriptedAI(creature) + npc_felfire_portalAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); } @@ -1041,19 +1041,19 @@ public: }; //AI for Felfire Fiend -class mob_volatile_felfire_fiend : public CreatureScript +class npc_volatile_felfire_fiend : public CreatureScript { public: - mob_volatile_felfire_fiend() : CreatureScript("mob_volatile_felfire_fiend") { } + npc_volatile_felfire_fiend() : CreatureScript("npc_volatile_felfire_fiend") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_volatile_felfire_fiendAI (creature); + return new npc_volatile_felfire_fiendAI (creature); } - struct mob_volatile_felfire_fiendAI : public ScriptedAI + struct npc_volatile_felfire_fiendAI : public ScriptedAI { - mob_volatile_felfire_fiendAI(Creature* creature) : ScriptedAI(creature) {} + npc_volatile_felfire_fiendAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiExplodeTimer; @@ -1098,19 +1098,19 @@ public: }; //AI for Armageddon target -class mob_armageddon : public CreatureScript +class npc_armageddon : public CreatureScript { public: - mob_armageddon() : CreatureScript("mob_armageddon") { } + npc_armageddon() : CreatureScript("npc_armageddon") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_armageddonAI (creature); + return new npc_armageddonAI (creature); } - struct mob_armageddonAI : public ScriptedAI + struct npc_armageddonAI : public ScriptedAI { - mob_armageddonAI(Creature* creature) : ScriptedAI(creature) + npc_armageddonAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); } @@ -1155,19 +1155,19 @@ public: }; //AI for Shield Orbs -class mob_shield_orb : public CreatureScript +class npc_shield_orb : public CreatureScript { public: - mob_shield_orb() : CreatureScript("mob_shield_orb") { } + npc_shield_orb() : CreatureScript("npc_shield_orb") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_shield_orbAI (creature); + return new npc_shield_orbAI (creature); } - struct mob_shield_orbAI : public ScriptedAI + struct npc_shield_orbAI : public ScriptedAI { - mob_shield_orbAI(Creature* creature) : ScriptedAI(creature) + npc_shield_orbAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -1242,19 +1242,19 @@ public: }; //AI for Sinister Reflection -class mob_sinster_reflection : public CreatureScript +class npc_sinster_reflection : public CreatureScript { public: - mob_sinster_reflection() : CreatureScript("mob_sinster_reflection") { } + npc_sinster_reflection() : CreatureScript("npc_sinster_reflection") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_sinster_reflectionAI (creature); + return new npc_sinster_reflectionAI (creature); } - struct mob_sinster_reflectionAI : public ScriptedAI + struct npc_sinster_reflectionAI : public ScriptedAI { - mob_sinster_reflectionAI(Creature* creature) : ScriptedAI(creature) {} + npc_sinster_reflectionAI(Creature* creature) : ScriptedAI(creature) {} uint8 victimClass; uint32 uiTimer[3]; @@ -1416,11 +1416,11 @@ void AddSC_boss_kiljaeden() new go_orb_of_the_blue_flight(); new boss_kalecgos_kj(); new boss_kiljaeden(); - new mob_kiljaeden_controller(); - new mob_hand_of_the_deceiver(); - new mob_felfire_portal(); - new mob_volatile_felfire_fiend(); - new mob_armageddon(); - new mob_shield_orb(); - new mob_sinster_reflection(); + new npc_kiljaeden_controller(); + new npc_hand_of_the_deceiver(); + new npc_felfire_portal(); + new npc_volatile_felfire_fiend(); + new npc_armageddon(); + new npc_shield_orb(); + new npc_sinster_reflection(); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index 2efffc816c0..343720dbdb1 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -62,20 +62,20 @@ enum Creatures { BOSS_MURU = 25741, BOSS_ENTROPIUS = 25840, - MOB_KALECGOS = 24850, - MOB_KALEC = 24891, - MOB_SATHROVARR = 24892, + NPC_KALECGOS = 24850, + NPC_KALEC = 24891, + NPC_SATHROVARR = 24892, - MOB_DEAD = 25268, - MOB_FLIGHT_LEFT = 25357, - MOB_FLIGHT_RIGHT = 25358, - MOB_DEATH_CLOUD = 25703, - MOB_VAPOR = 25265, - MOB_VAPOR_TRAIL = 25267, + NPC_DEAD = 25268, + NPC_FLIGHT_LEFT = 25357, + NPC_FLIGHT_RIGHT = 25358, + NPC_DEATH_CLOUD = 25703, + NPC_VAPOR = 25265, + NPC_VAPOR_TRAIL = 25267, - MOB_GRAND_WARLOCK_ALYTHESS = 25166, - MOB_SHADOW_IMAGE = 25214, - MOB_LADY_SACROLASH = 25165, + NPC_GRAND_WARLOCK_ALYTHESS = 25166, + NPC_SHADOW_IMAGE = 25214, + NPC_LADY_SACROLASH = 25165, CREATURE_ANVEENA = 26046, // Embodiment of the Sunwell CREATURE_KALECGOS = 25319, // Helps the raid throughout the fight diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index f7f2dbfa6f7..ed7332510fc 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -211,24 +211,24 @@ class boss_archaedas : public CreatureScript }; /* ScriptData -SDName: mob_archaedas_minions +SDName: npc_archaedas_minions SD%Complete: 100 SDComment: These mobs are initially frozen until Archaedas awakens them one at a time. EndScriptData */ -class mob_archaedas_minions : public CreatureScript +class npc_archaedas_minions : public CreatureScript { public: - mob_archaedas_minions() - : CreatureScript("mob_archaedas_minions") + npc_archaedas_minions() + : CreatureScript("npc_archaedas_minions") { } - struct mob_archaedas_minionsAI : public ScriptedAI + struct npc_archaedas_minionsAI : public ScriptedAI { - mob_archaedas_minionsAI(Creature* creature) : ScriptedAI(creature) + npc_archaedas_minionsAI(Creature* creature) : ScriptedAI(creature) { instance = me->GetInstanceScript(); } @@ -303,29 +303,29 @@ class mob_archaedas_minions : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_archaedas_minionsAI(creature); + return new npc_archaedas_minionsAI(creature); } }; /* ScriptData -SDName: mob_stonekeepers +SDName: npc_stonekeepers SD%Complete: 100 SDComment: After activating the altar of the keepers, the stone keepers will wake up one by one. EndScriptData */ -class mob_stonekeepers : public CreatureScript +class npc_stonekeepers : public CreatureScript { public: - mob_stonekeepers() - : CreatureScript("mob_stonekeepers") + npc_stonekeepers() + : CreatureScript("npc_stonekeepers") { } - struct mob_stonekeepersAI : public ScriptedAI + struct npc_stonekeepersAI : public ScriptedAI { - mob_stonekeepersAI(Creature* creature) : ScriptedAI(creature) + npc_stonekeepersAI(Creature* creature) : ScriptedAI(creature) { instance = me->GetInstanceScript(); } @@ -366,7 +366,7 @@ class mob_stonekeepers : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_stonekeepersAI(creature); + return new npc_stonekeepersAI(creature); } }; @@ -404,8 +404,8 @@ class go_altar_of_archaedas : public GameObjectScript void AddSC_boss_archaedas() { new boss_archaedas(); - new mob_archaedas_minions(); - new mob_stonekeepers(); + new npc_archaedas_minions(); + new npc_stonekeepers(); new go_altar_of_archaedas(); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 3a84c79afdc..5f9577e12fa 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -24,7 +24,7 @@ SDCategory: Uldaman EndScriptData */ /* ContentData -mob_jadespine_basilisk +npc_jadespine_basilisk go_keystone_chamber at_map_chamber EndContentData */ @@ -35,7 +35,7 @@ EndContentData */ #include "Player.h" /*###### -## mob_jadespine_basilisk +## npc_jadespine_basilisk ######*/ enum eSpells @@ -43,18 +43,18 @@ enum eSpells SPELL_CRYSTALLINE_SLUMBER = 3636, }; -class mob_jadespine_basilisk : public CreatureScript +class npc_jadespine_basilisk : public CreatureScript { public: - mob_jadespine_basilisk() - : CreatureScript("mob_jadespine_basilisk") + npc_jadespine_basilisk() + : CreatureScript("npc_jadespine_basilisk") { } - struct mob_jadespine_basiliskAI : public ScriptedAI + struct npc_jadespine_basiliskAI : public ScriptedAI { - mob_jadespine_basiliskAI(Creature* creature) : ScriptedAI(creature) {} + npc_jadespine_basiliskAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiCslumberTimer; @@ -98,7 +98,7 @@ class mob_jadespine_basilisk : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_jadespine_basiliskAI(creature); + return new npc_jadespine_basiliskAI(creature); } }; @@ -146,7 +146,7 @@ class AreaTrigger_at_map_chamber : public AreaTriggerScript void AddSC_uldaman() { - new mob_jadespine_basilisk(); + new npc_jadespine_basilisk(); new go_keystone_chamber(); new AreaTrigger_at_map_chamber(); } diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 7465bbc3f17..091eb5e3d93 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -54,7 +54,7 @@ enum eEnums EVENT_SAY_8 = 3, QUEST_GOGGLE_BOGGLE = 26050, - MOB_VENGEFUL_SURGE = 2776 + NPC_VENGEFUL_SURGE = 2776 }; class npc_professor_phizzlethorpe : public CreatureScript @@ -84,8 +84,8 @@ class npc_professor_phizzlethorpe : public CreatureScript break; case 8: Talk(EMOTE_PROGRESS_4); - me->SummonCreature(MOB_VENGEFUL_SURGE, -2065.505f, -2136.88f, 22.20362f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); - me->SummonCreature(MOB_VENGEFUL_SURGE, -2059.249f, -2134.88f, 21.51582f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(NPC_VENGEFUL_SURGE, -2065.505f, -2136.88f, 22.20362f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(NPC_VENGEFUL_SURGE, -2059.249f, -2134.88f, 21.51582f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); break; case 11: Talk(SAY_PROGRESS_5, player->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 4e04307d154..0a68ade7e6b 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -24,7 +24,7 @@ SDCategory: Eastern Plaguelands EndScriptData */ /* ContentData -mobs_ghoul_flayer +npc_ghoul_flayer npc_augustus_the_touched npc_darrowshire_spirit npc_tirion_fordring @@ -36,14 +36,14 @@ EndContentData */ #include "Player.h" #include "WorldSession.h" -class mobs_ghoul_flayer : public CreatureScript +class npc_ghoul_flayer : public CreatureScript { public: - mobs_ghoul_flayer() : CreatureScript("mobs_ghoul_flayer") { } + npc_ghoul_flayer() : CreatureScript("npc_ghoul_flayer") { } - struct mobs_ghoul_flayerAI : public ScriptedAI + struct npc_ghoul_flayerAI : public ScriptedAI { - mobs_ghoul_flayerAI(Creature* creature) : ScriptedAI(creature) { } + npc_ghoul_flayerAI(Creature* creature) : ScriptedAI(creature) { } void Reset() {} @@ -58,7 +58,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mobs_ghoul_flayerAI (creature); + return new npc_ghoul_flayerAI (creature); } }; @@ -185,7 +185,7 @@ public: void AddSC_eastern_plaguelands() { - new mobs_ghoul_flayer(); + new npc_ghoul_flayer(); new npc_augustus_the_touched(); new npc_darrowshire_spirit(); new npc_tirion_fordring(); diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index c148d485e1a..be0f4b47fed 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -435,8 +435,8 @@ public: ######*/ #define QUEST_UNEXPECTED_RESULT 8488 -#define MOB_GHARZUL 15958 -#define MOB_ANGERSHADE 15656 +#define NPC_GHARZUL 15958 +#define NPC_ANGERSHADE 15656 class npc_apprentice_mirveda : public CreatureScript { @@ -504,9 +504,9 @@ public: if (Summon) { - me->SummonCreature(MOB_GHARZUL, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); - me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); - me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(NPC_GHARZUL, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(NPC_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(NPC_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); Summon = false; } } @@ -519,7 +519,7 @@ public: enum InfusedCrystal { - MOB_ENRAGED_WRAITH = 17086, + NPC_ENRAGED_WRAITH = 17086, EMOTE = 0, QUEST_POWERING_OUR_DEFENSES = 8490 }; @@ -618,9 +618,9 @@ public: uint32 ran1 = rand()%8; uint32 ran2 = rand()%8; uint32 ran3 = rand()%8; - me->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran1].x, SpawnLocations[ran1].y, SpawnLocations[ran1].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); - me->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran2].x, SpawnLocations[ran2].y, SpawnLocations[ran2].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); - me->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran3].x, SpawnLocations[ran3].y, SpawnLocations[ran3].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); + me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran1].x, SpawnLocations[ran1].y, SpawnLocations[ran1].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); + me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran2].x, SpawnLocations[ran2].y, SpawnLocations[ran2].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); + me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran3].x, SpawnLocations[ran3].y, SpawnLocations[ran3].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); WaveTimer = 30000; } else WaveTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 5a67f0d053a..45b651872ac 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -24,7 +24,7 @@ SDCategory: Stranglethorn Vale EndScriptData */ /* ContentData -mob_yenniku +npc_yenniku EndContentData */ #include "ScriptMgr.h" @@ -33,22 +33,22 @@ EndContentData */ #include "SpellInfo.h" /*###### -## mob_yenniku +## npc_yenniku ######*/ -class mob_yenniku : public CreatureScript +class npc_yenniku : public CreatureScript { public: - mob_yenniku() : CreatureScript("mob_yenniku") { } + npc_yenniku() : CreatureScript("npc_yenniku") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_yennikuAI (creature); + return new npc_yennikuAI (creature); } - struct mob_yennikuAI : public ScriptedAI + struct npc_yennikuAI : public ScriptedAI { - mob_yennikuAI(Creature* creature) : ScriptedAI(creature) + npc_yennikuAI(Creature* creature) : ScriptedAI(creature) { bReset = false; } @@ -126,5 +126,5 @@ public: void AddSC_stranglethorn_vale() { - new mob_yenniku(); + new npc_yenniku(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index f3bfe0b8fbe..7f6f779c60e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -172,19 +172,19 @@ public: }; -class mob_towering_infernal : public CreatureScript +class npc_towering_infernal : public CreatureScript { public: - mob_towering_infernal() : CreatureScript("mob_towering_infernal") { } + npc_towering_infernal() : CreatureScript("npc_towering_infernal") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_towering_infernalAI (creature); + return new npc_towering_infernalAI (creature); } - struct mob_towering_infernalAI : public ScriptedAI + struct npc_towering_infernalAI : public ScriptedAI { - mob_towering_infernalAI(Creature* creature) : ScriptedAI(creature) + npc_towering_infernalAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); if (instance) @@ -257,5 +257,5 @@ public: void AddSC_boss_anetheron() { new boss_anetheron(); - new mob_towering_infernal(); + new npc_towering_infernal(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 9b1f2475c1b..757206f7fe3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -76,19 +76,19 @@ enum Summons Position const NordrassilLoc = {5503.713f, -3523.436f, 1608.781f, 0.0f}; -class mob_ancient_wisp : public CreatureScript +class npc_ancient_wisp : public CreatureScript { public: - mob_ancient_wisp() : CreatureScript("mob_ancient_wisp") { } + npc_ancient_wisp() : CreatureScript("npc_ancient_wisp") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ancient_wispAI(creature); + return new npc_ancient_wispAI(creature); } - struct mob_ancient_wispAI : public ScriptedAI + struct npc_ancient_wispAI : public ScriptedAI { - mob_ancient_wispAI(Creature* creature) : ScriptedAI(creature) + npc_ancient_wispAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); ArchimondeGUID = 0; @@ -134,19 +134,19 @@ public: /* This script is merely a placeholder for the Doomfire that triggers Doomfire spell. It will MoveChase the Doomfire Spirit always, until despawn (AttackStart is called upon it's spawn) */ -class mob_doomfire : public CreatureScript +class npc_doomfire : public CreatureScript { public: - mob_doomfire() : CreatureScript("mob_doomfire") { } + npc_doomfire() : CreatureScript("npc_doomfire") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_doomfireAI(creature); + return new npc_doomfireAI(creature); } - struct mob_doomfireAI : public ScriptedAI + struct npc_doomfireAI : public ScriptedAI { - mob_doomfireAI(Creature* creature) : ScriptedAI(creature) {} + npc_doomfireAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } @@ -162,19 +162,19 @@ public: /* This is the script for the Doomfire Spirit Mob. This mob simply follow players or travels in random directions if target cannot be found. */ -class mob_doomfire_targetting : public CreatureScript +class npc_doomfire_targetting : public CreatureScript { public: - mob_doomfire_targetting() : CreatureScript("mob_doomfire_targetting") { } + npc_doomfire_targetting() : CreatureScript("npc_doomfire_targetting") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_doomfire_targettingAI(creature); + return new npc_doomfire_targettingAI(creature); } - struct mob_doomfire_targettingAI : public ScriptedAI + struct npc_doomfire_targettingAI : public ScriptedAI { - mob_doomfire_targettingAI(Creature* creature) : ScriptedAI(creature) {} + npc_doomfire_targettingAI(Creature* creature) : ScriptedAI(creature) {} uint64 TargetGUID; uint32 ChangeTargetTimer; @@ -643,7 +643,7 @@ public: void AddSC_boss_archimonde() { new boss_archimonde(); - new mob_doomfire(); - new mob_doomfire_targetting(); - new mob_ancient_wisp(); + new npc_doomfire(); + new npc_doomfire_targetting(); + new npc_ancient_wisp(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index b45ace791fc..da7ade178d6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -179,19 +179,19 @@ public: }; -class mob_lesser_doomguard : public CreatureScript +class npc_lesser_doomguard : public CreatureScript { public: - mob_lesser_doomguard() : CreatureScript("mob_lesser_doomguard") { } + npc_lesser_doomguard() : CreatureScript("npc_lesser_doomguard") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_lesser_doomguardAI (creature); + return new npc_lesser_doomguardAI (creature); } - struct mob_lesser_doomguardAI : public hyjal_trashAI + struct npc_lesser_doomguardAI : public hyjal_trashAI { - mob_lesser_doomguardAI(Creature* creature) : hyjal_trashAI(creature) + npc_lesser_doomguardAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); if (instance) @@ -276,5 +276,5 @@ public: void AddSC_boss_azgalor() { new boss_azgalor(); - new mob_lesser_doomguard(); + new npc_lesser_doomguard(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index df928f30f21..f6a12103824 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -408,14 +408,14 @@ void hyjal_trashAI::JustDied(Unit* /*killer*/) me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);//no loot } -class mob_giant_infernal : public CreatureScript +class npc_giant_infernal : public CreatureScript { public: - mob_giant_infernal() : CreatureScript("mob_giant_infernal") { } + npc_giant_infernal() : CreatureScript("npc_giant_infernal") { } - struct mob_giant_infernalAI : public hyjal_trashAI + struct npc_giant_infernalAI : public hyjal_trashAI { - mob_giant_infernalAI(Creature* creature) : hyjal_trashAI(creature) + npc_giant_infernalAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); meteor = false;//call once! @@ -537,23 +537,23 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_giant_infernalAI(creature); + return new npc_giant_infernalAI(creature); } }; -class mob_abomination : public CreatureScript +class npc_abomination : public CreatureScript { public: - mob_abomination() : CreatureScript("mob_abomination") { } + npc_abomination() : CreatureScript("npc_abomination") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_abominationAI(creature); + return new npc_abominationAI(creature); } - struct mob_abominationAI : public hyjal_trashAI + struct npc_abominationAI : public hyjal_trashAI { - mob_abominationAI(Creature* creature) : hyjal_trashAI(creature) + npc_abominationAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); go = false; @@ -639,19 +639,19 @@ public: }; -class mob_ghoul : public CreatureScript +class npc_ghoul : public CreatureScript { public: - mob_ghoul() : CreatureScript("mob_ghoul") { } + npc_ghoul() : CreatureScript("npc_ghoul") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ghoulAI(creature); + return new npc_ghoulAI(creature); } - struct mob_ghoulAI : public hyjal_trashAI + struct npc_ghoulAI : public hyjal_trashAI { - mob_ghoulAI(Creature* creature) : hyjal_trashAI(creature) + npc_ghoulAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); go = false; @@ -741,19 +741,19 @@ public: }; -class mob_necromancer : public CreatureScript +class npc_necromancer : public CreatureScript { public: - mob_necromancer() : CreatureScript("mob_necromancer") { } + npc_necromancer() : CreatureScript("npc_necromancer") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_necromancerAI(creature); + return new npc_necromancerAI(creature); } - struct mob_necromancerAI : public hyjal_trashAI + struct npc_necromancerAI : public hyjal_trashAI { - mob_necromancerAI(Creature* creature) : hyjal_trashAI(creature), summons(me) + npc_necromancerAI(Creature* creature) : hyjal_trashAI(creature), summons(me) { instance = creature->GetInstanceScript(); go = false; @@ -868,19 +868,19 @@ public: }; -class mob_banshee : public CreatureScript +class npc_banshee : public CreatureScript { public: - mob_banshee() : CreatureScript("mob_banshee") { } + npc_banshee() : CreatureScript("npc_banshee") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_bansheeAI(creature); + return new npc_bansheeAI(creature); } - struct mob_bansheeAI : public hyjal_trashAI + struct npc_bansheeAI : public hyjal_trashAI { - mob_bansheeAI(Creature* creature) : hyjal_trashAI(creature) + npc_bansheeAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); go = false; @@ -971,19 +971,19 @@ public: }; -class mob_crypt_fiend : public CreatureScript +class npc_crypt_fiend : public CreatureScript { public: - mob_crypt_fiend() : CreatureScript("mob_crypt_fiend") { } + npc_crypt_fiend() : CreatureScript("npc_crypt_fiend") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_crypt_fiendAI(creature); + return new npc_crypt_fiendAI(creature); } - struct mob_crypt_fiendAI : public hyjal_trashAI + struct npc_crypt_fiendAI : public hyjal_trashAI { - mob_crypt_fiendAI(Creature* creature) : hyjal_trashAI(creature) + npc_crypt_fiendAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); go = false; @@ -1061,19 +1061,19 @@ public: }; -class mob_fel_stalker : public CreatureScript +class npc_fel_stalker : public CreatureScript { public: - mob_fel_stalker() : CreatureScript("mob_fel_stalker") { } + npc_fel_stalker() : CreatureScript("npc_fel_stalker") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_fel_stalkerAI(creature); + return new npc_fel_stalkerAI(creature); } - struct mob_fel_stalkerAI : public hyjal_trashAI + struct npc_fel_stalkerAI : public hyjal_trashAI { - mob_fel_stalkerAI(Creature* creature) : hyjal_trashAI(creature) + npc_fel_stalkerAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); go = false; @@ -1151,19 +1151,19 @@ public: }; -class mob_frost_wyrm : public CreatureScript +class npc_frost_wyrm : public CreatureScript { public: - mob_frost_wyrm() : CreatureScript("mob_frost_wyrm") { } + npc_frost_wyrm() : CreatureScript("npc_frost_wyrm") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_frost_wyrmAI(creature); + return new npc_frost_wyrmAI(creature); } - struct mob_frost_wyrmAI : public hyjal_trashAI + struct npc_frost_wyrmAI : public hyjal_trashAI { - mob_frost_wyrmAI(Creature* creature) : hyjal_trashAI(creature) + npc_frost_wyrmAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); go = false; @@ -1263,19 +1263,19 @@ public: }; -class mob_gargoyle : public CreatureScript +class npc_gargoyle : public CreatureScript { public: - mob_gargoyle() : CreatureScript("mob_gargoyle") { } + npc_gargoyle() : CreatureScript("npc_gargoyle") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_gargoyleAI(creature); + return new npc_gargoyleAI(creature); } - struct mob_gargoyleAI : public hyjal_trashAI + struct npc_gargoyleAI : public hyjal_trashAI { - mob_gargoyleAI(Creature* creature) : hyjal_trashAI(creature) + npc_gargoyleAI(Creature* creature) : hyjal_trashAI(creature) { instance = creature->GetInstanceScript(); go = false; @@ -1467,14 +1467,14 @@ public: void AddSC_hyjal_trash() { - new mob_giant_infernal(); - new mob_abomination(); - new mob_ghoul(); - new mob_necromancer(); - new mob_banshee(); - new mob_crypt_fiend(); - new mob_fel_stalker(); - new mob_frost_wyrm(); - new mob_gargoyle(); + new npc_giant_infernal(); + new npc_abomination(); + new npc_ghoul(); + new npc_necromancer(); + new npc_banshee(); + new npc_crypt_fiend(); + new npc_fel_stalker(); + new npc_frost_wyrm(); + new npc_gargoyle(); new alliance_rifleman(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 3dfb3ed2a37..ba0cf93e5dd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -140,23 +140,23 @@ enum ThrallOldHillsbrad ENTRY_ARMORER = 18764, ENTRY_SCARLOC = 17862, - MOB_ENTRY_RIFLE = 17820, - MOB_ENTRY_WARDEN = 17833, - MOB_ENTRY_VETERAN = 17860, - MOB_ENTRY_WATCHMAN = 17814, - MOB_ENTRY_SENTRY = 17815, + NPC_RIFLE = 17820, + NPC_WARDEN = 17833, + NPC_VETERAN = 17860, + NPC_WATCHMAN = 17814, + NPC_SENTRY = 17815, - MOB_ENTRY_BARN_GUARDSMAN = 18092, - MOB_ENTRY_BARN_PROTECTOR = 18093, - MOB_ENTRY_BARN_LOOKOUT = 18094, + NPC_BARN_GUARDSMAN = 18092, + NPC_BARN_PROTECTOR = 18093, + NPC_BARN_LOOKOUT = 18094, - MOB_ENTRY_CHURCH_GUARDSMAN = 23175, - MOB_ENTRY_CHURCH_PROTECTOR = 23179, - MOB_ENTRY_CHURCH_LOOKOUT = 23177, + NPC_CHURCH_GUARDSMAN = 23175, + NPC_CHURCH_PROTECTOR = 23179, + NPC_CHURCH_LOOKOUT = 23177, - MOB_ENTRY_INN_GUARDSMAN = 23176, - MOB_ENTRY_INN_PROTECTOR = 23180, - MOB_ENTRY_INN_LOOKOUT = 23178, + NPC_INN_GUARDSMAN = 23176, + NPC_INN_PROTECTOR = 23180, + NPC_INN_LOOKOUT = 23178, SKARLOC_MOUNT = 18798, SKARLOC_MOUNT_MODEL = 18223, @@ -316,22 +316,22 @@ public: SetRun(); break; case 15: - me->SummonCreature(MOB_ENTRY_RIFLE, 2200.28f, 137.37f, 87.93f, 5.07f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_WARDEN, 2197.44f, 131.83f, 87.93f, 0.78f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_VETERAN, 2203.62f, 135.40f, 87.93f, 3.70f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_VETERAN, 2200.75f, 130.13f, 87.93f, 1.48f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_RIFLE, 2200.28f, 137.37f, 87.93f, 5.07f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_WARDEN, 2197.44f, 131.83f, 87.93f, 0.78f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_VETERAN, 2203.62f, 135.40f, 87.93f, 3.70f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_VETERAN, 2200.75f, 130.13f, 87.93f, 1.48f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 21: - me->SummonCreature(MOB_ENTRY_RIFLE, 2135.80f, 154.01f, 67.45f, 4.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_WARDEN, 2144.36f, 151.87f, 67.74f, 4.46f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_VETERAN, 2142.12f, 154.41f, 67.12f, 4.56f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_VETERAN, 2138.08f, 155.38f, 67.24f, 4.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_RIFLE, 2135.80f, 154.01f, 67.45f, 4.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_WARDEN, 2144.36f, 151.87f, 67.74f, 4.46f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_VETERAN, 2142.12f, 154.41f, 67.12f, 4.56f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_VETERAN, 2138.08f, 155.38f, 67.24f, 4.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 25: - me->SummonCreature(MOB_ENTRY_RIFLE, 2102.98f, 192.17f, 65.24f, 6.02f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_WARDEN, 2108.48f, 198.75f, 65.18f, 5.15f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_VETERAN, 2106.11f, 197.29f, 65.18f, 5.63f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_RIFLE, 2102.98f, 192.17f, 65.24f, 6.02f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_WARDEN, 2108.48f, 198.75f, 65.18f, 5.15f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_VETERAN, 2106.11f, 197.29f, 65.18f, 5.63f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 29: Talk(SAY_TH_SKARLOC_MEET); @@ -350,9 +350,9 @@ public: break; case 37: //possibly regular patrollers? If so, remove this and let database handle them - me->SummonCreature(MOB_ENTRY_WATCHMAN, 2124.26f, 522.16f, 56.87f, 3.99f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_WATCHMAN, 2121.69f, 525.37f, 57.11f, 4.01f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_SENTRY, 2124.65f, 524.55f, 56.63f, 3.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_WATCHMAN, 2124.26f, 522.16f, 56.87f, 3.99f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_WATCHMAN, 2121.69f, 525.37f, 57.11f, 4.01f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_SENTRY, 2124.65f, 524.55f, 56.63f, 3.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 59: me->SummonCreature(SKARLOC_MOUNT, 2488.64f, 625.77f, 58.26f, 4.71f, TEMPSUMMON_TIMED_DESPAWN, 10000); @@ -372,10 +372,10 @@ public: SetRun(false); break; case 68: - me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_BARN_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_BARN_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_BARN_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_BARN_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 71: SetRun(); @@ -384,10 +384,10 @@ public: SetRun(false); break; case 83: - me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR, 2627.33f, 646.82f, 56.03f, 4.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); - me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT, 2624.14f, 648.03f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2625.32f, 649.60f, 56.03f, 4.38f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(NPC_CHURCH_PROTECTOR, 2627.33f, 646.82f, 56.03f, 4.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(NPC_CHURCH_LOOKOUT, 2624.14f, 648.03f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(NPC_CHURCH_GUARDSMAN, 2625.32f, 649.60f, 56.03f, 4.38f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(NPC_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); break; case 84: Talk(SAY_TH_CHURCH_END); @@ -398,10 +398,10 @@ public: SetRun(false); break; case 93: - me->SummonCreature(MOB_ENTRY_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_INN_GUARDSMAN, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 94: if (uint64 TarethaGUID = instance->GetData64(DATA_TARETHA)) @@ -508,9 +508,9 @@ public: switch (summoned->GetEntry()) { /// @todo make Scarloc start into event instead, and not start attack directly - case MOB_ENTRY_BARN_GUARDSMAN: - case MOB_ENTRY_BARN_PROTECTOR: - case MOB_ENTRY_BARN_LOOKOUT: + case NPC_BARN_GUARDSMAN: + case NPC_BARN_PROTECTOR: + case NPC_BARN_LOOKOUT: case SKARLOC_MOUNT: case EROZION_ENTRY: break; diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index ff775c1a031..242a1c4258b 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -74,6 +74,7 @@ public: switch (go->GetEntry()) { case 21099: DoorWardGUID = go->GetGUID(); break; + case 20920: go->SetUInt32Value(GAMEOBJECT_FACTION, 0); break; // big fat fugly hack } } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 55e81f1408f..ea669f96efc 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * Copyright (C) 2006-2013 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -16,22 +16,13 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Razorfen Kraul -SD%Complete: 100 -SDComment: Quest support: 1144 -SDCategory: Razorfen Kraul -EndScriptData */ - -/* ContentData -npc_willix -EndContentData */ - #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "razorfen_kraul.h" #include "Player.h" +#include "PetAI.h" +#include "SpellScript.h" enum Willix { @@ -148,7 +139,148 @@ public: }; +enum SnufflenoseGopher +{ + NPC_SNUFFLENOSE_GOPHER = 4781, + GO_BLUELEAF_TUBBER = 20920, + ACTION_FIND_NEW_TUBBER = 0, + POINT_TUBBER = 0 +}; + +struct DistanceOrder : public std::binary_function<GameObject, GameObject, bool> +{ + DistanceOrder(Creature* me) : me(me) {} + + bool operator() (GameObject* first, GameObject* second) + { + return me->GetDistanceOrder(first, second); + } + + Creature* me; +}; + +struct npc_snufflenose_gopher : public CreatureScript +{ +public: + npc_snufflenose_gopher() : CreatureScript("npc_snufflenose_gopher") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_snufflenose_gopherAI(creature); + } + + struct npc_snufflenose_gopherAI : public PetAI + { + npc_snufflenose_gopherAI(Creature* creature) : PetAI(creature) { } + + void Reset() + { + IsMovementActive = false; + } + + void MovementInform(uint32 type, uint32 id) + { + if (type == POINT_MOTION_TYPE && id == POINT_TUBBER) + { + if (GameObject* go = me->GetMap()->GetGameObject(TargetTubberGUID)) + { + go->SetRespawnTime(5 * MINUTE); + go->Refresh(); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); + } + + IsMovementActive = false; + } + else + PetAI::MovementInform(type, id); + } + + void DoFindNewTubber() + { + std::list<GameObject*> tubbersInRange; + GetGameObjectListWithEntryInGrid(tubbersInRange, me, GO_BLUELEAF_TUBBER, 40.0f); + + if (tubbersInRange.empty()) + return; + + tubbersInRange.sort(DistanceOrder(me)); + GameObject* nearestTubber = NULL; + + for (std::list<GameObject*>::const_iterator itr = tubbersInRange.begin(); itr != tubbersInRange.end(); ++itr) + { + if (!(*itr)->isSpawned() && (*itr)->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND)) + { + nearestTubber = *itr; + break; + } + } + + if (!nearestTubber) + return; + + TargetTubberGUID = nearestTubber->GetGUID(); + + // XFurry was wrong... + me->GetMotionMaster()->MovePoint(POINT_TUBBER, nearestTubber->GetPositionX(), + nearestTubber->GetPositionY(), + nearestTubber->GetPositionZ()); + IsMovementActive = true; + } + + void UpdateAI(uint32 diff) + { + if (!IsMovementActive) + PetAI::UpdateAI(diff); + } + + void DoAction(int32 action) + { + if (action == ACTION_FIND_NEW_TUBBER) + DoFindNewTubber(); + } + + + bool IsMovementActive; + uint64 TargetTubberGUID; + }; +}; + +class spell_snufflenose_command : public SpellScriptLoader +{ + public: + spell_snufflenose_command() : SpellScriptLoader("spell_snufflenose_command") { } + + class spell_snufflenose_commandSpellScript : public SpellScript + { + PrepareSpellScript(spell_snufflenose_commandSpellScript); + + bool Load() + { + return GetCaster()->GetTypeId() == TYPEID_PLAYER; + } + + void HandleAfterCast() + { + if (Unit* target = GetCaster()->ToPlayer()->GetSelectedUnit()) + if (target->GetEntry() == NPC_SNUFFLENOSE_GOPHER) + target->ToCreature()->AI()->DoAction(ACTION_FIND_NEW_TUBBER); + } + + void Register() + { + AfterCast += SpellCastFn(spell_snufflenose_commandSpellScript::HandleAfterCast); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_snufflenose_commandSpellScript(); + } +}; + void AddSC_razorfen_kraul() { + new npc_snufflenose_gopher(); new npc_willix(); + new spell_snufflenose_command(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 44b9999d9bc..7456d00ae90 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -210,7 +210,7 @@ public: instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); //to avoid having a following void zone - Creature* pPortal= me->FindNearestCreature(MOB_CTHUN_PORTAL, 10); + Creature* pPortal= me->FindNearestCreature(NPC_CTHUN_PORTAL, 10); if (pPortal) pPortal->SetReactState(REACT_PASSIVE); } @@ -224,7 +224,7 @@ public: void SpawnEyeTentacle(float x, float y) { - if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) + if (Creature* Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (Spawned->AI()) Spawned->AI()->AttackStart(target); @@ -289,7 +289,7 @@ public: Creature* Spawned = NULL; //Spawn claw tentacle on the random target - Spawned = me->SummonCreature(MOB_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500); + Spawned = me->SummonCreature(NPC_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500); if (Spawned && Spawned->AI()) Spawned->AI()->AttackStart(target); @@ -393,7 +393,7 @@ public: //Dead phase case PHASE_CTHUN_DONE: - Creature* pPortal= me->FindNearestCreature(MOB_CTHUN_PORTAL, 10); + Creature* pPortal= me->FindNearestCreature(NPC_CTHUN_PORTAL, 10); if (pPortal) pPortal->DespawnOrUnsummon(); @@ -540,7 +540,7 @@ public: void SpawnEyeTentacle(float x, float y) { Creature* Spawned; - Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500); + Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500); if (Spawned && Spawned->AI()) if (Unit* target = SelectRandomNotStomach()) Spawned->AI()->AttackStart(target); @@ -674,7 +674,7 @@ public: //Spawn flesh tentacle for (uint8 i = 0; i < 2; i++) { - Creature* spawned = me->SummonCreature(MOB_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN); + Creature* spawned = me->SummonCreature(NPC_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN); if (!spawned) ++FleshTentaclesKilled; } @@ -804,7 +804,7 @@ public: if (Unit* target = SelectRandomNotStomach()) { //Spawn claw tentacle on the random target - if (Creature* spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500)) + if (Creature* spawned = me->SummonCreature(NPC_GIANT_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500)) if (spawned->AI()) spawned->AI()->AttackStart(target); } @@ -819,7 +819,7 @@ public: if (Unit* target = SelectRandomNotStomach()) { //Spawn claw tentacle on the random target - if (Creature* spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500)) + if (Creature* spawned = me->SummonCreature(NPC_GIANT_EYE_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500)) if (spawned->AI()) spawned->AI()->AttackStart(target); } @@ -847,7 +847,7 @@ public: //Spawn flesh tentacle for (uint8 i = 0; i < 2; i++) { - Creature* spawned = me->SummonCreature(MOB_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN); + Creature* spawned = me->SummonCreature(NPC_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN); if (!spawned) ++FleshTentaclesKilled; } @@ -908,10 +908,10 @@ public: }; -class mob_eye_tentacle : public CreatureScript +class npc_eye_tentacle : public CreatureScript { public: - mob_eye_tentacle() : CreatureScript("mob_eye_tentacle") { } + npc_eye_tentacle() : CreatureScript("npc_eye_tentacle") { } CreatureAI* GetAI(Creature* creature) const { @@ -922,7 +922,7 @@ public: { eye_tentacleAI(Creature* creature) : ScriptedAI(creature) { - if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = me->SummonCreature(NPC_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); Portal = pPortal->GetGUID(); @@ -983,10 +983,10 @@ public: }; -class mob_claw_tentacle : public CreatureScript +class npc_claw_tentacle : public CreatureScript { public: - mob_claw_tentacle() : CreatureScript("mob_claw_tentacle") { } + npc_claw_tentacle() : CreatureScript("npc_claw_tentacle") { } CreatureAI* GetAI(Creature* creature) const { @@ -999,7 +999,7 @@ public: { SetCombatMovement(false); - if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = me->SummonCreature(NPC_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); Portal = pPortal->GetGUID(); @@ -1057,7 +1057,7 @@ public: if (!target->HasAura(SPELL_DIGESTIVE_ACID)) { me->SetPosition(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); - if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = me->SummonCreature(NPC_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); Portal = pPortal->GetGUID(); @@ -1093,10 +1093,10 @@ public: }; -class mob_giant_claw_tentacle : public CreatureScript +class npc_giant_claw_tentacle : public CreatureScript { public: - mob_giant_claw_tentacle() : CreatureScript("mob_giant_claw_tentacle") { } + npc_giant_claw_tentacle() : CreatureScript("npc_giant_claw_tentacle") { } CreatureAI* GetAI(Creature* creature) const { @@ -1109,7 +1109,7 @@ public: { SetCombatMovement(false); - if (Creature* pPortal = me->SummonCreature(MOB_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = me->SummonCreature(NPC_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); Portal = pPortal->GetGUID(); @@ -1169,7 +1169,7 @@ public: if (!target->HasAura(SPELL_DIGESTIVE_ACID)) { me->SetPosition(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); - if (Creature* pPortal = me->SummonCreature(MOB_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = me->SummonCreature(NPC_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); Portal = pPortal->GetGUID(); @@ -1212,10 +1212,10 @@ public: }; -class mob_giant_eye_tentacle : public CreatureScript +class npc_giant_eye_tentacle : public CreatureScript { public: - mob_giant_eye_tentacle() : CreatureScript("mob_giant_eye_tentacle") { } + npc_giant_eye_tentacle() : CreatureScript("npc_giant_eye_tentacle") { } CreatureAI* GetAI(Creature* creature) const { @@ -1228,7 +1228,7 @@ public: { SetCombatMovement(false); - if (Creature* pPortal = me->SummonCreature(MOB_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = me->SummonCreature(NPC_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); Portal = pPortal->GetGUID(); @@ -1276,10 +1276,10 @@ public: }; -class mob_giant_flesh_tentacle : public CreatureScript +class npc_giant_flesh_tentacle : public CreatureScript { public: - mob_giant_flesh_tentacle() : CreatureScript("mob_giant_flesh_tentacle") { } + npc_giant_flesh_tentacle() : CreatureScript("npc_giant_flesh_tentacle") { } CreatureAI* GetAI(Creature* creature) const { @@ -1310,9 +1310,9 @@ void AddSC_boss_cthun() { new boss_eye_of_cthun(); new boss_cthun(); - new mob_eye_tentacle(); - new mob_claw_tentacle(); - new mob_giant_claw_tentacle(); - new mob_giant_eye_tentacle(); - new mob_giant_flesh_tentacle(); + new npc_eye_tentacle(); + new npc_claw_tentacle(); + new npc_giant_claw_tentacle(); + new npc_giant_eye_tentacle(); + new npc_giant_flesh_tentacle(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index d4bb5416a4e..cadfbe1cd39 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -184,19 +184,19 @@ public: }; -class mob_sartura_royal_guard : public CreatureScript +class npc_sartura_royal_guard : public CreatureScript { public: - mob_sartura_royal_guard() : CreatureScript("mob_sartura_royal_guard") { } + npc_sartura_royal_guard() : CreatureScript("npc_sartura_royal_guard") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_sartura_royal_guardAI (creature); + return new npc_sartura_royal_guardAI (creature); } - struct mob_sartura_royal_guardAI : public ScriptedAI + struct npc_sartura_royal_guardAI : public ScriptedAI { - mob_sartura_royal_guardAI(Creature* creature) : ScriptedAI(creature) {} + npc_sartura_royal_guardAI(Creature* creature) : ScriptedAI(creature) {} uint32 WhirlWind_Timer; uint32 WhirlWindRandom_Timer; @@ -302,5 +302,5 @@ public: void AddSC_boss_sartura() { new boss_sartura(); - new mob_sartura_royal_guard(); + new npc_sartura_royal_guard(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index f92adef1634..f2e901458cd 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -17,7 +17,7 @@ */ /* ScriptData -SDName: mob_anubisath_sentinel +SDName: npc_anubisath_sentinel SD%Complete: 95 SDComment: Shadow storm is not properly implemented in core it should only target ppl outside of melee range. SDCategory: Temple of Ahn'Qiraj @@ -56,10 +56,10 @@ EndScriptData */ #define SPELL_STORM_BUFF 2148 #define SPELL_STORM 26546 -class mob_anubisath_sentinel : public CreatureScript +class npc_anubisath_sentinel : public CreatureScript { public: - mob_anubisath_sentinel() : CreatureScript("mob_anubisath_sentinel") { } + npc_anubisath_sentinel() : CreatureScript("npc_anubisath_sentinel") { } CreatureAI* GetAI(Creature* creature) const { @@ -259,7 +259,7 @@ public: }; }; -void AddSC_mob_anubisath_sentinel() +void AddSC_npc_anubisath_sentinel() { - new mob_anubisath_sentinel(); + new npc_anubisath_sentinel(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h index eecdce51831..1a7ba226135 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h @@ -40,15 +40,15 @@ enum DataTypes enum Creatures { BOSS_EYE_OF_CTHUN = 15589, - MOB_CTHUN_PORTAL = 15896, - MOB_CLAW_TENTACLE = 15725, - MOB_EYE_TENTACLE = 15726, - MOB_SMALL_PORTAL = 15904, - MOB_BODY_OF_CTHUN = 15809, - MOB_GIANT_CLAW_TENTACLE = 15728, - MOB_GIANT_EYE_TENTACLE = 15334, - MOB_FLESH_TENTACLE = 15802, - MOB_GIANT_PORTAL = 15910, + NPC_CTHUN_PORTAL = 15896, + NPC_CLAW_TENTACLE = 15725, + NPC_EYE_TENTACLE = 15726, + NPC_SMALL_PORTAL = 15904, + NPC_BODY_OF_CTHUN = 15809, + NPC_GIANT_CLAW_TENTACLE = 15728, + NPC_GIANT_EYE_TENTACLE = 15334, + NPC_FLESH_TENTACLE = 15802, + NPC_GIANT_PORTAL = 15910, NPC_VISCIDUS = 15299, NPC_GLOB_OF_VISCIDUS = 15667, diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 341d14863c4..d3ca2940205 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -421,7 +421,7 @@ enum Geezle EMOTE_SPARK = 7, - MOB_SPARK = 17243, + NPC_SPARK = 17243, GO_NAGA_FLAG = 181694 }; @@ -461,7 +461,7 @@ public: { Step = 0; EventStarted = true; - if (Creature* Spark = me->SummonCreature(MOB_SPARK, SparkPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature* Spark = me->SummonCreature(NPC_SPARK, SparkPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) { SparkGUID = Spark->GetGUID(); Spark->setActive(true); @@ -533,7 +533,7 @@ public: for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr) if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE && (*itr)->HasAura(SPELL_TREE_DISGUISE)) - (*itr)->KilledMonsterCredit(MOB_SPARK, 0); + (*itr)->KilledMonsterCredit(NPC_SPARK, 0); } void DespawnNagaFlag(bool despawn) diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 102a9494a65..713c66b66b8 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -24,7 +24,7 @@ SDCategory: Bloodmyst Isle EndScriptData */ /* ContentData -mob_webbed_creature +npc_webbed_creature npc_captured_sunhawk_agent EndContentData */ @@ -34,25 +34,25 @@ EndContentData */ #include "Player.h" /*###### -## mob_webbed_creature +## npc_webbed_creature ######*/ //possible creatures to be spawned uint32 const possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17680, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327}; -class mob_webbed_creature : public CreatureScript +class npc_webbed_creature : public CreatureScript { public: - mob_webbed_creature() : CreatureScript("mob_webbed_creature") { } + npc_webbed_creature() : CreatureScript("npc_webbed_creature") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_webbed_creatureAI (creature); + return new npc_webbed_creatureAI (creature); } - struct mob_webbed_creatureAI : public ScriptedAI + struct npc_webbed_creatureAI : public ScriptedAI { - mob_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) {} + npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} @@ -205,7 +205,7 @@ public: void AddSC_bloodmyst_isle() { - new mob_webbed_creature(); + new npc_webbed_creature(); new npc_captured_sunhawk_agent(); new npc_princess_stillpine(); new go_princess_stillpines_cage(); diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index ee4b4247b55..a85089cf588 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -37,7 +37,7 @@ EndContentData */ #include "WorldSession.h" /*###### -## mobs_risen_husk_spirit +## npc_risen_husk_spirit ######*/ enum HauntingWitchHill @@ -62,14 +62,14 @@ enum HauntingWitchHill EVENT_INTANGIBLE_PRESENCE = 2, }; -class mobs_risen_husk_spirit : public CreatureScript +class npc_risen_husk_spirit : public CreatureScript { public: - mobs_risen_husk_spirit() : CreatureScript("mobs_risen_husk_spirit") { } + npc_risen_husk_spirit() : CreatureScript("npc_risen_husk_spirit") { } - struct mobs_risen_husk_spiritAI : public ScriptedAI + struct npc_risen_husk_spiritAI : public ScriptedAI { - mobs_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { } + npc_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { } void Reset() { @@ -125,7 +125,7 @@ class mobs_risen_husk_spirit : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mobs_risen_husk_spiritAI (creature); + return new npc_risen_husk_spiritAI (creature); } }; diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index c5464d9fbd8..24e802f78ec 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -287,7 +287,7 @@ enum EternalBoard /* ContentData A Pawn on the Eternal Board - creatures, gameobjects and defines -mob_qiraj_war_spawn : Adds that are summoned in the Qiraj gates battle. +npc_qiraj_war_spawn : Adds that are summoned in the Qiraj gates battle. npc_anachronos_the_ancient : Creature that controls the event. npc_anachronos_quest_trigger: controls the spawning of the BG War mobs. go_crystalline_tear : GameObject that begins the event and hands out quest @@ -809,22 +809,22 @@ public: }; /*###### -# mob_qiraj_war_spawn +# npc_qiraj_war_spawn ######*/ -class mob_qiraj_war_spawn : public CreatureScript +class npc_qiraj_war_spawn : public CreatureScript { public: - mob_qiraj_war_spawn() : CreatureScript("mob_qiraj_war_spawn") { } + npc_qiraj_war_spawn() : CreatureScript("npc_qiraj_war_spawn") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_qiraj_war_spawnAI(creature); + return new npc_qiraj_war_spawnAI(creature); } - struct mob_qiraj_war_spawnAI : public ScriptedAI + struct npc_qiraj_war_spawnAI : public ScriptedAI { - mob_qiraj_war_spawnAI(Creature* creature) : ScriptedAI(creature) {} + npc_qiraj_war_spawnAI(Creature* creature) : ScriptedAI(creature) {} uint64 MobGUID; uint64 PlayerGUID; @@ -987,7 +987,7 @@ public: if (WaveCount < 5) //1-4 Wave { - if (mob_qiraj_war_spawn::mob_qiraj_war_spawnAI* spawnAI = CAST_AI(mob_qiraj_war_spawn::mob_qiraj_war_spawnAI, spawn->AI())) + if (npc_qiraj_war_spawn::npc_qiraj_war_spawnAI* spawnAI = CAST_AI(npc_qiraj_war_spawn::npc_qiraj_war_spawnAI, spawn->AI())) { spawnAI->MobGUID = me->GetGUID(); spawnAI->PlayerGUID = PlayerGUID; @@ -1070,7 +1070,7 @@ public: }; -void mob_qiraj_war_spawn::mob_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/) +void npc_qiraj_war_spawn::npc_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/) { me->RemoveCorpse(); diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 86b8955b4c6..82e89a18c0e 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -38,7 +38,7 @@ EndContentData */ #include "WorldSession.h" /*###### -## mob_aquementas +## npc_aquementas ######*/ enum Aquementas @@ -49,19 +49,19 @@ enum Aquementas SPELL_FROST_SHOCK = 15089 }; -class mob_aquementas : public CreatureScript +class npc_aquementas : public CreatureScript { public: - mob_aquementas() : CreatureScript("mob_aquementas") { } + npc_aquementas() : CreatureScript("npc_aquementas") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_aquementasAI (creature); + return new npc_aquementasAI (creature); } - struct mob_aquementasAI : public ScriptedAI + struct npc_aquementasAI : public ScriptedAI { - mob_aquementasAI(Creature* creature) : ScriptedAI(creature) {} + npc_aquementasAI(Creature* creature) : ScriptedAI(creature) {} uint32 SendItemTimer; uint32 SwitchFactionTimer; 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 6bc6279da79..552009cc3e0 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/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 4c99138ed3f..599e2b834a9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -300,7 +300,7 @@ class boss_devourer_of_souls : public CreatureScript DoCast(me, SPELL_WAILING_SOULS_STARTING); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - me->SetFacingTo(me->GetAngle(target)); + me->SetFacingToObject(target); DoCast(me, SPELL_WAILING_SOULS_BEAM); } 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/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 40c164533ee..f602a07f47f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -157,7 +157,6 @@ class boss_blood_queen_lana_thel : public CreatureScript events.ScheduleEvent(EVENT_TWILIGHT_BLOODBOLT, urand(20000, 25000), EVENT_GROUP_NORMAL); events.ScheduleEvent(EVENT_AIR_PHASE, 124000 + uint32(Is25ManRaid() ? 3000 : 0)); CleanAuras(); - me->SetSpeed(MOVE_FLIGHT, 0.642857f, true); _offtank = NULL; _vampires.clear(); _creditBloodQuickening = false; @@ -235,7 +234,6 @@ class boss_blood_queen_lana_thel : public CreatureScript { me->SetDisableGravity(true); me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); - me->SetCanFly(true); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } } @@ -249,7 +247,6 @@ class boss_blood_queen_lana_thel : public CreatureScript _killMinchar = false; me->SetDisableGravity(true); me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); - me->SetCanFly(true); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } else @@ -263,7 +260,6 @@ class boss_blood_queen_lana_thel : public CreatureScript { me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); - me->SetCanFly(false); me->SetReactState(REACT_AGGRESSIVE); _JustReachedHome(); Talk(SAY_WIPE); @@ -314,7 +310,6 @@ class boss_blood_queen_lana_thel : public CreatureScript case POINT_GROUND: me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); - me->SetCanFly(false); me->SetReactState(REACT_AGGRESSIVE); if (Unit* victim = me->SelectVictim()) AttackStart(victim); @@ -440,7 +435,6 @@ class boss_blood_queen_lana_thel : public CreatureScript case EVENT_AIR_START_FLYING: me->SetDisableGravity(true); me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); - me->SetCanFly(true); me->GetMotionMaster()->MovePoint(POINT_AIR, airPos); break; case EVENT_AIR_FLY_DOWN: 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/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index d16252ad05e..e55de3e3dcb 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -20,67 +20,61 @@ #include "InstanceScript.h" #include "naxxramas.h" -const DoorData doorData[] = +DoorData const doorData[] = { - {181126, BOSS_ANUBREKHAN, DOOR_TYPE_ROOM, BOUNDARY_S}, - {181195, BOSS_ANUBREKHAN, DOOR_TYPE_PASSAGE, 0}, - {194022, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, - {181209, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, - {181209, BOSS_MAEXXNA, DOOR_TYPE_ROOM, BOUNDARY_SW}, - {181200, BOSS_NOTH, DOOR_TYPE_ROOM, BOUNDARY_N}, - {181201, BOSS_NOTH, DOOR_TYPE_PASSAGE, BOUNDARY_E}, - {181202, BOSS_NOTH, DOOR_TYPE_PASSAGE, 0}, - {181202, BOSS_HEIGAN, DOOR_TYPE_ROOM, BOUNDARY_N}, - {181203, BOSS_HEIGAN, DOOR_TYPE_PASSAGE, BOUNDARY_E}, - {181241, BOSS_HEIGAN, DOOR_TYPE_PASSAGE, 0}, - {181241, BOSS_LOATHEB, DOOR_TYPE_ROOM, BOUNDARY_W}, - {181123, BOSS_PATCHWERK, DOOR_TYPE_PASSAGE, 0}, - {181123, BOSS_GROBBULUS, DOOR_TYPE_ROOM, 0}, - {181120, BOSS_GLUTH, DOOR_TYPE_PASSAGE, BOUNDARY_NW}, - {181121, BOSS_GLUTH, DOOR_TYPE_PASSAGE, 0}, - {181121, BOSS_THADDIUS, DOOR_TYPE_ROOM, 0}, - {181124, BOSS_RAZUVIOUS, DOOR_TYPE_PASSAGE, 0}, - {181124, BOSS_GOTHIK, DOOR_TYPE_ROOM, BOUNDARY_N}, - {181125, BOSS_GOTHIK, DOOR_TYPE_PASSAGE, BOUNDARY_S}, - {181119, BOSS_GOTHIK, DOOR_TYPE_PASSAGE, 0}, - {181119, BOSS_HORSEMEN, DOOR_TYPE_ROOM, BOUNDARY_NE}, - {181225, BOSS_SAPPHIRON, DOOR_TYPE_PASSAGE, BOUNDARY_W}, - {181228, BOSS_KELTHUZAD, DOOR_TYPE_ROOM, BOUNDARY_S}, - {0, 0, DOOR_TYPE_ROOM, 0}, // EOF + { GO_ROOM_ANUBREKHAN, BOSS_ANUBREKHAN, DOOR_TYPE_ROOM, BOUNDARY_S }, + { GO_PASSAGE_ANUBREKHAN, BOSS_ANUBREKHAN, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_PASSAGE_FAERLINA, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ROOM_MAEXXNA, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ROOM_MAEXXNA, BOSS_MAEXXNA, DOOR_TYPE_ROOM, BOUNDARY_SW }, + { GO_ROOM_NOTH, BOSS_NOTH, DOOR_TYPE_ROOM, BOUNDARY_N }, + { GO_PASSAGE_NOTH, BOSS_NOTH, DOOR_TYPE_PASSAGE, BOUNDARY_E }, + { GO_ROOM_HEIGAN, BOSS_NOTH, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ROOM_HEIGAN, BOSS_HEIGAN, DOOR_TYPE_ROOM, BOUNDARY_N }, + { GO_PASSAGE_HEIGAN, BOSS_HEIGAN, DOOR_TYPE_PASSAGE, BOUNDARY_E }, + { GO_ROOM_LOATHEB, BOSS_HEIGAN, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ROOM_LOATHEB, BOSS_LOATHEB, DOOR_TYPE_ROOM, BOUNDARY_W }, + { GO_ROOM_GROBBULUS, BOSS_PATCHWERK, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ROOM_GROBBULUS, BOSS_GROBBULUS, DOOR_TYPE_ROOM, BOUNDARY_NONE }, + { GO_PASSAGE_GLUTH, BOSS_GLUTH, DOOR_TYPE_PASSAGE, BOUNDARY_NW }, + { GO_ROOM_THADDIUS, BOSS_GLUTH, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ROOM_THADDIUS, BOSS_THADDIUS, DOOR_TYPE_ROOM, BOUNDARY_NONE }, + { GO_ROOM_GOTHIK, BOSS_RAZUVIOUS, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ROOM_GOTHIK, BOSS_GOTHIK, DOOR_TYPE_ROOM, BOUNDARY_N }, + { GO_PASSAGE_GOTHIK, BOSS_GOTHIK, DOOR_TYPE_PASSAGE, BOUNDARY_S }, + { GO_ROOM_HORSEMEN, BOSS_GOTHIK, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_GOTHIK_GATE, BOSS_GOTHIK, DOOR_TYPE_ROOM, BOUNDARY_NONE }, + { GO_ROOM_HORSEMEN, BOSS_HORSEMEN, DOOR_TYPE_ROOM, BOUNDARY_NE }, + { GO_PASSAGE_SAPPHIRON, BOSS_SAPPHIRON, DOOR_TYPE_PASSAGE, BOUNDARY_W }, + { GO_ROOM_KELTHUZAD, BOSS_KELTHUZAD, DOOR_TYPE_ROOM, BOUNDARY_S }, + { GO_ARAC_EYE_RAMP, BOSS_MAEXXNA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_ARAC_EYE_RAMP_BOSS, BOSS_MAEXXNA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_PLAG_EYE_RAMP, BOSS_LOATHEB, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_PLAG_EYE_RAMP_BOSS, BOSS_LOATHEB, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_MILI_EYE_RAMP, BOSS_HORSEMEN, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_MILI_EYE_RAMP_BOSS, BOSS_HORSEMEN, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_CONS_EYE_RAMP, BOSS_THADDIUS, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { GO_CONS_EYE_RAMP_BOSS, BOSS_THADDIUS, DOOR_TYPE_PASSAGE, BOUNDARY_NONE }, + { 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE } }; -const MinionData minionData[] = +MinionData const minionData[] = { - //{16573, BOSS_ANUBREKHAN}, there is no spawn point in db, so we do not add them here - {16506, BOSS_FAERLINA}, - {16803, BOSS_RAZUVIOUS}, - {16063, BOSS_HORSEMEN}, - {16064, BOSS_HORSEMEN}, - {16065, BOSS_HORSEMEN}, - {30549, BOSS_HORSEMEN}, - {0, 0, } + { NPC_FOLLOWER_WORSHIPPER, BOSS_FAERLINA }, + { NPC_DK_UNDERSTUDY, BOSS_RAZUVIOUS }, + { NPC_SIR, BOSS_HORSEMEN }, + { NPC_THANE, BOSS_HORSEMEN }, + { NPC_LADY, BOSS_HORSEMEN }, + { NPC_BARON, BOSS_HORSEMEN }, + { 0, 0, } }; -enum eEnums +float const HeiganPos[2] = { 2796.0f, -3707.0f }; +float const HeiganEruptionSlope[3] = { - GO_HORSEMEN_CHEST_HERO = 193426, - GO_HORSEMEN_CHEST = 181366, //four horsemen event, DoRespawnGameObject() when event == DONE - GO_GOTHIK_GATE = 181170, - GO_KELTHUZAD_PORTAL01 = 181402, - GO_KELTHUZAD_PORTAL02 = 181403, - GO_KELTHUZAD_PORTAL03 = 181404, - GO_KELTHUZAD_PORTAL04 = 181405, - GO_KELTHUZAD_TRIGGER = 181444, - - SPELL_ERUPTION = 29371 -}; - -const float HeiganPos[2] = {2796, -3707}; -const float HeiganEruptionSlope[3] = -{ - (-3685 - HeiganPos[1]) /(2724 - HeiganPos[0]), - (-3647 - HeiganPos[1]) /(2749 - HeiganPos[0]), - (-3637 - HeiganPos[1]) /(2771 - HeiganPos[0]), + (-3685.0f - HeiganPos[1]) / (2724.0f - HeiganPos[0]), + (-3647.0f - HeiganPos[1]) / (2749.0f - HeiganPos[0]), + (-3637.0f - HeiganPos[1]) / (2771.0f - HeiganPos[0]) }; // 0 H x @@ -106,367 +100,423 @@ inline uint32 GetEruptionSection(float x, float y) class instance_naxxramas : public InstanceMapScript { -public: - instance_naxxramas() : InstanceMapScript("instance_naxxramas", 533) { } - - InstanceScript* GetInstanceScript(InstanceMap* map) const - { - return new instance_naxxramas_InstanceMapScript(map); - } + public: + instance_naxxramas() : InstanceMapScript("instance_naxxramas", 533) { } - struct instance_naxxramas_InstanceMapScript : public InstanceScript - { - instance_naxxramas_InstanceMapScript(Map* map) : InstanceScript(map) + struct instance_naxxramas_InstanceMapScript : public InstanceScript { - SetBossNumber(MAX_BOSS_NUMBER); - LoadDoorData(doorData); - LoadMinionData(minionData); - } - - std::set<uint64> heiganEruptionGUID[4]; - uint64 gothikGateGUID; - uint64 horsemenChestGUID; - uint64 sapphironGUID; - uint64 faerlinaGUID; - uint64 thaneGUID; - uint64 ladyGUID; - uint64 baronGUID; - uint64 sirGUID; - - uint64 thaddiusGUID; - uint64 heiganGUID; - uint64 feugenGUID; - uint64 stalaggGUID; - - uint64 kelthuzadGUID; - uint64 kelthuzadTriggerGUID; - uint64 portalsGUID[4]; + instance_naxxramas_InstanceMapScript(Map* map) : InstanceScript(map) + { + SetBossNumber(EncounterCount); + LoadDoorData(doorData); + LoadMinionData(minionData); + + GothikGateGUID = 0; + HorsemenChestGUID = 0; + FaerlinaGUID = 0; + ThaneGUID = 0; + LadyGUID = 0; + BaronGUID = 0; + SirGUID = 0; + ThaddiusGUID = 0; + HeiganGUID = 0; + FeugenGUID = 0; + StalaggGUID = 0; + SapphironGUID = 0; + KelthuzadGUID = 0; + KelthuzadTriggerGUID = 0; + + playerDied = 0; + + memset(PortalsGUID, 0, sizeof(PortalsGUID)); + } - uint32 AbominationCount; + void OnCreatureCreate(Creature* creature) + { + switch (creature->GetEntry()) + { + case NPC_FAERLINA: + FaerlinaGUID = creature->GetGUID(); + break; + case NPC_THANE: + ThaneGUID = creature->GetGUID(); + break; + case NPC_LADY: + LadyGUID = creature->GetGUID(); + break; + case NPC_BARON: + BaronGUID = creature->GetGUID(); + break; + case NPC_SIR: + SirGUID = creature->GetGUID(); + break; + case NPC_THADDIUS: + ThaddiusGUID = creature->GetGUID(); + break; + case NPC_HEIGAN: + HeiganGUID = creature->GetGUID(); + break; + case NPC_FEUGEN: + FeugenGUID = creature->GetGUID(); + break; + case NPC_STALAGG: + StalaggGUID = creature->GetGUID(); + break; + case NPC_SAPPHIRON: + SapphironGUID = creature->GetGUID(); + break; + case NPC_KEL_THUZAD: + KelthuzadGUID = creature->GetGUID(); + break; + default: + break; + } - GOState gothikDoorState; + AddMinion(creature, true); + } - time_t minHorsemenDiedTime; - time_t maxHorsemenDiedTime; + void OnCreatureRemove(Creature* creature) + { + AddMinion(creature, false); + } - uint32 playerDied; + void OnGameObjectCreate(GameObject* go) + { + if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) + { + uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY()); + HeiganEruptionGUID[section].insert(go->GetGUID()); + return; + } - void Initialize() - { - gothikGateGUID = 0; - horsemenChestGUID = 0; - sapphironGUID = 0; - faerlinaGUID = 0; - thaneGUID = 0; - ladyGUID = 0; - baronGUID = 0; - sirGUID = 0; - thaddiusGUID = 0; - heiganGUID = 0; - feugenGUID = 0; - stalaggGUID = 0; - kelthuzadGUID = 0; - kelthuzadTriggerGUID = 0; - - playerDied = 0; - gothikDoorState = GO_STATE_ACTIVE; - - memset(portalsGUID, 0, sizeof(portalsGUID)); - } + switch (go->GetEntry()) + { + case GO_GOTHIK_GATE: + GothikGateGUID = go->GetGUID(); + break; + case GO_HORSEMEN_CHEST: + case GO_HORSEMEN_CHEST_HERO: + HorsemenChestGUID = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL01: + PortalsGUID[0] = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL02: + PortalsGUID[1] = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL03: + PortalsGUID[2] = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL04: + PortalsGUID[3] = go->GetGUID(); + break; + case GO_KELTHUZAD_TRIGGER: + KelthuzadTriggerGUID = go->GetGUID(); + break; + default: + break; + } - void OnCreatureCreate(Creature* creature) - { - switch (creature->GetEntry()) - { - case 15989: sapphironGUID = creature->GetGUID(); return; - case 15953: faerlinaGUID = creature->GetGUID(); return; - case 16064: thaneGUID = creature->GetGUID(); return; - case 16065: ladyGUID = creature->GetGUID(); return; - case 30549: baronGUID = creature->GetGUID(); return; - case 16063: sirGUID = creature->GetGUID(); return; - case 15928: thaddiusGUID = creature->GetGUID(); return; - case 15936: heiganGUID = creature->GetGUID(); return; - case 15930: feugenGUID = creature->GetGUID(); return; - case 15929: stalaggGUID = creature->GetGUID(); return; - case 15990: kelthuzadGUID = creature->GetGUID(); return; + AddDoor(go, true); } - AddMinion(creature, true); - } + void OnGameObjectRemove(GameObject* go) + { + if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) + { + uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY()); - void OnCreatureRemove(Creature* creature) - { - AddMinion(creature, false); - } + HeiganEruptionGUID[section].erase(go->GetGUID()); + return; + } - void OnGameObjectCreate(GameObject* go) - { - if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) - { - uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY()); - heiganEruptionGUID[section].insert(go->GetGUID()); + switch (go->GetEntry()) + { + case GO_BIRTH: + if (SapphironGUID) + { + if (Creature* sapphiron = instance->GetCreature(SapphironGUID)) + sapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); + return; + } + break; + default: + break; + } - return; + AddDoor(go, false); } - switch (go->GetEntry()) + void OnUnitDeath(Unit* unit) { - case GO_GOTHIK_GATE: - gothikGateGUID = go->GetGUID(); - go->SetGoState(gothikDoorState); - break; - case GO_HORSEMEN_CHEST: - horsemenChestGUID = go->GetGUID(); - break; - case GO_HORSEMEN_CHEST_HERO: - horsemenChestGUID = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL01: - portalsGUID[0] = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL02: - portalsGUID[1] = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL03: - portalsGUID[2] = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL04: - portalsGUID[3] = go->GetGUID(); - break; - case GO_KELTHUZAD_TRIGGER: - kelthuzadTriggerGUID = go->GetGUID(); - break; - default: - break; + if (unit->GetTypeId() == TYPEID_PLAYER && IsEncounterInProgress()) + { + playerDied = 1; + SaveToDB(); + } } - AddDoor(go, true); - } - - void OnGameObjectRemove(GameObject* go) - { - if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) + void SetData(uint32 id, uint32 value) { - uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY()); - - heiganEruptionGUID[section].erase(go->GetGUID()); - return; + switch (id) + { + case DATA_HEIGAN_ERUPT: + HeiganErupt(value); + break; + case DATA_GOTHIK_GATE: + if (GameObject* gate = instance->GetGameObject(GothikGateGUID)) + gate->SetGoState(GOState(value)); + break; + case DATA_HORSEMEN0: + case DATA_HORSEMEN1: + case DATA_HORSEMEN2: + case DATA_HORSEMEN3: + if (value == NOT_STARTED) + { + minHorsemenDiedTime = 0; + maxHorsemenDiedTime = 0; + } + else if (value == DONE) + { + time_t now = time(NULL); + + if (minHorsemenDiedTime == 0) + minHorsemenDiedTime = now; + + maxHorsemenDiedTime = now; + } + break; + case DATA_ABOMINATION_KILLED: + AbominationCount = value; + break; + } } - switch (go->GetEntry()) + uint32 GetData(uint32 id) const { - case GO_BIRTH: - if (sapphironGUID) - { - if (Creature* pSapphiron = instance->GetCreature(sapphironGUID)) - pSapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); - return; - } - break; - default: - break; - } + switch (id) + { + case DATA_ABOMINATION_KILLED: + return AbominationCount; + default: + break; + } - AddDoor(go, false); - } + return 0; + } - void OnUnitDeath(Unit* unit) - { - if (unit->GetTypeId() == TYPEID_PLAYER && IsEncounterInProgress()) + uint64 GetData64(uint32 id) const { - playerDied = 1; - SaveToDB(); + switch (id) + { + case DATA_FAERLINA: + return FaerlinaGUID; + case DATA_THANE: + return ThaneGUID; + case DATA_LADY: + return LadyGUID; + case DATA_BARON: + return BaronGUID; + case DATA_SIR: + return SirGUID; + case DATA_THADDIUS: + return ThaddiusGUID; + case DATA_HEIGAN: + return HeiganGUID; + case DATA_FEUGEN: + return FeugenGUID; + case DATA_STALAGG: + return StalaggGUID; + case DATA_KELTHUZAD: + return KelthuzadGUID; + case DATA_KELTHUZAD_PORTAL01: + return PortalsGUID[0]; + case DATA_KELTHUZAD_PORTAL02: + return PortalsGUID[1]; + case DATA_KELTHUZAD_PORTAL03: + return PortalsGUID[2]; + case DATA_KELTHUZAD_PORTAL04: + return PortalsGUID[3]; + case DATA_KELTHUZAD_TRIGGER: + return KelthuzadTriggerGUID; + } + + return 0; } - } - void SetData(uint32 id, uint32 value) - { - switch (id) + bool SetBossState(uint32 id, EncounterState state) { - case DATA_HEIGAN_ERUPT: - HeiganErupt(value); - break; - case DATA_GOTHIK_GATE: - if (GameObject* gothikGate = instance->GetGameObject(gothikGateGUID)) - gothikGate->SetGoState(GOState(value)); - gothikDoorState = GOState(value); - break; - case DATA_HORSEMEN0: - case DATA_HORSEMEN1: - case DATA_HORSEMEN2: - case DATA_HORSEMEN3: - if (value == NOT_STARTED) + if (!InstanceScript::SetBossState(id, state)) + return false; + + if (id == BOSS_HORSEMEN && state == DONE) + { + if (GameObject* horsemenChest = instance->GetGameObject(HorsemenChestGUID)) { - minHorsemenDiedTime = 0; - maxHorsemenDiedTime = 0; + horsemenChest->SetRespawnTime(horsemenChest->GetRespawnDelay()); + horsemenChest->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); } - else if (value == DONE) - { - time_t now = time(NULL); + } + + return true; + } - if (minHorsemenDiedTime == 0) - minHorsemenDiedTime = now; + void HeiganErupt(uint32 section) + { + for (uint32 i = 0; i < 4; ++i) + { + if (i == section) + continue; - maxHorsemenDiedTime = now; + for (std::set<uint64>::const_iterator itr = HeiganEruptionGUID[i].begin(); itr != HeiganEruptionGUID[i].end(); ++itr) + { + if (GameObject* heiganEruption = instance->GetGameObject(*itr)) + { + heiganEruption->SendCustomAnim(heiganEruption->GetGoAnimProgress()); + heiganEruption->CastSpell(NULL, SPELL_ERUPTION); + } } - break; - case DATA_ABOMINATION_KILLED: - AbominationCount = value; - break; + } } - } - uint32 GetData(uint32 id) const - { - switch (id) + // This Function is called in CheckAchievementCriteriaMeet and CheckAchievementCriteriaMeet is called before SetBossState(bossId, DONE), + // so to check if all bosses are done the checker must exclude 1 boss, the last done, if there is at most 1 encouter in progress when is + // called this function then all bosses are done. The one boss that check is the boss that calls this function, so it is dead. + bool AreAllEncoutersDone() { - case DATA_ABOMINATION_KILLED: - return AbominationCount; - default: - break; - } + uint32 numBossAlive = 0; + for (uint32 i = 0; i < EncounterCount; ++i) + if (GetBossState(i) != DONE) + numBossAlive++; - return 0; - } + if (numBossAlive > 1) + return false; + return true; + } - uint64 GetData64(uint32 id) const - { - switch (id) + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) { - case DATA_FAERLINA: - return faerlinaGUID; - case DATA_THANE: - return thaneGUID; - case DATA_LADY: - return ladyGUID; - case DATA_BARON: - return baronGUID; - case DATA_SIR: - return sirGUID; - case DATA_THADDIUS: - return thaddiusGUID; - case DATA_HEIGAN: - return heiganGUID; - case DATA_FEUGEN: - return feugenGUID; - case DATA_STALAGG: - return stalaggGUID; - case DATA_KELTHUZAD: - return kelthuzadGUID; - case DATA_KELTHUZAD_PORTAL01: - return portalsGUID[0]; - case DATA_KELTHUZAD_PORTAL02: - return portalsGUID[1]; - case DATA_KELTHUZAD_PORTAL03: - return portalsGUID[2]; - case DATA_KELTHUZAD_PORTAL04: - return portalsGUID[3]; - case DATA_KELTHUZAD_TRIGGER: - return kelthuzadTriggerGUID; - } - return 0; - } + switch (criteria_id) + { + case 7600: // Criteria for achievement 2176: And They Would All Go Down Together 15sec of each other 10-man + if (Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_10MAN_NORMAL && (maxHorsemenDiedTime - minHorsemenDiedTime) < 15) + return true; + return false; + case 7601: // Criteria for achievement 2177: And They Would All Go Down Together 15sec of each other 25-man + if (Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_25MAN_NORMAL && (maxHorsemenDiedTime - minHorsemenDiedTime) < 15) + return true; + return false; + // Difficulty checks are done on DB. + // Criteria for achievement 2186: The Immortal (25-man) + case 13233: // The Four Horsemen + case 13234: // Maexxna + case 13235: // Thaddius + case 13236: // Loatheb + case 7616: // Kel'Thuzad + // Criteria for achievement 2187: The Undying (10-man) + case 13237: // The Four Horsemen + case 13238: // Maexxna + case 13239: // Loatheb + case 13240: // Thaddius + case 7617: // Kel'Thuzad + if (AreAllEncoutersDone() && !playerDied) + return true; + return false; + } - bool SetBossState(uint32 id, EncounterState state) - { - if (!InstanceScript::SetBossState(id, state)) return false; + } - if (id == BOSS_HORSEMEN && state == DONE) + std::string GetSaveData() { - if (GameObject* pHorsemenChest = instance->GetGameObject(horsemenChestGUID)) - pHorsemenChest->SetRespawnTime(pHorsemenChest->GetRespawnDelay()); - } + OUT_SAVE_INST_DATA; - return true; - } + std::ostringstream saveStream; + saveStream << "N X " << GetBossSaveData() << playerDied; - void HeiganErupt(uint32 section) - { - for (uint32 i = 0; i < 4; ++i) - { - if (i == section) - continue; + OUT_SAVE_INST_DATA_COMPLETE; + return saveStream.str(); + } - for (std::set<uint64>::const_iterator itr = heiganEruptionGUID[i].begin(); itr != heiganEruptionGUID[i].end(); ++itr) + void Load(const char* strIn) + { + if (!strIn) { - if (GameObject* pHeiganEruption = instance->GetGameObject(*itr)) - { - pHeiganEruption->SendCustomAnim(pHeiganEruption->GetGoAnimProgress()); - pHeiganEruption->CastSpell(NULL, SPELL_ERUPTION); - } + OUT_LOAD_INST_DATA_FAIL; + return; } - } - } - // This Function is called in CheckAchievementCriteriaMeet and CheckAchievementCriteriaMeet is called before SetBossState(bossId, DONE), - // so to check if all bosses are done the checker must exclude 1 boss, the last done, if there is at most 1 encouter in progress when is - // called this function then all bosses are done. The one boss that check is the boss that calls this function, so it is dead. - bool AreAllEncoutersDone() - { - uint32 numBossAlive = 0; - for (uint32 i = 0; i < MAX_BOSS_NUMBER; ++i) - if (GetBossState(i) != DONE) - numBossAlive++; + OUT_LOAD_INST_DATA(strIn); - if (numBossAlive > 1) - return false; - return true; - } + char dataHead1, dataHead2; - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) - { - switch (criteria_id) - { - case 7600: // Criteria for achievement 2176: And They Would All Go Down Together 15sec of each other 10-man - if (Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_10MAN_NORMAL && (maxHorsemenDiedTime - minHorsemenDiedTime) < 15) - return true; - return false; - case 7601: // Criteria for achievement 2177: And They Would All Go Down Together 15sec of each other 25-man - if (Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_25MAN_NORMAL && (maxHorsemenDiedTime - minHorsemenDiedTime) < 15) - return true; - return false; - // Difficulty checks are done on DB. - // Criteria for achievement 2186: The Immortal (25-man) - case 13233: // The Four Horsemen - case 13234: // Maexxna - case 13235: // Thaddius - case 13236: // Loatheb - case 7616: // Kel'Thuzad - // Criteria for achievement 2187: The Undying (10-man) - case 13237: // The Four Horsemen - case 13238: // Maexxna - case 13239: // Loatheb - case 13240: // Thaddius - case 7617: // Kel'Thuzad - if (AreAllEncoutersDone() && !playerDied) - return true; - return false; - } - return false; - } + std::istringstream loadStream(strIn); + loadStream >> dataHead1 >> dataHead2; - std::string GetSaveData() - { - std::ostringstream saveStream; - saveStream << GetBossSaveData() << gothikDoorState << ' ' << playerDied; - return saveStream.str(); - } + if (dataHead1 == 'N' && dataHead2 == 'X') + { + for (uint8 i = 0; i < EncounterCount; ++i) + { + uint32 tmpState; + loadStream >> tmpState; + if (tmpState == IN_PROGRESS || tmpState > SPECIAL) + tmpState = NOT_STARTED; - void Load(const char * data) - { - std::istringstream loadStream(LoadBossState(data)); - uint32 temp, buff, buff2; + SetBossState(i, EncounterState(tmpState)); + } + + loadStream >> playerDied; + } - for (uint32 i = 0; i < MAX_BOSS_NUMBER; ++i) - loadStream >> temp; + OUT_LOAD_INST_DATA_COMPLETE; + } - loadStream >> buff; - gothikDoorState = GOState(buff); - loadStream >> buff2; - playerDied = buff2; + protected: + /* The Arachnid Quarter */ + // Grand Widow Faerlina + uint64 FaerlinaGUID; + + /* The Plague Quarter */ + // Heigan the Unclean + std::set<uint64> HeiganEruptionGUID[4]; + uint64 HeiganGUID; + + /* The Military Quarter */ + // Gothik the Harvester + uint64 GothikGateGUID; + // The Four Horsemen + uint64 ThaneGUID; + uint64 LadyGUID; + uint64 BaronGUID; + uint64 SirGUID; + uint64 HorsemenChestGUID; + uint64 HorsemenTeleporterGUID; + time_t minHorsemenDiedTime; + time_t maxHorsemenDiedTime; + + /* The Construct Quarter */ + // Thaddius + uint64 ThaddiusGUID; + uint64 FeugenGUID; + uint64 StalaggGUID; + + /* Frostwyrm Lair */ + // Sapphiron + uint64 SapphironGUID; + // Kel'Thuzad + uint64 KelthuzadGUID; + uint64 KelthuzadTriggerGUID; + uint64 PortalsGUID[4]; + uint8 AbominationCount; + + /* The Immortal / The Undying */ + uint32 playerDied; + }; + + InstanceScript* GetInstanceScript(InstanceMap* map) const + { + return new instance_naxxramas_InstanceMapScript(map); } - }; }; void AddSC_instance_naxxramas() diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 1f4955f4ddb..10b26e278bb 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -18,6 +18,8 @@ #ifndef DEF_NAXXRAMAS_H #define DEF_NAXXRAMAS_H +uint32 const EncounterCount = 15; + enum Encounter { BOSS_ANUBREKHAN, @@ -34,8 +36,7 @@ enum Encounter BOSS_GOTHIK, BOSS_HORSEMEN, BOSS_SAPPHIRON, - BOSS_KELTHUZAD, - MAX_BOSS_NUMBER + BOSS_KELTHUZAD }; enum Data @@ -70,7 +71,85 @@ enum Data64 DATA_KELTHUZAD_TRIGGER, }; -#define GO_BIRTH 181356 +enum CreaturesIds +{ + NPC_FAERLINA = 15953, + NPC_THANE = 16064, + NPC_LADY = 16065, + NPC_BARON = 30549, + NPC_SIR = 16063, + NPC_THADDIUS = 15928, + NPC_HEIGAN = 15936, + NPC_FEUGEN = 15930, + NPC_STALAGG = 15929, + NPC_SAPPHIRON = 15989, + NPC_KEL_THUZAD = 15990, + NPC_NAXXRAMAS_FOLLOWER = 16505, + NPC_FOLLOWER_WORSHIPPER = 16506, + NPC_DK_UNDERSTUDY = 16803 +}; -#endif +enum GameObjectsIds +{ + GO_HORSEMEN_CHEST_HERO = 193426, + GO_HORSEMEN_CHEST = 181366, + GO_GOTHIK_GATE = 181170, + GO_KELTHUZAD_PORTAL01 = 181402, + GO_KELTHUZAD_PORTAL02 = 181403, + GO_KELTHUZAD_PORTAL03 = 181404, + GO_KELTHUZAD_PORTAL04 = 181405, + GO_KELTHUZAD_TRIGGER = 181444, + GO_ROOM_ANUBREKHAN = 181126, + GO_PASSAGE_ANUBREKHAN = 181195, + GO_PASSAGE_FAERLINA = 194022, + GO_ROOM_MAEXXNA = 181209, + GO_ROOM_NOTH = 181200, + GO_PASSAGE_NOTH = 181201, + GO_ROOM_HEIGAN = 181202, + GO_PASSAGE_HEIGAN = 181203, + GO_ROOM_LOATHEB = 181241, + GO_ROOM_GROBBULUS = 181123, + GO_PASSAGE_GLUTH = 181120, + GO_ROOM_THADDIUS = 181121, + GO_ROOM_GOTHIK = 181124, + GO_PASSAGE_GOTHIK = 181125, + GO_ROOM_HORSEMEN = 181119, + GO_PASSAGE_SAPPHIRON = 181225, + GO_ROOM_KELTHUZAD = 181228, + GO_ARAC_PORTAL = 181575, + GO_PLAG_PORTAL = 181577, + GO_MILI_PORTAL = 181578, + GO_CONS_PORTAL = 181576, + GO_ARAC_EYE_RAMP = 181212, + GO_PLAG_EYE_RAMP = 181211, + GO_MILI_EYE_RAMP = 181210, + GO_CONS_EYE_RAMP = 181213, + GO_ARAC_EYE_RAMP_BOSS = 181233, + GO_PLAG_EYE_RAMP_BOSS = 181231, + GO_MILI_EYE_RAMP_BOSS = 181230, + GO_CONS_EYE_RAMP_BOSS = 181232, + GO_CONS_NOX_TESLA_FEUGEN = 181477, + GO_CONS_NOX_TESLA_STALAGG = 181478, + GO_BIRTH = 181356 +}; + +enum SpellIds +{ + SPELL_ERUPTION = 29371, + SPELL_SLIME = 28801 +}; +/* +template<class AI> +CreatureAI* GetNaxxramasAI(Creature* creature) +{ + if (InstanceMap* instance = creature->GetMap()->ToInstanceMap()) + if (instance->GetInstanceScript()) + if (instance->GetScriptId() == sObjectMgr->GetScriptId(NaxxramasScriptName)) + return new AI(creature); + + return NULL; +} +*/ + +#endif 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(); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index fce20a0fcdf..ea7f4c668ab 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -24,9 +24,9 @@ SDCategory: Auchindoun, Auchenai Crypts EndScriptData */ /* ContentData -mob_stolen_soul +npc_stolen_soul boss_exarch_maladaar -mob_avatar_of_martyred +npc_avatar_of_martyred EndContentData */ #include "ScriptMgr.h" @@ -42,19 +42,19 @@ EndContentData */ #define SPELL_FREEZING_TRAP 37368 #define SPELL_HAMMER_OF_JUSTICE 37369 -class mob_stolen_soul : public CreatureScript +class npc_stolen_soul : public CreatureScript { public: - mob_stolen_soul() : CreatureScript("mob_stolen_soul") { } + npc_stolen_soul() : CreatureScript("npc_stolen_soul") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_stolen_soulAI (creature); + return new npc_stolen_soulAI (creature); } - struct mob_stolen_soulAI : public ScriptedAI + struct npc_stolen_soulAI : public ScriptedAI { - mob_stolen_soulAI(Creature* creature) : ScriptedAI(creature) {} + npc_stolen_soulAI(Creature* creature) : ScriptedAI(creature) {} uint8 myClass; uint32 Class_Timer; @@ -213,7 +213,7 @@ public: if (Unit* target = Unit::GetUnit(*me, soulholder)) { - CAST_AI(mob_stolen_soul::mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); + CAST_AI(npc_stolen_soul::npc_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); summoned->AI()->AttackStart(target); } } @@ -297,19 +297,19 @@ public: #define SPELL_AV_MORTAL_STRIKE 16856 #define SPELL_AV_SUNDER_ARMOR 16145 -class mob_avatar_of_martyred : public CreatureScript +class npc_avatar_of_martyred : public CreatureScript { public: - mob_avatar_of_martyred() : CreatureScript("mob_avatar_of_martyred") { } + npc_avatar_of_martyred() : CreatureScript("npc_avatar_of_martyred") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_avatar_of_martyredAI (creature); + return new npc_avatar_of_martyredAI (creature); } - struct mob_avatar_of_martyredAI : public ScriptedAI + struct npc_avatar_of_martyredAI : public ScriptedAI { - mob_avatar_of_martyredAI(Creature* creature) : ScriptedAI(creature) {} + npc_avatar_of_martyredAI(Creature* creature) : ScriptedAI(creature) {} uint32 Mortal_Strike_timer; @@ -342,6 +342,6 @@ public: void AddSC_boss_exarch_maladaar() { new boss_exarch_maladaar(); - new mob_avatar_of_martyred(); - new mob_stolen_soul(); + new npc_avatar_of_martyred(); + new npc_stolen_soul(); } diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 844882e6d1b..a599bdf74cb 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -157,19 +157,19 @@ public: }; -class mob_focus_fire : public CreatureScript +class npc_focus_fire : public CreatureScript { public: - mob_focus_fire() : CreatureScript("mob_focus_fire") { } + npc_focus_fire() : CreatureScript("npc_focus_fire") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_focus_fireAI (creature); + return new npc_focus_fireAI (creature); } - struct mob_focus_fireAI : public ScriptedAI + struct npc_focus_fireAI : public ScriptedAI { - mob_focus_fireAI(Creature* creature) : ScriptedAI(creature) + npc_focus_fireAI(Creature* creature) : ScriptedAI(creature) { } @@ -211,5 +211,5 @@ public: void AddSC_boss_shirrak_the_dead_watcher() { new boss_shirrak_the_dead_watcher(); - new mob_focus_fire(); + new npc_focus_fire(); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 5870cd51b4d..41a94c84888 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -25,7 +25,7 @@ EndScriptData */ /* ContentData boss_nexusprince_shaffar -mob_ethereal_beacon +npc_ethereal_beacon EndContentData */ #include "ScriptMgr.h" @@ -219,19 +219,19 @@ enum eEnums SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 }; -class mob_ethereal_beacon : public CreatureScript +class npc_ethereal_beacon : public CreatureScript { public: - mob_ethereal_beacon() : CreatureScript("mob_ethereal_beacon") { } + npc_ethereal_beacon() : CreatureScript("npc_ethereal_beacon") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ethereal_beaconAI (creature); + return new npc_ethereal_beaconAI (creature); } - struct mob_ethereal_beaconAI : public ScriptedAI + struct npc_ethereal_beaconAI : public ScriptedAI { - mob_ethereal_beaconAI(Creature* creature) : ScriptedAI(creature) + npc_ethereal_beaconAI(Creature* creature) : ScriptedAI(creature) { } @@ -311,19 +311,19 @@ enum eEthereal SPELL_ETHEREAL_APPRENTICE_FROSTBOLT = 32370 }; -class mob_ethereal_apprentice : public CreatureScript +class npc_ethereal_apprentice : public CreatureScript { public: - mob_ethereal_apprentice() : CreatureScript("mob_ethereal_apprentice") { } + npc_ethereal_apprentice() : CreatureScript("npc_ethereal_apprentice") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ethereal_apprenticeAI (creature); + return new npc_ethereal_apprenticeAI (creature); } - struct mob_ethereal_apprenticeAI : public ScriptedAI + struct npc_ethereal_apprenticeAI : public ScriptedAI { - mob_ethereal_apprenticeAI(Creature* creature) : ScriptedAI(creature) {} + npc_ethereal_apprenticeAI(Creature* creature) : ScriptedAI(creature) {} uint32 Cast_Timer; @@ -360,6 +360,6 @@ public: void AddSC_boss_nexusprince_shaffar() { new boss_nexusprince_shaffar(); - new mob_ethereal_beacon(); - new mob_ethereal_apprentice(); + new npc_ethereal_beacon(); + new npc_ethereal_apprentice(); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 371c94035ac..22dcc7d996c 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -197,14 +197,14 @@ public: }; /* ELEMENTALS */ -class mob_syth_fire : public CreatureScript +class npc_syth_fire : public CreatureScript { public: - mob_syth_fire() : CreatureScript("mob_syth_fire") { } + npc_syth_fire() : CreatureScript("npc_syth_fire") { } - struct mob_syth_fireAI : public ScriptedAI + struct npc_syth_fireAI : public ScriptedAI { - mob_syth_fireAI(Creature* creature) : ScriptedAI(creature) + npc_syth_fireAI(Creature* creature) : ScriptedAI(creature) { } @@ -247,23 +247,23 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_fireAI (creature); + return new npc_syth_fireAI (creature); } }; -class mob_syth_arcane : public CreatureScript +class npc_syth_arcane : public CreatureScript { public: - mob_syth_arcane() : CreatureScript("mob_syth_arcane") { } + npc_syth_arcane() : CreatureScript("npc_syth_arcane") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_arcaneAI (creature); + return new npc_syth_arcaneAI (creature); } - struct mob_syth_arcaneAI : public ScriptedAI + struct npc_syth_arcaneAI : public ScriptedAI { - mob_syth_arcaneAI(Creature* creature) : ScriptedAI(creature) + npc_syth_arcaneAI(Creature* creature) : ScriptedAI(creature) { } @@ -305,19 +305,19 @@ public: }; }; -class mob_syth_frost : public CreatureScript +class npc_syth_frost : public CreatureScript { public: - mob_syth_frost() : CreatureScript("mob_syth_frost") { } + npc_syth_frost() : CreatureScript("npc_syth_frost") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_frostAI (creature); + return new npc_syth_frostAI (creature); } - struct mob_syth_frostAI : public ScriptedAI + struct npc_syth_frostAI : public ScriptedAI { - mob_syth_frostAI(Creature* creature) : ScriptedAI(creature) + npc_syth_frostAI(Creature* creature) : ScriptedAI(creature) { } @@ -360,19 +360,19 @@ public: }; -class mob_syth_shadow : public CreatureScript +class npc_syth_shadow : public CreatureScript { public: - mob_syth_shadow() : CreatureScript("mob_syth_shadow") { } + npc_syth_shadow() : CreatureScript("npc_syth_shadow") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_shadowAI (creature); + return new npc_syth_shadowAI (creature); } - struct mob_syth_shadowAI : public ScriptedAI + struct npc_syth_shadowAI : public ScriptedAI { - mob_syth_shadowAI(Creature* creature) : ScriptedAI(creature) + npc_syth_shadowAI(Creature* creature) : ScriptedAI(creature) { } @@ -418,8 +418,8 @@ public: void AddSC_boss_darkweaver_syth() { new boss_darkweaver_syth(); - new mob_syth_fire(); - new mob_syth_arcane(); - new mob_syth_frost(); - new mob_syth_shadow(); + new npc_syth_fire(); + new npc_syth_arcane(); + new npc_syth_frost(); + new npc_syth_shadow(); } diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index f8467b297cc..329a8c73927 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -16,16 +15,15 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Black_Temple -SD%Complete: 95 -SDComment: Spirit of Olum: Player Teleporter to Seer Kanai Teleport after defeating Naj'entus and Supremus. @todo Find proper gossip. -SDCategory: Black Temple -EndScriptData */ +/* +Name: Black_Temple +Complete: 100% +Comment: Spirit of Olum: Player Teleporter to Seer Kanai Teleport after defeating Naj'entus and Supremus. +*/ -/* ContentData +/* Content npc_spirit_of_olum -EndContentData */ +*/ #include "ScriptMgr.h" #include "ScriptedCreature.h" @@ -37,36 +35,35 @@ EndContentData */ # npc_spirit_of_olum ####*/ -#define SPELL_TELEPORT 41566 // s41566 - Teleport to Ashtongue NPC's -#define GOSSIP_OLUM1 "Teleport me to the other Ashtongue Deathsworn" +enum Spells +{ + SPELL_TELEPORT = 41566 +}; class npc_spirit_of_olum : public CreatureScript { public: npc_spirit_of_olum() : CreatureScript("npc_spirit_of_olum") { } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + struct npc_spirit_of_olumAI : public ScriptedAI { - player->PlayerTalkClass->ClearMenus(); - if (action == GOSSIP_ACTION_INFO_DEF + 1) - player->CLOSE_GOSSIP_MENU(); + npc_spirit_of_olumAI(Creature* creature) : ScriptedAI(creature) {} - player->InterruptNonMeleeSpells(false); - player->CastSpell(player, SPELL_TELEPORT, false); - return true; - } + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) + { + if (action == 1) + { + player->CLOSE_GOSSIP_MENU(); + player->InterruptNonMeleeSpells(false); + player->CastSpell(player, SPELL_TELEPORT, false); + } + } + }; - bool OnGossipHello(Player* player, Creature* creature) + CreatureAI* GetAI(Creature* creature) const { - InstanceScript* instance = creature->GetInstanceScript(); - - if (instance && (instance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (instance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE)) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - - player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); - return true; + return new npc_spirit_of_olumAI (creature); } - }; void AddSC_black_temple() diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 9ef7aaa6dad..22322625775 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -35,41 +35,32 @@ EndScriptData */ #define GETUNIT(unit, guid) Unit* unit = Unit::GetUnit(*me, guid) #define GETCRE(cre, guid) Creature* cre = Unit::GetCreature(*me, guid) -/************* Quotes and Sounds ***********************/ -// Gossip for when a player clicks Akama -#define GOSSIP_ITEM "We are ready to face Illidan" - -// Yells for/by Akama -#define SAY_AKAMA_BEWARE "Be wary friends, The Betrayer meditates in the court just beyond." -#define SOUND_AKAMA_BEWARE 11388 -#define SAY_AKAMA_MINION "Come, my minions. Deal with this traitor as he deserves!" -#define SOUND_AKAMA_MINION 11465 -#define SAY_AKAMA_LEAVE "I'll deal with these mongrels. Strike now, friends! Strike at the betrayer!" -#define SOUND_AKAMA_LEAVE 11390 - -// Self explanatory -char const* SAY_KILL1 = "Who shall be next to taste my blades?!"; -#define SOUND_KILL1 11473 -char const* SAY_KILL2 = "This is too easy!"; -#define SOUND_KILL2 11472 - -// I think I'll fly now and let my subordinates take you on -#define SAY_TAKEOFF "I will not be touched by rabble such as you!" -#define SOUND_TAKEOFF 11479 -#define SAY_SUMMONFLAMES "Behold the flames of Azzinoth!" -#define SOUND_SUMMONFLAMES 11480 - -// When casting Eye Blast. Demon Fire will be appear on places that he casts this -#define SAY_EYE_BLAST "Stare into the eyes of the Betrayer!" -#define SOUND_EYE_BLAST 11481 - -// kk, I go big, dark and demon on you. -#define SAY_MORPH "Behold the power... of the demon within!" -#define SOUND_MORPH 11475 - -// I KILL! -#define SAY_ENRAGE "You've wasted too much time mortals, now you shall fall!" -#define SOUND_ENRAGE 11474 +#define EMOTE_UNABLE_TO_SUMMON "%s is unable to summon Maiev Shadowsong and enter Phase 4. Resetting Encounter." + +// Other defines +#define CENTER_X 676.740f +#define CENTER_Y 305.297f +#define CENTER_Z 353.192f + +enum Say +{ + // Akama + SAY_AKAMA_BEWARE = 0, + SAY_AKAMA_LEAVE = 1, + // Illidan + SAY_ILLIDAN_MINION = 0, + SAY_ILLIDAN_KILL = 1, + SAY_ILLIDAN_TAKEOFF = 2, + SAY_ILLIDAN_SUMMONFLAMES = 3, + SAY_ILLIDAN_EYE_BLAST = 4, + SAY_ILLIDAN_MORPH = 5, + SAY_ILLIDAN_ENRAGE = 6, + SAY_ILLIDAN_TAUNT = 7, + // Maiev Shadowsong + SAY_MAIEV_SHADOWSONG_TAUNT = 0, + // Flame of Azzinoth + EMOTE_AZZINOTH_GAZE = 0 +}; enum Spells // Normal Form @@ -102,6 +93,7 @@ enum Spells SPELL_DEATH = 41220, SPELL_BERSERK = 45078, SPELL_DUAL_WIELD = 42459, + SPELL_SUMMON_MAIEV = 40403, // Phase Normal spells SPELL_FLAME_CRASH_EFFECT = 40836, SPELL_SUMMON_SHADOWDEMON = 41117, @@ -134,104 +126,107 @@ enum Spells SPELL_TELEPORT_VISUAL = 41232, SPELL_SHADOW_STRIKE = 40685, SPELL_THROW_DAGGER = 41152, - SPELL_FAN_BLADES = 39954, // bugged visual + SPELL_FAN_BLADES = 39954 // bugged visual }; -// Other defines -#define CENTER_X 676.740f -#define CENTER_Y 305.297f -#define CENTER_Z 353.192f +enum Misc +{ + FLAME_ENRAGE_DISTANCE = 30, + FLAME_CHARGE_DISTANCE = 50, -#define FLAME_ENRAGE_DISTANCE 30 -#define FLAME_CHARGE_DISTANCE 50 + EQUIP_ID_MAIN_HAND = 32837, + EQUIP_ID_OFF_HAND = 32838, + EQUIP_ID_MAIN_HAND_MAIEV = 44850, -#define EQUIP_ID_MAIN_HAND 32837 -#define EQUIP_ID_OFF_HAND 32838 + MODEL_INVISIBLE = 11686, + MODEL_ILLIDAN = 21135, + MODEL_BLADE = 21431 +}; /**** Creature Summon and Recognition IDs ****/ enum CreatureEntry { - EMPTY = 0, - AKAMA = 22990, - ILLIDAN_STORMRAGE = 22917, - BLADE_OF_AZZINOTH = 22996, - FLAME_OF_AZZINOTH = 22997, - MAIEV_SHADOWSONG = 23197, - SHADOW_DEMON = 23375, - DEMON_FIRE = 23069, - FLAME_CRASH = 23336, - ILLIDAN_DOOR_TRIGGER = 23412, - SPIRIT_OF_OLUM = 23411, - SPIRIT_OF_UDALO = 23410, - ILLIDARI_ELITE = 23226, - PARASITIC_SHADOWFIEND = 23498, - CAGE_TRAP_TRIGGER = 23292, + EMPTY = 0, + AKAMA = 22990, + ILLIDAN_STORMRAGE = 22917, + BLADE_OF_AZZINOTH = 22996, + FLAME_OF_AZZINOTH = 22997, + MAIEV_SHADOWSONG = 23197, + SHADOW_DEMON = 23375, + DEMON_FIRE = 23069, + FLAME_CRASH = 23336, + ILLIDAN_DOOR_TRIGGER = 23412, + SPIRIT_OF_OLUM = 23411, + SPIRIT_OF_UDALO = 23410, + ILLIDARI_ELITE = 23226, + PARASITIC_SHADOWFIEND = 23498, + CAGE_TRAP_TRIGGER = 23292 }; /*** Phase Names ***/ enum PhaseIllidan { - PHASE_ILLIDAN_NULL = 0, - PHASE_NORMAL = 1, - PHASE_FLIGHT = 2, - PHASE_NORMAL_2 = 3, - PHASE_DEMON = 4, - PHASE_NORMAL_MAIEV = 5, - PHASE_TALK_SEQUENCE = 6, - PHASE_FLIGHT_SEQUENCE = 7, - PHASE_TRANSFORM_SEQUENCE = 8, - PHASE_ILLIDAN_MAX = 9, + PHASE_ILLIDAN_NULL = 0, + PHASE_NORMAL = 1, + PHASE_FLIGHT = 2, + PHASE_NORMAL_2 = 3, + PHASE_DEMON = 4, + PHASE_NORMAL_MAIEV = 5, + PHASE_TALK_SEQUENCE = 6, + PHASE_FLIGHT_SEQUENCE = 7, + PHASE_TRANSFORM_SEQUENCE = 8, + PHASE_ILLIDAN_MAX = 9 }; // Maiev uses the same phase enum PhaseAkama { - PHASE_AKAMA_NULL = 0, - PHASE_CHANNEL = 1, - PHASE_WALK = 2, - PHASE_TALK = 3, - PHASE_FIGHT_ILLIDAN = 4, - PHASE_FIGHT_MINIONS = 5, - PHASE_RETURN = 6, + PHASE_AKAMA_NULL = 0, + PHASE_CHANNEL = 1, + PHASE_WALK = 2, + PHASE_TALK = 3, + PHASE_FIGHT_ILLIDAN = 4, + PHASE_FIGHT_MINIONS = 5, + PHASE_RETURN = 6 }; enum EventIllidan { - EVENT_NULL = 0, - EVENT_BERSERK = 1, + EVENT_NULL = 0, + EVENT_BERSERK = 1, // normal phase - EVENT_TAUNT = 2, - EVENT_SHEAR = 3, - EVENT_FLAME_CRASH = 4, - EVENT_PARASITIC_SHADOWFIEND = 5, - EVENT_PARASITE_CHECK = 6, - EVENT_DRAW_SOUL = 7, - EVENT_AGONIZING_FLAMES = 8, - EVENT_TRANSFORM_NORMAL = 9, - EVENT_ENRAGE = 10, + EVENT_TAUNT = 2, + EVENT_SHEAR = 3, + EVENT_FLAME_CRASH = 4, + EVENT_PARASITIC_SHADOWFIEND = 5, + EVENT_PARASITE_CHECK = 6, + EVENT_DRAW_SOUL = 7, + EVENT_AGONIZING_FLAMES = 8, + EVENT_TRANSFORM_NORMAL = 9, + EVENT_ENRAGE = 10, // flight phase - EVENT_FIREBALL = 2, - EVENT_DARK_BARRAGE = 3, - EVENT_EYE_BLAST = 4, - EVENT_MOVE_POINT = 5, + EVENT_FIREBALL = 2, + EVENT_DARK_BARRAGE = 3, + EVENT_EYE_BLAST = 4, + EVENT_MOVE_POINT = 5, // demon phase - EVENT_SHADOW_BLAST = 2, - EVENT_FLAME_BURST = 3, - EVENT_SHADOWDEMON = 4, - EVENT_TRANSFORM_DEMON = 5, + EVENT_SHADOW_BLAST = 2, + EVENT_FLAME_BURST = 3, + EVENT_SHADOWDEMON = 4, + EVENT_TRANSFORM_DEMON = 5, // sequence phase - EVENT_TALK_SEQUENCE = 2, - EVENT_FLIGHT_SEQUENCE = 2, - EVENT_TRANSFORM_SEQUENCE = 2, + EVENT_TALK_SEQUENCE = 2, + EVENT_FLIGHT_SEQUENCE = 2, + EVENT_TRANSFORM_SEQUENCE = 2 }; enum EventMaiev { - EVENT_MAIEV_NULL = 0, - EVENT_MAIEV_STEALTH = 1, - EVENT_MAIEV_TAUNT = 2, - EVENT_MAIEV_SHADOW_STRIKE = 3, - EVENT_MAIEV_THROW_DAGGER = 4, - EVENT_MAIEV_TRAP = 4, + EVENT_MAIEV_NULL = 0, + EVENT_MAIEV_STEALTH = 1, + EVENT_MAIEV_TAUNT = 2, + EVENT_MAIEV_SHADOW_STRIKE = 3, + EVENT_MAIEV_THROW_DAGGER = 4, + EVENT_MAIEV_TRAP = 4 }; static const EventIllidan MaxTimer[9] = @@ -247,6 +242,33 @@ static const EventIllidan MaxTimer[9] = EVENT_TRANSFORM_SEQUENCE }; + +/* ################## TO DO CONVERT THIS UGLINESS TO CREATURE TEXT ################## + +SET @AKAMA := 23089; +SET @ILLIDAN := 22917; +SET @MAIEV := 23197; +DELETE FROM `creature_text` WHERE `entry`=@AKAMA AND `groupid` IN (2,3,4); +DELETE FROM `creature_text` WHERE `entry`=@ILLIDAN AND `groupid` IN (8,9,10,11,12,13,14); +DELETE FROM `creature_text` WHERE `entry`=@MAIEV AND `groupid` IN (1,2,3,4); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ILLIDAN,8,0, "Akama... your duplicity is hardly surprising. I should have slaughtered you and your malformed brethren long ago.",14,0,100,0,0,11463, 'Illidan SAY_XXXXXXXXXXX'), +(@AKAMA,2,0, "We've come to end your reign, Illidan. My people and all of Outland shall be free!",14,0,100,25,0,11389, 'Akama SAY_XXXXXXXXXXX'), +(@ILLIDAN,9,0, "Boldly said. But I remain unconvinced.",14,0,100,396,0,11464, 'Illidan SAY_XXXXXXXXXXX'), +(@AKAMA,3,0, "The time has come! The moment is at hand!",14,0,100,22,0,11380, 'Akama SAY_XXXXXXXXXXX'), +(@ILLIDAN,10,0, "You are not prepared!",14,0,100,406,0,11466, 'Illidan SAY_XXXXXXXXXXX'), +(@ILLIDAN,11,0, "Is this it, mortals? Is this all the fury you can muster?",14,0,100,0,0,11476, 'Illidan SAY_XXXXXXXXXXX'), +(@MAIEV,1,0, "Their fury pales before mine, Illidan. We have some unsettled business between us.",14,0,100,5,0,11491, 'Maiev Shadowsong SAY_XXXXXXXXXXX'), +(@ILLIDAN,12,0, "Maiev... How is this even possible?",14,0,100,1,0,11477, 'Illidan SAY_XXXXXXXXXXX'), +(@MAIEV,2,0, "Ah... my long hunt is finally over. Today, Justice will be done!",14,0,100,15,0,11492, 'Maiev Shadowsong SAY_XXXXXXXXXXX'), +(@ILLIDAN,13,0, "Feel the hatred of ten thousand years!",14,0,100,396,0,11470, 'Illidan SAY_XXXXXXXXXXX'), +(@MAIEV,3,0, "Ahh... It is finished. You are beaten.",14,0,100,0,0,11496, 'Maiev Shadowsong SAY_XXXXXXXXXXX'), +(@ILLIDAN,14,0, "You have won... Maiev...but the huntress... is nothing...without the hunt... you... are nothing... without me..",14,0,100,65,0,11478, 'Illidan SAY_XXXXXXXXXXX'), +(@MAIEV,4,0, "He is right. I feel nothing... I am nothing... Farewell, champions.",14,0,100,0,0,11497, 'Maiev Shadowsong SAY_XXXXXXXXXXX'), +(@AKAMA,4,0, "The Light will fill these dismal halls once again. I swear it.",14,0,100,0,0,11387, 'Akama SAY_XXXXXXXXXXX'); + +*/ + struct Yells { uint32 sound; @@ -282,22 +304,6 @@ static const Yells Conversation[22] = {0, "", EMPTY, 1000, 0, false} // 21 }; -static const Yells RandomTaunts[4]= -{ - {11467, "I can feel your hatred.", ILLIDAN_STORMRAGE, 0, 0, false}, - {11468, "Give in to your fear!", ILLIDAN_STORMRAGE, 0, 0, false}, - {11469, "You know nothing of power!", ILLIDAN_STORMRAGE, 0, 0, false}, - {11471, "Such... arrogance!", ILLIDAN_STORMRAGE, 0, 0, false} -}; - -static const Yells MaievTaunts[4]= -{ - {11493, "That is for Naisha!", MAIEV_SHADOWSONG, 0, 0, false}, - {11494, "Bleed as I have bled!", MAIEV_SHADOWSONG, 0, 0, false}, - {11495, "There shall be no prison for you this time!", MAIEV_SHADOWSONG, 0, 0, false}, - {11500, "Meet your end, demon!", MAIEV_SHADOWSONG, 0, 0, false} -}; - struct Locations { float x, y, z; @@ -368,27 +374,15 @@ static const Animation DemonTransformation[10]= {0, SPELL_DEMON_TRANSFORM_3, 0, 0, 0, 8, true} }; -#define EMOTE_SETS_GAZE_ON "%s sets its gaze on $N!" -#define EMOTE_UNABLE_TO_SUMMON "%s is unable to summon Maiev Shadowsong and enter Phase 4. Resetting Encounter." - -class mob_flame_of_azzinoth : public CreatureScript +class npc_flame_of_azzinoth : public CreatureScript { public: - mob_flame_of_azzinoth() : CreatureScript("mob_flame_of_azzinoth") { } - - CreatureAI* GetAI(Creature* creature) const - { - return new flame_of_azzinothAI (creature); - } + npc_flame_of_azzinoth() : CreatureScript("npc_flame_of_azzinoth") { } struct flame_of_azzinothAI : public ScriptedAI { flame_of_azzinothAI(Creature* creature) : ScriptedAI(creature) {} - uint32 FlameBlastTimer; - uint32 CheckTimer; - uint64 GlaiveGUID; - void Reset() { FlameBlastTimer = 15000; @@ -409,7 +403,7 @@ public: me->AddThreat(target, 5000000.0f); AttackStart(target); DoCast(target, SPELL_CHARGE); - me->MonsterTextEmote(EMOTE_SETS_GAZE_ON, target->GetGUID()); + Talk(EMOTE_AZZINOTH_GAZE); } } @@ -463,7 +457,17 @@ public: DoMeleeAttackIfReady(); } + + private: + uint32 FlameBlastTimer; + uint32 CheckTimer; + uint64 GlaiveGUID; }; + + CreatureAI* GetAI(Creature* creature) const + { + return new flame_of_azzinothAI (creature); + } }; /************************************** Illidan's AI* **************************************/ @@ -472,11 +476,6 @@ class boss_illidan_stormrage : public CreatureScript public: boss_illidan_stormrage() : CreatureScript("boss_illidan_stormrage") { } - CreatureAI* GetAI(Creature* creature) const - { - return new boss_illidan_stormrageAI (creature); - } - struct boss_illidan_stormrageAI : public ScriptedAI { boss_illidan_stormrageAI(Creature* creature) : ScriptedAI(creature), Summons(me) @@ -485,25 +484,6 @@ public: DoCast(me, SPELL_DUAL_WIELD, true); } - InstanceScript* instance; - - PhaseIllidan Phase; - EventIllidan Event; - uint32 Timer[EVENT_ENRAGE + 1]; - - uint32 TalkCount; - uint32 TransformCount; - uint32 FlightCount; - - uint32 HoverPoint; - - uint64 AkamaGUID; - uint64 MaievGUID; - uint64 FlameGUID[2]; - uint64 GlaiveGUID[2]; - - SummonList Summons; - void Reset(); void JustSummoned(Creature* summon); @@ -577,18 +557,7 @@ public: if (victim->GetTypeId() != TYPEID_PLAYER) return; - /// @todo Find better way to handle emote - switch (urand(0, 1)) - { - case 0: - me->MonsterYell(SAY_KILL1, LANG_UNIVERSAL, victim->GetGUID()); - DoPlaySoundToSet(me, SOUND_KILL1); - break; - case 1: - me->MonsterYell(SAY_KILL2, LANG_UNIVERSAL, victim->GetGUID()); - DoPlaySoundToSet(me, SOUND_KILL2); - break; - } + Talk(SAY_ILLIDAN_KILL); } void DamageTaken(Unit* done_by, uint32 &damage) @@ -650,6 +619,7 @@ public: void EnterPhase(PhaseIllidan NextPhase) { DoZoneInCombat(); + switch (NextPhase) { case PHASE_NORMAL: @@ -713,8 +683,7 @@ public: { TransformCount = 0; Timer[EVENT_TRANSFORM_SEQUENCE] = 500; - me->MonsterYell(SAY_MORPH, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, SOUND_MORPH); + Talk(SAY_ILLIDAN_MORPH); } me->GetMotionMaster()->Clear(); me->AttackStop(); @@ -735,8 +704,7 @@ public: { me->InterruptNonMeleeSpells(false); - me->MonsterYell(SAY_EYE_BLAST, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, SOUND_EYE_BLAST); + Talk(SAY_ILLIDAN_EYE_BLAST); float distx, disty, dist[2]; for (uint8 i = 0; i < 2; ++i) @@ -771,8 +739,7 @@ public: } void SummonFlamesOfAzzinoth() { - me->MonsterYell(SAY_SUMMONFLAMES, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, SOUND_SUMMONFLAMES); + Talk(SAY_ILLIDAN_SUMMONFLAMES); for (uint8 i = 0; i < 2; ++i) { @@ -784,7 +751,7 @@ public: Flame->setFaction(me->getFaction()); // Just in case the database has it as a different faction Flame->SetMeleeDamageSchool(SPELL_SCHOOL_FIRE); FlameGUID[i] = Flame->GetGUID(); // Record GUID in order to check if they're dead later on to move to the next phase - CAST_AI(mob_flame_of_azzinoth::flame_of_azzinothAI, Flame->AI())->SetGlaiveGUID(GlaiveGUID[i]); + CAST_AI(npc_flame_of_azzinoth::flame_of_azzinothAI, Flame->AI())->SetGlaiveGUID(GlaiveGUID[i]); Glaive->CastSpell(Flame, SPELL_AZZINOTH_CHANNEL, false); // Glaives do some random Beam type channel on it. } } @@ -793,7 +760,7 @@ public: void SummonMaiev() { DoCast(me, SPELL_SHADOW_PRISON, true); - DoCast(me, 40403, true); + DoCast(me, SPELL_SUMMON_MAIEV, true); if (!MaievGUID) // If Maiev cannot be summoned, reset the encounter and post some errors to the console. { EnterEvadeMode(); @@ -812,8 +779,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); me->SetDisableGravity(true); me->StopMoving(); - me->MonsterYell(SAY_TAKEOFF, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, SOUND_TAKEOFF); + Talk(SAY_ILLIDAN_TAKEOFF); Timer[EVENT_FLIGHT_SEQUENCE] = 3000; break; case 2: // move to center @@ -828,7 +794,7 @@ public: { GlaiveGUID[i] = Glaive->GetGUID(); Glaive->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - Glaive->SetDisplayId(11686); + Glaive->SetDisplayId(MODEL_INVISIBLE); Glaive->setFaction(me->getFaction()); DoCast(Glaive, SPELL_THROW_GLAIVE2); } @@ -844,7 +810,7 @@ public: { GlaiveGUID[i] = Glaive->GetGUID(); Glaive->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - Glaive->SetDisplayId(11686); + Glaive->SetDisplayId(MODEL_INVISIBLE); Glaive->setFaction(me->getFaction()); DoCast(Glaive, SPELL_THROW_GLAIVE, true); } @@ -872,7 +838,7 @@ public: if (Glaive) { Glaive->CastSpell(me, SPELL_GLAIVE_RETURNS, false); // Make it look like the Glaive flies back up to us - Glaive->SetDisplayId(11686); // disappear but not die for now + Glaive->SetDisplayId(MODEL_INVISIBLE); // disappear but not die for now } } } @@ -1019,21 +985,13 @@ public: { // PHASE_NORMAL case EVENT_BERSERK: - me->MonsterYell(SAY_ENRAGE, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, SOUND_ENRAGE); + Talk(SAY_ILLIDAN_ENRAGE); DoCast(me, SPELL_BERSERK, true); Timer[EVENT_BERSERK] = 5000; // The buff actually lasts forever. break; case EVENT_TAUNT: - { - uint32 random = rand()%4; - uint32 soundid = RandomTaunts[random].sound; - if (RandomTaunts[random].text.size()) - me->MonsterYell(RandomTaunts[random].text.c_str(), LANG_UNIVERSAL, 0); - if (soundid) - DoPlaySoundToSet(me, soundid); - } + Talk(SAY_ILLIDAN_TAUNT); Timer[EVENT_TAUNT] = urand(25000, 35000); break; @@ -1150,7 +1108,28 @@ public: } } } + + public: + uint64 AkamaGUID; + uint32 Timer[EVENT_ENRAGE + 1]; + PhaseIllidan Phase; + private: + InstanceScript* instance; + EventIllidan Event; + uint32 TalkCount; + uint32 TransformCount; + uint32 FlightCount; + uint32 HoverPoint; + uint64 MaievGUID; + uint64 FlameGUID[2]; + uint64 GlaiveGUID[2]; + SummonList Summons; }; + + CreatureAI* GetAI(Creature* creature) const + { + return new boss_illidan_stormrageAI (creature); + } }; /********************************** End of Illidan AI* *****************************************/ @@ -1161,22 +1140,10 @@ class boss_maiev_shadowsong : public CreatureScript public: boss_maiev_shadowsong() : CreatureScript("boss_maiev_shadowsong") { } - CreatureAI* GetAI(Creature* creature) const - { - return new boss_maievAI (creature); - } - struct boss_maievAI : public ScriptedAI { boss_maievAI(Creature* creature) : ScriptedAI(creature) {}; - uint64 IllidanGUID; - - PhaseIllidan Phase; - EventMaiev Event; - uint32 Timer[5]; - uint32 MaxTimer; - void Reset() { MaxTimer = 0; @@ -1185,7 +1152,7 @@ public: Timer[EVENT_MAIEV_STEALTH] = 0; Timer[EVENT_MAIEV_TAUNT] = urand(22, 43) * 1000; Timer[EVENT_MAIEV_SHADOW_STRIKE] = 30000; - SetEquipmentSlots(false, 44850, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); + SetEquipmentSlots(false, EQUIP_ID_MAIN_HAND_MAIEV, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } @@ -1330,14 +1297,8 @@ public: } break; case EVENT_MAIEV_TAUNT: - { - uint32 random = rand()%4; - uint32 sound = MaievTaunts[random].sound; - if (MaievTaunts[random].text.size()) - me->MonsterYell(MaievTaunts[random].text.c_str(), LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, sound); - Timer[EVENT_MAIEV_TAUNT] = urand(22, 43) * 1000; - } + Talk(SAY_MAIEV_SHADOWSONG_TAUNT); + Timer[EVENT_MAIEV_TAUNT] = urand(22, 43) * 1000; break; case EVENT_MAIEV_SHADOW_STRIKE: DoCastVictim(SPELL_SHADOW_STRIKE); @@ -1376,7 +1337,19 @@ public: if (Phase == PHASE_NORMAL_MAIEV) DoMeleeAttackIfReady(); } + + private: + uint64 IllidanGUID; + PhaseIllidan Phase; + EventMaiev Event; + uint32 Timer[5]; + uint32 MaxTimer; }; + + CreatureAI* GetAI(Creature* creature) const + { + return new boss_maievAI (creature); + } }; class npc_akama_illidan : public CreatureScript @@ -1391,23 +1364,6 @@ public: instance = creature->GetInstanceScript(); JustCreated = true; } - bool JustCreated; - InstanceScript* instance; - - PhaseAkama Phase; - bool Event; - uint32 Timer; - - uint64 IllidanGUID; - uint64 ChannelGUID; - uint64 SpiritGUID[2]; - uint64 GateGUID; - uint64 DoorGUID[2]; - - uint32 ChannelCount; - uint32 WalkCount; - uint32 TalkCount; - uint32 Check_Timer; void Reset() { @@ -1440,21 +1396,21 @@ public: else { IllidanGUID = 0; - GateGUID = 0; + GateGUID = 0; DoorGUID[0] = 0; DoorGUID[1] = 0; } - ChannelGUID = 0; + ChannelGUID = 0; SpiritGUID[0] = 0; SpiritGUID[1] = 0; - Phase = PHASE_AKAMA_NULL; - Timer = 0; + Phase = PHASE_AKAMA_NULL; + Timer = 0; - ChannelCount = 0; - TalkCount = 0; - Check_Timer = 5000; + ChannelCount = 0; + TalkCount = 0; + Check_Timer = 5000; KillAllElites(); @@ -1537,7 +1493,7 @@ public: if (Creature* Channel = me->SummonCreature(ILLIDAN_DOOR_TRIGGER, x, y, z+5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) { ChannelGUID = Channel->GetGUID(); - Channel->SetDisplayId(11686); // Invisible but spell visuals can still be seen. + Channel->SetDisplayId(MODEL_INVISIBLE); // Invisible but spell visuals can still be seen. DoCast(Channel, SPELL_AKAMA_DOOR_FAIL); } @@ -1628,14 +1584,12 @@ public: if (GETCRE(Illidan, IllidanGUID)) { CAST_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, Illidan->AI())->Timer[EVENT_TAUNT] += 30000; - Illidan->MonsterYell(SAY_AKAMA_MINION, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(Illidan, SOUND_AKAMA_MINION); + Illidan->AI()->Talk(SAY_ILLIDAN_MINION); } Timer = 8000; break; case 1: - me->MonsterYell(SAY_AKAMA_LEAVE, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, SOUND_AKAMA_LEAVE); + Talk(SAY_AKAMA_LEAVE); Timer = 3000; break; case 2: @@ -1688,8 +1642,7 @@ public: Timer = 2000; break; case 5: - me->MonsterYell(SAY_AKAMA_BEWARE, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me, SOUND_AKAMA_BEWARE); + Talk(SAY_AKAMA_BEWARE); Channel->setDeathState(JUST_DIED); Spirit[0]->SetVisible(false); Spirit[1]->SetVisible(false); @@ -1814,26 +1767,29 @@ public: DoMeleeAttackIfReady(); } - }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) - { - player->PlayerTalkClass->ClearMenus(); - if (action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) { player->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_akama_illidan::npc_akama_illidanAI, creature->AI())->EnterPhase(PHASE_CHANNEL); + EnterPhase(PHASE_CHANNEL); } - return true; - } - - bool OnGossipHello(Player* player, Creature* creature) - { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - player->SEND_GOSSIP_MENU(10465, creature->GetGUID()); - return true; - } + private: + bool JustCreated; + InstanceScript* instance; + PhaseAkama Phase; + bool Event; + uint32 Timer; + uint64 IllidanGUID; + uint64 ChannelGUID; + uint64 SpiritGUID[2]; + uint64 GateGUID; + uint64 DoorGUID[2]; + uint32 ChannelCount; + uint32 WalkCount; + uint32 TalkCount; + uint32 Check_Timer; + }; CreatureAI* GetAI(Creature* creature) const { @@ -1878,7 +1834,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() FlightCount = 0; TransformCount = 0; - me->SetDisplayId(21135); + me->SetDisplayId(MODEL_ILLIDAN); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -2020,26 +1976,15 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence() ++TalkCount; } -class mob_cage_trap_trigger : public CreatureScript +class npc_cage_trap_trigger : public CreatureScript { public: - mob_cage_trap_trigger() : CreatureScript("mob_cage_trap_trigger") { } - - CreatureAI* GetAI(Creature* creature) const - { - return new cage_trap_triggerAI (creature); - } + npc_cage_trap_trigger() : CreatureScript("npc_cage_trap_trigger") { } struct cage_trap_triggerAI : public ScriptedAI { cage_trap_triggerAI(Creature* creature) : ScriptedAI(creature) {} - uint64 IllidanGUID; - uint32 DespawnTimer; - - bool Active; - bool SummonedBeams; - void Reset() { IllidanGUID = 0; @@ -2095,7 +2040,19 @@ public: // } // } } + + public: + bool Active; + private: + uint64 IllidanGUID; + uint32 DespawnTimer; + bool SummonedBeams; }; + + CreatureAI* GetAI(Creature* creature) const + { + return new cage_trap_triggerAI (creature); + } }; class gameobject_cage_trap : public GameObjectScript @@ -2110,28 +2067,21 @@ public: // Grid search for nearest live Creature of entry 23304 within 10 yards if (Creature* pTrigger = go->FindNearestCreature(23304, 10.0f)) - CAST_AI(mob_cage_trap_trigger::cage_trap_triggerAI, pTrigger->AI())->Active = true; + CAST_AI(npc_cage_trap_trigger::cage_trap_triggerAI, pTrigger->AI())->Active = true; go->SetGoState(GO_STATE_ACTIVE); return true; } }; -class mob_shadow_demon : public CreatureScript +class npc_shadow_demon : public CreatureScript { public: - mob_shadow_demon() : CreatureScript("mob_shadow_demon") { } - - CreatureAI* GetAI(Creature* creature) const - { - return new shadow_demonAI (creature); - } + npc_shadow_demon() : CreatureScript("npc_shadow_demon") { } struct shadow_demonAI : public ScriptedAI { shadow_demonAI(Creature* creature) : ScriptedAI(creature) {} - uint64 TargetGUID; - void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); @@ -2168,18 +2118,21 @@ public: if (me->IsWithinDistInMap(me->GetVictim(), 3)) DoCastVictim(SPELL_CONSUME_SOUL); } - }; -}; -class mob_blade_of_azzinoth : public CreatureScript -{ -public: - mob_blade_of_azzinoth() : CreatureScript("mob_blade_of_azzinoth") { } + private: + uint64 TargetGUID; + }; CreatureAI* GetAI(Creature* creature) const { - return new blade_of_azzinothAI (creature); + return new shadow_demonAI (creature); } +}; + +class npc_blade_of_azzinoth : public CreatureScript +{ +public: + npc_blade_of_azzinoth() : CreatureScript("npc_blade_of_azzinoth") { } struct blade_of_azzinothAI : public NullCreatureAI { @@ -2188,33 +2141,29 @@ public: void SpellHit(Unit* /*caster*/, const SpellInfo* spell) { if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE) - me->SetDisplayId(21431);// appear when hit by Illidan's glaive + me->SetDisplayId(MODEL_BLADE);// appear when hit by Illidan's glaive } }; -}; - -class mob_parasitic_shadowfiend : public CreatureScript -{ -public: - mob_parasitic_shadowfiend() : CreatureScript("mob_parasitic_shadowfiend") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_parasitic_shadowfiendAI (creature); + return new blade_of_azzinothAI (creature); } +}; + +class npc_parasitic_shadowfiend : public CreatureScript +{ +public: + npc_parasitic_shadowfiend() : CreatureScript("npc_parasitic_shadowfiend") { } // Shadowfiends interact with Illidan, setting more targets in Illidan's hashmap - struct mob_parasitic_shadowfiendAI : public ScriptedAI + struct npc_parasitic_shadowfiendAI : public ScriptedAI { - mob_parasitic_shadowfiendAI(Creature* creature) : ScriptedAI(creature) + npc_parasitic_shadowfiendAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } - InstanceScript* instance; - uint64 IllidanGUID; - uint32 CheckTimer; - void Reset() { if (instance) @@ -2274,7 +2223,17 @@ public: DoMeleeAttackIfReady(); } + + private: + InstanceScript* instance; + uint64 IllidanGUID; + uint32 CheckTimer; }; + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_parasitic_shadowfiendAI (creature); + } }; void AddSC_boss_illidan() @@ -2282,10 +2241,10 @@ void AddSC_boss_illidan() new boss_illidan_stormrage(); new npc_akama_illidan(); new boss_maiev_shadowsong(); - new mob_flame_of_azzinoth(); - new mob_blade_of_azzinoth(); + new npc_flame_of_azzinoth(); + new npc_blade_of_azzinoth(); new gameobject_cage_trap(); - new mob_cage_trap_trigger(); - new mob_shadow_demon(); - new mob_parasitic_shadowfiend(); + new npc_cage_trap_trigger(); + new npc_shadow_demon(); + new npc_parasitic_shadowfiend(); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index cf937ee0cd1..0c1994d0c2e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -115,19 +115,19 @@ static Location BrokenWP[]= const uint32 spawnEntries[4]= { 23523, 23318, 23524 }; -class mob_ashtongue_channeler : public CreatureScript +class npc_ashtongue_channeler : public CreatureScript { public: - mob_ashtongue_channeler() : CreatureScript("mob_ashtongue_channeler") { } + npc_ashtongue_channeler() : CreatureScript("npc_ashtongue_channeler") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ashtongue_channelerAI (creature); + return new npc_ashtongue_channelerAI (creature); } - struct mob_ashtongue_channelerAI : public ScriptedAI + struct npc_ashtongue_channelerAI : public ScriptedAI { - mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) + npc_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) { ShadeGUID = 0; } @@ -144,19 +144,19 @@ public: }; -class mob_ashtongue_sorcerer : public CreatureScript +class npc_ashtongue_sorcerer : public CreatureScript { public: - mob_ashtongue_sorcerer() : CreatureScript("mob_ashtongue_sorcerer") { } + npc_ashtongue_sorcerer() : CreatureScript("npc_ashtongue_sorcerer") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_ashtongue_sorcererAI (creature); + return new npc_ashtongue_sorcererAI (creature); } - struct mob_ashtongue_sorcererAI : public ScriptedAI + struct npc_ashtongue_sorcererAI : public ScriptedAI { - mob_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature) + npc_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature) { ShadeGUID = 0; } @@ -366,7 +366,7 @@ public: Creature* Sorcerer = me->SummonCreature(CREATURE_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0); if (Sorcerer) { - CAST_AI(mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID(); + CAST_AI(npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID(); Sorcerer->SetWalk(false); Sorcerer->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); Sorcerer->SetTarget(me->GetGUID()); @@ -400,7 +400,7 @@ public: { for (std::list<Creature*>::const_iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr) { - CAST_AI(mob_ashtongue_channeler::mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID(); + CAST_AI(npc_ashtongue_channeler::npc_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID(); Channelers.push_back((*itr)->GetGUID()); TC_LOG_DEBUG(LOG_FILTER_TSCR, "Shade of Akama Grid Search found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID()); } @@ -533,7 +533,7 @@ public: }; -void mob_ashtongue_channeler::mob_ashtongue_channelerAI::JustDied(Unit* /*killer*/) +void npc_ashtongue_channeler::npc_ashtongue_channelerAI::JustDied(Unit* /*killer*/) { Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); if (Shade && Shade->IsAlive()) @@ -541,7 +541,7 @@ void mob_ashtongue_channeler::mob_ashtongue_channelerAI::JustDied(Unit* /*killer else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama."); } -void mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/) +void npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI::JustDied(Unit* /*killer*/) { Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); if (Shade && Shade->IsAlive()) @@ -899,7 +899,7 @@ public: void AddSC_boss_shade_of_akama() { new boss_shade_of_akama(); - new mob_ashtongue_channeler(); - new mob_ashtongue_sorcerer(); + new npc_ashtongue_channeler(); + new npc_ashtongue_sorcerer(); new npc_akama_shade(); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 0310f9237cd..14a31e85e24 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -51,19 +51,19 @@ enum DoomBlossom CREATURE_SHADOWY_CONSTRUCT = 23111 }; -class mob_doom_blossom : public CreatureScript +class npc_doom_blossom : public CreatureScript { public: - mob_doom_blossom() : CreatureScript("mob_doom_blossom") { } + npc_doom_blossom() : CreatureScript("npc_doom_blossom") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_doom_blossomAI(creature); + return new npc_doom_blossomAI(creature); } - struct mob_doom_blossomAI : public ScriptedAI + struct npc_doom_blossomAI : public ScriptedAI { - mob_doom_blossomAI(Creature* creature) : ScriptedAI(creature) {} + npc_doom_blossomAI(Creature* creature) : ScriptedAI(creature) {} uint32 CheckTeronTimer; uint32 ShadowBoltTimer; @@ -119,19 +119,19 @@ public: }; }; -class mob_shadowy_construct : public CreatureScript +class npc_shadowy_construct : public CreatureScript { public: - mob_shadowy_construct() : CreatureScript("mob_shadowy_construct") { } + npc_shadowy_construct() : CreatureScript("npc_shadowy_construct") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_shadowy_constructAI(creature); + return new npc_shadowy_constructAI(creature); } - struct mob_shadowy_constructAI : public ScriptedAI + struct npc_shadowy_constructAI : public ScriptedAI { - mob_shadowy_constructAI(Creature* creature) : ScriptedAI(creature) {} + npc_shadowy_constructAI(Creature* creature) : ScriptedAI(creature) {} uint64 GhostGUID; uint64 TeronGUID; @@ -366,7 +366,7 @@ public: { Construct->CastSpell(Construct, SPELL_PASSIVE_SHADOWFORM, true); SetThreatList(Construct); // Use same function as Doom Blossom to set Threat List. - CAST_AI(mob_shadowy_construct::mob_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID; + CAST_AI(npc_shadowy_construct::npc_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID; Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!target) // someone's trying to solo. target = me->GetVictim(); @@ -444,7 +444,7 @@ public: DoomBlossom->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoomBlossom->setFaction(me->getFaction()); DoomBlossom->AddThreat(target, 1.0f); - CAST_AI(mob_doom_blossom::mob_doom_blossomAI, DoomBlossom->AI())->SetTeronGUID(me->GetGUID()); + CAST_AI(npc_doom_blossom::npc_doom_blossomAI, DoomBlossom->AI())->SetTeronGUID(me->GetGUID()); target->CombatStart(DoomBlossom); SetThreatList(DoomBlossom); SummonDoomBlossomTimer = 35000; @@ -512,7 +512,7 @@ public: void AddSC_boss_teron_gorefiend() { - new mob_doom_blossom(); - new mob_shadowy_construct(); + new npc_doom_blossom(); + new npc_shadowy_construct(); new boss_teron_gorefiend(); } diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index b75296a59e3..bbf75b2df5c 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -115,19 +115,19 @@ static CouncilYells CouncilEnrage[]= {1, 0}, // Zerevor }; -class mob_blood_elf_council_voice_trigger : public CreatureScript +class npc_blood_elf_council_voice_trigger : public CreatureScript { public: - mob_blood_elf_council_voice_trigger() : CreatureScript("mob_blood_elf_council_voice_trigger") { } + npc_blood_elf_council_voice_trigger() : CreatureScript("npc_blood_elf_council_voice_trigger") { } CreatureAI* GetAI(Creature* c) const { - return new mob_blood_elf_council_voice_triggerAI(c); + return new npc_blood_elf_council_voice_triggerAI(c); } - struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI + struct npc_blood_elf_council_voice_triggerAI : public ScriptedAI { - mob_blood_elf_council_voice_triggerAI(Creature* creature) : ScriptedAI(creature) + npc_blood_elf_council_voice_triggerAI(Creature* creature) : ScriptedAI(creature) { for (uint8 i = 0; i < 4; ++i) Council[i] = 0; @@ -210,19 +210,19 @@ public: }; -class mob_illidari_council : public CreatureScript +class npc_illidari_council : public CreatureScript { public: - mob_illidari_council() : CreatureScript("mob_illidari_council") { } + npc_illidari_council() : CreatureScript("npc_illidari_council") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_illidari_councilAI (creature); + return new npc_illidari_councilAI (creature); } - struct mob_illidari_councilAI : public ScriptedAI + struct npc_illidari_councilAI : public ScriptedAI { - mob_illidari_councilAI(Creature* creature) : ScriptedAI(creature) + npc_illidari_councilAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); for (uint8 i = 0; i < 4; ++i) @@ -295,8 +295,8 @@ public: // Start the event for the Voice Trigger if (Creature* VoiceTrigger = (Unit::GetCreature(*me, instance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) { - CAST_AI(mob_blood_elf_council_voice_trigger::mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->LoadCouncilGUIDs(); - CAST_AI(mob_blood_elf_council_voice_trigger::mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->EventStarted = true; + CAST_AI(npc_blood_elf_council_voice_trigger::npc_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->LoadCouncilGUIDs(); + CAST_AI(npc_blood_elf_council_voice_trigger::npc_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->EventStarted = true; } for (uint8 i = 0; i < 4; ++i) @@ -403,7 +403,7 @@ struct boss_illidari_councilAI : public ScriptedAI { Creature* Controller = (Unit::GetCreature(*me, instance->GetData64(DATA_ILLIDARICOUNCIL))); if (Controller) - CAST_AI(mob_illidari_council::mob_illidari_councilAI, Controller->AI())->StartEvent(who); + CAST_AI(npc_illidari_council::npc_illidari_councilAI, Controller->AI())->StartEvent(who); } else { @@ -929,8 +929,8 @@ public: void AddSC_boss_illidari_council() { - new mob_illidari_council(); - new mob_blood_elf_council_voice_trigger(); + new npc_illidari_council(); + new npc_blood_elf_council_voice_trigger(); new boss_gathios_the_shatterer(); new boss_lady_malande(); new boss_veras_darkshadow(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 8aa8d939a6d..7e168f8bf90 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -543,19 +543,19 @@ public: // Enchanted Elemental // If one of them reaches Vashj he will increase her damage done by 5%. -class mob_enchanted_elemental : public CreatureScript +class npc_enchanted_elemental : public CreatureScript { public: - mob_enchanted_elemental() : CreatureScript("mob_enchanted_elemental") { } + npc_enchanted_elemental() : CreatureScript("npc_enchanted_elemental") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_enchanted_elementalAI (creature); + return new npc_enchanted_elementalAI (creature); } - struct mob_enchanted_elementalAI : public ScriptedAI + struct npc_enchanted_elementalAI : public ScriptedAI { - mob_enchanted_elementalAI(Creature* creature) : ScriptedAI(creature) + npc_enchanted_elementalAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -637,19 +637,19 @@ public: // Tainted Elemental // This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental -class mob_tainted_elemental : public CreatureScript +class npc_tainted_elemental : public CreatureScript { public: - mob_tainted_elemental() : CreatureScript("mob_tainted_elemental") { } + npc_tainted_elemental() : CreatureScript("npc_tainted_elemental") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_tainted_elementalAI (creature); + return new npc_tainted_elementalAI (creature); } - struct mob_tainted_elementalAI : public ScriptedAI + struct npc_tainted_elementalAI : public ScriptedAI { - mob_tainted_elementalAI(Creature* creature) : ScriptedAI(creature) + npc_tainted_elementalAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -706,19 +706,19 @@ public: //Toxic Sporebat //Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it. -class mob_toxic_sporebat : public CreatureScript +class npc_toxic_sporebat : public CreatureScript { public: - mob_toxic_sporebat() : CreatureScript("mob_toxic_sporebat") { } + npc_toxic_sporebat() : CreatureScript("npc_toxic_sporebat") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_toxic_sporebatAI (creature); + return new npc_toxic_sporebatAI (creature); } - struct mob_toxic_sporebatAI : public ScriptedAI + struct npc_toxic_sporebatAI : public ScriptedAI { - mob_toxic_sporebatAI(Creature* creature) : ScriptedAI(creature) + npc_toxic_sporebatAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); EnterEvadeMode(); @@ -804,19 +804,19 @@ public: }; -class mob_shield_generator_channel : public CreatureScript +class npc_shield_generator_channel : public CreatureScript { public: - mob_shield_generator_channel() : CreatureScript("mob_shield_generator_channel") { } + npc_shield_generator_channel() : CreatureScript("npc_shield_generator_channel") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_shield_generator_channelAI (creature); + return new npc_shield_generator_channelAI (creature); } - struct mob_shield_generator_channelAI : public ScriptedAI + struct npc_shield_generator_channelAI : public ScriptedAI { - mob_shield_generator_channelAI(Creature* creature) : ScriptedAI(creature) + npc_shield_generator_channelAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -937,9 +937,9 @@ public: void AddSC_boss_lady_vashj() { new boss_lady_vashj(); - new mob_enchanted_elemental(); - new mob_tainted_elemental(); - new mob_toxic_sporebat(); - new mob_shield_generator_channel(); + new npc_enchanted_elemental(); + new npc_tainted_elemental(); + new npc_toxic_sporebat(); + new npc_shield_generator_channel(); new item_tainted_core(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 02a86e1ab6d..733ccf64101 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -56,7 +56,7 @@ enum LeotherasTheBlind MODEL_DEMON = 20125, MODEL_NIGHTELF = 20514, DEMON_FORM = 21875, - MOB_SPELLBINDER = 21806, + NPC_SPELLBINDER = 21806, INNER_DEMON_VICTIM = 1, SAY_AGGRO = 0, @@ -69,19 +69,19 @@ enum LeotherasTheBlind SAY_DEATH = 7 }; -class mob_inner_demon : public CreatureScript +class npc_inner_demon : public CreatureScript { public: - mob_inner_demon() : CreatureScript("mob_inner_demon") { } + npc_inner_demon() : CreatureScript("npc_inner_demon") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_inner_demonAI (creature); + return new npc_inner_demonAI (creature); } - struct mob_inner_demonAI : public ScriptedAI + struct npc_inner_demonAI : public ScriptedAI { - mob_inner_demonAI(Creature* creature) : ScriptedAI(creature) + npc_inner_demonAI(Creature* creature) : ScriptedAI(creature) { victimGUID = 0; } @@ -259,7 +259,7 @@ public: if (i == 0) {nx += 10; ny -= 5; o=2.5f;} if (i == 1) {nx -= 8; ny -= 7; o=0.9f;} if (i == 2) {nx -= 3; ny += 9; o=5.0f;} - Creature* binder = me->SummonCreature(MOB_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0); + Creature* binder = me->SummonCreature(NPC_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0); if (binder) SpellBinderGUID[i] = binder->GetGUID(); } @@ -669,19 +669,19 @@ public: }; }; -class mob_greyheart_spellbinder : public CreatureScript +class npc_greyheart_spellbinder : public CreatureScript { public: - mob_greyheart_spellbinder() : CreatureScript("mob_greyheart_spellbinder") { } + npc_greyheart_spellbinder() : CreatureScript("npc_greyheart_spellbinder") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_greyheart_spellbinderAI (creature); + return new npc_greyheart_spellbinderAI (creature); } - struct mob_greyheart_spellbinderAI : public ScriptedAI + struct npc_greyheart_spellbinderAI : public ScriptedAI { - mob_greyheart_spellbinderAI(Creature* creature) : ScriptedAI(creature) + npc_greyheart_spellbinderAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); leotherasGUID = 0; @@ -808,6 +808,6 @@ void AddSC_boss_leotheras_the_blind() { new boss_leotheras_the_blind(); new boss_leotheras_the_blind_demonform(); - new mob_greyheart_spellbinder(); - new mob_inner_demon(); + new npc_greyheart_spellbinder(); + new npc_inner_demon(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 3f42379dd62..da8e75e8f31 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -43,8 +43,8 @@ EndScriptData */ #define SPOUT_DIST 100 -#define MOB_COILFANG_GUARDIAN 21873 -#define MOB_COILFANG_AMBUSHER 21865 +#define NPC_COILFANG_GUARDIAN 21873 +#define NPC_COILFANG_AMBUSHER 21865 //Ambusher spells #define SPELL_SPREAD_SHOT 37790 @@ -350,7 +350,7 @@ public: me->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); // spawn adds for (uint8 i = 0; i < 9; ++i) - if (Creature* summoned = me->SummonCreature(i < 6 ? MOB_COILFANG_AMBUSHER : MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* summoned = me->SummonCreature(i < 6 ? NPC_COILFANG_AMBUSHER : NPC_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0)) Summons.Summon(summoned); Spawned = true; } @@ -359,19 +359,19 @@ public: }; }; -class mob_coilfang_ambusher : public CreatureScript +class npc_coilfang_ambusher : public CreatureScript { public: - mob_coilfang_ambusher() : CreatureScript("mob_coilfang_ambusher") { } + npc_coilfang_ambusher() : CreatureScript("npc_coilfang_ambusher") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_coilfang_ambusherAI (creature); + return new npc_coilfang_ambusherAI (creature); } - struct mob_coilfang_ambusherAI : public ScriptedAI + struct npc_coilfang_ambusherAI : public ScriptedAI { - mob_coilfang_ambusherAI(Creature* creature) : ScriptedAI(creature) + npc_coilfang_ambusherAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); } @@ -444,6 +444,6 @@ class go_strange_pool : public GameObjectScript void AddSC_boss_the_lurker_below() { new boss_the_lurker_below(); - new mob_coilfang_ambusher(); + new npc_coilfang_ambusher(); new go_strange_pool(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 877e1113962..ec949345928 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -280,19 +280,19 @@ public: //Water Globule AI #define SPELL_GLOBULE_EXPLOSION 37871 -class mob_water_globule : public CreatureScript +class npc_water_globule : public CreatureScript { public: - mob_water_globule() : CreatureScript("mob_water_globule") { } + npc_water_globule() : CreatureScript("npc_water_globule") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_water_globuleAI (creature); + return new npc_water_globuleAI (creature); } - struct mob_water_globuleAI : public ScriptedAI + struct npc_water_globuleAI : public ScriptedAI { - mob_water_globuleAI(Creature* creature) : ScriptedAI(creature) {} + npc_water_globuleAI(Creature* creature) : ScriptedAI(creature) {} uint32 Check_Timer; @@ -348,5 +348,5 @@ public: void AddSC_boss_morogrim_tidewalker() { new boss_morogrim_tidewalker(); - new mob_water_globule(); + new npc_water_globule(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 27134a3a740..de12e35ec19 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -31,9 +31,9 @@ EndScriptData */ #define MAX_ENCOUNTER 6 #define SPELL_SCALDINGWATER 37284 -#define MOB_COILFANG_FRENZY 21508 -#define TRASHMOB_COILFANG_PRIESTESS 21220 //6*2 -#define TRASHMOB_COILFANG_SHATTERER 21301 //6*3 +#define NPC_COILFANG_FRENZY 21508 +#define TRASHNPC_COILFANG_PRIESTESS 21220 //6*2 +#define TRASHNPC_COILFANG_SHATTERER 21301 //6*3 #define MIN_KILLS 30 @@ -153,7 +153,7 @@ class instance_serpent_shrine : public InstanceMapScript //spawn frenzy if (DoSpawnFrenzy) { - if (Creature* frenzy = player->SummonCreature(MOB_COILFANG_FRENZY, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000)) + if (Creature* frenzy = player->SummonCreature(NPC_COILFANG_FRENZY, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000)) { frenzy->Attack(player, false); frenzy->SetSwim(true); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index c9d394f6f2d..9a7ca994291 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -25,7 +25,7 @@ EndScriptData */ /* ContentData boss_hydromancer_thespia -mob_coilfang_waterelemental +npc_coilfang_waterelemental EndContentData */ #include "ScriptMgr.h" @@ -147,19 +147,19 @@ public: }; -class mob_coilfang_waterelemental : public CreatureScript +class npc_coilfang_waterelemental : public CreatureScript { public: - mob_coilfang_waterelemental() : CreatureScript("mob_coilfang_waterelemental") { } + npc_coilfang_waterelemental() : CreatureScript("npc_coilfang_waterelemental") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_coilfang_waterelementalAI (creature); + return new npc_coilfang_waterelementalAI (creature); } - struct mob_coilfang_waterelementalAI : public ScriptedAI + struct npc_coilfang_waterelementalAI : public ScriptedAI { - mob_coilfang_waterelementalAI(Creature* creature) : ScriptedAI(creature) {} + npc_coilfang_waterelementalAI(Creature* creature) : ScriptedAI(creature) {} uint32 WaterBoltVolley_Timer; @@ -190,5 +190,5 @@ public: void AddSC_boss_hydromancer_thespia() { new boss_hydromancer_thespia(); - new mob_coilfang_waterelemental(); + new npc_coilfang_waterelemental(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 5d8d44ee70c..31af3e5a8d8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -25,7 +25,7 @@ EndScriptData */ /* ContentData boss_mekgineer_steamrigger -mob_steamrigger_mechanic +npc_steamrigger_mechanic EndContentData */ #include "ScriptMgr.h" @@ -190,19 +190,19 @@ public: #define MAX_REPAIR_RANGE (13.0f) //we should be at least at this range for repair #define MIN_REPAIR_RANGE (7.0f) //we can stop movement at this range to repair but not required -class mob_steamrigger_mechanic : public CreatureScript +class npc_steamrigger_mechanic : public CreatureScript { public: - mob_steamrigger_mechanic() : CreatureScript("mob_steamrigger_mechanic") { } + npc_steamrigger_mechanic() : CreatureScript("npc_steamrigger_mechanic") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_steamrigger_mechanicAI (creature); + return new npc_steamrigger_mechanicAI (creature); } - struct mob_steamrigger_mechanicAI : public ScriptedAI + struct npc_steamrigger_mechanicAI : public ScriptedAI { - mob_steamrigger_mechanicAI(Creature* creature) : ScriptedAI(creature) + npc_steamrigger_mechanicAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -264,5 +264,5 @@ public: void AddSC_boss_mekgineer_steamrigger() { new boss_mekgineer_steamrigger(); - new mob_steamrigger_mechanic(); + new npc_steamrigger_mechanic(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 914539b27c9..d8cbcc8b49d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -44,19 +44,19 @@ enum NagaDistiller SPELL_WARLORDS_RAGE_PROC = 36453 }; -class mob_naga_distiller : public CreatureScript +class npc_naga_distiller : public CreatureScript { public: - mob_naga_distiller() : CreatureScript("mob_naga_distiller") { } + npc_naga_distiller() : CreatureScript("npc_naga_distiller") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_naga_distillerAI (creature); + return new npc_naga_distillerAI (creature); } - struct mob_naga_distillerAI : public ScriptedAI + struct npc_naga_distillerAI : public ScriptedAI { - mob_naga_distillerAI(Creature* creature) : ScriptedAI(creature) + npc_naga_distillerAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -178,7 +178,7 @@ public: { Talk(SAY_REGEN); DoCast(me, SPELL_WARLORDS_RAGE); - CAST_AI(mob_naga_distiller::mob_naga_distillerAI, distiller->AI())->StartRageGen(me); + CAST_AI(npc_naga_distiller::npc_naga_distillerAI, distiller->AI())->StartRageGen(me); } Rage_Timer = 3000+rand()%15000; } else Rage_Timer -= diff; @@ -207,6 +207,6 @@ public: void AddSC_boss_warlord_kalithresh() { - new mob_naga_distiller(); + new npc_naga_distiller(); new boss_warlord_kalithresh(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 7e2c13483bd..f1bb841fa85 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -104,19 +104,19 @@ public: #define SPELL_PUTRID_MUSHROOM 31690 #define SPELL_GROW 31698 -class mob_underbog_mushroom : public CreatureScript +class npc_underbog_mushroom : public CreatureScript { public: - mob_underbog_mushroom() : CreatureScript("mob_underbog_mushroom") { } + npc_underbog_mushroom() : CreatureScript("npc_underbog_mushroom") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_underbog_mushroomAI (creature); + return new npc_underbog_mushroomAI (creature); } - struct mob_underbog_mushroomAI : public ScriptedAI + struct npc_underbog_mushroomAI : public ScriptedAI { - mob_underbog_mushroomAI(Creature* creature) : ScriptedAI(creature) {} + npc_underbog_mushroomAI(Creature* creature) : ScriptedAI(creature) {} bool Stop; uint32 Grow_Timer; @@ -162,5 +162,5 @@ public: void AddSC_boss_hungarfen() { new boss_hungarfen(); - new mob_underbog_mushroom(); + new npc_underbog_mushroom(); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index f491c5d4c9a..31e66c380d2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -25,7 +25,7 @@ EndScriptData */ /* ContentData boss_kelidan_the_breaker -mob_shadowmoon_channeler +npc_shadowmoon_channeler EndContentData */ #include "ScriptMgr.h" @@ -280,7 +280,7 @@ class boss_kelidan_the_breaker : public CreatureScript }; /*###### -## mob_shadowmoon_channeler +## npc_shadowmoon_channeler ######*/ enum eShadowmoon @@ -292,15 +292,15 @@ enum eShadowmoon SPELL_CHANNELING = 39123 }; -class mob_shadowmoon_channeler : public CreatureScript +class npc_shadowmoon_channeler : public CreatureScript { public: - mob_shadowmoon_channeler() : CreatureScript("mob_shadowmoon_channeler") {} + npc_shadowmoon_channeler() : CreatureScript("npc_shadowmoon_channeler") {} - struct mob_shadowmoon_channelerAI : public ScriptedAI + struct npc_shadowmoon_channelerAI : public ScriptedAI { - mob_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){} + npc_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){} uint32 ShadowBolt_Timer; uint32 MarkOfShadow_Timer; @@ -373,13 +373,13 @@ class mob_shadowmoon_channeler : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_shadowmoon_channelerAI(creature); + return new npc_shadowmoon_channelerAI(creature); } }; void AddSC_boss_kelidan_the_breaker() { new boss_kelidan_the_breaker(); - new mob_shadowmoon_channeler(); + new npc_shadowmoon_channeler(); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 033d8e4c85e..cee8a2e840e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -460,17 +460,17 @@ class boss_vazruden_the_herald : public CreatureScript } }; -class mob_hellfire_sentry : public CreatureScript +class npc_hellfire_sentry : public CreatureScript { public: - mob_hellfire_sentry() - : CreatureScript("mob_hellfire_sentry") + npc_hellfire_sentry() + : CreatureScript("npc_hellfire_sentry") { } - struct mob_hellfire_sentryAI : public ScriptedAI + struct npc_hellfire_sentryAI : public ScriptedAI { - mob_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) {} + npc_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) {} uint32 KidneyShot_Timer; @@ -506,7 +506,7 @@ class mob_hellfire_sentry : public CreatureScript }; CreatureAI* GetAI(Creature* creature) const { - return new mob_hellfire_sentryAI(creature); + return new npc_hellfire_sentryAI(creature); } }; void AddSC_boss_vazruden_the_herald() @@ -514,6 +514,6 @@ void AddSC_boss_vazruden_the_herald() new boss_vazruden_the_herald(); new boss_vazruden(); new boss_nazan(); - new mob_hellfire_sentry(); + new npc_hellfire_sentry(); } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 21b77525ea3..8ad34033e5c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -49,10 +49,10 @@ enum eEmotes enum eCreatures { - MOB_MAGTHERIDON = 17257, - MOB_ROOM = 17516, - MOB_CHANNELLER = 17256, - MOB_ABYSSAL = 17454, + NPC_MAGTHERIDON = 17257, + NPC_ROOM = 17516, + NPC_CHANNELLER = 17256, + NPC_ABYSSAL = 17454, }; enum eSpells @@ -87,18 +87,18 @@ enum eSpells typedef std::map<uint64, uint64> CubeMap; -class mob_abyssal : public CreatureScript +class npc_abyssal : public CreatureScript { public: - mob_abyssal() - : CreatureScript("mob_abyssal") + npc_abyssal() + : CreatureScript("npc_abyssal") { } - struct mob_abyssalAI : public ScriptedAI + struct npc_abyssalAI : public ScriptedAI { - mob_abyssalAI(Creature* creature) : ScriptedAI(creature) + npc_abyssalAI(Creature* creature) : ScriptedAI(creature) { trigger = 0; Despawn_Timer = 60000; @@ -189,7 +189,7 @@ class mob_abyssal : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_abyssalAI(creature); + return new npc_abyssalAI(creature); } }; @@ -405,10 +405,10 @@ class boss_magtheridon : public CreatureScript { float x, y, z; target->GetPosition(x, y, z); - Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Creature* summon = me->SummonCreature(NPC_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) { - CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(2); + CAST_AI(npc_abyssal::npc_abyssalAI, summon->AI())->SetTrigger(2); DoCast(summon, SPELL_BLAZE_TARGET, true); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } @@ -439,9 +439,9 @@ class boss_magtheridon : public CreatureScript { float x, y, z; target->GetPosition(x, y, z); - Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Creature* summon = me->SummonCreature(NPC_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) - CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1); + CAST_AI(npc_abyssal::npc_abyssalAI, summon->AI())->SetTrigger(1); } Debris_Timer = 10000; } @@ -459,18 +459,18 @@ class boss_magtheridon : public CreatureScript } }; -class mob_hellfire_channeler : public CreatureScript +class npc_hellfire_channeler : public CreatureScript { public: - mob_hellfire_channeler() - : CreatureScript("mob_hellfire_channeler") + npc_hellfire_channeler() + : CreatureScript("npc_hellfire_channeler") { } - struct mob_hellfire_channelerAI : public ScriptedAI + struct npc_hellfire_channelerAI : public ScriptedAI { - mob_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature) + npc_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -574,7 +574,7 @@ class mob_hellfire_channeler : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_hellfire_channelerAI(creature); + return new npc_hellfire_channelerAI(creature); } }; @@ -614,8 +614,8 @@ public: void AddSC_boss_magtheridon() { new boss_magtheridon(); - new mob_hellfire_channeler(); - new mob_abyssal(); + new npc_hellfire_channeler(); + new npc_abyssal(); new go_manticron_cube(); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index f53748d0aa4..b3408ed6c49 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -25,8 +25,8 @@ EndScriptData */ /* ContentData boss_grand_warlock_nethekurse -mob_fel_orc_convert -mob_lesser_shadow_fissure +npc_fel_orc_convert +npc_lesser_shadow_fissure EndContentData */ #include "ScriptMgr.h" @@ -285,18 +285,18 @@ class boss_grand_warlock_nethekurse : public CreatureScript } }; -class mob_fel_orc_convert : public CreatureScript +class npc_fel_orc_convert : public CreatureScript { public: - mob_fel_orc_convert() - : CreatureScript("mob_fel_orc_convert") + npc_fel_orc_convert() + : CreatureScript("npc_fel_orc_convert") { } - struct mob_fel_orc_convertAI : public ScriptedAI + struct npc_fel_orc_convertAI : public ScriptedAI { - mob_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature) + npc_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -363,23 +363,23 @@ class mob_fel_orc_convert : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_fel_orc_convertAI(creature); + return new npc_fel_orc_convertAI(creature); } }; //NOTE: this Creature are also summoned by other spells, for different creatures -class mob_lesser_shadow_fissure : public CreatureScript +class npc_lesser_shadow_fissure : public CreatureScript { public: - mob_lesser_shadow_fissure() - : CreatureScript("mob_lesser_shadow_fissure") + npc_lesser_shadow_fissure() + : CreatureScript("npc_lesser_shadow_fissure") { } - struct mob_lesser_shadow_fissureAI : public ScriptedAI + struct npc_lesser_shadow_fissureAI : public ScriptedAI { - mob_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {} + npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } void MoveInLineOfSight(Unit* /*who*/) {} @@ -389,14 +389,14 @@ class mob_lesser_shadow_fissure : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_lesser_shadow_fissureAI (creature); + return new npc_lesser_shadow_fissureAI (creature); } }; void AddSC_boss_grand_warlock_nethekurse() { new boss_grand_warlock_nethekurse(); - new mob_fel_orc_convert(); - new mob_lesser_shadow_fissure(); + new npc_fel_orc_convert(); + new npc_lesser_shadow_fissure(); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 89a585e415f..82ee361b657 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -24,7 +24,7 @@ SDCategory: Hellfire Citadel, Shattered Halls EndScriptData */ /* ContentData -mob_omrogg_heads +npc_omrogg_heads boss_warbringer_omrogg EndContentData */ @@ -102,18 +102,18 @@ static Yell KillingDelay[]= {11, NPC_LEFT_HEAD}, }; -class mob_omrogg_heads : public CreatureScript +class npc_omrogg_heads : public CreatureScript { public: - mob_omrogg_heads() - : CreatureScript("mob_omrogg_heads") + npc_omrogg_heads() + : CreatureScript("npc_omrogg_heads") { } - struct mob_omrogg_headsAI : public ScriptedAI + struct npc_omrogg_headsAI : public ScriptedAI { - mob_omrogg_headsAI(Creature* creature) : ScriptedAI(creature) {} + npc_omrogg_headsAI(Creature* creature) : ScriptedAI(creature) {} bool DeathYell; uint32 Death_Timer; @@ -146,7 +146,7 @@ class mob_omrogg_heads : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_omrogg_headsAI(creature); + return new npc_omrogg_headsAI(creature); } }; @@ -306,7 +306,7 @@ class boss_warbringer_omrogg : public CreatureScript pLeftHead->AI()->Talk(YELL_DIE_L); - CAST_AI(mob_omrogg_heads::mob_omrogg_headsAI, pRightHead->ToCreature()->AI())->DoDeathYell(); + CAST_AI(npc_omrogg_heads::npc_omrogg_headsAI, pRightHead->ToCreature()->AI())->DoDeathYell(); if (instance) instance->SetData(TYPE_OMROGG, DONE); @@ -423,6 +423,6 @@ class boss_warbringer_omrogg : public CreatureScript void AddSC_boss_warbringer_omrogg() { new boss_warbringer_omrogg(); - new mob_omrogg_heads(); + new npc_omrogg_heads(); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index c8fa8948e5a..882cc3a0d3f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -45,10 +45,10 @@ enum eSpells enum eCreatures { - MOB_SHATTERED_ASSASSIN = 17695, - MOB_HEARTHEN_GUARD = 17621, - MOB_SHARPSHOOTER_GUARD = 17622, - MOB_REAVER_GUARD = 17623, + NPC_SHATTERED_ASSASSIN = 17695, + NPC_HEARTHEN_GUARD = 17621, + NPC_SHARPSHOOTER_GUARD = 17622, + NPC_REAVER_GUARD = 17623, }; #define TARGET_NUM 5 @@ -115,13 +115,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript { switch (summoned->GetEntry()) { - case MOB_HEARTHEN_GUARD: - case MOB_SHARPSHOOTER_GUARD: - case MOB_REAVER_GUARD: + case NPC_HEARTHEN_GUARD: + case NPC_SHARPSHOOTER_GUARD: + case NPC_REAVER_GUARD: summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); adds.push_back(summoned->GetGUID()); break; - case MOB_SHATTERED_ASSASSIN: + case NPC_SHATTERED_ASSASSIN: assassins.push_back(summoned->GetGUID()); break; } @@ -188,10 +188,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript } void SpawnAssassin() { - me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); } void UpdateAI(uint32 diff) @@ -279,13 +279,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript switch (urand(0, 2)) { case 0: - me->SummonCreature(MOB_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: - me->SummonCreature(MOB_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 2: - me->SummonCreature(MOB_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; } } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 62863edc2d7..7de32c4bfbd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -458,18 +458,18 @@ class boss_alar : public CreatureScript } }; -class mob_ember_of_alar : public CreatureScript +class npc_ember_of_alar : public CreatureScript { public: - mob_ember_of_alar() - : CreatureScript("mob_ember_of_alar") + npc_ember_of_alar() + : CreatureScript("npc_ember_of_alar") { } - struct mob_ember_of_alarAI : public ScriptedAI + struct npc_ember_of_alarAI : public ScriptedAI { - mob_ember_of_alarAI(Creature* creature) : ScriptedAI(creature) + npc_ember_of_alarAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); creature->SetDisableGravity(true); @@ -533,22 +533,22 @@ class mob_ember_of_alar : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_ember_of_alarAI(creature); + return new npc_ember_of_alarAI(creature); } }; -class mob_flame_patch_alar : public CreatureScript +class npc_flame_patch_alar : public CreatureScript { public: - mob_flame_patch_alar() - : CreatureScript("mob_flame_patch_alar") + npc_flame_patch_alar() + : CreatureScript("npc_flame_patch_alar") { } - struct mob_flame_patch_alarAI : public ScriptedAI + struct npc_flame_patch_alarAI : public ScriptedAI { - mob_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) {} + npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} @@ -558,14 +558,14 @@ class mob_flame_patch_alar : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_flame_patch_alarAI(creature); + return new npc_flame_patch_alarAI(creature); } }; void AddSC_boss_alar() { new boss_alar(); - new mob_ember_of_alar(); - new mob_flame_patch_alar(); + new npc_ember_of_alar(); + new npc_flame_patch_alar(); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index a18b34f7867..a7f19aad871 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -410,18 +410,18 @@ class boss_high_astromancer_solarian : public CreatureScript } }; -class mob_solarium_priest : public CreatureScript +class npc_solarium_priest : public CreatureScript { public: - mob_solarium_priest() - : CreatureScript("mob_solarium_priest") + npc_solarium_priest() + : CreatureScript("npc_solarium_priest") { } - struct mob_solarium_priestAI : public ScriptedAI + struct npc_solarium_priestAI : public ScriptedAI { - mob_solarium_priestAI(Creature* creature) : ScriptedAI(creature) + npc_solarium_priestAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -493,7 +493,7 @@ class mob_solarium_priest : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_solarium_priestAI(creature); + return new npc_solarium_priestAI(creature); } }; @@ -538,7 +538,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader void AddSC_boss_high_astromancer_solarian() { new boss_high_astromancer_solarian(); - new mob_solarium_priest(); + new npc_solarium_priest(); new spell_astromancer_wrath_of_the_astromancer(); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index d52c67bc2d6..a5923d86ff8 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1396,17 +1396,17 @@ class boss_master_engineer_telonicus : public CreatureScript }; //Flame Strike AI -class mob_kael_flamestrike : public CreatureScript +class npc_kael_flamestrike : public CreatureScript { public: - mob_kael_flamestrike() - : CreatureScript("mob_kael_flamestrike") + npc_kael_flamestrike() + : CreatureScript("npc_kael_flamestrike") { } - struct mob_kael_flamestrikeAI : public ScriptedAI + struct npc_kael_flamestrikeAI : public ScriptedAI { - mob_kael_flamestrikeAI(Creature* creature) : ScriptedAI(creature) + npc_kael_flamestrikeAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); } @@ -1458,22 +1458,22 @@ class mob_kael_flamestrike : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_kael_flamestrikeAI(creature); + return new npc_kael_flamestrikeAI(creature); } }; //Phoenix AI -class mob_phoenix_tk : public CreatureScript +class npc_phoenix_tk : public CreatureScript { public: - mob_phoenix_tk() - : CreatureScript("mob_phoenix_tk") + npc_phoenix_tk() + : CreatureScript("npc_phoenix_tk") { } - struct mob_phoenix_tkAI : public ScriptedAI + struct npc_phoenix_tkAI : public ScriptedAI { - mob_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) {} + npc_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) {} uint32 Cycle_Timer; @@ -1512,22 +1512,22 @@ class mob_phoenix_tk : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_phoenix_tkAI(creature); + return new npc_phoenix_tkAI(creature); } }; //Phoenix Egg AI -class mob_phoenix_egg_tk : public CreatureScript +class npc_phoenix_egg_tk : public CreatureScript { public: - mob_phoenix_egg_tk() - : CreatureScript("mob_phoenix_egg_tk") + npc_phoenix_egg_tk() + : CreatureScript("npc_phoenix_egg_tk") { } - struct mob_phoenix_egg_tkAI : public ScriptedAI + struct npc_phoenix_egg_tkAI : public ScriptedAI { - mob_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) {} + npc_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) {} uint32 Rebirth_Timer; @@ -1573,7 +1573,7 @@ class mob_phoenix_egg_tk : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_phoenix_egg_tkAI(creature); + return new npc_phoenix_egg_tkAI(creature); } }; @@ -1584,7 +1584,7 @@ void AddSC_boss_kaelthas() new boss_lord_sanguinar(); new boss_grand_astromancer_capernian(); new boss_master_engineer_telonicus(); - new mob_kael_flamestrike(); - new mob_phoenix_tk(); - new mob_phoenix_egg_tk(); + new npc_kael_flamestrike(); + new npc_phoenix_tk(); + new npc_phoenix_egg_tk(); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index c843f09beb9..3fb42ced19f 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -24,7 +24,7 @@ SDCategory: Tempest Keep, The Eye EndScriptData */ /* ContentData -mob_crystalcore_devastator +npc_crystalcore_devastator EndContentData */ #include "ScriptMgr.h" @@ -37,17 +37,17 @@ enum eSpells SPELL_KNOCKAWAY = 22893, }; -class mob_crystalcore_devastator : public CreatureScript +class npc_crystalcore_devastator : public CreatureScript { public: - mob_crystalcore_devastator() - : CreatureScript("mob_crystalcore_devastator") + npc_crystalcore_devastator() + : CreatureScript("npc_crystalcore_devastator") { } - struct mob_crystalcore_devastatorAI : public ScriptedAI + struct npc_crystalcore_devastatorAI : public ScriptedAI { - mob_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) {} + npc_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) {} uint32 Knockaway_Timer; uint32 Countercharge_Timer; @@ -102,11 +102,11 @@ class mob_crystalcore_devastator : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_crystalcore_devastatorAI(creature); + return new npc_crystalcore_devastatorAI(creature); } }; void AddSC_the_eye() { - new mob_crystalcore_devastator(); + new npc_crystalcore_devastator(); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 1a4916f491a..fbafe03fddb 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -142,14 +142,14 @@ class boss_nethermancer_sepethrea : public CreatureScript } }; -class mob_ragin_flames : public CreatureScript +class npc_ragin_flames : public CreatureScript { public: - mob_ragin_flames() : CreatureScript("mob_ragin_flames") { } + npc_ragin_flames() : CreatureScript("npc_ragin_flames") { } - struct mob_ragin_flamesAI : public ScriptedAI + struct npc_ragin_flamesAI : public ScriptedAI { - mob_ragin_flamesAI(Creature* creature) : ScriptedAI(creature) + npc_ragin_flamesAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -223,12 +223,12 @@ class mob_ragin_flames : public CreatureScript }; CreatureAI* GetAI(Creature* creature) const { - return new mob_ragin_flamesAI(creature); + return new npc_ragin_flamesAI(creature); } }; void AddSC_boss_nethermancer_sepethrea() { new boss_nethermancer_sepethrea(); - new mob_ragin_flames(); + new npc_ragin_flames(); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 67fadf34caa..adcfff10684 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -164,15 +164,15 @@ class boss_pathaleon_the_calculator : public CreatureScript } }; -class mob_nether_wraith : public CreatureScript +class npc_nether_wraith : public CreatureScript { public: - mob_nether_wraith() : CreatureScript("mob_nether_wraith") { } + npc_nether_wraith() : CreatureScript("npc_nether_wraith") { } - struct mob_nether_wraithAI : public ScriptedAI + struct npc_nether_wraithAI : public ScriptedAI { - mob_nether_wraithAI(Creature* creature) : ScriptedAI(creature) {} + npc_nether_wraithAI(Creature* creature) : ScriptedAI(creature) {} uint32 ArcaneMissiles_Timer; uint32 Detonation_Timer; @@ -232,13 +232,13 @@ class mob_nether_wraith : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_nether_wraithAI (creature); + return new npc_nether_wraithAI (creature); } }; void AddSC_boss_pathaleon_the_calculator() { new boss_pathaleon_the_calculator(); - new mob_nether_wraith(); + new npc_nether_wraith(); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 56e7dbe2a1f..43af42b1e72 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -26,7 +26,7 @@ EndScriptData */ /* ContentData npc_millhouse_manastorm npc_warden_mellichar -mob_zerekethvoidzone +npc_zerekethvoidzone EndContentData */ #include "ScriptMgr.h" @@ -521,7 +521,7 @@ class npc_warden_mellichar : public CreatureScript }; /*##### -# mob_zerekethvoidzone (this script probably not needed in future -> `creature_template_addon`.`auras`='36120 0') +# npc_zerekethvoidzone (this script probably not needed in future -> `creature_template_addon`.`auras`='36120 0') #####*/ enum ZerekethSpell @@ -529,16 +529,16 @@ enum ZerekethSpell SPELL_VOID_ZONE_DAMAGE = 36120, }; -class mob_zerekethvoidzone : public CreatureScript +class npc_zerekethvoidzone : public CreatureScript { public: - mob_zerekethvoidzone() : CreatureScript("mob_zerekethvoidzone") + npc_zerekethvoidzone() : CreatureScript("npc_zerekethvoidzone") { } - struct mob_zerekethvoidzoneAI : public ScriptedAI + struct npc_zerekethvoidzoneAI : public ScriptedAI { - mob_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {} + npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -554,7 +554,7 @@ class mob_zerekethvoidzone : public CreatureScript CreatureAI* GetAI(Creature* creature) const { - return new mob_zerekethvoidzoneAI(creature); + return new npc_zerekethvoidzoneAI(creature); } }; @@ -562,5 +562,5 @@ void AddSC_arcatraz() { new npc_millhouse_manastorm(); new npc_warden_mellichar(); - new mob_zerekethvoidzone(); + new npc_zerekethvoidzone(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 8f959334c5e..09ca90570b0 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -61,19 +61,19 @@ float treant_pos[6][3] = }; /*##### -# mob_treant (Sapling) +# npc_treant (Sapling) #####*/ -class mob_warp_splinter_treant : public CreatureScript +class npc_warp_splinter_treant : public CreatureScript { public: - mob_warp_splinter_treant() - : CreatureScript("mob_warp_splinter_treant") + npc_warp_splinter_treant() + : CreatureScript("npc_warp_splinter_treant") { } - struct mob_warp_splinter_treantAI : public ScriptedAI + struct npc_warp_splinter_treantAI : public ScriptedAI { - mob_warp_splinter_treantAI (Creature* creature) : ScriptedAI(creature) + npc_warp_splinter_treantAI (Creature* creature) : ScriptedAI(creature) { WarpGuid = 0; } @@ -120,7 +120,7 @@ class mob_warp_splinter_treant : public CreatureScript }; CreatureAI* GetAI(Creature* creature) const { - return new mob_warp_splinter_treantAI(creature); + return new npc_warp_splinter_treantAI(creature); } }; @@ -185,7 +185,7 @@ class boss_warp_splinter : public CreatureScript float O = - me->GetAngle(X, Y); if (Creature* pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000)) - CAST_AI(mob_warp_splinter_treant::mob_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID(); + CAST_AI(npc_warp_splinter_treant::npc_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID(); } Talk(SAY_SUMMON); } @@ -235,6 +235,6 @@ class boss_warp_splinter : public CreatureScript void AddSC_boss_warp_splinter() { new boss_warp_splinter(); - new mob_warp_splinter_treant(); + new npc_warp_splinter_treant(); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 3bf6840b6f4..8ecf26b028a 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -24,8 +24,8 @@ SDCategory: Blade's Edge Mountains EndScriptData */ /* ContentData -mobs_bladespire_ogre -mobs_nether_drake +npc_bladespire_ogre +npc_nether_drake npc_daranelle npc_overseer_nuaar npc_saikkal_the_elder @@ -51,23 +51,23 @@ bool obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five; #define LEGION_OBELISK_FIVE 185198 /*###### -## mobs_bladespire_ogre +## npc_bladespire_ogre ######*/ /// @todo add support for quest 10512 + Creature abilities -class mobs_bladespire_ogre : public CreatureScript +class npc_bladespire_ogre : public CreatureScript { public: - mobs_bladespire_ogre() : CreatureScript("mobs_bladespire_ogre") { } + npc_bladespire_ogre() : CreatureScript("npc_bladespire_ogre") { } CreatureAI* GetAI(Creature* creature) const { - return new mobs_bladespire_ogreAI (creature); + return new npc_bladespire_ogreAI (creature); } - struct mobs_bladespire_ogreAI : public ScriptedAI + struct npc_bladespire_ogreAI : public ScriptedAI { - mobs_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) {} + npc_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } @@ -82,7 +82,7 @@ public: }; /*###### -## mobs_nether_drake +## npc_nether_drake ######*/ enum eNetherdrake @@ -107,19 +107,19 @@ enum eNetherdrake SPELL_INTANGIBLE_PRESENCE = 36513 }; -class mobs_nether_drake : public CreatureScript +class npc_nether_drake : public CreatureScript { public: - mobs_nether_drake() : CreatureScript("mobs_nether_drake") { } + npc_nether_drake() : CreatureScript("npc_nether_drake") { } CreatureAI* GetAI(Creature* creature) const { - return new mobs_nether_drakeAI (creature); + return new npc_nether_drakeAI (creature); } - struct mobs_nether_drakeAI : public ScriptedAI + struct npc_nether_drakeAI : public ScriptedAI { - mobs_nether_drakeAI(Creature* creature) : ScriptedAI(creature) {} + npc_nether_drakeAI(Creature* creature) : ScriptedAI(creature) {} bool IsNihil; uint32 NihilSpeech_Timer; @@ -1142,8 +1142,8 @@ class go_apexis_relic : public GameObjectScript void AddSC_blades_edge_mountains() { - new mobs_bladespire_ogre(); - new mobs_nether_drake(); + new npc_bladespire_ogre(); + new npc_nether_drake(); new npc_daranelle(); new npc_overseer_nuaar(); new npc_saikkal_the_elder(); diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index dc0dacc6f95..f8be2a43bf8 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -714,7 +714,7 @@ public: }; /*###### -## mob_phase_hunter +## npc_phase_hunter ######*/ enum ePhaseHunterData @@ -734,19 +734,19 @@ enum ePhaseHunterData SPELL_DE_MATERIALIZE = 34814, }; -class mob_phase_hunter : public CreatureScript +class npc_phase_hunter : public CreatureScript { public: - mob_phase_hunter() : CreatureScript("mob_phase_hunter") { } + npc_phase_hunter() : CreatureScript("npc_phase_hunter") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_phase_hunterAI (creature); + return new npc_phase_hunterAI (creature); } - struct mob_phase_hunterAI : public ScriptedAI + struct npc_phase_hunterAI : public ScriptedAI { - mob_phase_hunterAI(Creature* creature) : ScriptedAI(creature) {} + npc_phase_hunterAI(Creature* creature) : ScriptedAI(creature) {} bool Weak; bool Materialize; @@ -1070,7 +1070,7 @@ void AddSC_netherstorm() new npc_commander_dawnforge(); new at_commander_dawnforge(); new npc_professor_dabiri(); - new mob_phase_hunter(); + new npc_phase_hunter(); new npc_bessy(); new npc_maxx_a_million_escort(); new go_captain_tyralius_prison(); diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index ff89c065c98..a51940a9143 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -24,8 +24,8 @@ SDCategory: Shadowmoon Valley EndScriptData */ /* ContentData -mob_mature_netherwing_drake -mob_enslaved_netherwing_drake +npc_mature_netherwing_drake +npc_enslaved_netherwing_drake npc_drake_dealer_hurlunk npcs_flanis_swiftwing_and_kagrosh npc_murkblood_overseer @@ -33,8 +33,8 @@ npc_karynaku npc_oronok_tornheart npc_overlord_morghor npc_earthmender_wilda -mob_torloth_the_magnificent -mob_illidari_spawn +npc_torloth_the_magnificent +npc_illidari_spawn npc_lord_illidan_stormrage go_crystal_prison npc_enraged_spirit @@ -50,7 +50,7 @@ EndContentData */ #include "WorldSession.h" /*##### -# mob_mature_netherwing_drake +# npc_mature_netherwing_drake #####*/ enum eMatureNetherwing @@ -68,19 +68,19 @@ enum eMatureNetherwing NPC_EVENT_PINGER = 22131 }; -class mob_mature_netherwing_drake : public CreatureScript +class npc_mature_netherwing_drake : public CreatureScript { public: - mob_mature_netherwing_drake() : CreatureScript("mob_mature_netherwing_drake") { } + npc_mature_netherwing_drake() : CreatureScript("npc_mature_netherwing_drake") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_mature_netherwing_drakeAI(creature); + return new npc_mature_netherwing_drakeAI(creature); } - struct mob_mature_netherwing_drakeAI : public ScriptedAI + struct npc_mature_netherwing_drakeAI : public ScriptedAI { - mob_mature_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) { } + npc_mature_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) { } uint64 uiPlayerGUID; @@ -187,7 +187,7 @@ public: }; /*### -# mob_enslaved_netherwing_drake +# npc_enslaved_netherwing_drake ####*/ #define FACTION_DEFAULT 62 @@ -199,19 +199,19 @@ public: #define CREATURE_DRAGONMAW_SUBJUGATOR 21718 #define CREATURE_ESCAPE_DUMMY 22317 -class mob_enslaved_netherwing_drake : public CreatureScript +class npc_enslaved_netherwing_drake : public CreatureScript { public: - mob_enslaved_netherwing_drake() : CreatureScript("mob_enslaved_netherwing_drake") { } + npc_enslaved_netherwing_drake() : CreatureScript("npc_enslaved_netherwing_drake") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_enslaved_netherwing_drakeAI(creature); + return new npc_enslaved_netherwing_drakeAI(creature); } - struct mob_enslaved_netherwing_drakeAI : public ScriptedAI + struct npc_enslaved_netherwing_drakeAI : public ScriptedAI { - mob_enslaved_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) + npc_enslaved_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) { PlayerGUID = 0; Tapped = false; @@ -327,22 +327,22 @@ public: }; /*##### -# mob_dragonmaw_peon +# npc_dragonmaw_peon #####*/ -class mob_dragonmaw_peon : public CreatureScript +class npc_dragonmaw_peon : public CreatureScript { public: - mob_dragonmaw_peon() : CreatureScript("mob_dragonmaw_peon") { } + npc_dragonmaw_peon() : CreatureScript("npc_dragonmaw_peon") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_dragonmaw_peonAI(creature); + return new npc_dragonmaw_peonAI(creature); } - struct mob_dragonmaw_peonAI : public ScriptedAI + struct npc_dragonmaw_peonAI : public ScriptedAI { - mob_dragonmaw_peonAI(Creature* creature) : ScriptedAI(creature) {} + npc_dragonmaw_peonAI(Creature* creature) : ScriptedAI(creature) {} uint64 PlayerGUID; bool Tapped; @@ -1153,8 +1153,8 @@ public: /* ContentData Battle of the crimson watch - creatures, gameobjects and defines -mob_illidari_spawn : Adds that are summoned in the Crimson Watch battle. -mob_torloth_the_magnificent : Final Creature that players have to face before quest is completed +npc_illidari_spawn : Adds that are summoned in the Crimson Watch battle. +npc_torloth_the_magnificent : Final Creature that players have to face before quest is completed npc_lord_illidan_stormrage : Creature that controls the event. go_crystal_prison : GameObject that begins the event and hands out quest EndContentData */ @@ -1240,22 +1240,22 @@ static SpawnSpells SpawnCast[]= }; /*###### -# mob_torloth_the_magnificent +# npc_torloth_the_magnificent #####*/ -class mob_torloth_the_magnificent : public CreatureScript +class npc_torloth_the_magnificent : public CreatureScript { public: - mob_torloth_the_magnificent() : CreatureScript("mob_torloth_the_magnificent") { } + npc_torloth_the_magnificent() : CreatureScript("npc_torloth_the_magnificent") { } CreatureAI* GetAI(Creature* c) const { - return new mob_torloth_the_magnificentAI(c); + return new npc_torloth_the_magnificentAI(c); } - struct mob_torloth_the_magnificentAI : public ScriptedAI + struct npc_torloth_the_magnificentAI : public ScriptedAI { - mob_torloth_the_magnificentAI(Creature* creature) : ScriptedAI(creature) {} + npc_torloth_the_magnificentAI(Creature* creature) : ScriptedAI(creature) {} uint32 AnimationTimer, SpellTimer1, SpellTimer2, SpellTimer3; @@ -1543,22 +1543,22 @@ public: }; /*###### -# mob_illidari_spawn +# npc_illidari_spawn ######*/ -class mob_illidari_spawn : public CreatureScript +class npc_illidari_spawn : public CreatureScript { public: - mob_illidari_spawn() : CreatureScript("mob_illidari_spawn") { } + npc_illidari_spawn() : CreatureScript("npc_illidari_spawn") { } CreatureAI* GetAI(Creature* c) const { - return new mob_illidari_spawnAI(c); + return new npc_illidari_spawnAI(c); } - struct mob_illidari_spawnAI : public ScriptedAI + struct npc_illidari_spawnAI : public ScriptedAI { - mob_illidari_spawnAI(Creature* creature) : ScriptedAI(creature) {} + npc_illidari_spawnAI(Creature* creature) : ScriptedAI(creature) {} uint64 LordIllidanGUID; uint32 SpellTimer1, SpellTimer2, SpellTimer3; @@ -1712,14 +1712,14 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave() Spawn->GetMotionMaster()->MovePoint(0, x, y, z); } } - CAST_AI(mob_illidari_spawn::mob_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = me->GetGUID(); + CAST_AI(npc_illidari_spawn::npc_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = me->GetGUID(); } if (WavesInfo[WaveCount].CreatureId == 22076) // Torloth { - CAST_AI(mob_torloth_the_magnificent::mob_torloth_the_magnificentAI, Spawn->AI())->LordIllidanGUID = me->GetGUID(); + CAST_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->LordIllidanGUID = me->GetGUID(); if (PlayerGUID) - CAST_AI(mob_torloth_the_magnificent::mob_torloth_the_magnificentAI, Spawn->AI())->AggroTargetGUID = PlayerGUID; + CAST_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->AggroTargetGUID = PlayerGUID; } } } @@ -2000,9 +2000,9 @@ public: void AddSC_shadowmoon_valley() { - new mob_mature_netherwing_drake(); - new mob_enslaved_netherwing_drake(); - new mob_dragonmaw_peon(); + new npc_mature_netherwing_drake(); + new npc_enslaved_netherwing_drake(); + new npc_dragonmaw_peon(); new npc_drake_dealer_hurlunk(); new npcs_flanis_swiftwing_and_kagrosh(); new npc_murkblood_overseer(); @@ -2012,8 +2012,8 @@ void AddSC_shadowmoon_valley() new npc_earthmender_wilda(); new npc_lord_illidan_stormrage(); new go_crystal_prison(); - new mob_illidari_spawn(); - new mob_torloth_the_magnificent(); + new npc_illidari_spawn(); + new npc_torloth_the_magnificent(); new npc_enraged_spirit(); new spell_unlocking_zuluheds_chains(); new npc_shadowmoon_tuber_node(); diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index d463f003523..fc43dac2c5d 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -24,10 +24,10 @@ SDCategory: Terokkar Forest EndScriptData */ /* ContentData -mob_unkor_the_ruthless -mob_infested_root_walker -mob_rotting_forest_rager -mob_netherweb_victim +npc_unkor_the_ruthless +npc_infested_root_walker +npc_rotting_forest_rager +npc_netherweb_victim npc_floon npc_isla_starmane npc_slim @@ -42,7 +42,7 @@ EndContentData */ #include "WorldSession.h" /*###### -## mob_unkor_the_ruthless +## npc_unkor_the_ruthless ######*/ enum UnkorTheRuthless @@ -56,19 +56,19 @@ enum UnkorTheRuthless SPELL_PULVERIZE = 2676 }; -class mob_unkor_the_ruthless : public CreatureScript +class npc_unkor_the_ruthless : public CreatureScript { public: - mob_unkor_the_ruthless() : CreatureScript("mob_unkor_the_ruthless") { } + npc_unkor_the_ruthless() : CreatureScript("npc_unkor_the_ruthless") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_unkor_the_ruthlessAI (creature); + return new npc_unkor_the_ruthlessAI (creature); } - struct mob_unkor_the_ruthlessAI : public ScriptedAI + struct npc_unkor_the_ruthlessAI : public ScriptedAI { - mob_unkor_the_ruthlessAI(Creature* creature) : ScriptedAI(creature) {} + npc_unkor_the_ruthlessAI(Creature* creature) : ScriptedAI(creature) {} bool CanDoQuest; uint32 UnkorUnfriendly_Timer; @@ -160,22 +160,22 @@ public: }; /*###### -## mob_infested_root_walker +## npc_infested_root_walker ######*/ -class mob_infested_root_walker : public CreatureScript +class npc_infested_root_walker : public CreatureScript { public: - mob_infested_root_walker() : CreatureScript("mob_infested_root_walker") { } + npc_infested_root_walker() : CreatureScript("npc_infested_root_walker") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_infested_root_walkerAI (creature); + return new npc_infested_root_walkerAI (creature); } - struct mob_infested_root_walkerAI : public ScriptedAI + struct npc_infested_root_walkerAI : public ScriptedAI { - mob_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) {} + npc_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } void EnterCombat(Unit* /*who*/) { } @@ -192,7 +192,7 @@ public: }; /*###### -## mob_skywing +## npc_skywing ######*/ class npc_skywing : public CreatureScript { @@ -246,22 +246,22 @@ public: }; /*###### -## mob_rotting_forest_rager +## npc_rotting_forest_rager ######*/ -class mob_rotting_forest_rager : public CreatureScript +class npc_rotting_forest_rager : public CreatureScript { public: - mob_rotting_forest_rager() : CreatureScript("mob_rotting_forest_rager") { } + npc_rotting_forest_rager() : CreatureScript("npc_rotting_forest_rager") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_rotting_forest_ragerAI (creature); + return new npc_rotting_forest_ragerAI (creature); } - struct mob_rotting_forest_ragerAI : public ScriptedAI + struct npc_rotting_forest_ragerAI : public ScriptedAI { - mob_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) {} + npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } void EnterCombat(Unit* /*who*/) { } @@ -278,7 +278,7 @@ public: }; /*###### -## mob_netherweb_victim +## npc_netherweb_victim ######*/ #define QUEST_TARGET 22459 @@ -288,19 +288,19 @@ const uint32 netherwebVictims[6] = { 18470, 16805, 21242, 18452, 22482, 21285 }; -class mob_netherweb_victim : public CreatureScript +class npc_netherweb_victim : public CreatureScript { public: - mob_netherweb_victim() : CreatureScript("mob_netherweb_victim") { } + npc_netherweb_victim() : CreatureScript("npc_netherweb_victim") { } CreatureAI* GetAI(Creature* creature) const { - return new mob_netherweb_victimAI (creature); + return new npc_netherweb_victimAI (creature); } - struct mob_netherweb_victimAI : public ScriptedAI + struct npc_netherweb_victimAI : public ScriptedAI { - mob_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) {} + npc_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } void EnterCombat(Unit* /*who*/) { } @@ -696,10 +696,10 @@ public: void AddSC_terokkar_forest() { - new mob_unkor_the_ruthless(); - new mob_infested_root_walker(); - new mob_rotting_forest_rager(); - new mob_netherweb_victim(); + new npc_unkor_the_ruthless(); + new npc_infested_root_walker(); + new npc_rotting_forest_rager(); + new npc_netherweb_victim(); new npc_floon(); new npc_isla_starmane(); new go_skull_pile(); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index fa5388ada33..c61a547d2c3 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2293,7 +2293,7 @@ class spell_item_unusual_compass : public SpellScriptLoader void HandleDummy(SpellEffIndex /* effIndex */) { Unit* caster = GetCaster(); - caster->SetFacingTo(frand(0.0f, 62832.0f) / 10000.0f); + caster->SetFacingTo(frand(0.0f, 2.0f * M_PI)); } void Register() diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 1034402c7b7..dca55306113 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1709,14 +1709,14 @@ public: #define SAY_RANDOM_MOJO6b ", I know of a little swamp not too far from here...." #define SAY_RANDOM_MOJO7 "There's just never enough Mojo to go around..." -class mob_mojo : public CreatureScript +class npc_mojo : public CreatureScript { public: - mob_mojo() : CreatureScript("mob_mojo") { } + npc_mojo() : CreatureScript("npc_mojo") { } - struct mob_mojoAI : public ScriptedAI + struct npc_mojoAI : public ScriptedAI { - mob_mojoAI(Creature* creature) : ScriptedAI(creature) {Reset();} + npc_mojoAI(Creature* creature) : ScriptedAI(creature) {Reset();} uint32 hearts; uint64 victimGUID; void Reset() @@ -1796,7 +1796,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_mojoAI(creature); + return new npc_mojoAI(creature); } }; @@ -2967,7 +2967,7 @@ void AddSC_npcs_special() new npc_mirror_image(); new npc_ebon_gargoyle(); new npc_lightwell(); - new mob_mojo(); + new npc_mojo(); new npc_training_dummy(); new npc_shadowfiend(); new npc_wormhole(); |