diff options
Diffstat (limited to 'src')
270 files changed, 509 insertions, 566 deletions
diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 364296597dc..5cb9b2c9f81 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -159,6 +159,8 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI void DoTeleportTo(float x, float y, float z, uint32 time = 0); + void DoAction(const int32 param) {} + //Teleports a player without dropping threat (only teleports to same map) void DoTeleportPlayer(Unit* pUnit, float x, float y, float z, float o); void DoTeleportAll(float x, float y, float z, float o); diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp index 15a813cd455..08b374c443e 100644 --- a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp @@ -32,7 +32,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI { - boss_emerissAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_emerissAI(Creature *c) : ScriptedAI(c) {} uint32 Sleep_Timer; uint32 NoxiousBreath_Timer; diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/boss/boss_taerar.cpp index 0de457f4094..0d046456523 100644 --- a/src/bindings/scripts/scripts/boss/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/boss/boss_taerar.cpp @@ -40,7 +40,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI { - boss_taerarAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_taerarAI(Creature *c) : ScriptedAI(c) {} uint32 Sleep_Timer; uint32 NoxiousBreath_Timer; @@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI { - boss_shadeoftaerarAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_shadeoftaerarAI(Creature *c) : ScriptedAI(c) {} uint32 PoisonCloud_Timer; uint32 PosionBreath_Timer; diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp index 44795b41750..0cfbc37b374 100644 --- a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp @@ -36,7 +36,7 @@ EndScriptData */ // Ysondre script struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI { - boss_ysondreAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_ysondreAI(Creature *c) : ScriptedAI(c) {} uint32 Sleep_Timer; uint32 NoxiousBreath_Timer; @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI // Summoned druid script struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI { - mob_dementeddruidsAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_dementeddruidsAI(Creature *c) : ScriptedAI(c) {} uint32 MoonFire_Timer; diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp index 46adc7f91f2..637c0754bd1 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp @@ -59,8 +59,6 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI ProcessEvent(*i); } } - - Reset(); } ~Mob_EventAI() diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp index 79ffef4ad54..a912e6af17f 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp @@ -27,7 +27,7 @@ EndScriptData */ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI { - generic_creatureAI(Creature *c) : ScriptedAI(c) {Reset();} + generic_creatureAI(Creature *c) : ScriptedAI(c) {} uint32 GlobalCooldown; //This variable acts like the global cooldown that players have (1.5 seconds) uint32 BuffTimer; //This variable keeps track of buffs diff --git a/src/bindings/scripts/scripts/custom/custom_example.cpp b/src/bindings/scripts/scripts/custom/custom_example.cpp index aae7fccbd57..0569af80bb7 100644 --- a/src/bindings/scripts/scripts/custom/custom_example.cpp +++ b/src/bindings/scripts/scripts/custom/custom_example.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI { //*** HANDLED FUNCTION *** //This is the constructor, called only once when the creature is first created - custom_exampleAI(Creature *c) : ScriptedAI(c) {Reset();} + custom_exampleAI(Creature *c) : ScriptedAI(c) {} //*** CUSTOM VARIABLES **** //These variables are for use only by this individual script. diff --git a/src/bindings/scripts/scripts/custom/test.cpp b/src/bindings/scripts/scripts/custom/test.cpp index b4e2780c4f1..9d847223940 100644 --- a/src/bindings/scripts/scripts/custom/test.cpp +++ b/src/bindings/scripts/scripts/custom/test.cpp @@ -29,7 +29,7 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI public: // CreatureAI functions - npc_testAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_testAI(Creature *c) : npc_escortAI(c) {} uint32 DeathCoilTimer; uint32 ChatTimer; diff --git a/src/bindings/scripts/scripts/guard/guard_ai.h b/src/bindings/scripts/scripts/guard/guard_ai.h index 6b346aefbb3..d7cd6cd6318 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.h +++ b/src/bindings/scripts/scripts/guard/guard_ai.h @@ -9,7 +9,7 @@ struct TRINITY_DLL_DECL guardAI : public ScriptedAI { - guardAI(Creature *c) : ScriptedAI(c) {Reset();} + guardAI(Creature *c) : ScriptedAI(c) {} uint32 GlobalCooldown; //This variable acts like the global cooldown that players have (1.5 seconds) uint32 BuffTimer; //This variable keeps track of buffs diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index 6caa6519c74..e157310f291 100644 --- a/src/bindings/scripts/scripts/guard/guards.cpp +++ b/src/bindings/scripts/scripts/guard/guards.cpp @@ -2498,7 +2498,7 @@ CreatureAI* GetAI_guard_shattrath(Creature *_Creature) struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI { - guard_shattrath_aldorAI(Creature *c) : guardAI(c) { Reset(); } + guard_shattrath_aldorAI(Creature *c) : guardAI(c) {} uint32 Exile_Timer; uint32 Banish_Timer; @@ -2694,7 +2694,7 @@ CreatureAI* GetAI_guard_shattrath_aldor(Creature *_Creature) struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI { - guard_shattrath_scryerAI(Creature *c) : guardAI(c) { Reset(); } + guard_shattrath_scryerAI(Creature *c) : guardAI(c) {} uint32 Exile_Timer; uint32 Banish_Timer; diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index e54417cc03a..a0023fb1c53 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -51,7 +51,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI { - npc_chicken_cluckAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_chicken_cluckAI(Creature *c) : ScriptedAI(c) {} uint32 ResetFlagTimer; @@ -139,7 +139,7 @@ bool QuestComplete_npc_chicken_cluck(Player *player, Creature *_Creature, const struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI { - npc_dancing_flamesAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_dancing_flamesAI(Creature *c) : ScriptedAI(c) {} bool active; uint32 can_iteract; @@ -277,7 +277,7 @@ const uint32 HordeSoldierId[3] = struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI { - npc_doctorAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_doctorAI(Creature *c) : ScriptedAI(c) {} uint64 Playerguid; @@ -317,7 +317,7 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI { - npc_injured_patientAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_injured_patientAI(Creature *c) : ScriptedAI(c) {} uint64 Doctorguid; Location* Coord; @@ -847,7 +847,7 @@ CreatureAI* GetAI_npc_garments_of_quests(Creature* pCreature) struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI { - npc_guardianAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_guardianAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -1144,7 +1144,7 @@ bool GossipSelect_npc_sayge(Player *player, Creature *_Creature, uint32 sender, struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI { - npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} void Reset() {} void Aggro(Unit *who) {} @@ -1177,7 +1177,6 @@ struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI npc_tonk_mineAI(Creature *c) : ScriptedAI(c) { m_creature->SetReactState(REACT_PASSIVE); - Reset(); } uint32 ExplosionTimer; @@ -1260,7 +1259,7 @@ bool ReceiveEmote_npc_brewfest_reveler( Player *player, Creature *_Creature, uin struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI { - npc_snake_trap_serpentsAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_snake_trap_serpentsAI(Creature *c) : ScriptedAI(c) {} uint32 SpellTimer; Unit *Owner; diff --git a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp index 10736c84acd..13f8bdd3fbf 100644 --- a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp @@ -33,7 +33,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_ravenholdtAI : public ScriptedAI { - npc_ravenholdtAI(Creature *c) : ScriptedAI(c) { Reset(); } + npc_ravenholdtAI(Creature *c) : ScriptedAI(c) {} void Reset() { } diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp index b3f92e93408..48232d8e9fe 100644 --- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp @@ -48,7 +48,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI { - npc_professor_phizzlethorpeAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_professor_phizzlethorpeAI(Creature *c) : npc_escortAI(c) {} bool Completed; diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp index 0192ac01a4a..42d219aabcb 100644 --- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp +++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp @@ -51,7 +51,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI { - npc_torekAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_torekAI(Creature *c) : npc_escortAI(c) {} uint32 Rend_Timer; uint32 Thunderclap_Timer; @@ -192,7 +192,7 @@ CreatureAI* GetAI_npc_torek(Creature *_Creature) struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI { - npc_ruul_snowhoofAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_ruul_snowhoofAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index de1cc812df8..986413cdf0f 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -41,7 +41,7 @@ EndContentData */ struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI { - mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {} uint8 myClass; uint32 Class_Timer; @@ -146,7 +146,6 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI boss_exarch_maladaarAI(Creature *c) : ScriptedAI(c) { HasTaunted = false; - Reset(); } uint32 soulmodel; @@ -304,7 +303,7 @@ CreatureAI* GetAI_boss_exarch_maladaar(Creature *_Creature) struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI { - mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {} uint32 Mortal_Strike_timer; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 4df3bc3c356..c7323267b2f 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -41,7 +41,6 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI boss_shirrak_the_dead_watcherAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 Inhibitmagic_Timer; @@ -154,7 +153,6 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI mob_focus_fireAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } bool HeroicMode; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index d0aa7fd45a6..6b030f53d9a 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -54,7 +54,7 @@ EndContentData */ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI { - boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c) {} uint32 Blink_Timer; uint32 Beacon_Timer; @@ -204,7 +204,6 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c), CanEvade(false) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); CanEvade = false; } diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp index 067ca215169..d3ca37b445e 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp @@ -44,7 +44,6 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI boss_pandemoniusAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } bool HeroicMode; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp index 046ce673b3f..758596ca55d 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -57,7 +57,6 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 flameshock_timer; @@ -210,7 +209,6 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 flameshock_timer; @@ -262,7 +260,6 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 arcaneshock_timer; @@ -314,7 +311,6 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 frostshock_timer; @@ -366,7 +362,6 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 shadowshock_timer; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index 3b017c48a69..94257e0aa37 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -55,7 +55,6 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI boss_talon_king_ikissAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index b77a2ec7702..f771cb94ad9 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -48,7 +48,6 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index 49b5524d51a..5aa71a80825 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -56,7 +56,6 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI boss_blackheart_the_inciterAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index 9e2b88dfd83..45e093f807e 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -71,7 +71,6 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI mob_voidtravelerAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } bool HeroicMode; @@ -136,7 +135,6 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); Intro = false; - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp index 7efb4a496e4..91eedc2bf26 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp @@ -38,7 +38,6 @@ struct TRINITY_DLL_DECL boss_murmurAI : public Scripted_NoMovementAI boss_murmurAI(Creature *c) : Scripted_NoMovementAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 SonicBoom_Timer; diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index b1fb11a8a09..845625a2ac0 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -38,7 +38,7 @@ EndContentData */ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI { - mobs_spitelashesAI(Creature *c) : ScriptedAI(c) {Reset();} + mobs_spitelashesAI(Creature *c) : ScriptedAI(c) {} uint32 morphtimer; bool spellhit; @@ -237,7 +237,7 @@ float WPs[58][4] = struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI { - mob_rizzle_sprysprocketAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_rizzle_sprysprocketAI(Creature *c) : ScriptedAI(c) {} uint32 spellEscape_Timer; uint32 Teleport_Timer; @@ -433,7 +433,7 @@ CreatureAI* GetAI_mob_rizzle_sprysprocket(Creature *_Creature) struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI { - mob_depth_chargeAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_depth_chargeAI(Creature *c) : ScriptedAI(c) {} bool we_must_die; uint32 must_die_timer; diff --git a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp index adc985aaef9..34aa388c4c7 100644 --- a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp @@ -35,7 +35,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI { - boss_azuregosAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_azuregosAI(Creature *c) : ScriptedAI(c) {} uint32 MarkOfFrost_Timer; uint32 ManaStorm_Timer; diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp index c65186a76ab..cd5dffd164c 100644 --- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp @@ -54,7 +54,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI { - npc_draenei_survivorAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_draenei_survivorAI(Creature *c) : ScriptedAI(c) {} uint64 pCaster; @@ -194,7 +194,7 @@ CreatureAI* GetAI_npc_draenei_survivor(Creature *_Creature) struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI { - npc_engineer_spark_overgrindAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_engineer_spark_overgrindAI(Creature *c) : ScriptedAI(c) {} uint32 Dynamite_Timer; uint32 Emote_Timer; @@ -265,7 +265,7 @@ bool GossipSelect_npc_engineer_spark_overgrind(Player *player, Creature *_Creatu struct TRINITY_DLL_DECL npc_injured_draeneiAI : public ScriptedAI { - npc_injured_draeneiAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_injured_draeneiAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -311,7 +311,7 @@ CreatureAI* GetAI_npc_injured_draenei(Creature *_Creature) struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI { - npc_magwinAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_magwinAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) @@ -472,7 +472,7 @@ static float SparkPos[3] = {-5030.95, -11291.99, 7.97}; struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI { - npc_geezleAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_geezleAI(Creature *c) : ScriptedAI(c) {} std::list<GameObject*> FlagList; @@ -593,7 +593,7 @@ CreatureAI* GetAI_npc_geezleAI(Creature *_Creature) struct TRINITY_DLL_DECL mob_nestlewood_owlkinAI : public ScriptedAI { - mob_nestlewood_owlkinAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_nestlewood_owlkinAI(Creature *c) : ScriptedAI(c) {} uint32 ChannelTimer; bool Channeled; diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index c18f87ccb9e..83104539c6a 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -101,7 +101,6 @@ struct TRINITY_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI npc_taskmaster_fizzuleAI(Creature* c) : ScriptedAI(c) { factionNorm = c->getFaction(); - Reset(); } uint32 factionNorm; @@ -203,7 +202,7 @@ float AffrayChallengerLoc[6][4]= struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI { - npc_twiggy_flatheadAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_twiggy_flatheadAI(Creature *c) : ScriptedAI(c) {} bool EventInProgress; bool EventGrate; @@ -415,7 +414,7 @@ CreatureAI* GetAI_npc_twiggy_flathead(Creature *_Creature) struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI { - npc_wizzlecrank_shredderAI(Creature* c) : npc_escortAI(c) {Reset();} + npc_wizzlecrank_shredderAI(Creature* c) : npc_escortAI(c) {} bool Completed; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp index 1ac54a682aa..a37d55c7417 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp @@ -68,7 +68,6 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI boss_gurtogg_bloodboilAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 78014b34bbb..a07c5ca0b1b 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -163,7 +163,7 @@ enum CreatureEntry /*** Phase Names ***/ enum PhaseIllidan { - PHASE_NULL = 0, + PHASE_ILLIDAN_NULL = 0, PHASE_NORMAL = 1, PHASE_FLIGHT = 2, PHASE_NORMAL_2 = 3, @@ -172,6 +172,7 @@ enum PhaseIllidan PHASE_TALK_SEQUENCE = 6, PHASE_FLIGHT_SEQUENCE = 7, PHASE_TRANSFORM_SEQUENCE = 8, + PHASE_ILLIDAN_MAX = 9, };//Maiev uses the same phase enum PhaseAkama @@ -367,7 +368,6 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); - Reset(); SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_SHADOWFIEND_PASSIVE); if(TempSpell) @@ -405,7 +405,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI if(summon->GetGUID() == FlameGUID[i]) FlameGUID[i] = 0; - if(!FlameGUID[0] && !FlameGUID[1] && Phase != PHASE_NULL) + if(!FlameGUID[0] && !FlameGUID[1] && Phase != PHASE_ILLIDAN_NULL) { m_creature->InterruptNonMeleeSpells(true); EnterPhase(PHASE_FLIGHT_SEQUENCE); @@ -890,7 +890,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI { - flame_of_azzinothAI(Creature *c) : ScriptedAI(c) {Reset();} + flame_of_azzinothAI(Creature *c) : ScriptedAI(c) {} uint32 FlameBlastTimer; uint32 CheckTimer; @@ -975,7 +975,6 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI npc_akama_illidanAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -1369,7 +1368,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI { - boss_maievAI(Creature *c) : ScriptedAI(c) { Reset(); }; + boss_maievAI(Creature *c) : ScriptedAI(c) {}; uint64 IllidanGUID; @@ -1428,6 +1427,12 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI ScriptedAI::AttackStart(who, true); } + void DoAction(const int32 param) + { + if(param > PHASE_ILLIDAN_NULL && param < PHASE_ILLIDAN_MAX) + EnterPhase(PhaseIllidan(param)); + } + void EnterPhase(PhaseIllidan NextPhase)//This is in fact Illidan's phase. { switch(NextPhase) @@ -1589,7 +1594,7 @@ bool GossipHello_npc_akama_at_illidan(Player *player, Creature *_Creature) struct TRINITY_DLL_DECL cage_trap_triggerAI : public ScriptedAI { - cage_trap_triggerAI(Creature *c) : ScriptedAI(c) {Reset();} + cage_trap_triggerAI(Creature *c) : ScriptedAI(c) {} uint64 IllidanGUID; uint32 DespawnTimer; @@ -1679,7 +1684,7 @@ bool GOHello_cage_trap(Player* plr, GameObject* go) struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI { - shadow_demonAI(Creature *c) : ScriptedAI(c) {Reset();} + shadow_demonAI(Creature *c) : ScriptedAI(c) {} uint64 TargetGUID; @@ -1722,7 +1727,6 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI mob_parasitic_shadowfiendAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -1824,7 +1828,7 @@ void boss_illidan_stormrageAI::Reset() GlaiveGUID[i] = 0; } - Phase = PHASE_NULL; + Phase = PHASE_ILLIDAN_NULL; Event = EVENT_NULL; Timer[EVENT_BERSERK] = 1500000; @@ -1876,7 +1880,7 @@ void boss_illidan_stormrageAI::JustSummoned(Creature* summon) summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); MaievGUID = summon->GetGUID(); ((boss_maievAI*)summon->AI())->GetIllidanGUID(m_creature->GetGUID()); - ((boss_maievAI*)summon->AI())->EnterPhase(PHASE_TALK_SEQUENCE); + summon->AI()->DoAction(PHASE_TALK_SEQUENCE); }break; case FLAME_OF_AZZINOTH: { @@ -2123,7 +2127,7 @@ void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase) { GETCRE(Maiev, MaievGUID); if(Maiev && Maiev->isAlive()) - ((boss_maievAI*)Maiev->AI())->EnterPhase(NextPhase); + Maiev->AI()->DoAction(NextPhase); } Phase = NextPhase; Event = EVENT_NULL; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp index 3e6598ae374..102c5c598d2 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp @@ -81,7 +81,6 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI boss_shahrazAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp index a5fcea2923a..37ebaca0b78 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp @@ -100,7 +100,7 @@ static Position Coords[]= struct TRINITY_DLL_DECL npc_enslaved_soulAI : public ScriptedAI { - npc_enslaved_soulAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_enslaved_soulAI(Creature *c) : ScriptedAI(c) {} uint64 ReliquaryGUID; @@ -121,7 +121,6 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); EssenceGUID = 0; - Reset(); } ScriptedInstance* pInstance; @@ -322,7 +321,7 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit, struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI { - boss_essence_of_sufferingAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_essence_of_sufferingAI(Creature *c) : ScriptedAI(c) {} uint64 StatAuraGUID; @@ -430,7 +429,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI { - boss_essence_of_desireAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_essence_of_desireAI(Creature *c) : ScriptedAI(c) {} uint32 RuneShieldTimer; uint32 DeadenTimer; @@ -526,7 +525,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI { - boss_essence_of_angerAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_essence_of_angerAI(Creature *c) : ScriptedAI(c) {} uint64 AggroTargetGUID; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp index d68b51e461f..46b6ad0bf9a 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp @@ -107,7 +107,7 @@ const uint32 spawnEntries[4]= { 23523, 23318, 23524 }; struct TRINITY_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI { - mob_ashtongue_channelerAI(Creature* c) : ScriptedAI(c) { Reset(); } + mob_ashtongue_channelerAI(Creature* c) : ScriptedAI(c) {} uint64 ShadeGUID; @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI { - mob_ashtongue_sorcererAI(Creature* c) : ScriptedAI(c) { Reset(); } + mob_ashtongue_sorcererAI(Creature* c) : ScriptedAI(c) {} uint64 ShadeGUID; uint32 CheckTimer; @@ -169,7 +169,6 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); AkamaGUID = pInstance ? pInstance->GetData64(DATA_AKAMA_SHADE) : 0; - Reset(); } ScriptedInstance* pInstance; @@ -507,7 +506,6 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI StartCombat = false; pInstance = ((ScriptedInstance*)c->GetInstanceData()); ShadeGUID = pInstance ? pInstance->GetData64(DATA_SHADEOFAKAMA) : 0; - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp index 3ae719effaf..72429886626 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp @@ -54,7 +54,6 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI boss_supremusAI(Creature *c) : ScriptedAI(c), summons(m_creature) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -241,7 +240,6 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public ScriptedAI npc_volcanoAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp index 778874c9078..aec4867316b 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp @@ -51,10 +51,7 @@ EndScriptData */ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI { - mob_doom_blossomAI(Creature *c) : ScriptedAI(c) - { - Reset(); - } + mob_doom_blossomAI(Creature *c) : ScriptedAI(c) {} uint32 CheckTeronTimer; uint32 ShadowBoltTimer; @@ -116,10 +113,7 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit, struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI { - mob_shadowy_constructAI(Creature* c) : ScriptedAI(c) - { - Reset(); - } + mob_shadowy_constructAI(Creature* c) : ScriptedAI(c) {} uint64 GhostGUID; uint64 TeronGUID; @@ -200,7 +194,6 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI boss_teron_gorefiendAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp index 1c2952e6791..9316e108db7 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp @@ -51,7 +51,6 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI boss_najentusAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp index 21104389edf..ca3a6658f45 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -111,7 +111,6 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA { for(uint8 i = 0; i < 4; ++i) Council[i] = 0; - Reset(); } uint64 Council[4]; @@ -196,8 +195,6 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); for(uint8 i = 0; i < 4; ++i) Council[i] = 0; - - Reset(); } ScriptedInstance* pInstance; @@ -432,7 +429,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_councilAI { - boss_gathios_the_shattererAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } + boss_gathios_the_shattererAI(Creature *c) : boss_illidari_councilAI(c) {} uint32 ConsecrationTimer; uint32 HammerOfJusticeTimer; @@ -547,7 +544,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI { - boss_high_nethermancer_zerevorAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } + boss_high_nethermancer_zerevorAI(Creature *c) : boss_illidari_councilAI(c) {} uint32 BlizzardTimer; uint32 FlamestrikeTimer; @@ -639,7 +636,7 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_ struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI { - boss_lady_malandeAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } + boss_lady_malandeAI(Creature *c) : boss_illidari_councilAI(c) {} uint32 EmpoweredSmiteTimer; uint32 CircleOfHealingTimer; @@ -705,7 +702,7 @@ struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI { - boss_veras_darkshadowAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } + boss_veras_darkshadowAI(Creature *c) : boss_illidari_councilAI(c) {} uint64 EnvenomTargetGUID; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index 7941a93840d..253912ef288 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -103,7 +103,6 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); MobSpawnId = rand()%6; - Reset(); } ScriptedInstance* pInstance; @@ -341,7 +340,7 @@ CreatureAI* GetAI_npc_grimstone(Creature *_Creature) struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI { - mob_phalanxAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_phalanxAI(Creature *c) : ScriptedAI(c) {} uint32 ThunderClap_Timer; uint32 FireballVolley_Timer; @@ -542,7 +541,7 @@ ScriptedInstance *pInstance; /* struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI { - npc_dughal_stormwingAI(Creature *c) : npc_escortAI(c) { Reset(); } + npc_dughal_stormwingAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -645,7 +644,6 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI npc_marshal_windsorAI(Creature *c) : npc_escortAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } void WaypointReached(uint32 i) @@ -810,7 +808,6 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI { npc_marshal_reginald_windsorAI(Creature *c) : npc_escortAI(c) { - Reset(); } void WaypointReached(uint32 i) @@ -1004,7 +1001,7 @@ CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature *_Creature) /* struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI { - npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {Reset();} + npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {} void Aggro(Unit* who) { } void Reset() {} @@ -1128,7 +1125,6 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI npc_rocknotAI(Creature *c) : npc_escortAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp index 8ac58521395..bf698aff507 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp @@ -27,7 +27,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI { - boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {} uint32 FireBlast_Timer; uint32 Spirit_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp index 9df9b7039e6..7cc38998a9e 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI { - boss_anubshiahAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_anubshiahAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowBolt_Timer; uint32 CurseOfTongues_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 4d7130dc3d0..e5b279d65ef 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI { - boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {} uint32 HandOfThaurissan_Timer; uint32 AvatarOfFlame_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp index 192cd18fbfa..c0ea7cac901 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI { - boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {} uint32 MightyBlow_Timer; uint32 HamString_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp index b2241df6e9d..3fd45e6eed7 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -28,7 +28,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI { - boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 MortalStrike_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp index bd9b200ea69..df109c24001 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI { - boss_grizzleAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_grizzleAI(Creature *c) : ScriptedAI(c) {} uint32 GroundTremor_Timer; uint32 Frenzy_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp index 65e4f6a0cf7..5921cc8419a 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI { - boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowWordPain_Timer; uint32 ManaBurn_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp index 722f3f02e04..c4230b5f557 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp @@ -28,7 +28,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI { - boss_magmusAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_magmusAI(Creature *c) : ScriptedAI(c) {} uint32 FieryBurst_Timer; uint32 WarStomp_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp index 2f562123068..bc90aeb17cf 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp @@ -32,7 +32,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI { - boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {} uint32 Heal_Timer; uint32 MindBlast_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp index 21fb384db57..3e99a09b266 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI { - boss_angerrelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_angerrelAI(Creature *c) : ScriptedAI(c) {} uint32 SunderArmor_Timer; uint32 ShieldBlock_Timer; @@ -91,7 +91,7 @@ CreatureAI* GetAI_boss_angerrel(Creature *_Creature) struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI { - boss_doperelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_doperelAI(Creature *c) : ScriptedAI(c) {} uint32 SinisterStrike_Timer; uint32 BackStab_Timer; @@ -149,7 +149,7 @@ CreatureAI* GetAI_boss_doperel(Creature *_Creature) struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI { - boss_haterelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_haterelAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowBolt_Timer; uint32 ManaBurn_Timer; @@ -221,7 +221,7 @@ CreatureAI* GetAI_boss_haterel(Creature *_Creature) struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI { - boss_vilerelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_vilerelAI(Creature *c) : ScriptedAI(c) {} uint32 MindBlast_Timer; uint32 Heal_Timer; @@ -290,7 +290,7 @@ CreatureAI* GetAI_boss_vilerel(Creature *_Creature) struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI { - boss_seethrelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_seethrelAI(Creature *c) : ScriptedAI(c) {} uint32 FrostArmor_Timer; uint32 Frostbolt_Timer; @@ -370,7 +370,7 @@ CreatureAI* GetAI_boss_seethrel(Creature *_Creature) struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI { - boss_gloomrelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_gloomrelAI(Creature *c) : ScriptedAI(c) {} uint32 Hamstring_Timer; uint32 Cleave_Timer; @@ -470,7 +470,7 @@ bool GossipSelect_boss_gloomrel(Player *player, Creature *_Creature, uint32 send struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI { - boss_doomrelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_doomrelAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 Immolate_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp index 9a909141eec..69ca2482357 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI { - boss_drakkisathAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_drakkisathAI(Creature *c) : ScriptedAI(c) {} uint32 FireNova_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp index 77725fb81d2..919643a34e9 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI { - boss_gythAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_gythAI(Creature *c) : ScriptedAI(c) {} uint32 Aggro_Timer; uint32 Dragons_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp index 437d85d6405..81e872b1ffa 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI { - boss_halyconAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_halyconAI(Creature *c) : ScriptedAI(c) {} uint32 CrowdPummel_Timer; uint32 MightyBlow_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp index 20a37278863..79ebd4fa098 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI { - boss_highlordomokkAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_highlordomokkAI(Creature *c) : ScriptedAI(c) {} uint32 WarStomp_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp index db30e876ec3..c2df5796f48 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI { - boss_mothersmolderwebAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_mothersmolderwebAI(Creature *c) : ScriptedAI(c) {} uint32 Crystalize_Timer; uint32 MothersMilk_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp index f597db32c70..ecb0a71db82 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -40,7 +40,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI { - boss_overlordwyrmthalakAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_overlordwyrmthalakAI(Creature *c) : ScriptedAI(c) {} uint32 BlastWave_Timer; uint32 Shout_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp index f54494d80d1..532a719bbe3 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI { - boss_pyroguard_emberseerAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_pyroguard_emberseerAI(Creature *c) : ScriptedAI(c) {} uint32 FireNova_Timer; uint32 FlameBuffet_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp index b0977de9696..af158d97de6 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI { - boss_quatermasterzigrisAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_quatermasterzigrisAI(Creature *c) : ScriptedAI(c) {} uint32 Shoot_Timer; uint32 StunBomb_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp index 46ed8545fad..d43de67fa56 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI { - boss_rend_blackhandAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_rend_blackhandAI(Creature *c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index 0d41ca5227f..6563aa8a929 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI { - boss_shadowvoshAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_shadowvoshAI(Creature *c) : ScriptedAI(c) {} uint32 CurseOfBlood_Timer; uint32 Hex_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp index 855b3539dd2..c9ba2a77921 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI { - boss_thebeastAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_thebeastAI(Creature *c) : ScriptedAI(c) {} uint32 Flamebreak_Timer; uint32 Immolate_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp index e59cecea060..d701edc6d40 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp @@ -32,7 +32,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI { - boss_warmastervooneAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_warmastervooneAI(Creature *c) : ScriptedAI(c) {} uint32 Snapkick_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp index 71fb5e9a022..b59be12f8eb 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI { - boss_broodlordAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_broodlordAI(Creature *c) : ScriptedAI(c) {} uint32 Cleave_Timer; uint32 BlastWave_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp index 981bd74d02c..83c0d3eebc9 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI { - boss_ebonrocAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_ebonrocAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp index a2613feff20..dfae4f31662 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI { - boss_firemawAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_firemawAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp index 9c2b5f28387..def9af062be 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI { - boss_flamegorAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_flamegorAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp index 548baf49ca3..4abe9265828 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp @@ -60,7 +60,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI { - boss_nefarianAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_nefarianAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 BellowingRoar_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp index 479e81d1d87..19d4385e34b 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp @@ -37,7 +37,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI { - boss_razorgoreAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_razorgoreAI(Creature *c) : ScriptedAI(c) {} uint32 Cleave_Timer; uint32 WarStomp_Timer; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp index 46ee49fb1be..c8fecdae893 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp @@ -45,7 +45,6 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI c->SetUInt32Value(UNIT_NPC_FLAGS,1); c->setFaction(35); c->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - Reset(); } uint64 PlayerGUID; diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp index b0b8135396e..03543bf9874 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp @@ -72,7 +72,6 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) { NefarianGUID = 0; - Reset(); srand(time(NULL)); switch (rand()%20) { diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp index b2cec0bda09..bf3ccea909e 100644 --- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp @@ -49,7 +49,7 @@ bool obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five; //TODO: add support for quest 10512 + creature abilities struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI { - mobs_bladespire_ogreAI(Creature *c) : ScriptedAI(c) {Reset();} + mobs_bladespire_ogreAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -94,7 +94,7 @@ CreatureAI* GetAI_mobs_bladespire_ogre(Creature *_Creature) struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI { - mobs_nether_drakeAI(Creature *c) : ScriptedAI(c) {Reset();} + mobs_nether_drakeAI(Creature *c) : ScriptedAI(c) {} bool IsNihil; uint32 NihilSpeech_Timer; @@ -248,7 +248,7 @@ CreatureAI* GetAI_mobs_nether_drake(Creature *_Creature) struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI { - npc_daranelleAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_daranelleAI(Creature *c) : ScriptedAI(c) {} void Reset() { } diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp index ae21c17b526..7516930285e 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI { - boss_kruulAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_kruulAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp index 2d13e3168a8..af80343943b 100644 --- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp @@ -37,7 +37,7 @@ const uint32 possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 173 struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI { - mob_webbed_creatureAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_webbed_creatureAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp index 59fbfae60d8..ddf7be8e752 100644 --- a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp +++ b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp @@ -46,7 +46,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI { - npc_ragged_johnAI(Creature *c) : ScriptedAI(c) { Reset(); } + npc_ragged_johnAI(Creature *c) : ScriptedAI(c) {} void Reset() {} diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp index 6599eab6a4e..abe37b53685 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -44,7 +44,6 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index 636c4a5270e..d7ffcde4059 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -44,7 +44,6 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp index ed84d5548c7..3e0e327bb89 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp @@ -43,7 +43,6 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index 8407b5c258b..423682ca0ab 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -59,7 +59,6 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI npc_medivh_bmAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -246,7 +245,6 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI npc_time_riftAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp index 217a1002e5d..0ac8193585b 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp @@ -76,7 +76,6 @@ struct mob_ancient_wispAI : public ScriptedAI mob_ancient_wispAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -125,7 +124,7 @@ struct mob_ancient_wispAI : public ScriptedAI MoveChase the Doomfire Spirit always, until despawn (AttackStart is called upon it's spawn) */ struct TRINITY_DLL_DECL mob_doomfireAI : public ScriptedAI { - mob_doomfireAI(Creature* c) : ScriptedAI(c) { Reset(); } + mob_doomfireAI(Creature* c) : ScriptedAI(c) {} void Reset() { } @@ -138,7 +137,7 @@ struct TRINITY_DLL_DECL mob_doomfireAI : public ScriptedAI travels in random directions if target cannot be found. */ struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI { - mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) { Reset(); } + mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) {} uint64 TargetGUID; uint32 ChangeTargetTimer; @@ -207,7 +206,6 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public ScriptedAI boss_archimondeAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp index fa159bd9872..b6c039c49fa 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp @@ -52,7 +52,6 @@ float AttackArea[2][3]= hyjalAI::hyjalAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } void hyjalAI::Reset() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp index e21cc826978..be4c2660b51 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp @@ -43,7 +43,6 @@ struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI boss_captain_skarlocAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index 863a3d9d5d1..60ef9ae55fe 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -45,7 +45,6 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI boss_epoch_hunterAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index 9b938d4d18b..b36555cd074 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -94,7 +94,7 @@ static Location DrakeWP[]= struct TRINITY_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI { - boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {} bool CanPatrol; uint32 wpId; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 8d81e939dd8..4769ac68be1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -211,7 +211,6 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -745,7 +744,6 @@ struct TRINITY_DLL_DECL npc_tarethaAI : public npc_escortAI npc_tarethaAI(Creature *c) : npc_escortAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index 22d539db2ab..4023157b09a 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -99,7 +99,6 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI Advisors[0] = 0; Advisors[1] = 0; Advisors[2] = 0; - Reset(); } ScriptedInstance* pInstance; @@ -309,7 +308,6 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI boss_fathomguard_sharkkisAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -454,7 +452,6 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI boss_fathomguard_tidalvessAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -570,7 +567,6 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI boss_fathomguard_caribdisAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index 665af987a6d..d4263ec4747 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -79,7 +79,6 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 9d66533972d..e3c8d654b93 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -132,9 +132,8 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI { boss_lady_vashjAI (Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; + pInstance = ((ScriptedInstance*)c->GetInstanceData()); Intro = false; - Reset(); CanAttack = false;//must be after reset() m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on creature create (no need do intro if wiped) } @@ -584,8 +583,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI { mob_enchanted_elementalAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } ScriptedInstance *pInstance; @@ -689,8 +687,7 @@ struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI { mob_tainted_elementalAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } ScriptedInstance *pInstance; @@ -753,7 +750,7 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI { mob_toxic_sporebatAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; + pInstance = ((ScriptedInstance*)c->GetInstanceData()); EnterEvadeMode(); } @@ -889,8 +886,7 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI { mob_shield_generator_channelAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 4f96e672352..44490d6afd9 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -76,7 +76,6 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI mob_inner_demonAI(Creature *c) : ScriptedAI(c) { victimGUID = 0; - Reset(); } uint32 ShadowBolt_Timer; @@ -147,14 +146,13 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) { m_creature->GetPosition(x,y,z); - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; + pInstance = ((ScriptedInstance*)c->GetInstanceData()); Demon = 0; for(uint8 i = 0; i < 3; i++)//clear guids SpellBinderGUID[i] = 0; - Reset(); - } + ScriptedInstance *pInstance; uint32 Whirlwind_Timer; @@ -578,10 +576,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI //Leotheras the Blind Demon Form AI struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI { - boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c) - { - Reset(); - } + boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c) {} uint32 ChaosBlast_Timer; bool DealDamage; @@ -652,7 +647,6 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI pInstance = ((ScriptedInstance *)c->GetInstanceData());; leotherasGUID = 0; AddedBanish = false; - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index 6d1fc0a9d51..aa862ea42f7 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -76,9 +76,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI { boss_the_lurker_belowAI(Creature *c) : Scripted_NoMovementAI(c), Summons(m_creature) { - pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); - SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_SPOUT_ANIM); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_SPOUT_ANIM); if(TempSpell) { TempSpell->Effect[0] = 0;//remove all spell effect, only anim is needed @@ -403,7 +401,6 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI { mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c) { - Reset(); SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_SHOOT); if(TempSpell) TempSpell->Effect[0] = 2;//change spell effect from weapon % dmg to simple phisical dmg diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index f243126e0d3..224f22f804e 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -101,7 +101,6 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI boss_morogrim_tidewalkerAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -295,7 +294,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI { - mob_water_globuleAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_water_globuleAI(Creature *c) : ScriptedAI(c) {} uint32 Check_Timer; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 5fd7837d911..8ffee603597 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -47,7 +47,6 @@ struct TRINITY_DLL_DECL boss_thespiaAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance *pInstance; @@ -143,7 +142,7 @@ struct TRINITY_DLL_DECL boss_thespiaAI : public ScriptedAI struct TRINITY_DLL_DECL mob_coilfang_waterelementalAI : public ScriptedAI { - mob_coilfang_waterelementalAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_coilfang_waterelementalAI(Creature *c) : ScriptedAI(c) {} bool HeroicMode; uint32 WaterBoltVolley_Timer; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 3424850686a..e5b12065298 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -52,7 +52,6 @@ struct TRINITY_DLL_DECL boss_mekgineer_steamriggerAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance *pInstance; @@ -202,7 +201,6 @@ struct TRINITY_DLL_DECL mob_steamrigger_mechanicAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index e525461de71..ede9a38126f 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -45,7 +45,6 @@ struct TRINITY_DLL_DECL mob_naga_distillerAI : public ScriptedAI mob_naga_distillerAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -92,7 +91,6 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI boss_warlord_kalithreshAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp index 1d6584b9523..99d313d303a 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -31,7 +31,6 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI boss_hungarfenAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } bool HeroicMode; @@ -95,7 +94,7 @@ CreatureAI* GetAI_boss_hungarfen(Creature *_Creature) struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI { - mob_underbog_mushroomAI(Creature *c) : ScriptedAI(c) { Reset(); } + mob_underbog_mushroomAI(Creature *c) : ScriptedAI(c) {} bool Stop; uint32 Grow_Timer; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 9e27f2bc063..325b6ffe244 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -38,7 +38,6 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI boss_the_black_stalkerAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } bool HeroicMode; diff --git a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp index 185d545d98d..c9cc4625b97 100644 --- a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp +++ b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp @@ -38,7 +38,7 @@ struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI uint32 lifeTimer; bool spellHit; - npc_narm_faulkAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_narm_faulkAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp index ed8a50f9d94..67f68334410 100644 --- a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp @@ -41,7 +41,7 @@ EndContentData */ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI { - mobs_risen_husk_spiritAI(Creature *c) : ScriptedAI(c) {Reset();} + mobs_risen_husk_spiritAI(Creature *c) : ScriptedAI(c) {} uint32 ConsumeFlesh_Timer; uint32 IntangiblePresence_Timer; @@ -108,7 +108,7 @@ bool GossipHello_npc_restless_apparition(Player *player, Creature *_Creature) struct TRINITY_DLL_DECL npc_deserter_agitatorAI : public ScriptedAI { - npc_deserter_agitatorAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_deserter_agitatorAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp index 0c8c47a4c52..167dd0455af 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp @@ -36,7 +36,7 @@ EndContentData */ struct TRINITY_DLL_DECL mobs_ghoul_flayerAI : public ScriptedAI { - mobs_ghoul_flayerAI(Creature *c) : ScriptedAI(c) {Reset();} + mobs_ghoul_flayerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } @@ -85,7 +85,7 @@ bool GossipSelect_npc_augustus_the_touched(Player *player, Creature *_Creature, struct TRINITY_DLL_DECL npc_darrowshire_spiritAI : public ScriptedAI { - npc_darrowshire_spiritAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_darrowshire_spiritAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp index b9ac3aa18c3..d1fa414ea11 100644 --- a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp +++ b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp @@ -38,7 +38,7 @@ struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI uint32 lifeTimer; bool spellHit; - npc_henze_faulkAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_henze_faulkAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp index b29e99d6206..f6a5c5bd4a2 100644 --- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp @@ -45,7 +45,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI { // CreatureAI functions - npc_prospector_anvilwardAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_prospector_anvilwardAI(Creature *c) : npc_escortAI(c) {} // Pure Virtual Functions void WaypointReached(uint32 i) @@ -180,7 +180,7 @@ static uint32 PaladinEntry[]= {CHAMPION_BLOODWRATH, CHAMPION_LIGHTREND, CHAMPION struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI { - npc_secondTrialAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_secondTrialAI(Creature *c) : ScriptedAI(c) {} uint32 timer; uint8 questPhase; @@ -314,7 +314,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI { - master_kelerun_bloodmournAI(Creature *c) : ScriptedAI(c) {Reset();} + master_kelerun_bloodmournAI(Creature *c) : ScriptedAI(c) {} uint8 questPhase; uint8 paladinPhase; @@ -399,7 +399,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI } void SecondTrialKill(); - void SummonedCreatureDespawn(Creature* c) {Reset();} + void SummonedCreatureDespawn(Creature* c) {} }; @@ -534,7 +534,7 @@ bool GOHello_go_second_trial(Player *player, GameObject* _GO) struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI { - npc_apprentice_mirvedaAI(Creature* c) : ScriptedAI(c), Summons(m_creature) {Reset();} + npc_apprentice_mirvedaAI(Creature* c) : ScriptedAI(c), Summons(m_creature) {} uint32 KillCount; uint64 PlayerGUID; @@ -637,7 +637,7 @@ static Location SpawnLocations[]= struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI { - npc_infused_crystalAI(Creature* c) : Scripted_NoMovementAI(c) {Reset();} + npc_infused_crystalAI(Creature* c) : Scripted_NoMovementAI(c) {} uint32 EndTimer; uint32 WaveTimer; diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index 12c6c3d26a3..54e4e3e4739 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -153,7 +153,7 @@ enum struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI { - npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {} std::list<GameObject*> CageList; diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp index f2da55becc8..fdfb25a2e50 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp @@ -54,7 +54,6 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI boss_gruulAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp index 68d89bccc2b..4437938a47a 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp @@ -73,7 +73,6 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); for(uint8 i = 0; i < 4; ++i) Council[i] = 0; - Reset(); } ScriptedInstance* pInstance; @@ -274,7 +273,6 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI boss_olm_the_summonerAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 DarkDecay_Timer; @@ -374,7 +372,6 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI boss_kiggler_the_crazedAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 GreaterPolymorph_Timer; @@ -482,7 +479,6 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI boss_blindeye_the_seerAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 GreaterPowerWordShield_Timer; @@ -578,7 +574,6 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI boss_krosh_firehandAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 GreaterFireball_Timer; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp index affe771babb..1afe49ce30e 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI { - boss_broggokAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_broggokAI(Creature *c) : ScriptedAI(c) {} uint32 AcidSpray_Timer; uint32 PoisonSpawn_Timer; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 31485690e46..d4505d58e18 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -75,7 +75,6 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); for(int i=0; i<5; ++i) Channelers[i] = 0; - Reset(); } ScriptedInstance* pInstance; @@ -276,7 +275,6 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 5606719dc65..e1ea1e03b2f 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -37,7 +37,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI { - boss_the_makerAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_the_makerAI(Creature *c) : ScriptedAI(c) {} uint32 AcidSpray_Timer; uint32 ExplodingBreaker_Timer; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index be9ae2525d8..e6b8593d0c0 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -46,7 +46,6 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public Scripted_NoMovementAI boss_omor_the_unscarredAI(Creature *c) : Scripted_NoMovementAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } bool HeroicMode; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 4a4647e7c61..447a59c314c 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -64,7 +64,6 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI HeroicMode = m_creature->GetMap()->IsHeroic(); VazrudenGUID = 0; flight = true; - Reset(); } uint32 Fireball_Timer; @@ -177,7 +176,6 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI boss_vazrudenAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 Revenge_Timer; @@ -257,7 +255,6 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI NazanGUID = 0; VazrudenGUID = 0; HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 phase; @@ -410,8 +407,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI { - mob_hellfire_sentryAI(Creature *c) : ScriptedAI(c) - { Reset();} + mob_hellfire_sentryAI(Creature *c) : ScriptedAI(c) {} uint32 KidneyShot_Timer; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index 608042cc43c..e955c537bf6 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -43,7 +43,6 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI boss_watchkeeper_gargolmarAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } bool HeroicMode; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index 195cc824650..a00c3cbde2e 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -94,7 +94,6 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI { trigger = 0; Despawn_Timer = 60000; - Reset(); } uint32 FireBlast_Timer; @@ -188,8 +187,6 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI { TempSpell->EffectTriggerSpell[0] = SPELL_QUAKE_KNOCKBACK; } - - Reset(); } CubeMap Cube; @@ -416,7 +413,6 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI mob_hellfire_channelerAI(Creature *c) : ScriptedAI(c) { pInstance =(ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index ffe9efa2309..91246b0c5b2 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -79,7 +79,6 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance* pInstance; @@ -314,7 +313,6 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI mob_fel_orc_convertAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -383,7 +381,7 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI //NOTE: this creature are also summoned by other spells, for different creatures struct TRINITY_DLL_DECL mob_lesser_shadow_fissureAI : public ScriptedAI { - mob_lesser_shadow_fissureAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_lesser_shadow_fissureAI(Creature *c) : ScriptedAI(c) {} void Reset() { } void MoveInLineOfSight(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index 9f241774cbe..af7a4501dc7 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -97,7 +97,7 @@ static Yell KillingDelay[]= struct TRINITY_DLL_DECL mob_omrogg_headsAI : public ScriptedAI { - mob_omrogg_headsAI(Creature *c) : ScriptedAI(c) { Reset(); } + mob_omrogg_headsAI(Creature *c) : ScriptedAI(c) {} bool DeathYell; uint32 Death_Timer; @@ -130,7 +130,6 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index c87c91fc62a..793efb598d4 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -54,7 +54,6 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp index 0cb6b7a849e..fbb86e6cabf 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp @@ -47,7 +47,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI { - boss_doomlordkazzakAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_doomlordkazzakAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp index 93a5be1e19d..61c31fb0fba 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp @@ -50,7 +50,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_aeranasAI : public ScriptedAI { - npc_aeranasAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_aeranasAI(Creature* c) : ScriptedAI(c) {} uint32 Faction_Timer; uint32 EnvelopingWinds_Timer; @@ -271,7 +271,7 @@ bool GossipSelect_npc_wing_commander_brack(Player *player, Creature *_Creature, struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI { - npc_wounded_blood_elfAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_wounded_blood_elfAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp index c9ea67ac824..bbc181f1099 100644 --- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp +++ b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp @@ -74,7 +74,7 @@ bool GossipSelect_npc_ayren_cloudbreaker(Player *player, Creature *_Creature, ui struct TRINITY_DLL_DECL npc_converted_sentryAI : public ScriptedAI { - npc_converted_sentryAI(Creature *c) : ScriptedAI(c) { Reset(); } + npc_converted_sentryAI(Creature *c) : ScriptedAI(c) {} bool Credit; uint32 Timer; @@ -148,7 +148,7 @@ bool GossipSelect_npc_unrestrained_dragonhawk(Player *player, Creature *_Creatur struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI { - npc_greengill_slaveAI(Creature* c) : ScriptedAI(c) {Reset();} + npc_greengill_slaveAI(Creature* c) : ScriptedAI(c) {} uint64 PlayerGUID; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp index 50eb20371f1..0c00ba7ba89 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp @@ -43,7 +43,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI { - boss_curatorAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_curatorAI(Creature *c) : ScriptedAI(c) {} uint32 AddTimer; uint32 HatefulBoltTimer; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp index a8581a351ff..95e34e85622 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp @@ -39,7 +39,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI { - boss_maiden_of_virtueAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_maiden_of_virtueAI(Creature *c) : ScriptedAI(c) {} uint32 Repentance_Timer; uint32 Holyfire_Timer; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp index 440e4bdfec1..0f6d13c2198 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp @@ -46,7 +46,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI { - boss_midnightAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_midnightAI(Creature *c) : ScriptedAI(c) {} uint64 Attumen; uint8 Phase; @@ -165,7 +165,6 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI { boss_attumenAI(Creature *c) : ScriptedAI(c) { - Reset(); Phase = 1; CleaveTimer = 10000 + (rand()%6)*1000; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp index 03cf1a719f4..76327c6ee1d 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp @@ -64,7 +64,6 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI { FirstTime = true; pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -377,7 +376,6 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI GuestGUID[i] = 0; pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } void Reset() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp index 8103d73c651..fd7e6176433 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp @@ -62,7 +62,6 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Intro = true; - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp index fe5c08ae45d..54c04f59743 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp @@ -98,7 +98,7 @@ static InfernalPoint InfernalPoints[] = struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI { netherspite_infernalAI(Creature *c) : ScriptedAI(c) , - malchezaar(0), HellfireTimer(0), CleanupTimer(0), point(NULL) {Reset();} + malchezaar(0), HellfireTimer(0), CleanupTimer(0), point(NULL) {} uint32 HellfireTimer; uint32 CleanupTimer; @@ -159,7 +159,6 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI boss_malchezaarAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp index 580cedf910b..98aa93f3b8d 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp @@ -84,7 +84,6 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI boss_aranAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -530,7 +529,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI struct TRINITY_DLL_DECL water_elementalAI : public ScriptedAI { - water_elementalAI(Creature *c) : ScriptedAI(c) {Reset();} + water_elementalAI(Creature *c) : ScriptedAI(c) {} uint32 CastTimer; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp index ef5a4753c9a..bf8d539026e 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp @@ -67,7 +67,6 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI mob_kilrekAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -129,10 +128,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI struct TRINITY_DLL_DECL mob_demon_chainAI : public ScriptedAI { - mob_demon_chainAI(Creature *c) : ScriptedAI(c) - { - Reset(); - } + mob_demon_chainAI(Creature *c) : ScriptedAI(c) {} uint64 SacrificeGUID; @@ -163,7 +159,6 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI for(uint8 i = 0; i < 2; ++i) PortalGUID[i] = 0; pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -364,7 +359,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI struct TRINITY_DLL_DECL mob_karazhan_impAI : public ScriptedAI { - mob_karazhan_impAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_karazhan_impAI(Creature *c) : ScriptedAI(c) {} uint32 FireboltTimer; diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index 77026561ad7..c5646167c3c 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -105,7 +105,6 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI boss_dorotheeAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -201,10 +200,7 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI struct TRINITY_DLL_DECL mob_titoAI : public ScriptedAI { - mob_titoAI(Creature* c) : ScriptedAI(c) - { - Reset(); - } + mob_titoAI(Creature* c) : ScriptedAI(c) {} uint64 DorotheeGUID; uint32 YipTimer; @@ -263,7 +259,6 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI boss_strawmanAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -361,7 +356,6 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI boss_tinheadAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -455,7 +449,6 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI boss_roarAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -548,7 +541,6 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI boss_croneAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -616,10 +608,7 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI struct TRINITY_DLL_DECL mob_cycloneAI : public ScriptedAI { - mob_cycloneAI(Creature* c) : ScriptedAI(c) - { - Reset(); - } + mob_cycloneAI(Creature* c) : ScriptedAI(c) {} uint32 MoveTimer; @@ -739,7 +728,6 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI boss_bigbadwolfAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -931,7 +919,6 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); EntryYellTimer = 1000; AggroYellTimer = 10000; - Reset(); } ScriptedInstance* pInstance; @@ -1044,7 +1031,6 @@ struct TRINITY_DLL_DECL boss_romuloAI : public ScriptedAI boss_romuloAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); EntryYellTimer = 8000; AggroYellTimer = 15000; } diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index c1246b444df..3b550c34e72 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -116,7 +116,6 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI { RaidWiped = false; pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -487,7 +486,6 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI npc_image_of_medivhAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp index f8304b409b3..d9b69b8bddc 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp @@ -79,9 +79,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI { boss_felblood_kaelthasAI(Creature* c) : ScriptedAI(c) { - pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); - Heroic = c->GetMap()->IsHeroic(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); Heroic = c->GetMap()->IsHeroic(); } ScriptedInstance* pInstance; @@ -420,7 +418,6 @@ struct TRINITY_DLL_DECL mob_felkael_flamestrikeAI : public ScriptedAI { mob_felkael_flamestrikeAI(Creature *c) : ScriptedAI(c) { - Reset(); Heroic = c->GetMap()->IsHeroic(); } @@ -454,7 +451,6 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI mob_felkael_phoenixAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -563,7 +559,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI { - mob_felkael_phoenix_eggAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_felkael_phoenix_eggAI(Creature *c) : ScriptedAI(c) {} uint32 HatchTimer; diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp index fa96e43f015..3eaa526778d 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp @@ -98,7 +98,6 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); SummonAdds(); - Reset(); Heroic = c->GetMap()->IsHeroic(); } @@ -342,9 +341,7 @@ struct TRINITY_DLL_DECL boss_priestess_guestAI : public ScriptedAI boss_priestess_guestAI(Creature* c) : ScriptedAI(c) { Group.clear(); - pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); - AcquireGUIDs(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); AcquireGUIDs(); } ScriptedInstance* pInstance; @@ -527,10 +524,7 @@ struct TRINITY_DLL_DECL boss_kagani_nightstrikeAI : public boss_priestess_guestA /*struct TRINITY_DLL_DECL mob_fizzleAI : public ScriptedAI { - mob_fizzleAI(Creature *c) : ScriptedAI(c) - { - Reset(); - } + mob_fizzleAI(Creature *c) : ScriptedAI(c) {} uint64 EllrisGUID; uint32 Firebal_Timer; @@ -917,10 +911,7 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_guestAI /*struct TRINITY_DLL_DECL mob_sliverAI : public ScriptedAI { - mob_sliverAI(Creature *c) : ScriptedAI(c) - { - Reset(); - } + mob_sliverAI(Creature *c) : ScriptedAI(c) {} uint64 GaraxxasGUID; @@ -1214,7 +1205,7 @@ struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_guestAI //struct TRINITY_DLL_DECL mob_high_explosive_sheepAI : public ScriptedAI //{ -// mob_high_explosive_sheepAI(Creature *c) : ScriptedAI(c) {Reset();} +// mob_high_explosive_sheepAI(Creature *c) : ScriptedAI(c) {} // // uint32 Explosion_Timer; // diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp index 90533797d5e..2dc2d893c5a 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp @@ -67,7 +67,6 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI Crystals.push_back(guid); } } - Reset(); Heroic = c->GetMap()->IsHeroic(); } @@ -331,7 +330,7 @@ CreatureAI* GetAI_boss_selin_fireheart(Creature *_Creature) struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI { - mob_fel_crystalAI(Creature *c) : ScriptedAI(c) { Reset(); } + mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {} void Reset() {} void Aggro(Unit* who) {} diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp index 8c47e354081..5fb43c88306 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp @@ -53,9 +53,8 @@ struct TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI { boss_vexallusAI(Creature *c) : ScriptedAI(c) { - pInstance = ((ScriptedInstance*)c->GetInstanceData()); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); Heroic = c->GetMap()->IsHeroic(); Heroic = c->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance* pInstance; @@ -187,7 +186,7 @@ CreatureAI* GetAI_boss_vexallus(Creature *_Creature) struct TRINITY_DLL_DECL mob_pure_energyAI : public ScriptedAI { - mob_pure_energyAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_pure_energyAI(Creature *c) : ScriptedAI(c) {} void Reset() { } diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp index 767246b876c..bb7c183ff02 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI { - celebras_the_cursedAI(Creature *c) : ScriptedAI(c) {Reset();} + celebras_the_cursedAI(Creature *c) : ScriptedAI(c) {} uint32 Wrath_Timer; uint32 EntanglingRoots_Timer; diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp index 49d50b43a59..960307421d0 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI { - boss_landslideAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_landslideAI(Creature *c) : ScriptedAI(c) {} uint32 KnockAway_Timer; uint32 Trample_Timer; diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp index a987fd6399a..d748220d3cf 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp @@ -28,7 +28,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI { - boss_noxxionAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_noxxionAI(Creature *c) : ScriptedAI(c) {} uint32 ToxicVolley_Timer; uint32 Uppercut_Timer; diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp index c78d28e0aa8..4741577a60b 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI { - boss_ptheradrasAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_ptheradrasAI(Creature *c) : ScriptedAI(c) {} uint32 Dustfield_Timer; uint32 Boulder_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp index da8b47d6a7c..953ed97cfc6 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp @@ -32,7 +32,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI { - boss_baron_geddonAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_baron_geddonAI(Creature *c) : ScriptedAI(c) {} uint32 Inferno_Timer; uint32 IgniteMana_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp index ac1ff61c2ba..72d2e871f16 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp @@ -34,7 +34,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI { - boss_garrAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_garrAI(Creature *c) : ScriptedAI(c) {} uint32 AntiMagicPulse_Timer; uint32 MagmaShackles_Timer; @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI { - mob_fireswornAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_fireswornAI(Creature *c) : ScriptedAI(c) {} uint32 Immolate_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp index c65782c3e4d..55ed3c6fb38 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI { - boss_gehennasAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_gehennasAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowBolt_Timer; uint32 RainOfFire_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp index b5ebfbe4c73..b98c4bec979 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp @@ -41,7 +41,6 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI boss_golemaggAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -119,8 +118,7 @@ struct TRINITY_DLL_DECL mob_core_ragerAI : public ScriptedAI { mob_core_ragerAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } uint32 Mangle_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp index c87d77ab73b..b1d12d5a351 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_lucifronAI : public ScriptedAI { - boss_lucifronAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_lucifronAI(Creature *c) : ScriptedAI(c) {} uint32 ImpendingDoom_Timer; uint32 LucifronCurse_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp index de26001d185..034344845c6 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI { - boss_magmadarAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_magmadarAI(Creature *c) : ScriptedAI(c) {} uint32 Frenzy_Timer; uint32 Panic_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp index 9f5f815631a..ccfed05578b 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp @@ -56,7 +56,6 @@ struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI boss_majordomoAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp index 8ed490e3d58..fddbbdeb992 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp @@ -85,7 +85,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_ragnarosAI : public Scripted_NoMovementAI { - boss_ragnarosAI(Creature *c) : Scripted_NoMovementAI(c) {Reset();} + boss_ragnarosAI(Creature *c) : Scripted_NoMovementAI(c) {} uint32 WrathOfRagnaros_Timer; uint32 HandOfRagnaros_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp index e0ee20518b0..1f515f1e32f 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI { - boss_shazzrahAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_shazzrahAI(Creature *c) : ScriptedAI(c) {} uint32 ArcaneExplosion_Timer; uint32 ShazzrahCurse_Timer; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp index cc0cb5c9f12..3efc6d08bbf 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp @@ -39,8 +39,7 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI { boss_sulfuronAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } uint32 Darkstrike_Timer; @@ -127,8 +126,7 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI { mob_flamewaker_priestAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } uint32 Heal_Timer; diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp index 0431f348f83..dfafa193542 100644 --- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp +++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp @@ -268,7 +268,7 @@ float Clintar_spirit_WP[41][5] = struct TRINITY_DLL_DECL npc_clintar_spiritAI : public npc_escortAI { public: - npc_clintar_spiritAI(Creature *c) : npc_escortAI(c) {Reset(); } + npc_clintar_spiritAI(Creature *c) : npc_escortAI(c) {} uint32 Step; uint32 CurrWP; diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index d6d905eaa86..85d5d8a1d53 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -63,7 +63,7 @@ bool GossipSelect_npc_skorn_whitecloud(Player *player, Creature *_Creature, uint struct TRINITY_DLL_DECL npc_kyle_frenziedAI : public ScriptedAI { - npc_kyle_frenziedAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_kyle_frenziedAI(Creature *c) : ScriptedAI(c) {} int STATE; uint32 wait; @@ -220,7 +220,7 @@ float wp_plain_vision[50][3] = struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI { - npc_plains_visionAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_plains_visionAI(Creature *c) : ScriptedAI(c) {} bool newWaypoint; uint8 WayPointId; diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp index b90ba14104f..4080676d99b 100644 --- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp +++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL mob_shattered_rumblerAI : public ScriptedAI { bool Spawn; - mob_shattered_rumblerAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_shattered_rumblerAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -95,7 +95,6 @@ struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI mob_lumpAI(Creature *c) : ScriptedAI(c) { bReset = false; - Reset(); } uint32 Reset_Timer; @@ -222,7 +221,7 @@ bool GossipSelect_mob_lump(Player *player, Creature *_Creature, uint32 sender, u struct TRINITY_DLL_DECL mob_sunspring_villagerAI : public ScriptedAI { - mob_sunspring_villagerAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_sunspring_villagerAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -522,7 +521,7 @@ bool GossipSelect_npc_lantresor_of_the_blade(Player *player, Creature *_Creature struct TRINITY_DLL_DECL npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI { - npc_creditmarker_visit_with_ancestorsAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_creditmarker_visit_with_ancestorsAI(Creature* c) : ScriptedAI(c) {} void Reset() {} @@ -564,7 +563,7 @@ CreatureAI* GetAI_npc_creditmarker_visit_with_ancestors(Creature *_Creature) struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI { - mob_sparrowhawkAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_sparrowhawkAI(Creature *c) : ScriptedAI(c) {} uint32 Check_Timer; uint64 PlayerGUID; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp index 6e8fb71f155..0766e432105 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp @@ -46,7 +46,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_anubrekhanAI : public ScriptedAI { - boss_anubrekhanAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_anubrekhanAI(Creature *c) : ScriptedAI(c) {} uint32 Impale_Timer; uint32 LocustSwarm_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp index 19ec0ed8487..5fafebadb96 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp @@ -42,7 +42,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_faerlinaAI : public ScriptedAI { - boss_faerlinaAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_faerlinaAI(Creature *c) : ScriptedAI(c) {} uint32 PoisonBoltVolley_Timer; uint32 RainOfFire_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp index 26c9eb09f14..a51573d745d 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp @@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL boss_lady_blaumeuxAI : public ScriptedAI { - boss_lady_blaumeuxAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_lady_blaumeuxAI(Creature *c) : ScriptedAI(c) {} uint32 Mark_Timer; uint32 VoidZone_Timer; @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_rivendare_naxxAI : public ScriptedAI { - boss_rivendare_naxxAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_rivendare_naxxAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_thane_korthazzAI : public ScriptedAI { - boss_thane_korthazzAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_thane_korthazzAI(Creature *c) : ScriptedAI(c) {} uint32 Mark_Timer; uint32 Meteor_Timer; @@ -298,7 +298,7 @@ struct TRINITY_DLL_DECL boss_sir_zeliekAI : public ScriptedAI { - boss_sir_zeliekAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_sir_zeliekAI(Creature *c) : ScriptedAI(c) {} uint32 Mark_Timer; uint32 HolyWrath_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp index f9e739c5be9..5fb9f017b0a 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp @@ -67,7 +67,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_gluthAI : public ScriptedAI { - boss_gluthAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_gluthAI(Creature *c) : ScriptedAI(c) {} uint32 MortalWound_Timer; uint32 Decimate_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp new file mode 100644 index 00000000000..8bfce605bc4 --- /dev/null +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp @@ -0,0 +1,179 @@ +/* Copyright (C) 2006 - 2008 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 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Highlord_Mograine +SD%Complete: 100 +SDComment: SCRIPT OBSOLETE +SDCategory: Naxxramas +EndScriptData */ + +#include "precompiled.h" + +//All horsemen +#define SPELL_SHIELDWALL 29061 +#define SPELL_BESERK 26662 + +// highlord mograine +#define SPELL_MARK_OF_MOGRAINE 28834 +#define SPELL_RIGHTEOUS_FIRE 28882 // Applied as a 25% chance on melee hit to proc. m_creature->GetVictim() + +#define SAY_TAUNT1 "Enough prattling. Let them come! We shall grind their bones to dust." +#define SAY_TAUNT2 "Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough." +#define SAY_TAUNT3 "Life is meaningless. It is in death that we are truly tested." +#define SAY_AGGRO1 "You seek death?" +#define SAY_AGGRO2 "None shall pass!" +#define SAY_AGGRO3 "Be still!" +#define SAY_SLAY1 "You will find no peace in death." +#define SAY_SLAY2 "The master's will is done." +#define SAY_SPECIAL "Bow to the might of the Highlord!" +#define SAY_DEATH "I... am... released! Perhaps it's not too late to - noo! I need... more time..." + +#define SOUND_TAUNT1 8842 +#define SOUND_TAUNT2 8843 +#define SOUND_TAUNT3 8844 +#define SOUND_AGGRO1 8835 +#define SOUND_AGGRO2 8836 +#define SOUND_AGGRO3 8837 +#define SOUND_SLAY1 8839 +#define SOUND_SLAY2 8840 +#define SOUND_SPECIAL 8841 +#define SOUND_DEATH 8838 + +#define SPIRIT_OF_MOGRAINE 16775 + +struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI +{ + boss_highlord_mograineAI(Creature *c) : ScriptedAI(c) {} + + uint32 Mark_Timer; + uint32 RighteousFire_Timer; + bool ShieldWall1; + bool ShieldWall2; + + void Reset() + { + Mark_Timer = 20000; // First Horsemen Mark is applied at 20 sec. + RighteousFire_Timer = 2000; // applied approx 1 out of 4 attacks + ShieldWall1 = true; + ShieldWall2 = true; + } + + void InitialYell() + { + if(!InCombat) + { + switch(rand()%3) + { + case 0: + DoYell(SAY_AGGRO1,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,SOUND_AGGRO1); + break; + case 1: + DoYell(SAY_AGGRO2,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,SOUND_AGGRO2); + break; + case 2: + DoYell(SAY_AGGRO3,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,SOUND_AGGRO3); + break; + } + } + } + + void KilledUnit() + { + switch(rand()%2) + { + case 0: + DoYell(SAY_SLAY1,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,SOUND_SLAY1); + break; + case 1: + DoYell(SAY_SLAY2,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,SOUND_SLAY2); + break; + } + } + + void JustDied(Unit* Killer) + { + DoYell(SAY_DEATH,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature, SOUND_DEATH); + } + + void Aggro(Unit *who) + { + InitialYell(); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + // Mark of Mograine + if(Mark_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_MARK_OF_MOGRAINE); + Mark_Timer = 12000; + }else Mark_Timer -= diff; + + // Shield Wall - All 4 horsemen will shield wall at 50% hp and 20% hp for 20 seconds + if(ShieldWall1 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) + { + if(ShieldWall1) + { + DoCast(m_creature,SPELL_SHIELDWALL); + ShieldWall1 = false; + } + } + if(ShieldWall2 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) + { + if(ShieldWall2) + { + DoCast(m_creature,SPELL_SHIELDWALL); + ShieldWall2 = false; + } + } + + // Righteous Fire + if(RighteousFire_Timer < diff) + { + if(rand()%4 == 1) // 1/4 + { + DoCast(m_creature->getVictim(),SPELL_RIGHTEOUS_FIRE); + } + RighteousFire_Timer = 2000; + }else RighteousFire_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; +CreatureAI* GetAI_boss_highlord_mograine(Creature *_Creature) +{ + return new boss_highlord_mograineAI (_Creature); +} + +void AddSC_boss_highlord_mograine() +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_highlord_mograine"; + newscript->GetAI = &GetAI_boss_highlord_mograine; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index fc26214f474..952fb5504ce 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -159,7 +159,6 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public ScriptedAI GuardiansOfIcecrown[3] = 0; GuardiansOfIcecrown[4] = 0; GuardiansOfIcecrown_Count = 0; - Reset(); } uint64 GuardiansOfIcecrown[5]; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp index 9b2458630e3..aceaba93b1f 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp @@ -42,7 +42,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_loathebAI : public ScriptedAI { - boss_loathebAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_loathebAI(Creature *c) : ScriptedAI(c) {} uint32 CorruptedMind_Timer; uint32 PoisonAura_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp index 4885079646d..6c41ad1b022 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp @@ -49,7 +49,7 @@ EndScriptData */ struct TRINITY_DLL_DECL mob_webwrapAI : public ScriptedAI { - mob_webwrapAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_webwrapAI(Creature *c) : ScriptedAI(c) {} uint64 victimGUID; @@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL mob_webwrapAI : public ScriptedAI struct TRINITY_DLL_DECL boss_maexxnaAI : public ScriptedAI { - boss_maexxnaAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_maexxnaAI(Creature *c) : ScriptedAI(c) {} uint32 WebTrap_Timer; uint32 WebSpray_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp index 857ec33e3fa..43be957aa81 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp @@ -51,7 +51,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_nothAI : public ScriptedAI { - boss_nothAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_nothAI(Creature *c) : ScriptedAI(c) {} uint32 Blink_Timer; uint32 Curse_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp index 9d96e35d572..5359b47bad4 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp @@ -39,7 +39,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_patchwerkAI : public ScriptedAI { - boss_patchwerkAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_patchwerkAI(Creature *c) : ScriptedAI(c) {} uint32 HatefullStrike_Timer; uint32 Enrage_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp index 77e1303f8b6..9054e89dc26 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp @@ -55,7 +55,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_razuviousAI : public ScriptedAI { - boss_razuviousAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_razuviousAI(Creature *c) : ScriptedAI(c) {} uint32 UnbalancingStrike_Timer; uint32 DisruptingShout_Timer; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp index bf600c29eef..c0c2f457f0c 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp @@ -35,10 +35,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI { - boss_sapphironAI(Creature* c) : ScriptedAI(c) - { - Reset(); - } + boss_sapphironAI(Creature* c) : ScriptedAI(c) {} uint32 Icebolt_Count; uint32 Icebolt_Timer; diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index 70add388c60..2e2157ed857 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -62,7 +62,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI { - npc_manaforge_control_consoleAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_manaforge_control_consoleAI(Creature *c) : ScriptedAI(c) {} uint32 Event_Timer; uint32 Wave_Timer; @@ -790,7 +790,7 @@ bool GossipSelect_npc_veronia(Player *player, Creature *_Creature, uint32 sender struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI { - mob_phase_hunterAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_phase_hunterAI(Creature *c) : ScriptedAI(c) {} bool Weak; bool Materialize; @@ -907,7 +907,7 @@ CreatureAI* GetAI_mob_phase_hunter(Creature *_Creature) struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI { - npc_bessyAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_bessyAI(Creature *c) : npc_escortAI(c) {} bool Completed; diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp index eff383f872b..9e2370af086 100644 --- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp @@ -64,7 +64,7 @@ static float SpawnLocations[4][3]= struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI { - boss_onyxiaAI(Creature* c) : ScriptedAI(c) {Reset();} + boss_onyxiaAI(Creature* c) : ScriptedAI(c) {} uint32 Phase; diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp index 68b2d6d3dd9..fdb6fff31bb 100644 --- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp @@ -73,7 +73,7 @@ bool GossipSelect_npc_neeru_fireblade(Player *player, Creature *_Creature, uint3 struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI { - npc_shenthulAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_shenthulAI(Creature* c) : ScriptedAI(c) {} bool CanTalk; bool CanEmote; @@ -163,7 +163,7 @@ bool ReciveEmote_npc_shenthul(Player *player, Creature *_Creature, uint32 emote) //TODO: verify abilities/timers struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI { - npc_thrall_warchiefAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_thrall_warchiefAI(Creature* c) : ScriptedAI(c) {} uint32 ChainLightning_Timer; uint32 Shock_Timer; diff --git a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp index ff03a97481f..9c089fddf71 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -36,7 +36,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_amnennar_the_coldbringerAI : public ScriptedAI { - boss_amnennar_the_coldbringerAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_amnennar_the_coldbringerAI(Creature *c) : ScriptedAI(c) {} uint32 AmnenarsWrath_Timer; uint32 FrostBolt_Timer; diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp index 540c8e77c0b..2edb4afcf16 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -45,7 +45,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_willixAI : public npc_escortAI { -npc_willixAI(Creature *c) : npc_escortAI(c) {Reset();} +npc_willixAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp index 4ed8e3cb73f..be15a35f032 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -35,7 +35,7 @@ make him fly from 70-100% struct TRINITY_DLL_DECL boss_ayamissAI : public ScriptedAI { - boss_ayamissAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_ayamissAI(Creature *c) : ScriptedAI(c) {} Unit *pTarget; uint32 STINGERSPRAY_Timer; diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index e1505496516..f164009c79b 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI { - boss_kurinnaxxAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_kurinnaxxAI(Creature *c) : ScriptedAI(c) {} Unit *pTarget; uint32 MORTALWOUND_Timer; diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp index 6c293b4a1c1..df0e63f8599 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp @@ -34,7 +34,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI { - boss_moamAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_moamAI(Creature *c) : ScriptedAI(c) {} Unit *pTarget; uint32 TRAMPLE_Timer; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp index a10c21a2300..533adf732f3 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp @@ -37,7 +37,7 @@ enum struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI { - boss_arcanist_doanAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_arcanist_doanAI(Creature *c) : ScriptedAI(c) {} uint32 Polymorph_Timer; uint32 AoESilence_Timer; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp index a7e1785eb4f..5975d5f7e57 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI { - boss_azshir_the_sleeplessAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_azshir_the_sleeplessAI(Creature *c) : ScriptedAI(c) {} uint32 SoulSiphon_Timer; uint32 CallOftheGrave_Timer; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp index 1476b79ba7f..9a31ee6518d 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -37,7 +37,7 @@ enum struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI { - boss_bloodmage_thalnosAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_bloodmage_thalnosAI(Creature *c) : ScriptedAI(c) {} bool HpYell; uint32 FlameShock_Timer; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp index 1fec7ccd88e..cdca1d62455 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp @@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI { - mob_headAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_headAI(Creature *c) : ScriptedAI(c) {} uint64 bodyGUID; @@ -338,7 +338,6 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI speed->EffectApplyAuraName[1] = SPELL_AURA_MOD_CONFUSE; }*/ pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -716,7 +715,7 @@ void mob_headAI::Disappear() struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI { - mob_pulsing_pumpkinAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_pulsing_pumpkinAI(Creature *c) : ScriptedAI(c) {} bool sprouted; uint64 debuffGUID; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp index d8486fa211d..bccbcb62c33 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp @@ -40,7 +40,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI { - boss_herodAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_herodAI(Creature *c) : ScriptedAI(c) {} bool Enrage; @@ -133,7 +133,7 @@ uint32 Wait[12][1]= struct TRINITY_DLL_DECL mob_scarlet_traineeAI : public npc_escortAI { - mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c) {Reset();} + mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c) {} uint32 Start_Timer; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index 63d167fb4c4..a188fe9c3f2 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -34,7 +34,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI { - boss_high_inquisitor_fairbanksAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_high_inquisitor_fairbanksAI(Creature *c) : ScriptedAI(c) {} uint32 Healing_Timer; uint32 Sleep2_Timer; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp index 1d193ba43eb..7f812310be3 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_houndmaster_lokseyAI : public ScriptedAI { - boss_houndmaster_lokseyAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_houndmaster_lokseyAI(Creature *c) : ScriptedAI(c) {} uint32 Enrage_Timer; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp index 22ab3c8070f..34d5a7fff37 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp @@ -40,7 +40,6 @@ struct TRINITY_DLL_DECL boss_interrogator_vishasAI : public ScriptedAI boss_interrogator_vishasAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp index 23e1e50ab75..bde26d42478 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -47,7 +47,6 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI boss_scarlet_commander_mograineAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; @@ -175,7 +174,6 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI boss_high_inquisitor_whitemaneAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp index 7542b4e4801..642c884ebc8 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp @@ -30,7 +30,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_scornAI : public ScriptedAI { - boss_scornAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_scornAI(Creature *c) : ScriptedAI(c) {} uint32 LichSlap_Timer; uint32 FrostboltVolley_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp index d13b9d1c2f1..46f216220aa 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp @@ -53,7 +53,6 @@ struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI boss_darkmaster_gandlingAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp index 6d18d2ba1bf..8bb3703fa8b 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp @@ -25,7 +25,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_death_knight_darkreaverAI : public ScriptedAI { - boss_death_knight_darkreaverAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_death_knight_darkreaverAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp index 03d3b63e49d..96afbfe1971 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp @@ -32,7 +32,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI { - boss_theolenkrastinovAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_theolenkrastinovAI(Creature *c) : ScriptedAI(c) {} uint32 Rend_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp index dc77bc79800..02f4c9bc5a4 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI { - boss_illuciabarovAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_illuciabarovAI(Creature *c) : ScriptedAI(c) {} uint32 CurseOfAgony_Timer; uint32 ShadowShock_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp index e31f20aaa3e..2790e36ddaf 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp @@ -32,7 +32,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI { - boss_instructormaliciaAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_instructormaliciaAI(Creature *c) : ScriptedAI(c) {} uint32 CallOfGraves_Timer; uint32 Corruption_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp index 972fb9d1cfa..d2890801b5d 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI { - boss_jandicebarovAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_jandicebarovAI(Creature *c) : ScriptedAI(c) {} uint32 CurseOfBlood_Timer; uint32 Illusion_Timer; @@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI { - mob_illusionofjandicebarovAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_illusionofjandicebarovAI(Creature *c) : ScriptedAI(c) {} uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp index 0a630ad0cd9..8fdda4d2f33 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp @@ -28,7 +28,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI { - boss_kormokAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_kormokAI(Creature *c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 BoneShield_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp index a76c07a6bd8..ddf3c3b083d 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI { - boss_lordalexeibarovAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_lordalexeibarovAI(Creature *c) : ScriptedAI(c) {} uint32 Immolate_Timer; uint32 VeilofShadow_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp index 0f33e8d38d7..040cafc91fc 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI { - boss_lorekeeperpolkeltAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_lorekeeperpolkeltAI(Creature *c) : ScriptedAI(c) {} uint32 VolatileInfection_Timer; uint32 Darkplague_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp index 3ca8b414673..fbb1e355f1d 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp @@ -32,7 +32,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI { - boss_rasfrostAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_rasfrostAI(Creature *c) : ScriptedAI(c) {} uint32 IceArmor_Timer; uint32 Frostbolt_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp index ccb9a79e150..aea8b476ad2 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI { - boss_theravenianAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_theravenianAI(Creature *c) : ScriptedAI(c) {} uint32 Trample_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp index c85ac0158b2..2ade6f7fd4d 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI { - boss_vectusAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_vectusAI(Creature *c) : ScriptedAI(c) {} uint32 FireShield_Timer; uint32 BlastWave_Timer; diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp index 9759f55a939..717849bc07f 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp @@ -41,7 +41,6 @@ struct TRINITY_DLL_DECL npc_shadowfang_prisonerAI : public npc_escortAI npc_shadowfang_prisonerAI(Creature *c) : npc_escortAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp index 87698fe7658..5174f5c8e28 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp @@ -42,7 +42,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI { - boss_doomwalkerAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_doomwalkerAI(Creature *c) : ScriptedAI(c) {} uint32 Chain_Timer; uint32 Enrage_Timer; diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index 757bf6141e7..caf3a8ef51d 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -305,10 +305,7 @@ CreatureAI* GetAI_mob_enslaved_netherwing_drake(Creature* _Creature) struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI { - mob_dragonmaw_peonAI(Creature* c) : ScriptedAI(c) - { - Reset(); - } + mob_dragonmaw_peonAI(Creature* c) : ScriptedAI(c) {} uint64 PlayerGUID; bool Tapped; @@ -672,7 +669,7 @@ bool QuestAccept_npc_karynaku(Player* player, Creature* creature, Quest const* q struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI { - npc_overlord_morghorAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_overlord_morghorAI(Creature *c) : ScriptedAI(c) {} uint64 PlayerGUID; uint64 IllidanGUID; @@ -866,7 +863,7 @@ bool QuestAccept_npc_overlord_morghor(Player *player, Creature *_Creature, const struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI { - npc_earthmender_wildaAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_earthmender_wildaAI(Creature *c) : npc_escortAI(c) {} bool Completed; @@ -1159,7 +1156,7 @@ static SpawnSpells SpawnCast[]= struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI { - mob_illidari_spawnAI(Creature* c) : ScriptedAI(c) {Reset();} + mob_illidari_spawnAI(Creature* c) : ScriptedAI(c) {} uint64 LordIllidanGUID; uint32 SpellTimer1, SpellTimer2, SpellTimer3; @@ -1260,7 +1257,7 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI { - mob_torloth_the_magnificentAI(Creature* c) : ScriptedAI(c) {Reset();} + mob_torloth_the_magnificentAI(Creature* c) : ScriptedAI(c) {} uint32 AnimationTimer, SpellTimer1, SpellTimer2, SpellTimer3; @@ -1409,7 +1406,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI { - npc_lord_illidan_stormrageAI(Creature* c) : ScriptedAI(c) {Reset();} + npc_lord_illidan_stormrageAI(Creature* c) : ScriptedAI(c) {} uint64 PlayerGUID; @@ -1694,7 +1691,7 @@ CreatureAI* GetAI_mob_torloth_the_magnificent(Creature* c) struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI { - npc_enraged_spiritAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_enraged_spiritAI(Creature *c) : ScriptedAI(c) {} void Reset() { } diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index 460a19aeb59..bbd5cdf2235 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -48,7 +48,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_raliq_the_drunkAI : public ScriptedAI { - npc_raliq_the_drunkAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_raliq_the_drunkAI(Creature* c) : ScriptedAI(c) {} uint32 Uppercut_Timer; @@ -111,7 +111,7 @@ bool GossipSelect_npc_raliq_the_drunk(Player *player, Creature *_Creature, uint3 struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI { - npc_salsalabimAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_salsalabimAI(Creature* c) : ScriptedAI(c) {} uint32 MagneticPull_Timer; @@ -275,7 +275,7 @@ bool GossipSelect_npc_zephyr(Player *player, Creature *_Creature, uint32 sender, struct TRINITY_DLL_DECL npc_kservantAI : public npc_escortAI { public: - npc_kservantAI(Creature *c) : npc_escortAI(c) { Reset();} + npc_kservantAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) @@ -431,7 +431,7 @@ CreatureAI* GetAI_npc_kservantAI(Creature *_Creature) struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI { - npc_dirty_larryAI(Creature* c) : ScriptedAI(c) {Reset();} + npc_dirty_larryAI(Creature* c) : ScriptedAI(c) {} bool Event; bool Attack; diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp index c5bf5720624..b8119f82d6b 100644 --- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp @@ -39,7 +39,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI { - npc_blood_knight_stillbladeAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_blood_knight_stillbladeAI(Creature *c) : ScriptedAI(c) {} uint32 lifeTimer; bool spellHit; diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp index 8dfda004d55..16e372f7261 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -37,7 +37,7 @@ EndContentData */ #define GOSSIP_SAH "You've got something I need, Astor. And I'll be taking it now." struct TRINITY_DLL_DECL npc_astor_hadrenAI : public ScriptedAI { - npc_astor_hadrenAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_astor_hadrenAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -112,7 +112,7 @@ bool GossipSelect_npc_astor_hadren(Player *player, Creature *_Creature, uint32 s struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI { - npc_deathstalker_erlandAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_deathstalker_erlandAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp index 5678c27e276..a438c14294d 100644 --- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp @@ -91,7 +91,7 @@ bool GossipSelect_npc_braug_dimspirit(Player *player, Creature *_Creature, uint3 struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI { - npc_kaya_flathoofAI(Creature* c) : npc_escortAI(c) {Reset();} + npc_kaya_flathoofAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index 16468a04b41..08c7d637b02 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -68,7 +68,7 @@ bool GossipSelect_npc_archmage_malin(Player *player, Creature *_Creature, uint32 struct TRINITY_DLL_DECL npc_bartlebyAI : public ScriptedAI { - npc_bartlebyAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_bartlebyAI(Creature *c) : ScriptedAI(c) {} uint64 PlayerGUID; @@ -127,7 +127,7 @@ CreatureAI* GetAI_npc_bartleby(Creature *_creature) struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI { - npc_dashel_stonefistAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_dashel_stonefistAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp index d9da6ee786b..2a46fe4d5dd 100644 --- a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp +++ b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp @@ -36,7 +36,6 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI mob_yennikuAI(Creature *c) : ScriptedAI(c) { bReset = false; - Reset(); } uint32 Reset_Timer; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp index 0b612bbf3b9..aa897761344 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp @@ -80,7 +80,6 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI boss_baron_rivendareAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp index 3c9a343c84f..57f70cf33dd 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp @@ -34,7 +34,6 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI boss_baroness_anastariAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp index 7a4e71a5413..ce09bbc2cd0 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp @@ -76,7 +76,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI { - boss_cannon_master_willeyAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_cannon_master_willeyAI(Creature *c) : ScriptedAI(c) {} uint32 KnockAway_Timer; uint32 Pummel_Timer; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp index bac6d4bcb7d..5b85cdc07fe 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp @@ -84,7 +84,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI { - boss_dathrohan_balnazzarAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_dathrohan_balnazzarAI(Creature *c) : ScriptedAI(c) {} uint32 CrusadersHammer_Timer; uint32 CrusaderStrike_Timer; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp index e4f7903d897..9402c601219 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp @@ -37,7 +37,6 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI boss_magistrate_barthilasAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp index b9bd3349d7d..e08c97965b1 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp @@ -34,7 +34,6 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI boss_maleki_the_pallidAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp index b1376ef7cd6..3233e5c9c50 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp @@ -34,7 +34,6 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI boss_nerubenkanAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp index 71ec3d59fed..9c2084f6cec 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp @@ -46,7 +46,6 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI boss_silver_hand_bossesAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp index 5edf47787fd..a8ed628ffc0 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp @@ -36,7 +36,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI { - boss_postmaster_malownAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_postmaster_malownAI(Creature *c) : ScriptedAI(c) {} uint32 WailingDead_Timer; uint32 Backhand_Timer; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp index f729e2e34ce..6ef1477ff35 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp @@ -34,7 +34,6 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI boss_ramstein_the_gorgerAI(Creature *c) : ScriptedAI(c) { pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp index 9458964712b..0555c5da57d 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI { - boss_timmy_the_cruelAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_timmy_the_cruelAI(Creature *c) : ScriptedAI(c) {} uint32 RavenousClaw_Timer; bool HasYelled; diff --git a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp index 3a5e9c0daa7..74aa992323a 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp @@ -79,7 +79,7 @@ bool GOHello_go_gauntlet_gate(Player *player, GameObject* _GO) struct TRINITY_DLL_DECL mob_freed_soulAI : public ScriptedAI { - mob_freed_soulAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_freed_soulAI(Creature *c) : ScriptedAI(c) {} void Reset() { @@ -112,7 +112,7 @@ CreatureAI* GetAI_mob_freed_soul(Creature *_Creature) struct TRINITY_DLL_DECL mob_restless_soulAI : public ScriptedAI { - mob_restless_soulAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_restless_soulAI(Creature *c) : ScriptedAI(c) {} uint64 Tagger; uint32 Die_Timer; @@ -176,7 +176,7 @@ CreatureAI* GetAI_mob_restless_soul(Creature *_Creature) struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI { - mobs_spectral_ghostly_citizenAI(Creature *c) : ScriptedAI(c) {Reset();} + mobs_spectral_ghostly_citizenAI(Creature *c) : ScriptedAI(c) {} uint32 Die_Timer; bool Tagged; diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp index e1235155f71..4dcc95a79c1 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp @@ -61,7 +61,6 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI boss_brutallusAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp index 471a2acef16..884d14db552 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp @@ -97,7 +97,6 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI boss_sacrolashAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -361,9 +360,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI { boss_alythessAI(Creature *c) : Scripted_NoMovementAI(c) { - pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); - IntroStepCounter = 10; + pInstance = ((ScriptedInstance*)c->GetInstanceData()); IntroStepCounter = 10; } ScriptedInstance *pInstance; @@ -689,7 +686,7 @@ CreatureAI* GetAI_boss_alythess(Creature *_Creature) struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI { - mob_shadow_imageAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_shadow_imageAI(Creature *c) : ScriptedAI(c) {} uint32 shadowfury_timer; uint32 kill_timer; diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp index adea2dab4e2..442ac05816c 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp @@ -127,8 +127,6 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { boss_felmystAI(Creature *c) : ScriptedAI(c) { - Reset(); - // wait for core patch be accepted SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_ENCAPSULATE_EFFECT); if(TempSpell->SpellIconID == 2294) diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp index ec0ba0037ff..d462b3be7cd 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -95,7 +95,6 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); SathGUID = 0; DoorGUID = 0; - Reset(); } ScriptedInstance *pInstance; @@ -241,7 +240,6 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); KalecGUID = 0; KalecgosGUID = 0; - Reset(); } ScriptedInstance *pInstance; @@ -442,7 +440,6 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI boss_kalecAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } void Reset() diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp index 538aee596ec..a23c5495ef5 100644 --- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp +++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp @@ -44,7 +44,7 @@ EndContentData */ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI { - mob_aquementasAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_aquementasAI(Creature *c) : ScriptedAI(c) {} uint32 SendItem_Timer; uint32 SwitchFaction_Timer; @@ -148,7 +148,7 @@ CreatureAI* GetAI_mob_aquementas(Creature *_Creature) struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI { - npc_custodian_of_timeAI(Creature *c) : npc_escortAI(c) { Reset(); } + npc_custodian_of_timeAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -383,7 +383,7 @@ bool GossipSelect_npc_stone_watcher_of_norgannon(Player *player, Creature *_Crea struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI { - npc_OOX17AI(Creature *c) : npc_escortAI(c) {Reset();} + npc_OOX17AI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp index 7b013c54781..8ced55f5741 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp @@ -64,7 +64,6 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI npc_millhouse_manastormAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -261,7 +260,6 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI npc_warden_mellicharAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; @@ -490,7 +488,7 @@ CreatureAI* GetAI_npc_warden_mellichar(Creature *_Creature) struct TRINITY_DLL_DECL mob_zerekethvoidzoneAI : public ScriptedAI { - mob_zerekethvoidzoneAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_zerekethvoidzoneAI(Creature *c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index 8e17151c0c5..ee8bacb930c 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -60,7 +60,6 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); Intro = false; - Reset(); } ScriptedInstance *pInstance; @@ -282,7 +281,6 @@ struct TRINITY_DLL_DECL boss_harbinger_skyriss_illusionAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index 59ccd996236..85a644f7ab8 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -43,7 +43,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI { - boss_high_botanist_freywinnAI(Creature *c) : ScriptedAI(c) { Reset(); } + boss_high_botanist_freywinnAI(Creature *c) : ScriptedAI(c) {} std::list<uint64> Adds_List; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp index 1c4e27bac48..9a276ead142 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp @@ -45,7 +45,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI { - boss_lajAI(Creature *c) : ScriptedAI(c) { Reset(); } + boss_lajAI(Creature *c) : ScriptedAI(c) {} bool CanSummon; uint32 Teleport_Timer; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp index dd6344269de..bbd18dee029 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp @@ -34,7 +34,6 @@ struct TRINITY_DLL_DECL mob_treantAI : public ScriptedAI mob_treantAI (Creature *c) : ScriptedAI(c) { WarpGuid = 0; - Reset(); } uint64 WarpGuid; @@ -112,7 +111,6 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI HeroicMode = c->GetMap()->IsHeroic(); Treant_Spawn_Pos_X = c->GetPositionX(); Treant_Spawn_Pos_Y = c->GetPositionY(); - Reset(); } uint32 War_Stomp_Timer; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp index 3486f937214..a0c331ebbf5 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp @@ -71,7 +71,6 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI { pInstance =((ScriptedInstance*)c->GetInstanceData()); DefaultMoveSpeedRate = m_creature->GetSpeedRate(MOVE_RUN); - Reset(); } ScriptedInstance *pInstance; @@ -414,7 +413,6 @@ struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI pInstance = (ScriptedInstance*)c->GetInstanceData(); m_creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp index 32432da45fc..340d3f23fc8 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp @@ -76,7 +76,6 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI defaultarmor = m_creature->GetArmor(); defaultsize = m_creature->GetFloatValue(OBJECT_FIELD_SCALE_X); - Reset(); } ScriptedInstance *pInstance; @@ -394,7 +393,6 @@ struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI mob_solarium_priestAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp index 1498dbfb7ca..c1f64b23fc7 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp @@ -159,7 +159,6 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI advisorbase_ai(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } void MoveInLineOfSight(Unit *who) @@ -276,7 +275,6 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI AdvisorGuid[1] = 0; AdvisorGuid[2] = 0; AdvisorGuid[3] = 0; - Reset(); } ScriptedInstance* pInstance; @@ -1362,7 +1360,7 @@ struct TRINITY_DLL_DECL boss_master_engineer_telonicusAI : public advisorbase_ai //Flame Strike AI struct TRINITY_DLL_DECL mob_kael_flamestrikeAI : public ScriptedAI { - mob_kael_flamestrikeAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_kael_flamestrikeAI(Creature *c) : ScriptedAI(c) {} uint32 Timer; bool Casting; @@ -1412,7 +1410,7 @@ struct TRINITY_DLL_DECL mob_kael_flamestrikeAI : public ScriptedAI //Phoenix AI struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI { - mob_phoenix_tkAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_phoenix_tkAI(Creature *c) : ScriptedAI(c) {} uint32 Cycle_Timer; uint8 SummonEgg; @@ -1470,7 +1468,7 @@ struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI //Phoenix Egg AI struct TRINITY_DLL_DECL mob_phoenix_egg_tkAI : public ScriptedAI { - mob_phoenix_egg_tkAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_phoenix_egg_tkAI(Creature *c) : ScriptedAI(c) {} uint32 Rebirth_Timer; bool summoned; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp index 66ee717bc4f..65c8d2f87f3 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp @@ -42,7 +42,6 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI boss_void_reaverAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp index 83ba68c955c..7d73e08d9e5 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp @@ -33,7 +33,7 @@ EndContentData */ struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI { - mob_crystalcore_devastatorAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_crystalcore_devastatorAI(Creature *c) : ScriptedAI(c) {} uint32 Knockaway_Timer; uint32 Countercharge_Timer; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index 2fcf154eb67..9bc8afc8aef 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -42,12 +42,11 @@ EndScriptData */ // Gatewatcher Iron-Hand AI struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI { -boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) -{ - pInstance = ((ScriptedInstance*)c->GetInstanceData()); - HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); -} + boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) + { + pInstance = ((ScriptedInstance*)c->GetInstanceData()); + HeroicMode = m_creature->GetMap()->IsHeroic(); + } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index de5a723c630..b8cd2fc0cbe 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -43,12 +43,11 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI { -boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) -{ - pInstance = ((ScriptedInstance*)c->GetInstanceData()); - HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); -} + boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) + { + pInstance = ((ScriptedInstance*)c->GetInstanceData()); + HeroicMode = m_creature->GetMap()->IsHeroic(); + } ScriptedInstance *pInstance; @@ -169,9 +168,7 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI { mob_ragin_flamesAI(Creature *c) : ScriptedAI(c) { - pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); - HeroicMode = m_creature->GetMap()->IsHeroic(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index dd46457c759..59f1748c9a5 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -53,7 +53,6 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI boss_pathaleon_the_calculatorAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); - Reset(); } uint32 Summon_Timer; @@ -173,7 +172,7 @@ CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature *_Creature) struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI { - mob_nether_wraithAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_nether_wraithAI(Creature *c) : ScriptedAI(c) {} ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp index 70cba44e8d6..64c4fdae2c8 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -40,7 +40,6 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI boss_kriAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -126,7 +125,6 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI boss_vemAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -208,7 +206,6 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI boss_yaujAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp index 60e946c708b..32b815e876b 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp @@ -108,7 +108,7 @@ EndScriptData */ struct TRINITY_DLL_DECL flesh_tentacleAI : public Scripted_NoMovementAI { - flesh_tentacleAI(Creature *c) : Scripted_NoMovementAI(c), Parent(0) {Reset();} + flesh_tentacleAI(Creature *c) : Scripted_NoMovementAI(c), Parent(0) {} uint64 Parent; uint32 CheckTimer; @@ -139,8 +139,6 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI pInst = (ScriptedInstance*)c->GetInstanceData(); if (!pInst) error_log("SD2: No Instance eye_of_cthunAI"); - - Reset(); } ScriptedInstance* pInst; @@ -440,8 +438,6 @@ struct TRINITY_DLL_DECL cthunAI : public Scripted_NoMovementAI pInst = (ScriptedInstance*)c->GetInstanceData(); if (!pInst) error_log("SD2: No Instance eye_of_cthunAI"); - - Reset(); } ScriptedInstance* pInst; @@ -920,7 +916,6 @@ struct TRINITY_DLL_DECL eye_tentacleAI : public Scripted_NoMovementAI { eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { - Reset(); Unit* p = DoSpawnCreature(MOB_SMALL_PORTAL,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN, 0); if (p) Portal = p->GetGUID(); @@ -983,7 +978,6 @@ struct TRINITY_DLL_DECL claw_tentacleAI : public Scripted_NoMovementAI { claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { - Reset(); Unit* p = DoSpawnCreature(MOB_SMALL_PORTAL,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN, 0); if (p) Portal = p->GetGUID(); @@ -1078,7 +1072,6 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public Scripted_NoMovementAI { giant_claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { - Reset(); Unit* p = DoSpawnCreature(MOB_GIANT_PORTAL,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN, 0); if (p) Portal = p->GetGUID(); @@ -1183,7 +1176,6 @@ struct TRINITY_DLL_DECL giant_eye_tentacleAI : public Scripted_NoMovementAI { giant_eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { - Reset(); Unit* p = DoSpawnCreature(MOB_GIANT_PORTAL,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN, 0); if (p) Portal = p->GetGUID(); diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp index 2c2e69125b0..9315817a460 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp @@ -37,7 +37,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI { - boss_fankrissAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_fankrissAI(Creature *c) : ScriptedAI(c) {} uint32 MortalWound_Timer; uint32 SpawnHatchlings_Timer; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp index 7d39c026cbc..3456fd19d87 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp @@ -35,7 +35,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI { - boss_huhuranAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_huhuranAI(Creature *c) : ScriptedAI(c) {} uint32 Frenzy_Timer; uint32 Wyvern_Timer; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp index 35efe3f1dab..a5721c4bc92 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp @@ -33,7 +33,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI { - boss_ouroAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_ouroAI(Creature *c) : ScriptedAI(c) {} uint32 Sweep_Timer; uint32 SandBlast_Timer; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp index 5b0495cb097..b1a0b4bdfea 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp @@ -38,7 +38,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI { - boss_sarturaAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_sarturaAI(Creature *c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 WhirlWindRandom_Timer; @@ -172,7 +172,7 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI { - mob_sartura_royal_guardAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_sartura_royal_guardAI(Creature *c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 WhirlWindRandom_Timer; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp index c4acade3b4f..c4f9401f869 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp @@ -55,7 +55,6 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); IsImage = false; - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp index 92be01c4a6d..58d77bf17b2 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -414,10 +414,7 @@ class TRINITY_DLL_DECL BugAura : public Aura struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI { bool IAmVeklor() {return false;} - boss_veknilashAI(Creature *c) : boss_twinemperorsAI(c) - { - Reset(); - } + boss_veknilashAI(Creature *c) : boss_twinemperorsAI(c) {} uint32 UpperCut_Timer; uint32 UnbalancingStrike_Timer; @@ -497,10 +494,7 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI { bool IAmVeklor() {return true;} - boss_veklorAI(Creature *c) : boss_twinemperorsAI(c) - { - Reset(); - } + boss_veklorAI(Creature *c) : boss_twinemperorsAI(c) {} uint32 ShadowBolt_Timer; uint32 Blizzard_Timer; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 41e2d7172e1..97a139a9c3d 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -106,7 +106,6 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI { ClearBudyList(); abselected = 0; // just initialization of variable - Reset(); } Creature *nearby[3]; diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp index 914714dd4aa..c94e21c0be8 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -49,7 +49,7 @@ EndContentData */ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI { - mob_unkor_the_ruthlessAI(Creature* c) : ScriptedAI(c) { Reset(); } + mob_unkor_the_ruthlessAI(Creature* c) : ScriptedAI(c) {} bool CanDoQuest; uint32 UnkorUnfriendly_Timer; @@ -148,7 +148,7 @@ CreatureAI* GetAI_mob_unkor_the_ruthless(Creature *_Creature) struct TRINITY_DLL_DECL mob_infested_root_walkerAI : public ScriptedAI { - mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } void Aggro(Unit *who) { } @@ -173,7 +173,7 @@ CreatureAI* GetAI_mob_infested_root_walker(Creature *_Creature) struct TRINITY_DLL_DECL mob_rotting_forest_ragerAI : public ScriptedAI { - mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } void Aggro(Unit *who) { } @@ -205,7 +205,7 @@ const uint32 netherwebVictims[6] = }; struct TRINITY_DLL_DECL mob_netherweb_victimAI : public ScriptedAI { - mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {} void Reset() { } void Aggro(Unit *who) { } @@ -254,7 +254,7 @@ CreatureAI* GetAI_mob_netherweb_victim(Creature *_Creature) struct TRINITY_DLL_DECL npc_floonAI : public ScriptedAI { - npc_floonAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_floonAI(Creature* c) : ScriptedAI(c) {} uint32 Silence_Timer; uint32 Frostbolt_Timer; @@ -372,7 +372,7 @@ bool GossipSelect_npc_skyguard_handler_deesak(Player *player, Creature *_Creatur struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI { - npc_isla_starmaneAI(Creature* c) : npc_escortAI(c) {Reset();} + npc_isla_starmaneAI(Creature* c) : npc_escortAI(c) {} bool Completed; diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp index c4c21fdc132..cdd7cfd924d 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -42,7 +42,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_swiftmountainAI : public npc_escortAI { -npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {Reset();} +npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -200,7 +200,7 @@ CreatureAI* GetAI_npc_swiftmountain(Creature *_Creature) struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI { - npc_pluckyAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_pluckyAI(Creature *c) : ScriptedAI(c) {} bool Transformed; bool Chicken; diff --git a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp index e5d345bd0e7..8038b7e4c34 100644 --- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp @@ -37,7 +37,7 @@ EndScriptData */ //TODO: verify abilities/timers struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI { - npc_cairne_bloodhoofAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_cairne_bloodhoofAI(Creature* c) : ScriptedAI(c) {} uint32 BerserkerCharge_Timer; uint32 Cleave_Timer; diff --git a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp index 4e23707e371..82f1afbff5d 100644 --- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp @@ -39,7 +39,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI { - npc_calvin_montagueAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_calvin_montagueAI(Creature* c) : ScriptedAI(c) {} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp index dee990fb495..adf88585a39 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp @@ -52,7 +52,6 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI boss_archaedasAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)m_creature->GetInstanceData()); - Reset(); } uint32 Tremor_Timer; @@ -207,7 +206,6 @@ struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI mob_archaedas_minionsAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)m_creature->GetInstanceData()); - Reset(); } uint32 Arcing_Timer; @@ -357,7 +355,6 @@ struct TRINITY_DLL_DECL mob_stonekeepersAI : public ScriptedAI mob_stonekeepersAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)m_creature->GetInstanceData()); - Reset(); } bool InCombat; diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp index 85eede55913..030a5937caa 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp @@ -31,7 +31,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI { - boss_ironayaAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_ironayaAI(Creature *c) : ScriptedAI(c) {} uint32 Arcing_Timer; bool hasCastedWstomp; diff --git a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp index 2fecc120d14..cf30cdb8824 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp @@ -36,7 +36,7 @@ EndContentData */ struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI { - mob_jadespine_basiliskAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_jadespine_basiliskAI(Creature *c) : ScriptedAI(c) {} uint32 Cslumber_Timer; diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp index 7a7159cfcf9..316c47ef2f4 100644 --- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp +++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp @@ -57,7 +57,7 @@ float HighborneLoc[4][3]= struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI { - npc_lady_sylvanas_windrunnerAI(Creature *c) : ScriptedAI(c) { Reset(); } + npc_lady_sylvanas_windrunnerAI(Creature *c) : ScriptedAI(c) {} uint32 LamentEvent_Timer; bool LamentEvent; @@ -151,7 +151,7 @@ bool ChooseReward_npc_lady_sylvanas_windrunner(Player *player, Creature *_Creatu struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI { - npc_highborne_lamenterAI(Creature *c) : ScriptedAI(c) { Reset(); } + npc_highborne_lamenterAI(Creature *c) : ScriptedAI(c) {} uint32 EventMove_Timer; uint32 EventCast_Timer; diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp index 16877f16d65..619d9d7802f 100644 --- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp @@ -45,7 +45,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI { - npc_ameAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_ameAI(Creature *c) : npc_escortAI(c) {} uint32 DEMORALIZINGSHOUT_Timer; diff --git a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp index 51fe821f0af..70033f7c97b 100644 --- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp @@ -96,7 +96,7 @@ bool GossipSelect_npcs_dithers_and_arbington(Player *player, Creature *_Creature struct TRINITY_DLL_DECL npc_the_scourge_cauldronAI : public ScriptedAI { - npc_the_scourge_cauldronAI(Creature *c) : ScriptedAI(c) {Reset();} + npc_the_scourge_cauldronAI(Creature *c) : ScriptedAI(c) {} void Reset() {} diff --git a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp index 67c7f548ec5..fe83eb68bb9 100644 --- a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp +++ b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp @@ -41,7 +41,6 @@ struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI npc_defias_traitorAI(Creature *c) : npc_escortAI(c) { IsWalking = false; - Reset(); } bool IsWalking; diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp index 7d76ea20917..3d7481544e8 100644 --- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp @@ -127,7 +127,7 @@ bool GossipSelect_npcs_ashyen_and_keleth(Player *player, Creature *_Creature, ui struct TRINITY_DLL_DECL npc_cooshcooshAI : public ScriptedAI { - npc_cooshcooshAI(Creature* c) : ScriptedAI(c) { Reset(); } + npc_cooshcooshAI(Creature* c) : ScriptedAI(c) {} uint32 LightningBolt_Timer; @@ -267,7 +267,7 @@ bool GossipSelect_npc_mortog_steamhead(Player *player, Creature *_Creature, uint struct TRINITY_DLL_DECL npc_kayra_longmaneAI : public npc_escortAI { - npc_kayra_longmaneAI(Creature* c) : npc_escortAI(c) {Reset();} + npc_kayra_longmaneAI(Creature* c) : npc_escortAI(c) {} bool Completed; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp index 481fa508864..704cadb0bcd 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp @@ -65,7 +65,6 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI if(TempSpell) TempSpell->EffectBasePoints[1] = 49;//disable bugged lightning until fixed in core pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -368,7 +367,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI { - mob_soaring_eagleAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_soaring_eagleAI(Creature *c) : ScriptedAI(c) {} uint32 EagleSwoop_Timer; bool arrived; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp index 3ab0be0747e..b9601764d1b 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp @@ -76,7 +76,6 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI boss_halazziAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); // need to find out what controls totem's spell cooldown SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_LIGHTNING); if(TempSpell && TempSpell->CastingTimeIndex != 5) @@ -331,7 +330,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI { - boss_spiritlynxAI(Creature *c) : ScriptedAI(c) { Reset(); } + boss_spiritlynxAI(Creature *c) : ScriptedAI(c) {} uint32 FrenzyTimer; uint32 shredder_timer; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp index 51e21d86c22..3014394976e 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp @@ -180,7 +180,6 @@ struct TRINITY_DLL_DECL boss_hexlord_addAI : public ScriptedAI boss_hexlord_addAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } void Reset() {} @@ -204,7 +203,6 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI SelectAddEntry(); for(uint8 i = 0; i < 4; ++i) AddGUID[i] = 0; - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index 9a63ea4ad70..89168e812cc 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -102,7 +102,6 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI boss_janalaiAI(Creature *c) : ScriptedAI(c) { pInstance =((ScriptedInstance*)c->GetInstanceData()); - Reset(); SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_HATCH_EGG); if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 1) @@ -451,7 +450,7 @@ CreatureAI* GetAI_boss_janalaiAI(Creature *_Creature) struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI { - mob_janalai_firebombAI(Creature *c) : ScriptedAI(c){Reset();} + mob_janalai_firebombAI(Creature *c) : ScriptedAI(c){} void Reset() {} @@ -480,7 +479,6 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI mob_amanishi_hatcherAI(Creature *c) : ScriptedAI(c) { pInstance =((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -612,7 +610,6 @@ struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI mob_hatchlingAI(Creature *c) : ScriptedAI(c) { pInstance =((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp index 8e908880d3a..d45750cc4df 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp @@ -96,7 +96,6 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI MoveEvent = true; MovePhase = 0; pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp index 2bb04ee4bb9..4150e0ec393 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp @@ -144,7 +144,6 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI boss_zuljinAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp index 78fe5ee274b..a7243ac125d 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp @@ -41,7 +41,6 @@ struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI npc_forest_frogAI(Creature* c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp index a91acd38b54..b53855990b3 100644 --- a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp @@ -45,7 +45,6 @@ struct TRINITY_DLL_DECL npc_sergeant_blyAI : public ScriptedAI npc_sergeant_blyAI(Creature *c) : ScriptedAI(c) { //pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } //ScriptedInstance* pInstance; @@ -143,7 +142,6 @@ struct TRINITY_DLL_DECL npc_weegli_blastfuseAI : public ScriptedAI npc_weegli_blastfuseAI(Creature *c) : ScriptedAI(c) { //pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } //ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp index 466b8bd489f..102fef21467 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp @@ -39,7 +39,6 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI boss_arlokkAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp index 4a99dfa5c38..e5e727b4843 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI { - boss_gahzrankaAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_gahzrankaAI(Creature *c) : ScriptedAI(c) {} uint32 Frostbreath_Timer; uint32 MassiveGeyser_Timer; uint32 Slam_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp index adfddad2ac0..dce2e76e157 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_grilekAI : public ScriptedAI { - boss_grilekAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_grilekAI(Creature *c) : ScriptedAI(c) {} uint32 Avartar_Timer; uint32 GroundTremor_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp index 4c6c62fa4e3..592129b88da 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp @@ -47,7 +47,6 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI boss_hakkarAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp index c32608a01a3..bd341fdaf40 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI { - boss_hazzarahAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_hazzarahAI(Creature *c) : ScriptedAI(c) {} uint32 ManaBurn_Timer; uint32 Sleep_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp index b7fe7d8f31e..62a057dc2cb 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp @@ -46,7 +46,6 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI boss_jeklikAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -215,7 +214,6 @@ struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI mob_batriderAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp index 5a6af5025a2..4ea62662ef9 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp @@ -43,8 +43,7 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI { boss_jindoAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } ScriptedInstance *pInstance; @@ -170,7 +169,6 @@ struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI mob_healing_wardAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 Heal_Timer; @@ -208,8 +206,7 @@ struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI { mob_shade_of_jindoAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } uint32 ShadowShock_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp index 81bc9dc7c25..7ad5be3fefd 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp @@ -47,7 +47,6 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI boss_mandokirAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 KillCount; @@ -272,7 +271,6 @@ struct TRINITY_DLL_DECL mob_ohganAI : public ScriptedAI mob_ohganAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 SunderArmor_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp index 309e6135a64..44606438a02 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp @@ -43,7 +43,6 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI boss_marliAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; @@ -200,7 +199,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI //Spawn of Marli struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI { - mob_spawn_of_marliAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_spawn_of_marliAI(Creature *c) : ScriptedAI(c) {} uint32 LevelUp_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp index b2e66b1bbdb..42742437fec 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI { - boss_renatakiAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_renatakiAI(Creature *c) : ScriptedAI(c) {} uint32 Invisible_Timer; uint32 Ambush_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp index 8319ac8f174..7a753dc9e01 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp @@ -55,7 +55,6 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI boss_thekalAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } uint32 MortalCleave_Timer; @@ -236,8 +235,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI { mob_zealot_lorkhanAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } uint32 Shield_Timer; @@ -372,8 +370,7 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI { mob_zealot_zathAI(Creature *c) : ScriptedAI(c) { - pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; - Reset(); + pInstance = ((ScriptedInstance*)c->GetInstanceData()); } uint32 SweepingStrikes_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp index 04a51ff7925..1dff6b63dbe 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp @@ -42,7 +42,6 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI boss_venoxisAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp index 858feb06e54..1776dfc5868 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp @@ -29,7 +29,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI { - boss_wushoolayAI(Creature *c) : ScriptedAI(c) {Reset();} + boss_wushoolayAI(Creature *c) : ScriptedAI(c) {} uint32 LightningCloud_Timer; uint32 LightningWave_Timer; diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index fa82c3b1eac..049218cca86 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -612,6 +612,7 @@ bool Creature::AIM_Initialize(CreatureAI* ai) i_AI = ai ? ai : FactorySelector::selectAI(this); if(oldAI) delete oldAI; IsAIEnabled = true; + i_AI->Reset(); return true; } diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index a15ae59a0ad..7388aab786c 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -79,9 +79,15 @@ class TRINITY_DLL_SPEC UnitAI virtual void AttackStart(Unit *); virtual void UpdateAI(const uint32 diff) = 0; + // Initialize + virtual void Reset() {}; + // Called when unit is charmed virtual void OnCharmed(bool apply) = 0; + // Pass parameters between AI + virtual void DoAction(const int32 param) {} + //Do melee swing of current victim if in rnage and ready and not casting void DoMeleeAttackIfReady(); }; |