diff options
Diffstat (limited to 'src')
345 files changed, 681 insertions, 873 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 4b91519172c..fde0f92f1c9 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -68,14 +68,6 @@ void ScriptedAI::AttackStart(Unit* who, bool melee) if (m_creature->Attack(who, melee)) { - m_creature->AddThreat(who, 0.0f); - - if (!InCombat) - { - InCombat = true; - Aggro(who); - } - if(melee) DoStartMovement(who); else @@ -90,14 +82,6 @@ void ScriptedAI::AttackStart(Unit* who) if (m_creature->Attack(who, true)) { - m_creature->AddThreat(who, 0.0f); - - if (!InCombat) - { - InCombat = true; - Aggro(who); - } - DoStartMovement(who); } } @@ -139,13 +123,11 @@ void ScriptedAI::EnterEvadeMode() m_creature->GetMotionMaster()->MoveTargetedHome(); } - InCombat = false; Reset(); } void ScriptedAI::JustRespawned() { - InCombat = false; Reset(); } @@ -792,14 +774,6 @@ void Scripted_NoMovementAI::AttackStart(Unit* who) if (m_creature->Attack(who, true)) { - m_creature->AddThreat(who, 0.0f); - - if (!InCombat) - { - InCombat = true; - Aggro(who); - } - DoStartNoMovement(who); } } diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 72598a40617..1be35b864c5 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -44,7 +44,7 @@ struct PointMovement struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI { - ScriptedAI(Creature* creature) : CreatureAI(creature), m_creature(creature), InCombat(false), IsFleeing(false) {} + ScriptedAI(Creature* creature) : CreatureAI(creature), m_creature(creature), IsFleeing(false) {} ~ScriptedAI() {} //************* @@ -98,9 +98,6 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI //Pointer to creature we are manipulating Creature* m_creature; - //Bool for if we are in combat or not - bool InCombat; - //For fleeing bool IsFleeing; @@ -112,7 +109,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI void Reset() {} //Called at creature aggro either by MoveInLOS or Attack Start - virtual void Aggro(Unit*) = 0; + void EnterCombat(Unit*); //************* //AI Helper Functions @@ -208,7 +205,7 @@ struct TRINITY_DLL_DECL NullCreatureAI : public ScriptedAI ~NullCreatureAI() {} void Reset() {} - void Aggro(Unit*) {} + void EnterCombat(Unit*) {} void MoveInLineOfSight(Unit *) {} void AttackStart(Unit *) {} void EnterEvadeMode() {} diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp index 08b374c443e..f2fc1ab8515 100644 --- a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI CorruptionofEarth3_Timer = 0; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/boss/boss_taerar.cpp index 0d046456523..47586a1e98c 100644 --- a/src/bindings/scripts/scripts/boss/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/boss/boss_taerar.cpp @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI Shades = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI PosionBreath_Timer = 12000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp index 0cfbc37b374..e6199a4b6fd 100644 --- a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI SummonDruids3_Timer = 0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -200,7 +200,7 @@ struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI MoonFire_Timer = 3000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp index a912e6af17f..2f2d5349f2a 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI IsSelfRooted = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (!m_creature->IsWithinMeleeRange(who)) { @@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI else GlobalCooldown = 0; //Buff timer (only buff when we are alive and not in combat - if (!InCombat && m_creature->isAlive()) + if (!m_creature->isInCombat() && m_creature->isAlive()) if (BuffTimer < diff ) { //Find a spell that targets friendly and applies an aura (these are generally buffs) diff --git a/src/bindings/scripts/scripts/creature/simple_ai.cpp b/src/bindings/scripts/scripts/creature/simple_ai.cpp index 5dd299e0a14..a33f66fcef0 100644 --- a/src/bindings/scripts/scripts/creature/simple_ai.cpp +++ b/src/bindings/scripts/scripts/creature/simple_ai.cpp @@ -61,7 +61,7 @@ void SimpleAI::Reset() { } -void SimpleAI::Aggro(Unit *who) +void SimpleAI::EnterCombat(Unit *who) { //Reset cast timers if (Spell[0].First_Cast >= 0) diff --git a/src/bindings/scripts/scripts/creature/simple_ai.h b/src/bindings/scripts/scripts/creature/simple_ai.h index 44cadef1f33..3a2e8a9341a 100644 --- a/src/bindings/scripts/scripts/creature/simple_ai.h +++ b/src/bindings/scripts/scripts/creature/simple_ai.h @@ -25,7 +25,7 @@ struct TRINITY_DLL_DECL SimpleAI : public ScriptedAI void Reset(); - void Aggro(Unit *who); + void EnterCombat(Unit *who); void KilledUnit(Unit *victim); diff --git a/src/bindings/scripts/scripts/examples/example_creature.cpp b/src/bindings/scripts/scripts/examples/example_creature.cpp index 140e477441d..cba35d173ca 100644 --- a/src/bindings/scripts/scripts/examples/example_creature.cpp +++ b/src/bindings/scripts/scripts/examples/example_creature.cpp @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI //*** HANDLED FUNCTION *** //Attack Start is called whenever someone hits us. - void Aggro(Unit *who) + void EnterCombat(Unit *who) { //Say some stuff DoScriptText(SAY_AGGRO, m_creature, who); diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp index 1cc5356a9ac..4d701ed0fdf 100644 --- a/src/bindings/scripts/scripts/examples/example_escort.cpp +++ b/src/bindings/scripts/scripts/examples/example_escort.cpp @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { if (IsBeingEscorted) { @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI npc_escortAI::UpdateAI(diff); //Combat check - if (InCombat && m_creature->getVictim()) + if (m_creature->getVictim()) { if (DeathCoilTimer < diff) { @@ -132,7 +132,8 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI DeathCoilTimer = 4000; }else DeathCoilTimer -= diff; - }else + } + else if(!m_creature->isInCombat()) { //Out of combat but being escorted if (IsBeingEscorted) diff --git a/src/bindings/scripts/scripts/guard/guard_ai.cpp b/src/bindings/scripts/scripts/guard/guard_ai.cpp index b635ae74b2d..3d7c3f5ba4c 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.cpp +++ b/src/bindings/scripts/scripts/guard/guard_ai.cpp @@ -38,7 +38,7 @@ void guardAI::Reset() BuffTimer = 0; //Rebuff as soon as we can } -void guardAI::Aggro(Unit *who) +void guardAI::EnterCombat(Unit *who) { if (m_creature->GetEntry() == 15184) { @@ -69,7 +69,7 @@ void guardAI::UpdateAI(const uint32 diff) else GlobalCooldown = 0; //Buff timer (only buff when we are alive and not in combat - if (m_creature->isAlive() && !InCombat) + if (m_creature->isAlive() && !m_creature->isInCombat()) if (BuffTimer < diff ) { //Find a spell that targets friendly and applies an aura (these are generally buffs) diff --git a/src/bindings/scripts/scripts/guard/guard_ai.h b/src/bindings/scripts/scripts/guard/guard_ai.h index d7cd6cd6318..71ded211f6f 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.h +++ b/src/bindings/scripts/scripts/guard/guard_ai.h @@ -16,7 +16,7 @@ struct TRINITY_DLL_DECL guardAI : public ScriptedAI void Reset(); - void Aggro(Unit *who); + void EnterCombat(Unit *who); void JustDied(Unit *Killer); diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index 2a7f171a4a4..fb27c64135d 100644 --- a/src/bindings/scripts/scripts/guard/guards.cpp +++ b/src/bindings/scripts/scripts/guard/guards.cpp @@ -2513,7 +2513,7 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI CanTeleport = false; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -2709,7 +2709,7 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI CanTeleport = false; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp index 5895ef97af6..78f5ea850c1 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp @@ -31,28 +31,20 @@ void npc_escortAI::AttackStart(Unit *who) if (IsBeingEscorted && !Defend) return; + if ( m_creature->Attack(who, true) ) + { + m_creature->GetMotionMaster()->MoveChase(who); + } +} - if ( m_creature->Attack(who, true) ) - { - m_creature->AddThreat(who, 0.0f); - - if (!InCombat) - { - InCombat = true; - - if (IsBeingEscorted) - { - //Store last position - m_creature->GetPosition(LastPos.x, LastPos.y, LastPos.z); - - debug_log("TSCR: EscortAI has entered combat and stored last location."); - } - - Aggro(who); - } +void npc_escortAI::EnterCombat(Unit *who) +{ + if (IsBeingEscorted) + { + //Store last position + m_creature->GetPosition(LastPos.x, LastPos.y, LastPos.z); - m_creature->GetMotionMaster()->MovementExpired(); - m_creature->GetMotionMaster()->MoveChase(who); + debug_log("TSCR: EscortAI has entered combat and stored last location."); } } @@ -69,7 +61,6 @@ void npc_escortAI::MoveInLineOfSight(Unit *who) void npc_escortAI::JustRespawned() { - InCombat = false; IsBeingEscorted = false; IsOnHold = false; @@ -81,8 +72,6 @@ void npc_escortAI::JustRespawned() void npc_escortAI::EnterEvadeMode() { - InCombat = false; - m_creature->RemoveAllAuras(); m_creature->DeleteThreatList(); m_creature->CombatStop(); @@ -108,7 +97,7 @@ void npc_escortAI::EnterEvadeMode() void npc_escortAI::UpdateAI(const uint32 diff) { //Waypoint Updating - if (IsBeingEscorted && !InCombat && WaitTimer && !Returning) + if (IsBeingEscorted && !m_creature->isInCombat() && WaitTimer && !Returning) { if (WaitTimer <= diff) { @@ -177,7 +166,7 @@ void npc_escortAI::UpdateAI(const uint32 diff) } //Check if player is within range - if (IsBeingEscorted && !InCombat && PlayerGUID) + if (IsBeingEscorted && !m_creature->isInCombat() && PlayerGUID) { if (PlayerTimer < diff) { @@ -326,7 +315,7 @@ void npc_escortAI::SetRun(bool bRun) void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID) { - if (InCombat) + if (m_creature->isInCombat()) { debug_log("SD2 ERROR: EscortAI attempt to Start while in combat"); return; diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.h b/src/bindings/scripts/scripts/npc/npc_escortAI.h index 23fc2561bf0..362c7ed902a 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.h +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.h @@ -34,15 +34,13 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI // Pure Virtual Functions virtual void WaypointReached(uint32) = 0; - virtual void Aggro(Unit*) = 0; - - virtual void Reset() = 0; - // CreatureAI functions npc_escortAI(Creature *c) : ScriptedAI(c), IsBeingEscorted(false), PlayerTimer(1000), MaxPlayerDistance(DEFAULT_MAX_PLAYER_DISTANCE), CanMelee(true), DespawnAtEnd(true), DespawnAtFar(true) {m_creature->GetPosition(LastPos.x, LastPos.y, LastPos.z);} bool IsVisible(Unit*) const; + void EnterCombat(Unit *); + void AttackStart(Unit*); void MoveInLineOfSight(Unit*); diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index 3755cf04f1f..82cb02123df 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -172,7 +172,7 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI } } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void ReceiveEmote( Player *player, uint32 emote ) { @@ -306,7 +306,7 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI void PatientSaved(Creature* soldier, Player* player, Location* Point); void UpdateAI(const uint32 diff); - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} }; /*##### @@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI } } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -646,14 +646,14 @@ struct TRINITY_DLL_DECL npc_garments_of_questsAI : public npc_escortAI m_creature->SetHealth(int(m_creature->GetMaxHealth()*0.7)); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void SpellHit(Unit* pCaster, const SpellEntry *Spell) { if (Spell->Id == SPELL_LESSER_HEAL_R2 || Spell->Id == SPELL_FORTITUDE_R1) { //not while in combat - if (InCombat) + if (m_creature->isInCombat()) return; //nothing to be done now @@ -764,7 +764,7 @@ struct TRINITY_DLL_DECL npc_garments_of_questsAI : public npc_escortAI void UpdateAI(const uint32 diff) { - if (bCanRun && !InCombat) + if (bCanRun && !m_creature->isInCombat()) { if (RunAwayTimer <= diff) { @@ -816,7 +816,7 @@ struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -1147,7 +1147,7 @@ struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void OnPossess(bool apply) { @@ -1186,7 +1186,7 @@ struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI ExplosionTimer = 3000; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void AttackStart(Unit *who) {} void MoveInLineOfSight(Unit *who) {} @@ -1265,7 +1265,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI Unit *Owner; bool IsViper; - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void Reset() { @@ -1289,9 +1289,6 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI uint32 delta = (rand() % 7) *100; m_creature->SetStatFloatValue(UNIT_FIELD_BASEATTACKTIME, Info->baseattacktime + delta); m_creature->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER , Info->attackpower); - - InCombat = false; - } //Redefined for random target selection: @@ -1313,7 +1310,6 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI m_creature->setAttackTimer(BASE_ATTACK, (rand() % 10) * 100); SpellTimer = (rand() % 10) * 100; AttackStart(who); - InCombat = true; } } } @@ -1325,7 +1321,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI return; //Follow if not in combat - if (!m_creature->hasUnitState(UNIT_STAT_FOLLOW)&& !InCombat) + if (!m_creature->hasUnitState(UNIT_STAT_FOLLOW)&& !m_creature->isInCombat()) { m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MoveFollow(Owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); @@ -1334,11 +1330,9 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI //No victim -> get new from owner (need this because MoveInLineOfSight won't work while following -> corebug) if (!m_creature->getVictim()) { - if (InCombat) + if (m_creature->isInCombat()) DoStopAttack(); - InCombat = false; - if(Owner->getAttackerForHelper()) AttackStart(Owner->getAttackerForHelper()); 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 13f8bdd3fbf..a6959cc5268 100644 --- a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL npc_ravenholdtAI : public ScriptedAI ((Player*)who)->KilledMonster(m_creature->GetEntry(),m_creature->GetGUID() ); } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } }; CreatureAI* GetAI_npc_ravenholdt(Creature *_Creature) { 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 084e958a92a..ba3b6aa8e9a 100644 --- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI m_creature->setFaction(35); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature, NULL); } diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp index bdd61f36f82..edf762360ad 100644 --- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp +++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp @@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI Completed = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void Reset() { 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 986413cdf0f..fb81cde9f6b 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 @@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI Class_Timer = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } void SetMyClass(uint8 myclass) @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch (rand()%3) { @@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI Mortal_Strike_timer = 10000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 c7323267b2f..586a0f06a8d 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 @@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI focusedTarget = NULL; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } void JustSummoned(Creature *summoned) @@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI fiery1 = fiery2 = true; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) 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 8e2d4cea736..5a32bb8635b 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 @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -222,7 +222,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI ArcaneBolt_Timer = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 d3ca37b445e..1aaf53bde7b 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 @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { 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 758596ca55d..86727837219 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 @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI summon10 = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -222,7 +222,7 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI flamebuffet_timer = 5000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { @@ -273,7 +273,7 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI arcanebuffet_timer = 5000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { @@ -324,7 +324,7 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI frostbuffet_timer = 5000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { @@ -375,7 +375,7 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI shadowbuffet_timer = 5000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { 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 94257e0aa37..f17d1a133ce 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 @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { 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 719e6f32eff..ca589b268a5 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 @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI pInstance->SetData(TYPE_HELLMAW, IN_PROGRESS); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI }else EventCheck_Timer -= diff; } - if (!InCombat && !IsBanished) + if (!m_creature->isInCombat() && !IsBanished) { //this is where we add MovePoint() //DoWhine("I haz no mount!", LANG_UNIVERSAL, NULL); 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 5aa71a80825..6d683c09764 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 @@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { 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 c58bae35137..80260e673f3 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 @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI sacrificed = false; } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void UpdateAI(const uint32 diff) { @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { 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 defaaa51a5d..99bce54be62 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 @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public Scripted_NoMovementAI } } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } // Sonic Boom instant damage (needs core fix instead of this) void SpellHitTarget(Unit *target, const SpellEntry *spell) diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index 0803d58aebf..3cfb0af2fa1 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -109,20 +109,6 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance return NULL; } - void HandleGameObject(uint64 guid, uint32 state) - { - Player *player = GetPlayerInMap(); - - if (!player || !guid) - { - debug_log("TSCR: Shadow Labyrinth: HandleGameObject fail"); - return; - } - - if (GameObject *go = GameObject::GetGameObject(*player,guid)) - go->SetGoState(state); - } - void SetData(uint32 type, uint32 data) { switch(type) @@ -149,7 +135,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance case DATA_BLACKHEARTTHEINCITEREVENT: if( data == DONE ) { - HandleGameObject(RefectoryDoorGUID,0); + HandleGameObject(RefectoryDoorGUID, true); } Encounter[2] = data; break; @@ -157,7 +143,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance case DATA_GRANDMASTERVORPILEVENT: if( data == DONE ) { - HandleGameObject(ScreamingHallDoorGUID,0); + HandleGameObject(ScreamingHallDoorGUID, true); } Encounter[3] = data; break; diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp index 9431880921c..84f092d12f6 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_amanitarAI : public ScriptedAI void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index a911d9a0c17..9990d5d8891 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI pInstance->SetData(DATA_ELDER_NADOX_EVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_DEATH,m_creature); @@ -195,7 +195,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI DoCast(m_creature,SPELL_GUARDIAN_AURA,true); sprint_Timer = 10000; } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void UpdateAI(const uint32 diff) { if(m_creature->GetEntry() == 30176) diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index 8e0b1a4744d..9c249ad4031 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI uint32 phase; void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 145c017679e..d42fe688137 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_jedogaAI : public ScriptedAI boss_jedogaAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index 36e68862f0c..03b5b5777c9 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI boss_taldaramAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp index c479e17d162..65d9d012f14 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI uint32 phase; void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp index e72ccd6436f..e509a4c7d39 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_hadronoxAI : public ScriptedAI uint32 phase; void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index 43ae13d0b9d..c8250011906 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index d94579361de..db3f7fd1da9 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI spellhit = false; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) { @@ -382,7 +382,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void MovementInform(uint32 type, uint32 id) { @@ -475,7 +475,7 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI return; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { return; } diff --git a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp index 34aa388c4c7..ae5e5db68f6 100644 --- a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI Enraged = false; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { 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 febf52effd1..0962207575f 100644 --- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI m_creature->SetStandState(UNIT_STAND_STATE_SLEEP); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) { @@ -206,11 +206,11 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI m_creature->setFaction(875); } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { - if( !InCombat ) + if( !m_creature->isInCombat() ) { if (Emote_Timer < diff) { @@ -278,7 +278,7 @@ struct TRINITY_DLL_DECL npc_injured_draeneiAI : public ScriptedAI } } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) { @@ -341,7 +341,7 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature, who); } @@ -460,7 +460,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI StartEvent(); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void StartEvent() { @@ -576,7 +576,7 @@ struct TRINITY_DLL_DECL mob_nestlewood_owlkinAI : public ScriptedAI Hitted = false; } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void SpellHit(Unit* caster, const SpellEntry* spell) { diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index e944d25ad70..1adc651788b 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI } } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void UpdateAI(const uint32 diff) { @@ -233,7 +233,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI BigWill = 0; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void MoveInLineOfSight(Unit *who) { @@ -462,7 +462,7 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI m_creature->setFaction(69); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void JustDied(Unit* killer) { 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 b181f50f69b..e70f144d460 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); DoScriptText(SAY_AGGRO, m_creature); 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 a0f054c53a4..7775f3e3e4d 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -429,7 +429,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->setActive(true); DoZoneInCombat(); @@ -903,7 +903,7 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI GlaiveGUID = 0; } - void Aggro(Unit *who) {DoZoneInCombat();} + void EnterCombat(Unit *who) {DoZoneInCombat();} void ChargeCheck() { @@ -1043,10 +1043,9 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI m_creature->RemoveAllAuras(); m_creature->DeleteThreatList(); m_creature->CombatStop(); - InCombat = false; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *) {} void MovementInform(uint32 MovementType, uint32 Data) {Timer = 1;} @@ -1390,7 +1389,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) {} void EnterEvadeMode() {} void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } @@ -1614,7 +1613,7 @@ struct TRINITY_DLL_DECL cage_trap_triggerAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void MoveInLineOfSight(Unit *who) { @@ -1688,7 +1687,7 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI uint64 TargetGUID; - void Aggro(Unit *who) {DoZoneInCombat();} + void EnterCombat(Unit *who) {DoZoneInCombat();} void Reset() { @@ -1744,7 +1743,7 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI DoCast(m_creature, SPELL_SHADOWFIEND_PASSIVE, true); } - void Aggro(Unit* who) { DoZoneInCombat(); } + void EnterCombat(Unit* who) { DoZoneInCombat(); } void DoMeleeAttackIfReady() { 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 e459e1aa687..0321ea6d9ad 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 @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI Enraged = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); 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 7a78e767279..04e01a94e69 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 @@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL npc_enslaved_soulAI : public ScriptedAI void Reset() {ReliquaryGUID = 0;} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { m_creature->CastSpell(m_creature, ENSLAVED_SOUL_PASSIVE, true); DoZoneInCombat(); @@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { m_creature->AddThreat(who, 10000.0f); DoZoneInCombat(); @@ -169,15 +169,6 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI Timer = 0; } - void AttackStart(Unit* who) - { - if (!InCombat) - { - Aggro(who); - InCombat = true; - } - } - bool SummonSoul() { uint32 random = rand()%6; @@ -197,8 +188,6 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI { if(pInstance) pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); - - InCombat = false; } void UpdateAI(const uint32 diff) @@ -361,7 +350,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SUFF_SAY_FREED, m_creature); DoZoneInCombat(); @@ -405,7 +394,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if(InCombat) + if(m_creature->isInCombat()) { //Supposed to be cast on nearest target if(FixateTimer < diff) @@ -484,7 +473,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI m_creature->InterruptSpell(CURRENT_GENERIC_SPELL, false); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(DESI_SAY_FREED, m_creature); DoZoneInCombat(); @@ -563,7 +552,7 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI CheckedAggro = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%2) { 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 b77ca8b9a4e..df535d2528c 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 @@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI void Reset() { ShadeGUID = 0; } void JustDied(Unit* killer); - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) {} @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI } void JustDied(Unit* killer); - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) @@ -274,8 +274,6 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI } } - void Aggro(Unit* who) { } - void AttackStart(Unit* who) { if(!who || IsBanished) return; @@ -381,7 +379,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if(!InCombat) + if(!m_creature->isInCombat()) return; if(IsBanished) @@ -555,7 +553,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void BeginEvent(Player* pl) { @@ -574,8 +572,8 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); ((boss_shade_of_akamaAI*)Shade->AI())->SetAkamaGUID(m_creature->GetGUID()); ((boss_shade_of_akamaAI*)Shade->AI())->SetSelectableChannelers(); - ((boss_shade_of_akamaAI*)Shade->AI())->InCombat = true; Shade->AddThreat(m_creature, 1000000.0f); + m_creature->CombatStart(Shade); Shade->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); Shade->SetUInt64Value(UNIT_FIELD_TARGET, m_creature->GetGUID()); if(pl) Shade->AddThreat(pl, 1.0f); 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 ca48a9c6e7d..e9a23476543 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI summons.DespawnAll(); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS); @@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public ScriptedAI DoCast(m_creature, SPELL_VOLCANIC_ERUPTION); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) {} 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 33a0f20a23e..72fc69d9378 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 @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI TeronGUID = 0; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void AttackStart(Unit* who) { } void MoveInLineOfSight(Unit* who) { } @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI CheckTeronTimer = 5000; }else CheckTeronTimer -= diff; - if(ShadowBoltTimer < diff && InCombat) + if(ShadowBoltTimer < diff && m_creature->isInCombat()) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_SHADOWBOLT); ShadowBoltTimer = 10000; @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI CheckTeronTimer = 5000; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void MoveInLineOfSight(Unit *who) { @@ -237,7 +237,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI Intro = false; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) { @@ -255,7 +255,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI m_creature->AddThreat(who, 1.0f); } - if(!InCombat && !Intro && m_creature->IsWithinDistInMap(who, 60.0f) && (who->GetTypeId() == TYPEID_PLAYER)) + if(!m_creature->isInCombat() && !Intro && m_creature->IsWithinDistInMap(who, 60.0f) && (who->GetTypeId() == TYPEID_PLAYER)) { if(pInstance) pInstance->SetData(DATA_TERONGOREFIENDEVENT, IN_PROGRESS); @@ -427,7 +427,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI DoomBlossom->setFaction(m_creature->getFaction()); DoomBlossom->AddThreat(target, 1.0f); ((mob_doom_blossomAI*)DoomBlossom->AI())->SetTeronGUID(m_creature->GetGUID()); - ((mob_doom_blossomAI*)DoomBlossom->AI())->InCombat = true; + target->CombatStart(DoomBlossom); SetThreatList(DoomBlossom); SummonDoomBlossomTimer = 35000; } 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 4560ac3699c..adf8011d989 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 @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); 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 3c063ff30c5..08f6bb335f2 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA }else error_log(ERROR_INST_DATA); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} @@ -243,7 +243,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, 11686); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} @@ -360,7 +360,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI bool LoadedGUIDs; - void Aggro(Unit* who) + void EnterCombat(Unit* who) { if(pInstance) { 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 977ee247f8b..592e0aa52a4 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -127,8 +127,6 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI CanWalk = false; } - void Aggro(Unit *who) { } - //TODO: move them to center void SummonRingMob() { @@ -185,6 +183,11 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI } } + void HandleGameObject(uint32 id, bool open) + { + pInstance->HandleGameObject(pInstance->GetData64(id), open); + } + void UpdateAI(const uint32 diff) { if (!pInstance) @@ -236,7 +239,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI { case 0: DoScriptText(-1000000, m_creature);//1 - DoGate(DATA_ARENA4,1); + HandleGameObject(DATA_ARENA4, false); Start(false, false, false); CanWalk = true; Event_Timer = 0; @@ -333,10 +336,6 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI MightyBlow_Timer = 15000; } - void Aggro(Unit *who) - { - } - void UpdateAI(const uint32 diff) { //Return since we have no target @@ -538,7 +537,7 @@ struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI } } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void Reset() {} void JustDied(Unit* killer) @@ -671,7 +670,7 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch(rand()%3) { @@ -867,7 +866,7 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch(rand()%3) { @@ -983,7 +982,7 @@ struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI { npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {} - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void Reset() {} void JustDied(Unit* killer) @@ -1097,12 +1096,10 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI BreakDoor_Timer = 0; } - void Aggro(Unit *who) { } - void DoGo(uint32 id, uint32 state) { if (GameObject *go = GameObject::GetGameObject(*m_creature,pInstance->GetData64(id))) - go->SetGoState(state); + go->SetGoState((GOState)state); } void WaypointReached(uint32 i) 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 bf698aff507..28f2e6935e2 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 @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI Spirit_Timer = 24000; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void SummonSpirits(Unit* victim) { 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 7cc38998a9e..a65d41e3170 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp @@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI EnvelopingWeb_Timer = 16000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 e5b279d65ef..378f8163f9d 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 @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI //Counter= 0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 c0ea7cac901..98e1e959314 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 @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI Medics = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 3fd45e6eed7..6a89906faf7 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 @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI MortalStrike_Timer = 22000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 df109c24001..5aa3786efce 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp @@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI Frenzy_Timer =0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 5921cc8419a..62ba94347d4 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 @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI ShadowShield_Timer = 8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 c4230b5f557..f9016987dfa 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI WarStomp_Timer =0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 bc90aeb17cf..b60ad5cdbe5 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 @@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI Smite_Timer = 8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 3e99a09b266..3768422e323 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 @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI Strike_Timer = 12000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI Gouge_Timer = 6000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -164,7 +164,7 @@ struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI Strike_Timer = 12000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -236,7 +236,7 @@ struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI Shield_Timer = 3000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -309,7 +309,7 @@ struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI m_creature->CastSpell(m_creature,SPELL_FROSTARMOR,true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI m_creature->setFaction(FACTION_NEUTRAL); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -493,7 +493,7 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI m_creature->setFaction(FACTION_NEUTRAL); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 69ca2482357..cf199073b77 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI Thunderclap_Timer = 17000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 919643a34e9..e48c832e3b0 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 81e872b1ffa..f5f7e11f7db 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI Summoned = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 79ebd4fa098..e84d538bf79 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 @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI Slow_Timer = 24000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 c2df5796f48..749ff71f024 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 @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI MothersMilk_Timer = 10000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void DamageTaken(Unit *done_by, uint32 &damage) { 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 ecb0a71db82..cdb038588bf 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 @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI Summoned = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 532a719bbe3..474a3ffcfdd 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 @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI PyroBlast_Timer = 14000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 af158d97de6..d244567eafa 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 @@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI //HelingPotion_Timer = 25000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 d43de67fa56..58f487f846d 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 @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI Thunderclap_Timer = 9000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 6563aa8a929..43417a6996c 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 @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI //m_creature->CastSpell(m_creature,SPELL_ICEARMOR,true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 c9ba2a77921..38bdd2f2c55 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 @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI TerrifyingRoar_Timer = 23000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 d701edc6d40..358e33969dd 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 @@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI ThrowAxe_Timer = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 b59be12f8eb..915c3062ea7 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 @@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); DoZoneInCombat(); diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp index c91c2cc1136..555a0825b50 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp @@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI Enraged = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 54348dd86c4..90ff9b9b967 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI Heal_Timer = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } 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 dfae4f31662..0af2c66b54f 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI FlameBuffet_Timer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } 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 def9af062be..87ce0e3fb3b 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI Frenzy_Timer = 10000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } 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 4abe9265828..808f381d197 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp @@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch (rand()%3) { 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 ff29427664f..763a3b3f7f4 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } 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 c8fecdae893..b11ac370804 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp @@ -98,7 +98,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI DoScriptText(SAY_KILLTARGET, m_creature, victim); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoCast(m_creature,SPELL_ESSENCEOFTHERED); DoZoneInCombat(); 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 3d809971a3d..b3aee0035df 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 @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI AttackStart(target); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 03c3a57568c..8a40fd86b58 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 @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI { } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI IntangiblePresence_Timer = 15000; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void MoveInLineOfSight(Unit *who) { @@ -252,7 +252,7 @@ struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI void Reset() { } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void MoveInLineOfSight(Unit *who) { 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 7516930285e..062efcb1c4e 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI Hound_Timer = 8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 79d7b19e108..2dcc84eba80 100644 --- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp @@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI { } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } 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 b16b6551c78..1bbe33ea415 100644 --- a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp +++ b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} }; CreatureAI* GetAI_npc_ragged_john(Creature *_Creature) diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp index de2ff9b93fd..4912f586309 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_epochAI : public ScriptedAI void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp index 12cbb5f27a3..bc2d69a6a73 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp @@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI yelled3 = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp index 187889cb053..7109560b915 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp @@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI Frenzy_Timer = 20000 + rand()%10000; //made it up } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp index 7226a1304dc..0b4e8d6641e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI Summon_ghouls_Timer = 19000 + rand()%5000; //on a video approx 24s after aggro } - void Aggro(Unit* who) + void EnterCombat(Unit* who) {DoScriptText(SAY_AGGRO, m_creature);} void AttackStart(Unit* who) {} 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 abe37b53685..872f7b2fcaf 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 @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI Frenzy_Timer = 120000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 d7ffcde4059..b4a4ffd04f8 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 @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI TimeLapse_Timer = 15000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 3e0e327bb89..56b434373bd 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 @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI SpellReflection_Timer = 40000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 ac858f76ec1..e69973c5fa5 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 @@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI //ScriptedAI::AttackStart(who); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void SpellHit(Unit* caster, const SpellEntry* spell) { @@ -272,7 +272,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI else mWaveId = 1; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void DoSummonAtRift(uint32 creature_entry) { diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp index cae3a17ff02..de86ca23242 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance && IsEvent) pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); @@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI CheckTimer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -259,11 +259,8 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI void MoveInLineOfSight(Unit *who) { - if (m_creature->GetDistance(who) <= 50 && !InCombat && m_creature->IsHostileTo(who)) - { - m_creature->AddThreat(who,0.0); - m_creature->Attack(who,false); - } + if (m_creature->GetDistance(who) <= 50 && !m_creature->isInCombat() && m_creature->IsHostileTo(who)) + AttackStart(who); } void UpdateAI(const uint32 diff) 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 af842479ed1..ca3d8296f35 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 @@ -91,7 +91,7 @@ struct mob_ancient_wispAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void DamageTaken(Unit* done_by, uint32 &damage) { damage = 0; } @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL mob_doomfireAI : public ScriptedAI void Reset() { } void MoveInLineOfSight(Unit* who) { } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void DamageTaken(Unit *done_by, uint32 &damage) { damage = 0; } }; @@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI TargetGUID = who->GetGUID(); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void DamageTaken(Unit *done_by, uint32 &damage) { damage = 0; } @@ -262,7 +262,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI IsChanneling = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->InterruptSpell(CURRENT_CHANNELED_SPELL); DoScriptText(SAY_AGGRO, m_creature); @@ -429,7 +429,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI void UpdateAI(const uint32 diff) { - if (!InCombat) + if (!m_creature->isInCombat()) { if (pInstance) { diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp index 9bdee9887e5..44eebba1d5e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance && IsEvent) pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI CheckTimer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -222,11 +222,8 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI void MoveInLineOfSight(Unit *who) { - if (m_creature->GetDistance(who) <= 50 && !InCombat && m_creature->IsHostileTo(who)) - { - m_creature->AddThreat(who,0.0); - m_creature->Attack(who,false); - } + if (m_creature->GetDistance(who) <= 50 && !m_creature->isInCombat() && m_creature->IsHostileTo(who)) + AttackStart(who); } void JustDied(Unit *victim) diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp index c1934ada453..7ab9000d05f 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance && IsEvent) pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp index ddf5e0ad715..f198ed483d1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance && IsEvent) pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); 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 57f484f3ac1..9ce2ac28d45 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 @@ -431,11 +431,9 @@ void hyjalAI::EnterEvadeMode() m_creature->GetMotionMaster()->MoveTargetedHome(); m_creature->SetLootRecipient(NULL); - - InCombat = false; } -void hyjalAI::Aggro(Unit *who) +void hyjalAI::EnterCombat(Unit *who) { if(IsDummy)return; for(uint8 i = 0; i < 3; ++i) diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h index ba75eaa36f2..2eae91ad7c1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h @@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL hyjalAI : public npc_escortAI void EnterEvadeMode(); // Send creature back to spawn location and evade. - void Aggro(Unit *who); // Used to reset cooldowns for our spells and to inform the raid that we're under attack + void EnterCombat(Unit *who); // Used to reset cooldowns for our spells and to inform the raid that we're under attack void UpdateAI(const uint32 diff); // Called to summon waves, check for boss deaths and to cast our spells. diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp index b3f3ef07498..9123214bd2a 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp @@ -166,8 +166,6 @@ void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) } } -void hyjal_trashAI::Aggro(Unit *who){} - void hyjal_trashAI::UpdateAI(const uint32 diff) { if(IsOverrun && !SetupOverrun) @@ -521,7 +519,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI imol = false; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void WaypointReached(uint32 i) { @@ -688,7 +686,7 @@ struct mob_abominationAI : public hyjal_trashAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { @@ -807,7 +805,7 @@ struct mob_ghoulAI : public hyjal_trashAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { @@ -939,7 +937,7 @@ struct mob_necromancerAI : public hyjal_trashAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { @@ -1044,7 +1042,7 @@ struct mob_bansheeAI : public hyjal_trashAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { @@ -1152,7 +1150,7 @@ struct mob_crypt_fiendAI : public hyjal_trashAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { @@ -1251,7 +1249,7 @@ struct mob_fel_stalkerAI : public hyjal_trashAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { @@ -1349,7 +1347,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI m_creature->Relocate(x,y,z,0); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { @@ -1587,7 +1585,7 @@ struct TRINITY_DLL_DECL alliance_riflemanAI : public Scripted_NoMovementAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.h b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.h index 1113ce4c8a2..36f9108fb26 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.h @@ -15,7 +15,7 @@ struct TRINITY_DLL_DECL hyjal_trashAI : public npc_escortAI //void EnterEvadeMode(); - void Aggro(Unit *who); + void EnterCombat(Unit *who); void UpdateAI(const uint32 diff); 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 be4c2660b51..3eda30963a5 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 @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI Consecration_Timer = 8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { //This is not correct. Should taunt Thrall before engage in combat DoScriptText(SAY_TAUNT1, m_creature); 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 60ef9ae55fe..c2451dce22d 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 @@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI Mda_Timer = 40000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%2) { 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 b36555cd074..ddca1523597 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 @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI ExplodingShout_Timer = 25000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 4f11af1a5d2..6b4d37f4b63 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 @@ -435,7 +435,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI m_creature->Unmount(); m_creature->SetSpeed(MOVE_RUN,SPEED_RUN); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch(rand()%4) { @@ -627,7 +627,7 @@ struct TRINITY_DLL_DECL npc_tarethaAI : public npc_escortAI } } void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { 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 ac646413cb0..deb3f995216 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 @@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI m_creature->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { StartEvent(who); } @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); @@ -356,7 +356,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (pInstance) { @@ -368,7 +368,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); @@ -485,7 +485,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (pInstance) { @@ -498,7 +498,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); @@ -600,7 +600,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (pInstance) { @@ -612,7 +612,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); 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 14012be1d1f..cb91f063d9f 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 @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI } } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); 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 6a481f21b19..beebbc631c0 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 @@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (pInstance) { @@ -622,7 +622,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI Vashj = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_LADYVASHJ)); } - void Aggro(Unit *who) { return; } + void EnterCombat(Unit *who) { return; } void MoveInLineOfSight(Unit *who){return;} @@ -714,7 +714,7 @@ struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->AddThreat(who, 0.1f); } @@ -772,7 +772,7 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI Check_Timer = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -898,7 +898,7 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who) { return; } + void EnterCombat(Unit *who) { return; } void MoveInLineOfSight(Unit *who) { return; } 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 073649db5ee..15ce224454f 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 @@ -98,7 +98,7 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (!victimGUID) return; } @@ -382,7 +382,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(m_creature->HasAura(AURA_BANISH)) return; @@ -607,7 +607,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI m_creature->CastSpell(m_creature, 8149, true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { StartEvent(); } @@ -668,7 +668,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->InterruptNonMeleeSpells(false); if(pInstance) @@ -677,14 +677,13 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI void JustRespawned() { - InCombat = false; AddedBanish = false; Reset(); } void CastChanneling() { - if(!InCombat && !m_creature->m_currentSpells[CURRENT_CHANNELED_SPELL]) + if(!m_creature->isInCombat() && !m_creature->m_currentSpells[CURRENT_CHANNELED_SPELL]) { if(leotherasGUID) { @@ -702,7 +701,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI if(!leotherasGUID) leotherasGUID = pInstance->GetData64(DATA_LEOTHERAS); - if(!InCombat && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + if(!m_creature->isInCombat() && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { Unit *victim = NULL; victim = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); 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 b911c1e5a87..1de9f1debbd 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 @@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); @@ -416,7 +416,7 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 35f3f5b9b13..859c9d27943 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 @@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { PlayerList = &((InstanceMap*)m_creature->GetMap())->GetPlayers(); Playercount = PlayerList->getSize(); @@ -307,7 +307,7 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI m_creature->setFaction(14); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) { 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 8ffee603597..648781f6606 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 @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_thespiaAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL mob_coilfang_waterelementalAI : public ScriptedAI WaterBoltVolley_Timer = 3000+rand()%3000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { 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 e5b12065298..14dae22fdc2 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 @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_mekgineer_steamriggerAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL mob_steamrigger_mechanicAI : public ScriptedAI return; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { 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 ede9a38126f..fb8a00865ed 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 @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL mob_naga_distillerAI : public ScriptedAI } } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void StartRageGen(Unit *caster) { @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI pInstance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { 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 99d313d303a..a0a0b2a2cd1 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 @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI AcidGeyser_Timer = 10000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI void AttackStart(Unit* who) { return; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void UpdateAI(const uint32 diff) { 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 d7c9791cf51..370b07c8adc 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 @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI Striders.clear(); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void JustSummoned(Creature *summon) { diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp index a1980b7506b..c4b05ef8001 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp @@ -26,7 +26,7 @@ struct TRINITY_DLL_DECL boss_dredAI : public ScriptedAI boss_dredAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp index 54392bc3b1f..e4b4278151e 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp @@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public ScriptedAI boss_novosAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp index 1454a9de8f5..086ef509ff7 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI boss_tharon_jaAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp index bfc123edb4d..94993e7b3ec 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp @@ -33,7 +33,7 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI boss_trollgoreAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } 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 c9cc4625b97..c4e405477c2 100644 --- a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp +++ b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp @@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI spellHit = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 67f68334410..6fc6a53651b 100644 --- a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI IntangiblePresence_Timer = 5000; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void DamageTaken(Unit *done_by, uint32 &damage) { @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL npc_deserter_agitatorAI : public ScriptedAI m_creature->setFaction(894); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} }; CreatureAI* GetAI_npc_deserter_agitator(Creature *_Creature) 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 167dd0455af..be1a2258dda 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL mobs_ghoul_flayerAI : public ScriptedAI void Reset() { } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void JustDied(Unit* Killer) { @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL npc_darrowshire_spiritAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } }; CreatureAI* GetAI_npc_darrowshire_spirit(Creature *_Creature) 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 d1fa414ea11..7dbe22e8a25 100644 --- a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp +++ b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp @@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI spellHit = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 e420446abe8..85c094dada0 100644 --- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI } } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void Reset() { @@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI } } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { @@ -324,7 +324,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -542,7 +542,7 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI Summon = false; } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void JustSummoned(Creature *summoned) { @@ -647,7 +647,7 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI WaveTimer = 0; } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void MoveInLineOfSight(Unit* who) { diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index 516966da993..c74f11d14a9 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void Reset() { 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 2ae9e4fb030..34400549822 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); 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 5bf36cc1d1e..6a22e58bbc6 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 @@ -186,7 +186,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { StartEvent(who); } @@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if(!InCombat && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -323,7 +323,7 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) { @@ -350,7 +350,7 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if(!InCombat && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -427,7 +427,7 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) { @@ -454,7 +454,7 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if(!InCombat && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -535,7 +535,7 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) { @@ -562,7 +562,7 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if(!InCombat && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); @@ -633,7 +633,7 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) { @@ -660,7 +660,7 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if(!InCombat && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp index 0b2fc89dd97..ee0e99d46ec 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp @@ -23,7 +23,7 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI uint32 phase; void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp index 9c518bee397..3c283e17271 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp @@ -29,7 +29,7 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI berserk = 120000; //2min } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp index 71654de9852..a369df3abb6 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp @@ -37,7 +37,7 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI boss_gal_darahAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp index 49afd7b8126..edfc8e7a26a 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI uint32 phase; void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp index 7efd16fc375..ba813a69f8d 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp @@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI boss_slad_ranAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } 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 1afe49ce30e..a4c873eabcd 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 @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI PoisonBolt_Timer = 7000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL mob_broggok_poisoncloudAI : public ScriptedAI void Reset() { } void MoveInLineOfSight(Unit *who) { } void AttackStart(Unit *who) { } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } }; CreatureAI* GetAI_boss_broggok(Creature *_Creature) 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 8c118a022ea..e1365a05a77 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 @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI SummonChannelers(); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_WAKE, m_creature); if (m_creature->IsNonMeleeSpellCasted(false)) @@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI m_creature->InterruptNonMeleeSpells(true); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { if(Creature *Kelidan = (Creature *)FindCreature(ENTRY_KELIDAN, 100, m_creature)) ((boss_kelidan_the_breakerAI*)Kelidan->AI())->ChannelerEngaged(who); 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 e1ea1e03b2f..02bfef63ea1 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 @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI Knockdown_Timer = 10000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index caf29b1f213..035bd8aadfe 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -68,20 +68,6 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance return NULL; } - void HandleGameObject(uint64 guid, uint32 state) - { - Player *player = GetPlayerInMap(); - - if (!player || !guid) - { - debug_log("TSCR: Blood Furnace: HandleGameObject fail"); - return; - } - - if (GameObject *go = GameObject::GetGameObject(*player,guid)) - go->SetGoState(state); - } - void SetData(uint32 type, uint32 data) { switch(type) @@ -89,8 +75,8 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance case DATA_KELIDANEVENT: if( data == DONE ) { - HandleGameObject(Sewer1GUID,0); - HandleGameObject(Sewer2GUID,0); + HandleGameObject(Sewer1GUID, true); + HandleGameObject(Sewer2GUID, true); } break; } 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 e6b8593d0c0..99130528eb8 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 @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public Scripted_NoMovementAI CanPullBack = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { 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 a27c826816b..0e99aea9350 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 @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI UnsummonCheck = 5000; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void JustSummoned(Creature *summoned) { @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI WipeSaid = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -317,7 +317,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(phase==0) { @@ -416,7 +416,7 @@ struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI KidneyShot_Timer = 3000+rand()%4000; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void JustDied(Unit* who) { 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 e955c537bf6..c36f963555c 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 @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI YelledForHeal = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { 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 50db6680e94..96956790019 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 @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI } } - void Aggro(Unit*) {DoZoneInCombat();} + void EnterCombat(Unit*) {DoZoneInCombat();} void AttackStart(Unit *who) {if(!trigger) ScriptedAI::AttackStart(who);} void MoveInLineOfSight(Unit *who) {if(!trigger) ScriptedAI::MoveInLineOfSight(who);} @@ -297,7 +297,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (!InCombat) + if (!m_creature->isInCombat()) { if (RandChat_Timer < diff) { @@ -439,7 +439,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_SHADOW_GRASP_C, false); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index 14046be51e7..8f3a28e02a3 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -189,10 +189,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance case DATA_COLLAPSE: // true - collapse / false - reset for(std::set<uint64>::iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i) - { - if(GameObject *Column = instance->GetGameObject(*i)) - Column->SetGoState(!data); - } + HandleGameObject(*i, data); break; default: break; 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 2c4a4869bb0..2506d2a56aa 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 @@ -168,14 +168,6 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI if (m_creature->Attack(who, true)) { - m_creature->AddThreat(who, 0.0f); - - if (!InCombat) - { - InCombat = true; - Aggro(who); - } - if (Phase) DoStartNoMovement(who); else DoStartMovement(who); } @@ -202,7 +194,7 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -329,7 +321,7 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI return; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { if (pInstance) { @@ -386,7 +378,7 @@ struct TRINITY_DLL_DECL mob_lesser_shadow_fissureAI : public ScriptedAI void Reset() { } void MoveInLineOfSight(Unit *who) { } void AttackStart(Unit* who) { } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } }; CreatureAI* GetAI_boss_grand_warlock_nethekurse(Creature *_Creature) 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 3f4c2d5b62c..a225293a48e 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 @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL mob_omrogg_headsAI : public ScriptedAI uint32 Death_Timer; void Reset() {} - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void DoDeathYell() { @@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoSpawnCreature(ENTRY_LEFT_HEAD,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,90000); DoSpawnCreature(ENTRY_RIGHT_HEAD,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,90000); 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 e72c0adc8e9..33e6468c3e7 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 @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI resetcheck_timer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch (rand()%3) { 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 fbb86e6cabf..27e673f7f29 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 @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI DoScriptText(SAY_INTRO, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%2) { 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 2adbc632155..54d4e4803f4 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL npc_aeranasAI : public ScriptedAI DoScriptText(SAY_SUMMON, m_creature); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -316,7 +316,7 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI m_creature->setFaction(1604); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { if (IsBeingEscorted) DoScriptText(SAY_ELF_AGGRO, m_creature); 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 70a77302823..a5d1fcd3c37 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 @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL npc_converted_sentryAI : public ScriptedAI void MoveInLineOfSight(Unit *who) { return; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } void UpdateAI(const uint32 diff) @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI uint64 PlayerGUID; - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp index c71870b3232..f95ff8ead5a 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 95e34e85622..69fae7d4f72 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 @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp index e488ea26810..d60e057c296 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp @@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI m_creature->SetVisibility(VISIBILITY_ON); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void KilledUnit(Unit *victim) { @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void KilledUnit(Unit *victim) { diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp index b0457b49359..988b0883754 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI pInstance->SetData(DATA_MOROES_EVENT, IN_PROGRESS); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { StartEvent(); @@ -384,7 +384,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI pInstance->SetData(DATA_MOROES_EVENT, NOT_STARTED); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AcquireGUID() { diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp index a60d2106cd9..b3226c7a038 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp @@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_NIGHTBANE_EVENT, IN_PROGRESS); 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 398fc99186b..0d24d4002dd 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp @@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI InfernalPoint *point; void Reset() {} - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) {} void UpdateAI(const uint32 diff) @@ -249,7 +249,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); 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 053f101e39a..d358f9585c1 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 @@ -169,7 +169,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -538,7 +538,7 @@ struct TRINITY_DLL_DECL water_elementalAI : public ScriptedAI CastTimer = 2000 + (rand()%3000); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { 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 13dd8feab34..b504844d924 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp @@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI AmplifyTimer = 2000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(!pInstance) { @@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL mob_demon_chainAI : public ScriptedAI SacrificeGUID = 0; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} @@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI pInstance->SetData(DATA_TERESTIAN_EVENT, NOT_STARTED); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); @@ -369,7 +369,7 @@ struct TRINITY_DLL_DECL mob_karazhan_impAI : public ScriptedAI m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index eb39f79802f..67dd35b46a0 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI TitoDied = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_DOROTHEE_AGGRO, m_creature); } @@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL mob_titoAI : public ScriptedAI YipTimer = 10000; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void JustDied(Unit* killer) { @@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_STRAWMAN_AGGRO, m_creature); } @@ -375,7 +375,7 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI RustCount = 0; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_TINHEAD_AGGRO, m_creature); } @@ -482,7 +482,7 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_ROAR_AGGRO, m_creature); } @@ -554,7 +554,7 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI ChainLightningTimer = 10000; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch(rand()%2) { @@ -619,7 +619,7 @@ struct TRINITY_DLL_DECL mob_cycloneAI : public ScriptedAI MoveTimer = 1000; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void MoveInLineOfSight(Unit* who) { @@ -755,7 +755,7 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI IsChasing = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_WOLF_AGGRO, m_creature); } @@ -978,7 +978,7 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI RomuloDead = false; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) { @@ -1074,7 +1074,7 @@ struct TRINITY_DLL_DECL boss_romuloAI : public ScriptedAI void DamageTaken(Unit* done_by, uint32 &damage); - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_ROMULO_AGGRO, m_creature); if(JulianneGUID) diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index 4afc4d753e3..384ac20822b 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void WaypointReached(uint32 i) { @@ -514,7 +514,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI m_creature->RemoveCorpse(); } } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void MovementInform(uint32 type, uint32 id) { 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 aa619aec3cb..1d27ddd6e2d 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 @@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (pInstance) { @@ -434,7 +434,7 @@ struct TRINITY_DLL_DECL mob_felkael_flamestrikeAI : public ScriptedAI DoCast(m_creature, SPELL_FLAMESTRIKE2, true); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -470,7 +470,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI FakeDeath = false; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void DamageTaken(Unit* pKiller, uint32 &damage) { @@ -569,7 +569,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) @@ -602,7 +602,7 @@ struct TRINITY_DLL_DECL mob_arcane_sphereAI : public ScriptedAI } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) 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 dd4daf745af..ead9e36eed6 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 @@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI } else error_log(ERROR_INST_DATA); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); @@ -377,7 +377,7 @@ struct TRINITY_DLL_DECL boss_priestess_guestAI : public ScriptedAI ResetThreatTimer = 5000 + rand()%15000; // These guys like to switch targets often, and are not meant to be tanked. } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void JustDied(Unit* killer) { @@ -552,7 +552,7 @@ struct TRINITY_DLL_DECL boss_kagani_nightstrikeAI : public boss_priestess_guestA void KilledUnit(Unit* victim); void JustDied(Unit* killer); - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void UpdateAI(const uint32 diff) { @@ -847,7 +847,7 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_guestAI boss_priestess_guestAI::Reset(); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoCast(m_creature, SPELL_BATTLE_SHOUT); } @@ -938,7 +938,7 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_guestAI void KilledUnit(Unit* victim); void JustDied(Unit* killer); - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} };*/ @@ -1234,7 +1234,7 @@ struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_guestAI // // void JustDied(Unit *Killer){} // -// void Aggro(Unit *who){} +// void EnterCombat(Unit *who){} // // void UpdateAI(const uint32 diff) // { 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 bce21249588..d057f0d8932 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 @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); @@ -333,7 +333,7 @@ struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) {} 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 8a2d5ac62b3..6d8bea0a24c 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); @@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL mob_pure_energyAI : public ScriptedAI } } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void MoveInLineOfSight(Unit *who) { } void AttackStart(Unit *who) { } }; 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 bb7c183ff02..914a6b3d578 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 @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI CorruptForces_Timer = 30000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void JustDied(Unit* Killer) { diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp index 960307421d0..c67bebeebb0 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI Landslide_Timer = 0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp index d748220d3cf..db5ad5214d2 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI Invisible = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 4741577a60b..0ecac0e86c4 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI RepulsiveGaze_Timer = 23000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 953ed97cfc6..26361c68e2b 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 @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI LivingBomb_Timer = 35000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 72d2e871f16..3dcb017cf73 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI CheckAdds_Timer = 2000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI Immolate_Timer = 4000; //These times are probably wrong } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 55ed3c6fb38..450d136e0be 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI GehennasCurse_Timer = 12000; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void UpdateAI(const uint32 diff) { 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 b98c4bec979..b2baadc0b03 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp @@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI m_creature->CastSpell(m_creature,SPELL_MAGMASPLASH,true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL mob_core_ragerAI : public ScriptedAI Check_Timer = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 b1d12d5a351..4514f4640dd 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_lucifronAI : public ScriptedAI ShadowShock_Timer = 6000; //6 seconds } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 034344845c6..0738457efae 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp @@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI m_creature->CastSpell(m_creature,SPELL_MAGMASPIT,true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 ccfed05578b..3da7134c471 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 @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI DoScriptText(SAY_SLAY, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 fddbbdeb992..929547ca900 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp @@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public Scripted_NoMovementAI DoScriptText(SAY_KILL, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 1f515f1e32f..89c0163700e 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp @@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI Blink_Timer = 30000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 3efc6d08bbf..dc5b10a25d0 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 @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI Flamespear_Timer = 2000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI Immolate_Timer = 8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp index dfafa193542..66fd81d53b6 100644 --- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp +++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp @@ -317,7 +317,7 @@ public: npc_escortAI::EnterEvadeMode(); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { uint32 rnd = rand()%2; switch(rnd) @@ -353,13 +353,16 @@ public: return; } - if(!InCombat && !Event_onWait && checkPlayer_Timer < diff) + if(!m_creature->isInCombat() && !Event_onWait) { - Player *player = (Player *)Unit::GetUnit((*m_creature), PlayerGUID); - if(player && player->isInCombat() && player->getAttackerForHelper()) - AttackStart(player->getAttackerForHelper()); - checkPlayer_Timer = 1000; - } else if(!InCombat && !Event_onWait) checkPlayer_Timer -= diff; + if(checkPlayer_Timer < diff) + { + Player *player = (Player *)Unit::GetUnit((*m_creature), PlayerGUID); + if(player && player->isInCombat() && player->getAttackerForHelper()) + AttackStart(player->getAttackerForHelper()); + checkPlayer_Timer = 1000; + }else checkPlayer_Timer -= diff; + } if(Event_onWait && Event_Timer < diff) { diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index 85d5d8a1d53..16ba4686719 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL npc_kyle_frenziedAI : public ScriptedAI m_creature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); m_creature->GetMotionMaster()->Initialize(); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void SpellHit(Unit *caster, const SpellEntry* spell) { // we can feed him without any quest @@ -233,7 +233,7 @@ struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI amountWP = 49; } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void MovementInform(uint32 type, uint32 id) { diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp index 8b43005b5df..25a27ac3a73 100644 --- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp +++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL mob_shattered_rumblerAI : public ScriptedAI Spawn = false; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) { @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (m_creature->HasAura(SPELL_VISUAL_SLEEP)) m_creature->RemoveAura(SPELL_VISUAL_SLEEP); @@ -229,7 +229,7 @@ struct TRINITY_DLL_DECL mob_sunspring_villagerAI : public ScriptedAI m_creature->SetStandState(UNIT_STAND_STATE_DEAD); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -525,7 +525,7 @@ struct TRINITY_DLL_DECL npc_creditmarker_visit_with_ancestorsAI : public Scripte void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void MoveInLineOfSight(Unit *who) { @@ -584,7 +584,7 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void MoveInLineOfSight(Unit *who) { diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp index 815b273d185..afc0957fc43 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public ScriptedAI DoScriptText(SAY_SLAY, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp index 5fafebadb96..5ec67a8920b 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public ScriptedAI HasTaunted = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch (rand()%4) { 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 a51573d745d..7e77afa7167 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp @@ -62,7 +62,7 @@ ShieldWall2 = true; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_BLAU_AGGRO, m_creature); } @@ -149,7 +149,7 @@ { } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch(rand()%3) { @@ -218,7 +218,7 @@ ShieldWall2 = true; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_KORT_AGGRO, m_creature); } @@ -313,7 +313,7 @@ ShieldWall2 = true; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_ZELI_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp index 5fb9f017b0a..7a064fb922c 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp @@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_gluthAI : public ScriptedAI Summon_Timer = 10000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index 952fb5504ce..4e74445d2cd 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public ScriptedAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch(rand()%3) { diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp index aceaba93b1f..3d50e8f084b 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_loathebAI : public ScriptedAI Summon_Timer = 8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp index 6c41ad1b022..937dd8bbb6d 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp @@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL mob_webwrapAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public ScriptedAI Enraged = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp index 43be957aa81..03f17450c5e 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_nothAI : public ScriptedAI Summon_Timer = 12000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch (rand()%3) { diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp index 6b2083f6b5c..edbfd760b9e 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp @@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (rand()%2) { diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp index 9054e89dc26..64147eaea8a 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp @@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public ScriptedAI DoPlaySoundToSet(m_creature, SOUND_DEATH); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { switch (rand()%3) { diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp index 7842bb238b1..eecbb9cf980 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index 7704247cf90..5991777c5d7 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI Creature* add = NULL; } - void Aggro(Unit *who) { return; } + void EnterCombat(Unit *who) { return; } /*void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -391,7 +391,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI isEvent = false; } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } //Select any creature in a grid Creature* SelectCreatureInGrid(uint32 entry, float range) @@ -814,7 +814,7 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI ManaBurnTimer = 5000 + (rand()%3 * 1000); // 5-8 sec cd } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(Player *player = who->GetCharmerOrOwnerPlayerOrPlayerItself()) PlayerGUID = player->GetGUID(); @@ -961,7 +961,7 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI summoned->AI()->AttackStart(m_creature); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void Reset() { diff --git a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp index 25a156b1bc4..def7d32fa12 100644 --- a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_malygosAI : public ScriptedAI //Source Deadly Boss Mod enrage = 615000; //10 min } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { if(phase == 1) DoScriptText(SAY_PHASE1_AGGRO, m_creature); diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp index 559a9081226..d06129ac2b2 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp @@ -34,7 +34,7 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI boss_anomalusAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL mob_crazed_mana_wraithAI : public ScriptedAI mob_crazed_mana_wraithAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { //Return since we have no target @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL npc_chaotic_riftAI : public ScriptedAI npc_chaotic_riftAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { //Return since we have no target diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp index 7c764c3ec1a..05679a3f9d5 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp @@ -37,7 +37,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI { enraged = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp index 0d97b530376..ee8018ecfc4 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI { splited = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp index d4dcbae6616..d134cc43244 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI { frenzy = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp index b8715fb6d7d..ece7877cc7a 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp @@ -27,7 +27,7 @@ struct TRINITY_DLL_DECL boss_commander_kolurgAI : public ScriptedAI boss_commander_kolurgAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp index 26ef1fc5f97..6f3236629c7 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp @@ -27,7 +27,7 @@ struct TRINITY_DLL_DECL boss_commander_stoutbeardAI : public ScriptedAI boss_commander_stoutbeardAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp index eca9760262c..6ecb53f1ccb 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_drakosAI : public ScriptedAI boss_drakosAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp index abfa904beb6..4ab0ca59bdf 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_eregosAI : public ScriptedAI uint32 phase; void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp index f7d35d014dd..793696ac2cd 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_uromAI : public ScriptedAI boss_uromAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp index 272196008f2..a14f616fc01 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_varosAI : public ScriptedAI boss_varosAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp b/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp index 73e6157c600..7e71a0f527f 100644 --- a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp +++ b/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI { berserk = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_SARTHARION_DEATH,m_creature); } @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL mob_vesperonAI : public ScriptedAI mob_vesperonAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_VESPERON_AGGRO,m_creature); } @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL mob_shadronAI : public ScriptedAI mob_shadronAI(Creature *c) : ScriptedAI(c) {} void Reset(){} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_SHADRON_AGGRO,m_creature); } @@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL mob_tenebronAI : public ScriptedAI mob_tenebronAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_TENEBRON_AGGRO,m_creature); } @@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL mob_whelpAI : public ScriptedAI uint32 Fade_armor_Timer; void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { //Return since we have no target 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 98e9322aad6..a969c85f38c 100644 --- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp @@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); DoZoneInCombat(); diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp index 1c2822b24b1..5b328aee776 100644 --- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp @@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI playerGUID = 0; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void UpdateAI(const uint32 diff) { @@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI Shock_Timer = 8000; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { 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 9c089fddf71..89fff0d3fd7 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 @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_amnennar_the_coldbringerAI : public ScriptedAI Hp = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 8a65b493c5a..eef07d16591 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -100,7 +100,7 @@ npc_willixAI(Creature *c) : npc_escortAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO1, m_creature, NULL); } 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 be15a35f032..60830068e01 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 @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_ayamissAI : public ScriptedAI phase=1; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { pTarget = who; } 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 f164009c79b..69d1babf173 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 @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI SANDTRAP_Timer = 30000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { pTarget = who; } 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 df0e63f8599..df542a69693 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 @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI DRAINMANA_Timer = 30000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(EMOTE_AGGRO, m_creature); pTarget = who; 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 533adf732f3..454abb1602d 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 @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI bShielded = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 5975d5f7e57..2e2bb14a711 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 @@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI Terrify_Timer = 20000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 351a72db2fc..c8ca71dff7c 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 @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI FireNova_Timer = 40000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 9d1b447e746..9d0031f2af2 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 @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI uint32 spell; uint32 spell2; void Reset(){} - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void SetType(uint32 _type) { Creaturetype = _type; @@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI laugh = 15000 + rand()%16 * 1000; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void SaySound(int32 textEntry, Unit *target = 0) { DoScriptText(textEntry, m_creature, target); @@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI ++id; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); @@ -737,7 +737,7 @@ struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void SpellHit(Unit *caster, const SpellEntry *spell) { 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 956fa26bdac..913097c4918 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI Whirlwind_Timer = 60000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); DoCast(m_creature,SPELL_RUSHINGCHARGE); @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL mob_scarlet_traineeAI : public npc_escortAI void Reset() { } void WaypointReached(uint32 uiPoint) { } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void UpdateAI(const uint32 diff) { 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 a188fe9c3f2..d477483b125 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 @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI MindBlast5_Timer = 20000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 7f812310be3..370ed9aedc8 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 @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_houndmaster_lokseyAI : public ScriptedAI Enrage_Timer = 0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 34d5a7fff37..f062419c6c1 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 @@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_interrogator_vishasAI : public ScriptedAI ShadowWordPain_Timer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 bde26d42478..9bbe880cc69 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 @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI BlessingOfProtection3_Timer = 45000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_MO_AGGRO, m_creature); DoCast(m_creature,SPELL_RETRIBUTIONAURA3); @@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI MindBlast6_Timer = 6000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_WH_INTRO, m_creature); } 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 642c884ebc8..d4e2a1f5f69 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_scornAI : public ScriptedAI FrostNova_Timer = 30000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 46f216220aa..7dccb8c5e56 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI Teleport_Timer = 16000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 8bb3703fa8b..5840b782575 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 @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_death_knight_darkreaverAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } }; 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 96afbfe1971..74f7f2a13a1 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 @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 02f4c9bc5a4..ff63af2719d 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 2790e36ddaf..4b262f625aa 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 d2890801b5d..26e296c3f54 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp @@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI Invisible = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp index 8fdda4d2f33..60b805f1db1 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp @@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI Mages = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 ddf3c3b083d..fe9ff752dc7 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 @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 040cafc91fc..62409b26442 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 fbb1e355f1d..9c0c8e29ff4 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp @@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI m_creature->CastSpell(m_creature,SPELL_ICEARMOR,true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 aea8b476ad2..64172abe45c 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp index 2ade6f7fd4d..55a50724294 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI Frenzy_Timer = 0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp index bd3ae444ecb..caf18778abb 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp @@ -112,20 +112,6 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance } } - void HandleGameObject(uint64 guid, uint32 state) - { - Player *player = GetPlayerInMap(); - - if (!player || !guid) - { - debug_log("TSCR: Instance Shadowfang Keep: HandleGameObject fail"); - return; - } - - if (GameObject *go = GameObject::GetGameObject(*player,guid)) - go->SetGoState(state); - } - void DoSpeech() { Player* pPlayer = GetPlayerInMap(); 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 f4b49b5f524..3c557118f3b 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp @@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL npc_shadowfang_prisonerAI : public npc_escortAI } void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} }; CreatureAI* GetAI_npc_shadowfang_prisoner(Creature* pCreature) 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 ea84a299403..f46476df98a 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 6ead5c42082..426b0eb0202 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL mob_mature_netherwing_drakeAI : public ScriptedAI CastTimer = 5000; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void MoveInLineOfSight(Unit* who) { @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI m_creature->SetVisibility(VISIBILITY_ON); } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void SpellHit(Unit* caster, const SpellEntry* spell) { @@ -318,7 +318,7 @@ struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI PoisonTimer = 0; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void SpellHit(Unit* caster, const SpellEntry* spell) { @@ -690,7 +690,7 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI Event = false; } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void StartEvent() { @@ -867,7 +867,7 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI bool Completed; - void Aggro(Unit *who) + void EnterCombat(Unit *who) { Player* player = Unit::GetPlayer(PlayerGUID); @@ -1168,7 +1168,7 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI Timers = false; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void JustDied(Unit* slayer); void UpdateAI(const uint32 diff) @@ -1281,7 +1281,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI m_creature->SetUInt64Value(UNIT_FIELD_TARGET, 0); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void HandleAnimation() { @@ -1436,7 +1436,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI m_creature->SetVisibility(VISIBILITY_OFF); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void AttackStart(Unit* who) {} @@ -1695,7 +1695,7 @@ struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI void Reset() { } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void JustDied(Unit* killer) { diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index 6a83b2fbd89..e346b9c25fc 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL npc_raliq_the_drunkAI : public ScriptedAI m_creature->setFaction(FACTION_FRIENDLY_RD); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI m_creature->setFaction(FACTION_FRIENDLY_SA); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void DamageTaken(Unit *done_by, uint32 &damage) { @@ -319,7 +319,7 @@ public: } } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void MoveInLineOfSight(Unit *who) { @@ -437,7 +437,7 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI } } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void UpdateAI(const uint32 diff) { diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp index b8119f82d6b..982c00dfcab 100644 --- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI spellHit = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 c975dea89cf..3d61a6b0e87 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL npc_astor_hadrenAI : public ScriptedAI m_creature->setFaction(68); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } @@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch(rand()%2) { 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 fcb44c764f3..e600888905a 100644 --- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI void Reset(){} - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void JustDied(Unit* killer) { diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index 64c3df4f0c3..8212cb27254 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL npc_bartlebyAI : public ScriptedAI } } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} }; bool QuestAccept_npc_bartleby(Player *player, Creature *_Creature, Quest const *_Quest) @@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI } } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} }; bool QuestAccept_npc_dashel_stonefist(Player *player, Creature *_Creature, Quest const *_Quest) 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 2a46fe4d5dd..f4233e5dd94 100644 --- a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp +++ b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI return; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { 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 aa897761344..d3a6db26e02 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI SummonSkeletons_Timer = 34000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (pInstance) pInstance->SetData(TYPE_BARON,IN_PROGRESS); 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 57f70cf33dd..f154cefa545 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp @@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI //Possess_Timer = 35000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 a91c67c9c0d..e5a74cbc144 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 @@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 5b85cdc07fe..8372393f2f7 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI m_creature->SummonCreature(10698,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 9402c601219..5be1f35dc93 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_HUMAN); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 e08c97965b1..d010bcf07f3 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 @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI DrainLife_Timer = 31000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp index 3233e5c9c50..be7aa5d1e2a 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI RaiseUndeadScarab_Timer = 3000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 9c2084f6cec..e673652fc7e 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 @@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } 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 a8ed628ffc0..fb27ae43928 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI HasYelled = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 6ef1477ff35..cbc615f9825 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 @@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI Knockout_Timer = 12000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 0555c5da57d..a3330d4710a 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 @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI HasYelled = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (!HasYelled) { diff --git a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp index 8ded80bb36e..988667ebe5c 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance if (withRestoreTime) go->UseDoorOrButton(10); else - go->SetGoState(newState); + go->SetGoState((GOState)newState); } } diff --git a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp index d7f16105f07..d843be2ee73 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL mob_freed_soulAI : public ScriptedAI } } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } }; CreatureAI* GetAI_mob_freed_soul(Creature *_Creature) @@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL mob_restless_soulAI : public ScriptedAI Tagged = false; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI Tagged = false; } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void SpellHit(Unit *caster, const SpellEntry *spell) { 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 e848557f859..481f14f1a7d 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI pInstance->SetData(DATA_BRUTALLUS, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(YELL_AGGRO, m_creature); 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 34f0f98fef4..95c0fe29502 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 @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); if(pInstance) @@ -410,7 +410,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI IntroYell_Timer = 10000; } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); if(pInstance) @@ -440,11 +440,9 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI float attackRadius = m_creature->GetAttackDistance(who); if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) { - if (!InCombat) + if (!m_creature->isInCombat()) { DoStartNoMovement(who); - Aggro(who); - InCombat = true; } } } @@ -700,7 +698,7 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void SpellHitTarget(Unit* target,const SpellEntry* spell) { 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 dfaaadcd889..b9bda8fa422 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI m_creature->setActive(false); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->setActive(true); DoZoneInCombat(); @@ -523,7 +523,7 @@ struct TRINITY_DLL_DECL mob_felmyst_vaporAI : public ScriptedAI m_creature->SetSpeed(MOVE_RUN, 0.8); } void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoZoneInCombat(); //m_creature->CastSpell(m_creature, SPELL_VAPOR_FORCE, true); core bug @@ -545,7 +545,7 @@ struct TRINITY_DLL_DECL mob_felmyst_trailAI : public ScriptedAI m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01); // core bug } void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) {} 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 615bcdf4476..ef7cd79f9c0 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI damage = 0; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { m_creature->SetStandState(UNIT_STAND_STATE_STAND); DoScriptText(SAY_EVIL_AGGRO, m_creature); @@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI isBanished = false; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { Creature *Kalec = m_creature->SummonCreature(MOB_KALEC, m_creature->GetPositionX() + 10, m_creature->GetPositionY() + 5, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); if(Kalec) @@ -455,7 +455,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI isEnraged = false; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void DamageTaken(Unit *done_by, uint32 &damage) { diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp index 04ffd78c14b..5c2c6a57f46 100644 --- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp +++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(AGGRO_YELL_AQUE, m_creature, who); } @@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI } } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void Reset() { } void UpdateAI(const uint32 diff) @@ -395,7 +395,7 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI void Reset(){} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch (rand()%2) { 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 c99e2fcb5ec..04963bf02c2 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp @@ -102,20 +102,12 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI { if (m_creature->Attack(who, true)) { - m_creature->AddThreat(who, 0.0f); - - if (!InCombat) - { - InCombat = true; - Aggro(who); - } - //TODO: Make it so he moves when target out of range DoStartNoMovement(who); } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -301,11 +293,11 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI float attackRadius = m_creature->GetAttackDistance(who)/10; if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) ) - Aggro(who); + EnterCombat(who); } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(YELL_INTRO1, m_creature); DoCast(m_creature,SPELL_BUBBLE_VISUAL); @@ -499,7 +491,7 @@ struct TRINITY_DLL_DECL mob_zerekethvoidzoneAI : public ScriptedAI DoCast(m_creature,SPELL_VOID_ZONE_DAMAGE); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} }; CreatureAI* GetAI_mob_zerekethvoidzoneAI(Creature *_Creature) { 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 6203942cf37..9a9e0aa0966 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 @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void JustDied(Unit* Killer) { @@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyriss_illusionAI : public ScriptedAI void Reset() { } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } }; CreatureAI* GetAI_boss_harbinger_skyriss_illusion(Creature *_Creature) 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 85a644f7ab8..13e65b9e416 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 @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI MoveFree = true; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 9a276ead142..69abca68dff 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 @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI CanSummon = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 bbd18dee029..4dd70cb7d20 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 @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL mob_treantAI : public ScriptedAI check_Timer = 0; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit*) {} @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI m_creature->SetSpeed( MOVE_RUN, 0.7f, true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } 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 3e5bbbf66da..52c67125ee7 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 @@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI m_creature->setActive(false); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS); @@ -435,7 +435,7 @@ struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI bool toDie; void Reset() {toDie = false;} - void Aggro(Unit *who) {DoZoneInCombat();} + void EnterCombat(Unit *who) {DoZoneInCombat();} void EnterEvadeMode() {m_creature->setDeathState(JUST_DIED);} void DamageTaken(Unit* pKiller, uint32 &damage) @@ -486,7 +486,7 @@ struct TRINITY_DLL_DECL mob_flame_patch_alarAI : public ScriptedAI { mob_flame_patch_alarAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) {} 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 340d3f23fc8..41087682670 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 @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { StartEvent(); } @@ -408,7 +408,7 @@ struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI aoesilenceTimer = 15000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 dab1f5aa816..d2784e55d77 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 @@ -348,7 +348,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI IsCastingFireball = false; ChainPyros = false; - if(InCombat) + if(m_creature->isInCombat()) PrepareAdvisors(); DeleteLegs(); @@ -467,7 +467,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (pInstance && !pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); @@ -1048,7 +1048,7 @@ struct TRINITY_DLL_DECL boss_thaladred_the_darkenerAI : public advisorbase_ai DoScriptText(SAY_THALADRED_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1120,7 +1120,7 @@ struct TRINITY_DLL_DECL boss_lord_sanguinarAI : public advisorbase_ai DoScriptText(SAY_SANGUINAR_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1188,19 +1188,11 @@ struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_ if (m_creature->Attack(who, true)) { - m_creature->AddThreat(who, 0.0f); - - if (!InCombat) - { - InCombat = true; - Aggro(who); - } - DoStartMovement(who, CAPERNIAN_DISTANCE, M_PI/2); } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1302,7 +1294,7 @@ struct TRINITY_DLL_DECL boss_master_engineer_telonicusAI : public advisorbase_ai DoScriptText(SAY_TELONICUS_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1364,7 +1356,7 @@ struct TRINITY_DLL_DECL mob_kael_flamestrikeAI : public ScriptedAI m_creature->setFaction(14); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -1430,7 +1422,7 @@ struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI m_creature->CastSpell(m_creature,SPELL_BURN,true); } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void DamageTaken(Unit* pKiller, uint32 &damage) { @@ -1487,16 +1479,11 @@ struct TRINITY_DLL_DECL mob_phoenix_egg_tkAI : public ScriptedAI { if (m_creature->Attack(who, false)) { - if (!InCombat) - { - InCombat = true; - Aggro(who); - } DoStartNoMovement(who); } } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void JustSummoned(Creature* 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 65c8d2f87f3..d5648e3a8ff 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 @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI pInstance->SetData(DATA_VOIDREAVEREVENT, DONE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); 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 7d73e08d9e5..89d5e04e0c3 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 @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI Knockaway_Timer = 25000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 9bc8afc8aef..34e131ba013 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 @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI Stream_of_Machine_Fluid_Timer = 55000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO_1, m_creature); } 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 b8cd2fc0cbe..beb663b5947 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 @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI pInstance->SetData(DATA_NETHERMANCER_EVENT, NOT_STARTED); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS); @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI m_creature->SetSpeed(MOVE_RUN, HeroicMode ? 0.7f : 0.5f); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } 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 59f1748c9a5..ddfcf6bda0a 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 @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI Counter = 0; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { } 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 64c4fdae2c8..d34c83aef92 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 @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI Death = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -244,7 +244,7 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 47cd5bed6ed..e3c10237635 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 @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL flesh_tentacleAI : public Scripted_NoMovementAI CheckTimer = 1000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI pInst->SetData(DATA_CTHUN_PHASE, 0); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } @@ -498,7 +498,7 @@ struct TRINITY_DLL_DECL cthunAI : public Scripted_NoMovementAI pInst->SetData(DATA_CTHUN_PHASE, 0); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } @@ -941,7 +941,7 @@ struct TRINITY_DLL_DECL eye_tentacleAI : public Scripted_NoMovementAI KillSelfTimer = 35000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } @@ -1003,7 +1003,7 @@ struct TRINITY_DLL_DECL claw_tentacleAI : public Scripted_NoMovementAI EvadeTimer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } @@ -1099,7 +1099,7 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public Scripted_NoMovementAI EvadeTimer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } @@ -1197,7 +1197,7 @@ struct TRINITY_DLL_DECL giant_eye_tentacleAI : public Scripted_NoMovementAI BeamTimer = 500; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); } 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 9315817a460..d53b9d78511 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 @@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI ((CreatureAI*)Spawn->AI())->AttackStart(victim); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 3456fd19d87..d846fc18aa0 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 @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI Berserk = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 a5721c4bc92..d66cdb8e6ba 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 @@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI Submerged = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoCast(m_creature->getVictim(), SPELL_BIRTH); } 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 b1a0b4bdfea..bcae80fcf3e 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 @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } 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 c4f9401f869..ae2c48742d6 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 @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (IsImage || Images75) return; 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 0abaf8e79d9..e98daf7cc11 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 @@ -140,17 +140,16 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(m_creature, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoZoneInCombat(); - InCombat = true; Creature *pOtherBoss = GetOtherBoss(); if (pOtherBoss) { // TODO: we should activate the other boss location so he can start attackning even if nobody // is near I dont know how to do that ScriptedAI *otherAI = (ScriptedAI*)pOtherBoss->AI(); - if (!otherAI->InCombat) + if (!pOtherBoss->isInCombat()) { DoPlaySoundToSet(m_creature, IAmVeklor() ? SOUND_VL_AGGRO : SOUND_VN_AGGRO); otherAI->AttackStart(who); @@ -604,12 +603,6 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI m_creature->GetMotionMaster()->MoveChase(who, VEKLOR_DIST, 0); m_creature->AddThreat(who, 0.0f); } - - if (!InCombat) - { - InCombat = true; - Aggro(who); - } } } }; 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 0899fa5a610..30106f62180 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 @@ -264,7 +264,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (gatherOthersWhenAggro) GetOtherSentinels(who); 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 7c77bb3c10a..f1abe49c46e 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI m_creature->setFaction(FACTION_HOSTILE); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void DoNice() { @@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL mob_infested_root_walkerAI : public ScriptedAI mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void DamageTaken(Unit *done_by, uint32 &damage) { @@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL mob_rotting_forest_ragerAI : public ScriptedAI mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void DamageTaken(Unit *done_by, uint32 &damage) { @@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL mob_netherweb_victimAI : public ScriptedAI mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void MoveInLineOfSight(Unit *who) { } void JustDied(Unit* Killer) @@ -268,7 +268,7 @@ struct TRINITY_DLL_DECL npc_floonAI : public ScriptedAI m_creature->setFaction(FACTION_FRIENDLY_FL); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -415,7 +415,7 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI m_creature->setFaction(1660); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void JustDied(Unit* killer) { 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 4c9c76010ca..b4d89470229 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -75,7 +75,7 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {} m_creature->setFaction(104); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void JustSummoned(Creature* summoned) { @@ -217,7 +217,7 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI ChickenTimer = 0; } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void TransformHuman(uint32 emoteid) { 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 8038b7e4c34..fbc248cde94 100644 --- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI Uppercut_Timer = 10000; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { 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 e7028c14c91..78619c47782 100644 --- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp @@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); } - void Aggro(Unit* who) { } + void EnterCombat(Unit* who) { } void JustDied(Unit* Killer) { diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp index adf88585a39..56c1d0d3f9d 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->setFaction (14); m_creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI m_creature->RemoveAllAuras(); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->setFaction (14); m_creature->RemoveAllAuras(); @@ -369,7 +369,7 @@ struct TRINITY_DLL_DECL mob_stonekeepersAI : public ScriptedAI m_creature->RemoveAllAuras(); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { m_creature->setFaction (14); m_creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp index 030a5937caa..ccee1e68790 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI hasCastedWstomp = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp index cf30cdb8824..8498b3b5770 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI Cslumber_Timer = 2000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp index 48ecfdbbcbf..d9022fcf445 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp @@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI uint32 whirlwind; void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp index 1760c8d0032..30d1ac40fad 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI boss_ionarAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL npc_spark_of_ionarAI : public ScriptedAI npc_spark_of_ionarAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp index e8b991a5172..c479f6c7a93 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp @@ -39,7 +39,7 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI boss_lokenAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp index a613a084f02..8cc20f64c17 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -37,7 +37,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI boss_volkhanAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL mob_molten_golemAI : public ScriptedAI mob_molten_golemAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp index e58c2f8a2ac..662e67a8941 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp @@ -31,7 +31,7 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI boss_krystallusAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index f179e8d7a73..3b7ae182d70 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -34,7 +34,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp index ddb048ee241..852395cf3b8 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp @@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI boss_sjonnirAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp index 2fe97b343a2..b4e12f60ead 100644 --- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp +++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI targetGUID = 0; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void JustSummoned(Creature *summoned) { @@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI EventCast = true; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { 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 9bb13dd7718..c3987526126 100644 --- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI DEMORALIZINGSHOUT_Timer = 5000; } - void Aggro(Unit* who) + void EnterCombat(Unit* who) {} void JustSummoned(Creature* summoned) diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 76823289ba5..ac4b22bb2f7 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI DoScriptText(YELL_AGGRO_2,m_creature); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(YELL_AGGRO_1,m_creature); @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { if(Resurect_Timer) @@ -411,7 +411,7 @@ struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI } void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { if(Despawn_Timer < diff) diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp index 6e99f204666..3ba7d16dd41 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI } void Reset(){ FrostTombGUID = 0; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} @@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); DoZoneInCombat(); @@ -227,7 +227,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI isDead = false; } - void Aggro(Unit *who){} + void EnterCombat(Unit *who){} void DamageTaken(Unit *done_by, uint32 &damage) { if(done_by->GetGUID() == m_creature->GetGUID()) diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index 667baa3a781..40b365736cf 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(!ghost) { @@ -244,7 +244,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(!ghost) { diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp index e0e243cbed9..d1cf7ad33bc 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp @@ -82,20 +82,6 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance return NULL; } - void HandleGameObject(uint64 guid, uint32 state) - { - Player *player = GetPlayerInMap(); - - if (!player || !guid) - { - debug_log("TSCR: Utgarde Keep: HandleGameObject fail"); - return; - } - - if (GameObject *go = GameObject::GetGameObject(*player,guid)) - go->SetGoState(state); - } - void OnCreatureCreate(Creature *creature, uint32 creature_entry) { switch(creature_entry) diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index d2351f1f458..16d8c33d889 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -27,7 +27,7 @@ struct TRINITY_DLL_DECL boss_palehoofAI : public ScriptedAI boss_palehoofAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index e08f249b036..ee6208ce65c 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI uint32 phase; void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index 30064208cc3..39306430a29 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI boss_svalaAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp index 527a18d9af4..ff1c5390659 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp @@ -37,7 +37,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI boss_ymironAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp index 9eb629f2f5f..824ab27259e 100644 --- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp +++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp @@ -37,7 +37,7 @@ struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI boss_archavonAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { //Return since we have no target @@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL mob_warderAI : public ScriptedAI //npc 32353 mob_warderAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void UpdateAI(const uint32 diff) { //Return since we have no target diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp index cf6833d94bb..c3a7dd550f5 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI boss_cyanigosaAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp index c74b3e28b6f..46b88666e6f 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI boss_erekemAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp index 871eba33c32..ae10e434f78 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp @@ -34,7 +34,7 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI boss_ichoronAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp index 2f88a6f2e30..525a1969328 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp @@ -22,7 +22,7 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI boss_lavanthorAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp index 72be8a72632..87cc0a1fb5f 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp @@ -20,7 +20,7 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI boss_moraggAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp index e8653018cc9..16d00aba3c6 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI boss_xevozzAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp index e14c3ba672d..3eb91c1d47a 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI uint32 void_shift; void Reset() {} - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); } 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 70033f7c97b..5ab59db8c40 100644 --- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL npc_the_scourge_cauldronAI : public ScriptedAI void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void DoDie() { diff --git a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp index 6eef452270d..a865b763ae5 100644 --- a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp +++ b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI break; } } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { switch(rand()%2) { diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp index ebe549a0599..df3fe6dd0fe 100644 --- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp @@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL npc_cooshcooshAI : public ScriptedAI m_creature->setFaction(FACTION_FRIENDLY_CO); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { @@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL npc_kayra_longmaneAI : public npc_escortAI m_creature->setFaction(1660); } - void Aggro(Unit* who){} + void EnterCombat(Unit* who){} void JustSummoned(Creature *summoned) { diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp index 246ec7eb4b2..f31f944a3d4 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI SetWeather(WEATHER_STATE_FINE, 0.0f); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_ONAGGRO); @@ -381,16 +381,7 @@ struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI m_creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void Aggro(Unit *who) {DoZoneInCombat();} - - void AttackStart(Unit *who) - { - if (!InCombat) - { - Aggro(who); - InCombat = true; - } - } + void EnterCombat(Unit *who) {DoZoneInCombat();} void MoveInLineOfSight(Unit *) {} diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp index b9601764d1b..279e8985774 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI EnterPhase(PHASE_LYNX); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); @@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void Aggro(Unit *who) {/*DoZoneInCombat();*/} + void EnterCombat(Unit *who) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp index 95db93e71fb..9587bc167ba 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_hexlord_addAI : public ScriptedAI void Reset() {} - void Aggro(Unit* who) {DoZoneInCombat();} + void EnterCombat(Unit* who) {DoZoneInCombat();} void UpdateAI(const uint32 diff) { @@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE ); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { if(pInstance) pInstance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS); @@ -525,12 +525,6 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI m_creature->GetMotionMaster()->MoveChase(who, 20); m_creature->AddThreat(who, 0.0f); } - - if (!InCombat) - { - Aggro(who); - InCombat = true; - } } } @@ -610,12 +604,6 @@ struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI m_creature->GetMotionMaster()->MoveChase(who, 20); m_creature->AddThreat(who, 0.0f); } - - if (!InCombat) - { - Aggro(who); - InCombat = true; - } } } @@ -730,12 +718,6 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI m_creature->GetMotionMaster()->MoveChase(who, 20); m_creature->AddThreat(who, 0.0f); } - - if (!InCombat) - { - Aggro(who); - InCombat = true; - } } } diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index 5c1d9177d6b..852be55c195 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); @@ -463,7 +463,7 @@ struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_FIRE_BOMB_DUMMY, true); } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} @@ -542,7 +542,7 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI return true; } - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit*) {} void MoveInLineOfSight(Unit*) {} void MovementInform(uint32, uint32) @@ -629,7 +629,7 @@ struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI m_creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void Aggro(Unit *who) {/*DoZoneInCombat();*/} + void EnterCombat(Unit *who) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { @@ -662,7 +662,7 @@ struct TRINITY_DLL_DECL mob_eggAI : public ScriptedAI { mob_eggAI(Creature *c) : ScriptedAI(c){} void Reset() {} - void Aggro(Unit* who) {} + void EnterCombat(Unit* who) {} void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) {} diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp index 0212e4005f5..8f2efe7189f 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp @@ -258,7 +258,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp index 4150e0ec393..16c3dd3f333 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp @@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI //m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if(pInstance) pInstance->SetData(DATA_ZULJINEVENT, IN_PROGRESS); @@ -577,7 +577,7 @@ struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI void Reset() {} - void Aggro(Unit* target) {} + void EnterCombat(Unit* target) {} void SpellHit(Unit *caster, const SpellEntry *spell) { diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp index 62130f9a863..8bc21dbba1d 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp @@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI void Reset() { } - void Aggro(Unit *who) { } + void EnterCombat(Unit *who) { } void DoSpawnRandom() { @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL npc_zulaman_hostageAI : public ScriptedAI bool IsLoot; uint64 PlayerGUID; void Reset() {} - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void JustDied(Unit *) { Player* player = Unit::GetPlayer(PlayerGUID); diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp index b53855990b3..bdc5c264c51 100644 --- a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL npc_sergeant_blyAI : public ScriptedAI pInstance->SetData(0, NOT_STARTED);*/ } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { /*if( pInstance ) pInstance->SetData(0, IN_PROGRESS);*/ @@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL npc_weegli_blastfuseAI : public ScriptedAI pInstance->SetData(0, NOT_STARTED);*/ } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { /*if( pInstance ) pInstance->SetData(0, IN_PROGRESS);*/ diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp index 102fef21467..1b75cd12ee6 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp index e5e727b4843..c5f45901245 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp @@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI Slam_Timer = 17000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp index dce2e76e157..6a7455e731e 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_grilekAI : public ScriptedAI GroundTremor_Timer = 8000 + rand()%8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp index 592129b88da..0de85d55986 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI Enraged = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp index bd341fdaf40..a8de44dc712 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp @@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI Illusions_Timer = 10000 + rand()%8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp index 62a057dc2cb..67231fd69bd 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp @@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI PhaseTwo = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); DoCast(m_creature,SPELL_BAT_FORM); @@ -229,7 +229,7 @@ struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void UpdateAI (const uint32 diff) { diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp index 4ea62662ef9..d1cf79ed183 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI Teleport_Timer = 5000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI Heal_Timer = 2000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_INVISIBLE,true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp index 7ad5be3fefd..13eac015d6d 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL mob_ohganAI : public ScriptedAI SunderArmor_Timer = 5000; } - void Aggro(Unit *who) {} + void EnterCombat(Unit *who) {} void JustDied(Unit* Killer) { diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp index 44606438a02..7d18ed5a14f 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI LevelUp_Timer = 3000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp index 42742437fec..9881555aaf3 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI Ambushed = false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp index 7a753dc9e01..72594a0b8f8 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI pInstance->SetData(DATA_THEKAL_ALIVE, 0); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } @@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } @@ -402,7 +402,7 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp index 1dff6b63dbe..ea939289696 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI InBerserk= false; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp index 1776dfc5868..9c6aab1a0e4 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI LightningWave_Timer = 8000 + rand()%8000; } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { } diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index b201aafe4dd..4eebbcd3fc8 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -1057,7 +1057,7 @@ void CreatureEventAI::Reset() } break; //default: - //TODO: enable below code line / verify this is correct to enable events previously disabled (ex. aggro yell), instead of enable this in void Aggro() + //TODO: enable below code line / verify this is correct to enable events previously disabled (ex. aggro yell), instead of enable this in void EnterCombat() //(*i).Enabled = true; //(*i).Time = 0; //break; diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index d702ea6d047..97acf08ce8c 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -83,7 +83,7 @@ bool OutdoorPvPObjective::AddObject(uint32 type, uint32 entry, uint32 map, float data.spawntimesecs = 0; data.animprogress = 100; data.spawnMask = 1; - data.go_state = 1; + data.go_state = GO_STATE_READY; objmgr.AddGameobjectToGrid(guid, &data); @@ -95,7 +95,7 @@ bool OutdoorPvPObjective::AddObject(uint32 type, uint32 entry, uint32 map, float if(!pMap) return true; GameObject * go = new GameObject; - if(!go->Create(guid,entry, pMap,PHASEMASK_NORMAL,x,y,z,o,rotation0,rotation1,rotation2,rotation3,100,1)) + if(!go->Create(guid,entry, pMap,PHASEMASK_NORMAL,x,y,z,o,rotation0,rotation1,rotation2,rotation3,100,GO_STATE_READY)) { sLog.outError("Gameobject template %u not found in database.", entry); delete go; @@ -238,7 +238,7 @@ bool OutdoorPvPObjective::AddCapturePoint(uint32 entry, uint32 map, float x, flo data.spawntimesecs = 1; data.animprogress = 100; data.spawnMask = 1; - data.go_state = 1; + data.go_state = GO_STATE_READY; objmgr.AddGameobjectToGrid(guid, &data); @@ -255,7 +255,7 @@ bool OutdoorPvPObjective::AddCapturePoint(uint32 entry, uint32 map, float x, flo return true; // add GO... GameObject * go = new GameObject; - if(!go->Create(guid,entry, pMap,PHASEMASK_NORMAL,x,y,z,o,rotation0,rotation1,rotation2,rotation3,100,1)) + if(!go->Create(guid,entry, pMap,PHASEMASK_NORMAL,x,y,z,o,rotation0,rotation1,rotation2,rotation3,100,GO_STATE_READY)) { sLog.outError("Gameobject template %u not found in database.", entry); delete go; diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp index 2bd35ef5a54..bb4cd22edfa 100644 --- a/src/game/OutdoorPvPSI.cpp +++ b/src/game/OutdoorPvPSI.cpp @@ -202,7 +202,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) Map * map = MapManager::Instance().GetMap(plr->GetMapId(), plr); if(!map) return true; - if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,1)) + if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY)) { delete go; } @@ -228,7 +228,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) Map * map = MapManager::Instance().GetMap(plr->GetMapId(), plr); if(!map) return true; - if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,1)) + if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY)) { delete go; } diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 01cdcdcbf38..48b28179591 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9705,12 +9705,6 @@ void Unit::CombatStart(Unit* target) && !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->IsAIEnabled) { ((Creature*)target)->AI()->AttackStart(this); - ((Creature*)target)->AI()->EnterCombat(this); - if(((Creature*)target)->GetFormation()) - { - ((Creature*)target)->GetFormation()->MemberAttackStart((Creature*)target, this); - sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);"); - } } SetInCombatWith(target); @@ -9744,8 +9738,18 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); - if(GetTypeId() != TYPEID_PLAYER && GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != IDLE_MOTION_TYPE) - ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); + if(GetTypeId() != TYPEID_PLAYER) + { + if(GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != IDLE_MOTION_TYPE) + ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); + if(enemy) + { + if(!((Creature*)this)->HasReactState(REACT_PASSIVE) && ((Creature*)this)->IsAIEnabled) + ((Creature*)this)->AI()->EnterCombat(enemy); + if(((Creature*)this)->GetFormation()) + ((Creature*)this)->GetFormation()->MemberAttackStart((Creature*)this, enemy); + } + } if(GetTypeId() != TYPEID_PLAYER && ((Creature*)this)->isPet()) { |