diff options
Diffstat (limited to 'src/server/scripts/Northrend')
14 files changed, 29 insertions, 30 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp index 38bda91bce7..52d7e991e2f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp @@ -217,7 +217,7 @@ struct dummy_dragonAI : public ScriptedAI if (pointId == POINT_ID_LAND) { me->GetMotionMaster()->Clear(); - me->SetInCombatWithZone(); + DoZoneInCombat(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) { AddThreat(target, 1.0f); @@ -821,7 +821,7 @@ public: void JustSummoned(Creature* who) override { - who->SetInCombatWithZone(); + DoZoneInCombat(who); } void UpdateAI(uint32 diff) override @@ -988,7 +988,7 @@ public: void Reset() override { me->RemoveAllAuras(); - me->SetInCombatWithZone(); + DoZoneInCombat(); events.ScheduleEvent(EVENT_FADE_ARMOR, 1000); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index 93b66780106..4706f5767a9 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -214,7 +214,7 @@ class npc_onyx_flamecaller : public CreatureScript if (type != SPLINE_CHAIN_MOTION_TYPE && pointId != POINT_GENERAL_ROOM) return; - me->SetInCombatWithZone(); + DoZoneInCombat(); } void MoveToGeneral() diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index feb4f6f355a..135726939f0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1275,7 +1275,7 @@ class npc_living_inferno : public CreatureScript void IsSummonedBy(Unit* /*summoner*/) override { - me->SetInCombatWithZone(); + DoZoneInCombat(); me->CastSpell(me, SPELL_BLAZING_AURA, true); // SMSG_SPELL_GO for the living ember stuff isn't even sent to the client - Blizzard on drugs. diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 3acc27563e1..e59ea6eb024 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -467,7 +467,7 @@ class npc_swarm_scarab : public CreatureScript me->SetCorpseDelay(0); Initialize(); DoCast(me, SPELL_ACID_MANDIBLE); - me->SetInCombatWithZone(); + DoZoneInCombat(); if (me->IsInCombat()) if (Creature* anubarak = _instance->GetCreature(DATA_ANUBARAK)) anubarak->AI()->JustSummoned(me); @@ -547,7 +547,7 @@ class npc_nerubian_burrower : public CreatureScript DoCast(me, SPELL_EXPOSE_WEAKNESS); DoCast(me, SPELL_SPIDER_FRENZY); DoCast(me, SPELL_AWAKENED); - me->SetInCombatWithZone(); + DoZoneInCombat(); if (me->IsInCombat()) if (Creature* anubarak = _instance->GetCreature(DATA_ANUBARAK)) anubarak->AI()->JustSummoned(me); @@ -710,7 +710,7 @@ class npc_anubarak_spike : public CreatureScript { Initialize(); // make sure the spike has everyone on threat list - me->SetInCombatWithZone(); + DoZoneInCombat(); } bool CanAIAttack(Unit const* victim) const override @@ -823,7 +823,7 @@ class npc_anubarak_spike : public CreatureScript me->SetSpeedRate(MOVE_RUN, 0.5f); // make sure the Spine will really follow the one he should me->GetThreatManager().ResetAllThreat(); - me->SetInCombatWithZone(); + DoZoneInCombat(); AddThreat(who, 1000000.0f); me->GetMotionMaster()->Clear(true); me->GetMotionMaster()->MoveChase(who); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index e85c91987a4..b8269474ab3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -358,7 +358,7 @@ struct boss_gormok : public boss_northrend_beastsAI // Npc that should keep raid in combat while boss change if (Creature* combatStalker = me->SummonCreature(NPC_BEASTS_COMBAT_STALKER, CombatStalkerPosition)) { - combatStalker->SetInCombatWithZone(); + DoZoneInCombat(combatStalker); combatStalker->SetCombatPulseDelay(5); } DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 002b8557586..843e300fee3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -265,11 +265,11 @@ struct boss_twin_baseAI : public BossAI void JustEngagedWith(Unit* /*who*/) override { - me->SetInCombatWithZone(); + DoZoneInCombat(); if (Creature* pSister = GetSister()) { me->AddAura(MyEmphatySpellId, pSister); - pSister->SetInCombatWithZone(); + DoZoneInCombat(pSister); } instance->SetBossState(DATA_TWIN_VALKIRIES, IN_PROGRESS); diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index eb909ffa7bb..bddb1a745f4 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -152,7 +152,7 @@ class boss_drakkari_colossus : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); me->RemoveAura(SPELL_FREEZE_ANIM); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; } @@ -222,10 +222,10 @@ class boss_drakkari_colossus : public CreatureScript void JustSummoned(Creature* summon) override { - summon->SetInCombatWithZone(); + DoZoneInCombat(summon); - if (phase == COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON) - summon->SetHealth(summon->GetMaxHealth() / 2); + if (phase == COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON) + summon->SetHealth(summon->GetMaxHealth() / 2); } private: @@ -424,7 +424,7 @@ public: colossus->AI()->DoAction(ACTION_UNFREEZE_COLOSSUS); if (!colossus->AI()->GetData(DATA_INTRO_DONE)) colossus->AI()->SetData(DATA_INTRO_DONE, true); - colossus->SetInCombatWithZone(); + DoZoneInCombat(colossus); me->DespawnOrUnsummon(); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index ca4634f2f56..ff0dd695971 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -743,7 +743,7 @@ class npc_putricide_oozeAI : public ScriptedAI if (_instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) != IN_PROGRESS) me->DespawnOrUnsummon(); - me->SetInCombatWithZone(); + DoZoneInCombat(); DoCastAOE(_auraSpellId, true); } diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 2fbd0f792aa..0d4dd46ed99 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -468,7 +468,7 @@ public: me->GetMotionMaster()->MoveLand(POINT_LAND_P_ONE, pos); me->SetImmuneToAll(false); me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); events.ScheduleEvent(EVENT_LAND_START_ENCOUNTER, 7*IN_MILLISECONDS, 1, PHASE_NOT_STARTED); } break; @@ -1181,7 +1181,7 @@ public: if (unit->GetTypeId() == TYPEID_UNIT) { unit->CastSpell(unit, SPELL_TELEPORT_VISUAL_ONLY); - unit->ToCreature()->SetInCombatWithZone(); + DoZoneInCombat(unit->ToCreature()); } else if (unit->GetTypeId() == TYPEID_PLAYER) me->SetDisableGravity(true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 61891e9cd82..8b03f77be73 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -132,7 +132,7 @@ class boss_kologarn : public CreatureScript if (Vehicle* vehicle = me->GetVehicleKit()) for (uint8 i = 0; i < 2; ++i) if (Unit* arm = vehicle->GetPassenger(i)) - arm->ToCreature()->SetInCombatWithZone(); + DoZoneInCombat(arm->ToCreature()); _JustEngagedWith(); } @@ -205,7 +205,7 @@ class boss_kologarn : public CreatureScript else { events.CancelEvent(EVENT_STONE_SHOUT); - who->ToCreature()->SetInCombatWithZone(); + DoZoneInCombat(who->ToCreature()); } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 239e60d22ff..3e64ff8a5f8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -1287,7 +1287,7 @@ struct npc_darkrune_watcher : public ScriptedAI { case EVENT_START_COMBAT: me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; case EVENT_LIGHTNING_BOLT: DoCastVictim(LIGHTNING_BOLT); @@ -1358,7 +1358,7 @@ struct npc_darkrune_guardian : public ScriptedAI { case EVENT_START_COMBAT: me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; case EVENT_STORMSTRIKE: DoCastVictim(SPELL_STORMSTRIKE); @@ -1417,7 +1417,7 @@ struct npc_darkrune_sentinel : public ScriptedAI { case EVENT_START_COMBAT: me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; case EVENT_HEROIC_STRIKE: DoCastVictim(SPELL_HEROIC_STRIKE); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 7bc35eb3710..bf769cb28a4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -460,11 +460,10 @@ class boss_voice_of_yogg_saron : public CreatureScript } void MoveInLineOfSight(Unit* who) override - { // TODO: MoveInLineOfSight doesn't work for such a big distance if (who->GetTypeId() == TYPEID_PLAYER && me->GetDistance2d(who) < 99.0f && !me->IsInCombat()) - me->SetInCombatWithZone(); + DoZoneInCombat(); } void EnterEvadeMode(EvadeReason why) override @@ -624,7 +623,7 @@ class boss_voice_of_yogg_saron : public CreatureScript events.SetPhase(PHASE_TWO); me->SummonCreature(NPC_YOGG_SARON, YoggSaronSpawnPos); if (Creature* brain = instance->GetCreature(DATA_BRAIN_OF_YOGG_SARON)) - brain->SetInCombatWithZone(); + DoZoneInCombat(brain); events.ScheduleEvent(EVENT_SUMMON_CORRUPTOR_TENTACLE, 1, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO); events.ScheduleEvent(EVENT_SUMMON_CONSTRICTOR_TENTACLE, 1, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO); events.ScheduleEvent(EVENT_SUMMON_CRUSHER_TENTACLE, 1, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 89c525198c7..5fb2e62012f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -117,7 +117,7 @@ public: { _owner->SetReactState(REACT_AGGRESSIVE); _owner->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); - _owner->SetInCombatWithZone(); + _owner->AI()->DoZoneInCombat(); return true; } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index bcc0f7c0c51..d9800fab916 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -160,7 +160,7 @@ struct npc_frozen_orb : public ScriptedAI if (toravon->IsInCombat()) { toravon->AI()->JustSummoned(me); - me->SetInCombatWithZone(); + DoZoneInCombat(); } else me->DespawnOrUnsummon(); |