diff options
Diffstat (limited to 'src/server/scripts')
17 files changed, 0 insertions, 31 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 23719d2a0f7..5f74d0dcf44 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -383,7 +383,6 @@ struct boss_headless_horseman : public ScriptedAI void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); _events.ScheduleEvent(EVENT_HORSEMAN_CLEAVE, 13s, 0, PHASE_1); _events.ScheduleEvent(EVENT_RANDOM_LAUGH, 30s, 60s); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 11b2e61efea..40c19e8cfce 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -337,7 +337,6 @@ struct npc_gatewatcher_petAI : public ScriptedAI } _JustEngagedWith(); ScriptedAI::JustEngagedWith(who); - me->SetCombatPulseDelay(5); } void SetData(uint32 data, uint32 value) override diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index b4198fc8fa0..6981c20453e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -632,7 +632,6 @@ struct boss_faction_championsAI : public BossAI void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_ANTI_AOE, true); - me->SetCombatPulseDelay(5); me->setActive(true); DoZoneInCombat(); if (Creature* pChampionController = instance->GetCreature(DATA_FACTION_CRUSADERS)) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 5512f5b4460..c6a4c1a9395 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -114,7 +114,6 @@ struct boss_jaraxxus : public BossAI void Reset() override { - me->SetCombatPulseDelay(0); me->ResetLootMode(); events.Reset(); summons.DespawnAll(); 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 b61a3633ef7..4ebdd7270ac 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -215,7 +215,6 @@ struct boss_northrend_beastsAI : public BossAI events.SetPhase(PHASE_EVENT); summons.DespawnAll(); me->SetReactState(REACT_PASSIVE); - me->SetCombatPulseDelay(0); HandleInitialMovement(); } @@ -248,7 +247,6 @@ struct boss_northrend_beastsAI : public BossAI void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); ScheduleTasks(); HandleInstanceProgress(); @@ -356,10 +354,7 @@ struct boss_gormok : public boss_northrend_beastsAI me->SetReactState(REACT_AGGRESSIVE); // Npc that should keep raid in combat while boss change if (Creature* combatStalker = me->SummonCreature(NPC_BEASTS_COMBAT_STALKER, CombatStalkerPosition)) - { DoZoneInCombat(combatStalker); - combatStalker->SetCombatPulseDelay(5); - } DoZoneInCombat(); events.SetPhase(PHASE_COMBAT); DoCastSelf(SPELL_TANKING_GORMOK, true); 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 0a6ca5742d2..98607db6f34 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -276,7 +276,6 @@ struct boss_twin_baseAI : public BossAI Talk(SAY_AGGRO); DoCast(me, SurgeSpellId); - me->SetCombatPulseDelay(5); me->setActive(true); events.ScheduleEvent(EVENT_TWIN_SPIKE, 20s); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 17ae3a3dd64..de35763ca12 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -271,7 +271,6 @@ struct boss_blood_council_controller : public BossAI return; } - me->SetCombatPulseDelay(5); me->setActive(true); DoZoneInCombat(); instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, IN_PROGRESS); @@ -442,7 +441,6 @@ struct BloodPrincesBossAI : public BossAI { events.Reset(); summons.DespawnAll(); - me->SetCombatPulseDelay(0); me->SetImmuneToPC(false); _isEmpowered = false; @@ -452,7 +450,6 @@ struct BloodPrincesBossAI : public BossAI void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_BLOOD_PRINCES_CONTROL))) DoZoneInCombat(controller); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 9bbdc9149ac..b6948a05f50 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -289,7 +289,6 @@ struct boss_lady_deathwhisper : public BossAI } _phase = PHASE_ONE; - me->SetCombatPulseDelay(5); me->setActive(true); DoZoneInCombat(); scheduler.CancelGroup(GROUP_INTRO); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 25dc005fd52..ed10054edeb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -272,7 +272,6 @@ struct boss_professor_putricide : public BossAI Talk(SAY_AGGRO); DoCast(me, SPELL_OOZE_TANK_PROTECTION, true); DoZoneInCombat(me); - me->SetCombatPulseDelay(5); instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, IN_PROGRESS); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index e57abfc67b8..df500406a23 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -280,7 +280,6 @@ struct boss_sindragosa : public BossAI DoCastSelf(SPELL_PERMAEATING_CHILL); Talk(SAY_AGGRO); instance->SetBossState(DATA_SINDRAGOSA, IN_PROGRESS); - me->SetCombatPulseDelay(5); me->setActive(true); me->SetFarVisible(true); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 92b885d6d55..a64996f59d0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -552,7 +552,6 @@ struct boss_the_lich_king : public BossAI } me->setActive(true); - me->SetCombatPulseDelay(5); DoZoneInCombat(); events.SetPhase(PHASE_ONE); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 2905d24ea24..d30b51119b0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -177,7 +177,6 @@ struct boss_four_horsemen_baseAI : public BossAI case ACTION_BEGIN_FIGHTING: if (_ourMovementFinished) break; - me->SetCombatPulseDelay(5); BeginFighting(); _ourMovementFinished = true; break; @@ -305,7 +304,6 @@ struct boss_four_horsemen_baseAI : public BossAI _ourMovementFinished = false; me->SetReactState(REACT_AGGRESSIVE); SetCombatMovement(false); - me->SetCombatPulseDelay(0); me->ResetLootMode(); events.Reset(); summons.DespawnAll(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 4aa91542934..6a2289b5642 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -329,10 +329,7 @@ struct boss_gothik : public BossAI { summons.Summon(summon); if (me->IsInCombat()) - { summon->AI()->DoAction(_gateIsOpen ? ACTION_GATE_OPENED : ACTION_ACQUIRE_TARGET); - summon->SetCombatPulseDelay(5); - } else summon->DespawnOrUnsummon(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 33207c6048d..a36f99be4a2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -748,7 +748,6 @@ struct npc_kelthuzad_guardian : public ScriptedAI me->SetVisible(false); me->SetHomePosition(me->GetPosition()); DoZoneInCombat(); - me->SetCombatPulseDelay(5); _visibilityTimer = 2 * IN_MILLISECONDS; _bloodTapTimer = 25 * IN_MILLISECONDS; break; @@ -781,7 +780,6 @@ struct npc_kelthuzad_guardian : public ScriptedAI void Reset() override { - me->SetCombatPulseDelay(0); ScriptedAI::Reset(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 9d0b962d40a..0cddcf5ad5e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -317,14 +317,12 @@ struct PalehoofMinionsBossAI : public BossAI void Reset() override { - me->SetCombatPulseDelay(0); events.Reset(); DoCastSelf(SPELL_FREEZE, true); } void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); ScheduleTasks(); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index d4e04e9b8c5..309b538fce4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -248,14 +248,12 @@ struct IllidariCouncilBossAI : public BossAI void Reset() override { - me->SetCombatPulseDelay(0); events.Reset(); DoCastSelf(SPELL_BALANCE_OF_POWER, true); } void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); if (Creature* illidari = instance->GetCreature(DATA_ILLIDARI_COUNCIL)) DoZoneInCombat(illidari); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 049ecbb80bb..5af82e20198 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -332,7 +332,6 @@ struct boss_essence_of_suffering : public BossAI void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); events.ScheduleEvent(EVENT_SOUL_DRAIN, 20s); @@ -401,7 +400,6 @@ struct boss_essence_of_desire : public BossAI events.ScheduleEvent(EVENT_RUNE_SHIELD, 16s); events.ScheduleEvent(EVENT_DEADEN, 31s); - me->SetCombatPulseDelay(5); me->setActive(true); Talk(DESI_SAY_FREED); } @@ -507,7 +505,6 @@ struct boss_essence_of_anger : public BossAI events.ScheduleEvent(EVENT_SPITE, 20s); events.ScheduleEvent(EVENT_FREED_2, Seconds(1), Minutes(3)); - me->SetCombatPulseDelay(5); me->setActive(true); } |