From b210320df0090da4f9f6c61f990e4de8165e57a2 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 16 Jan 2020 05:01:39 +0100 Subject: [PATCH] Core/Spells: unify successful spell cast and interrupt AI hooks into one helper with different cast results to reduce duplicate code * fixed position update logic that was responsible for interrupting channeled spells because of a missing movement generator update call that was kicking in after the interrupt already happened * improved Baron Ashburys timer layout --- src/server/game/AI/CreatureAI.h | 7 +- src/server/game/Entities/Unit/Unit.cpp | 26 ++++-- src/server/game/Entities/Unit/Unit.h | 8 ++ src/server/game/Spells/Spell.cpp | 6 +- src/server/game/Spells/Spell.h | 7 ++ .../boss_ascendant_council.cpp | 18 +--- .../BastionOfTwilight/boss_chogall.cpp | 7 +- .../boss_corla_herald_of_twilight.cpp | 8 +- .../BlackwingDescent/boss_chimaeron.cpp | 5 +- .../BlackwingDescent/boss_maloriak.cpp | 17 +--- .../BlackwingDescent/boss_nefarians_end.cpp | 7 +- .../boss_omnotron_defense_system.cpp | 10 +-- .../ShadowfangKeep/boss_baron_ashbury.cpp | 82 ++++++++----------- .../ShadowfangKeep/boss_lord_godfrey.cpp | 27 +----- .../ThroneOfTheTides/boss_lady_nazjar.cpp | 16 +--- .../ZulGurub/boss_high_priest_venoxis.cpp | 5 +- .../ZulGurub/boss_high_priestess_kilnara.cpp | 5 +- .../EasternKingdoms/ZulGurub/boss_zanzil.cpp | 20 +---- .../Kalimdor/HallsOfOrigination/boss_rajh.cpp | 11 +-- .../boss_temple_guardian_anhuur.cpp | 5 +- .../Stonecore/boss_high_priestess_azil.cpp | 10 +-- 21 files changed, 115 insertions(+), 192 deletions(-) diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 66d73e6d6a..e9e5217cd3 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -29,6 +29,7 @@ class GameObject; class PlayerAI; class WorldObject; struct Position; +enum SpellFinishReason; typedef std::vector CreatureBoundary; @@ -149,11 +150,7 @@ class TC_GAME_API CreatureAI : public UnitAI void OnCharmed(bool apply) override; - // Called when a spell cast gets interrupted - virtual void OnSpellCastInterrupt(SpellInfo const* /*spell*/) { } - - // Called when a spell cast has been successfully finished - virtual void OnSuccessfulSpellCast(SpellInfo const* /*spell*/) { } + virtual void OnSpellCastFinished(SpellInfo const* /*spell*/, SpellFinishReason /*reason*/) { } // Called at reaching home after evade virtual void JustReachedHome() { } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index b679d5b7e2..f6963d5a8f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -522,6 +522,10 @@ void Unit::Update(uint32 p_time) UpdateSplineMovement(p_time); i_motionMaster->UpdateMotion(p_time); + // Wait with the cleanup until we have updated our movement generators and position + if (!movespline->Finalized() || isMoving() || isTurning()) + InterruptMovementBasedAuras(); + // Update serverside orientation of channeled spells that are suposed to track the channel target if (Spell const* spell = m_currentSpells[CURRENT_CHANNELED_SPELL]) if (spell->GetSpellInfo()->HasAttribute(SPELL_ATTR1_CHANNEL_TRACK_TARGET)) @@ -596,6 +600,16 @@ void Unit::UpdateSplinePosition() UpdatePosition(loc.x, loc.y, loc.z, loc.orientation); } +void Unit::InterruptMovementBasedAuras() +{ + // TODO: Check if orientation transport offset changed instead of only global orientation + if (m_positionUpdateInfo.Turned) + RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING); + + if (m_positionUpdateInfo.Relocated && !GetVehicle()) + RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE); +} + void Unit::DisableSpline() { m_movementInfo.RemoveMovementFlag(MOVEMENTFLAG_FORWARD); @@ -3139,7 +3153,7 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool wi spell->cancel(); if (GetTypeId() == TYPEID_UNIT && IsAIEnabled) - ToCreature()->AI()->OnSpellCastInterrupt(spell->GetSpellInfo()); + ToCreature()->AI()->OnSpellCastFinished(spell->GetSpellInfo(), SPELL_FINISHED_CANCELED); spell->SetReferencedFromCurrent(false); } @@ -13861,15 +13875,8 @@ bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool tel std::fabs(GetPositionY() - y) > 0.001f || std::fabs(GetPositionZ() - z) > 0.001f); - // TODO: Check if orientation transport offset changed instead of only global orientation - if (turn) - RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING); - if (relocated) { - if (!GetVehicle()) - RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE); - // move and update visible state if need if (GetTypeId() == TYPEID_PLAYER) GetMap()->PlayerRelocation(ToPlayer(), x, y, z, orientation); @@ -13881,6 +13888,9 @@ bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool tel UpdatePositionData(); + m_positionUpdateInfo.Relocated = relocated; + m_positionUpdateInfo.Turned = turn; + return (relocated || turn); } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 9203894a9b..f03fe2fd8a 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1988,11 +1988,19 @@ class TC_GAME_API Unit : public WorldObject void ProcessPositionDataChanged(PositionFullTerrainStatus const& data) override; virtual void ProcessTerrainStatusUpdate(ZLiquidStatus status, Optional const& liquidData); + + void InterruptMovementBasedAuras(); private: void UpdateSplineMovement(uint32 t_diff); void UpdateSplinePosition(); + struct + { + bool Relocated = false; + bool Turned = false; + } m_positionUpdateInfo; + // player or player's pet float GetCombatRatingReduction(CombatRating cr) const; uint32 GetCombatRatingDamageReduction(CombatRating cr, float rate, float cap, uint32 damage) const; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index b4a06839e4..dc9081c7da 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3552,7 +3552,7 @@ void Spell::_cast(bool skipCheck) // Call CreatureAI hook OnSuccessfulSpellCast if (Creature* caster = m_originalCaster->ToCreature()) if (caster->IsAIEnabled) - caster->AI()->OnSuccessfulSpellCast(GetSpellInfo()); + caster->AI()->OnSpellCastFinished(GetSpellInfo(), SPELL_FINISHED_SUCCESSFUL_CAST); } void Spell::handle_immediate() @@ -3843,6 +3843,10 @@ void Spell::update(uint32 difftime) { SendChannelUpdate(0); finish(); + + if (Creature* creatureCaster = m_caster->ToCreature()) + if (creatureCaster->IsAIEnabled) + creatureCaster->AI()->OnSpellCastFinished(m_spellInfo, SPELL_FINISHED_FINISHED); } break; } diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index fa610ebc1f..a1fa8b58c0 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -100,6 +100,13 @@ enum SpellRangeFlag SPELL_RANGE_RANGED = 2 //hunter range and ranged weapon }; +enum SpellFinishReason +{ + SPELL_FINISHED_SUCCESSFUL_CAST = 0, // spell has sucessfully launched + SPELL_FINISHED_CANCELED = 1, // spell has been canceled (interrupts) + SPELL_FINISHED_FINISHED = 2 // spell has been finished (channeling finished) +}; + struct TC_GAME_API SpellDestination { SpellDestination(); diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp index 16f6b07b02..e5965839e3 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp @@ -616,13 +616,7 @@ class npc_feludius : public CreatureScript } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - if (spell->Id == SPELL_HYDRO_LANCE) - me->MakeInterruptable(false); - } - - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_HYDRO_LANCE) me->MakeInterruptable(false); @@ -773,7 +767,7 @@ class npc_ignacious : public CreatureScript Talk(SAY_ABILITY); } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_RISING_FLAMES) me->MakeInterruptable(false); @@ -1048,13 +1042,7 @@ class npc_arion : public CreatureScript } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - if (spell->Id == SPELL_LIGHTNING_BLAST) - me->MakeInterruptable(false); - } - - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_LIGHTNING_BLAST) me->MakeInterruptable(false); diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp index 1be52224a0..32c403cbda 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp @@ -595,17 +595,12 @@ struct npc_chogall_corrupting_adherent : public ScriptedAI _events.ScheduleEvent(EVENT_DEPRAVITY, 8s, 9s); } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_DEPRAVITY) me->MakeInterruptable(false); } - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - if (spell->Id == SPELL_DEPRAVITY) - me->MakeInterruptable(false); - } void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp index 6af51470e0..1624f66b87 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp @@ -164,7 +164,7 @@ struct boss_corla_herald_of_twilight : public BossAI instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_DARK_COMMAND) me->MakeInterruptable(false); @@ -175,12 +175,6 @@ struct boss_corla_herald_of_twilight : public BossAI _killedZealots++; } - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - if (spell->Id == SPELL_DARK_COMMAND) - me->MakeInterruptable(false); - } - uint32 GetData(uint32 type) const override { if (type == DATA_ARRESTED_DEVELOPMENT) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp index 88d31e099b..77d34422ab 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp @@ -249,8 +249,11 @@ struct boss_chimaeron : public BossAI } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { + if (reason != SPELL_FINISHED_SUCCESSFUL_CAST) + return; + switch (spell->Id) { case SPELL_MASSACRE: diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp index cc9adbc25f..874f6e47ac 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp @@ -315,7 +315,7 @@ struct boss_maloriak : public BossAI } } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { switch (spell->Id) { @@ -325,19 +325,8 @@ struct boss_maloriak : public BossAI break; case SPELL_RELEASE_ABERRATIONS: me->MakeInterruptable(false); - break; - default: - break; - } - } - - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - switch (spell->Id) - { - case SPELL_RELEASE_ABERRATIONS: - Talk(SAY_RELEASE_ABERRATIONS); - me->MakeInterruptable(false); + if (reason == SPELL_FINISHED_SUCCESSFUL_CAST) + Talk(SAY_RELEASE_ABERRATIONS); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp index 4f8c943be0..58ea16a807 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp @@ -545,8 +545,11 @@ struct boss_nefarians_end : public BossAI } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { + if (reason != SPELL_FINISHED_SUCCESSFUL_CAST) + return; + switch (spell->Id) { case SPELL_BRUSHFIRE_START: @@ -1014,7 +1017,7 @@ struct npc_nefarians_end_onyxia : public ScriptedAI damage = me->GetHealth() - 1; } - void OnSuccessfulSpellCast(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { switch (spell->Id) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp index 45346cf8c2..cc9f1c6881 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp @@ -942,16 +942,10 @@ struct npc_omnotron_arcanotron : public ScriptedAI } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_ARCANE_ANNIHILATION) - me->MakeInterruptable(true); - } - - void OnSpellCastInterrupt(SpellInfo const* spell) override - { - if (spell->Id == SPELL_ARCANE_ANNIHILATION) - me->MakeInterruptable(true); + me->MakeInterruptable(false); } void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp index b888d85a28..7c126f4f1d 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp @@ -30,7 +30,6 @@ enum Spells SPELL_ASPHYXIATE = 93423, SPELL_ASPHYXIATE_ROOT = 93422, SPELL_ASPHYXIATE_DAMAGE = 93424, - SPELL_PAIN_AND_SUFFERING = 93581, SPELL_PAIN_AND_SUFFERING_DUMMY = 93605, SPELL_WRACKING_PAIN = 93720, SPELL_DARK_ARCHANGEL_FORM = 93757, @@ -38,6 +37,7 @@ enum Spells }; #define SPELL_STAY_OF_EXECUTION RAID_MODE(93468, 93705) +#define SPELL_PAIN_AND_SUFFERING RAID_MODE(93581, 93712) enum Texts { @@ -57,9 +57,7 @@ enum Events EVENT_STAY_OF_EXECUTION, EVENT_PAIN_AND_SUFFERING, EVENT_WRACKING_PAIN, - EVENT_DARK_ARCHANGEL_FORM, - EVENT_DISABLE_ACHIEVEMENT, - EVENT_APPLY_INTERRUPT_IMMUNITY + EVENT_DARK_ARCHANGEL_FORM }; enum AchievementData @@ -77,7 +75,6 @@ struct boss_baron_ashbury : public BossAI void Initialize() { _phaseTwoTriggered = false; - _canAttack = true; _pardonDenied = true; me->MakeInterruptable(false); } @@ -94,10 +91,8 @@ struct boss_baron_ashbury : public BossAI Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); - events.ScheduleEvent(EVENT_ASPHYXIATE, 20s); - events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 5s + 500ms); - if (IsHeroic()) - events.ScheduleEvent(EVENT_WRACKING_PAIN, 14s); + events.ScheduleEvent(EVENT_ASPHYXIATE, IsHeroic() ? 20s + 500ms : 15s + 500ms); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 6s); } void JustDied(Unit* /*killer*/) override @@ -124,27 +119,29 @@ struct boss_baron_ashbury : public BossAI events.CancelEvent(EVENT_PAIN_AND_SUFFERING); events.CancelEvent(EVENT_ASPHYXIATE); events.CancelEvent(EVENT_STAY_OF_EXECUTION); - events.CancelEvent(EVENT_APPLY_INTERRUPT_IMMUNITY); events.ScheduleEvent(EVENT_DARK_ARCHANGEL_FORM, 1ms); _phaseTwoTriggered = true; } } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { + if (spell->Id != SPELL_STAY_OF_EXECUTION && spell->Id != SPELL_PAIN_AND_SUFFERING) + return; + + if (reason == SPELL_FINISHED_SUCCESSFUL_CAST && (spell->Id != SPELL_STAY_OF_EXECUTION || IsHeroic())) + return; + me->MakeInterruptable(false); - events.CancelEvent(EVENT_APPLY_INTERRUPT_IMMUNITY); - - if (spell->Id == SPELL_STAY_OF_EXECUTION && IsHeroic()) - events.CancelEvent(EVENT_DISABLE_ACHIEVEMENT); - } - - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - if (spell->Id == SPELL_STAY_OF_EXECUTION && !IsHeroic()) + if (spell->Id == SPELL_STAY_OF_EXECUTION) { - me->MakeInterruptable(false); - events.CancelEvent(EVENT_APPLY_INTERRUPT_IMMUNITY); + // Failing achievement when Baron Ashbury finished channeling Stay of Execution + if (reason == SPELL_FINISHED_FINISHED && IsHeroic()) + _pardonDenied = false; + + me->SetReactState(REACT_AGGRESSIVE); + me->resetAttackTimer(); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 500ms); } } @@ -175,39 +172,32 @@ struct boss_baron_ashbury : public BossAI switch (eventId) { case EVENT_ASPHYXIATE: + me->AttackStop(); + me->SetReactState(REACT_PASSIVE); + me->StopMoving(); Talk(SAY_ASPHYXIATE); - DoCastAOE(SPELL_ASPHYXIATE); + DoCastSelf(SPELL_ASPHYXIATE); + events.CancelEvent(EVENT_PAIN_AND_SUFFERING); events.ScheduleEvent(EVENT_STAY_OF_EXECUTION, 7s); - events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 12s); - if (IsHeroic()) - events.ScheduleEvent(EVENT_WRACKING_PAIN, 13s); - events.Repeat(52s); - _canAttack = false; + events.Repeat(47s); break; case EVENT_STAY_OF_EXECUTION: - me->StopMoving(); me->MakeInterruptable(true); Talk(SAY_STAY_OF_EXECUTION); Talk(SAY_ANNOUNCE_STAY_OF_EXECUTION); - DoCastAOE(SPELL_STAY_OF_EXECUTION); - _canAttack = true; - if (IsHeroic()) - { - events.ScheduleEvent(EVENT_DISABLE_ACHIEVEMENT, 8s); - events.ScheduleEvent(EVENT_APPLY_INTERRUPT_IMMUNITY, 8s); - } + DoCastSelf(SPELL_STAY_OF_EXECUTION); break; case EVENT_PAIN_AND_SUFFERING: me->MakeInterruptable(true); - me->StopMoving(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) - { DoCast(target, SPELL_PAIN_AND_SUFFERING); - events.ScheduleEvent(EVENT_APPLY_INTERRUPT_IMMUNITY, 6s); - } + + if (IsHeroic() && events.GetTimeUntilEvent(EVENT_ASPHYXIATE) > 10 * IN_MILLISECONDS) + events.ScheduleEvent(EVENT_WRACKING_PAIN, 8s + 100ms); + events.Repeat(23s); break; case EVENT_WRACKING_PAIN: - DoCastAOE(SPELL_WRACKING_PAIN, true); + DoCastAOE(SPELL_WRACKING_PAIN); break; case EVENT_DARK_ARCHANGEL_FORM: me->AttackStop(); @@ -216,22 +206,14 @@ struct boss_baron_ashbury : public BossAI Talk(SAY_ARCHANGEL_FORM); DoCastAOE(SPELL_DARK_ARCHANGEL_FORM); break; - case EVENT_DISABLE_ACHIEVEMENT: - _pardonDenied = false; - break; - case EVENT_APPLY_INTERRUPT_IMMUNITY: - me->MakeInterruptable(false); - break; default: break; } } - if (_canAttack) - DoMeleeAttackIfReady(); + DoMeleeAttackIfReady(); } private: bool _phaseTwoTriggered; - bool _canAttack; bool _pardonDenied; }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp index fdbcc4cbe3..a12cc31c62 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp @@ -85,7 +85,7 @@ struct boss_lord_godfrey : public BossAI void Reset() override { _Reset(); - MakeInterruptable(false); + me->MakeInterruptable(false); } void JustEngagedWith(Unit* /*who*/) override @@ -166,32 +166,13 @@ struct boss_lord_godfrey : public BossAI _DespawnAtEvade(); } - void MakeInterruptable(bool apply) - { - me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_INTERRUPT, !apply); - me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, !apply); - } - - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { switch (spell->Id) { case SPELL_CURSED_BULLETS: case SPELL_CURSED_BULLETS_HC: - MakeInterruptable(false); - break; - default: - break; - } - } - - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - switch (spell->Id) - { - case SPELL_CURSED_BULLETS: - case SPELL_CURSED_BULLETS_HC: - MakeInterruptable(false); + me->MakeInterruptable(false); break; default: break; @@ -213,7 +194,7 @@ struct boss_lord_godfrey : public BossAI switch (eventId) { case EVENT_CURSED_BULLETS: - MakeInterruptable(true); + me->MakeInterruptable(true); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) DoCast(target, SPELL_CURSED_BULLETS); events.Repeat(12s); diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp index 482944d1cd..ac39098f86 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp @@ -251,13 +251,7 @@ struct boss_lady_nazjar : public BossAI } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - if (spell->Id == SPELL_SHOCK_BLAST) - me->MakeInterruptable(false); - } - - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_SHOCK_BLAST) me->MakeInterruptable(false); @@ -439,13 +433,7 @@ struct npc_nazjar_nazjar_tempest_witch : public ScriptedAI _events.ScheduleEvent(EVENT_LIGHTNING_SURGE, 14s, 16s); } - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - if (spell->Id == SPELL_CHAIN_LIGHTNING) - me->MakeInterruptable(false); - } - - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_CHAIN_LIGHTNING) me->MakeInterruptable(false); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp index ba4fec7f1e..844d836e6d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp @@ -253,8 +253,11 @@ struct boss_high_priest_venoxis : public BossAI } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { + if (reason != SPELL_FINISHED_SUCCESSFUL_CAST) + return; + switch (spell->Id) { case SPELL_TOXIC_LINK: diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp index 8b68788b87..406a7a0dd1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp @@ -160,8 +160,11 @@ struct boss_high_priestess_kilnara : public BossAI } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { + if (reason != SPELL_FINISHED_SUCCESSFUL_CAST) + return; + if (spell->Id == SPELL_CAMOUFLAGE) me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp index 50ffbb055e..ca1fc8eafc 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp @@ -218,25 +218,13 @@ struct boss_zanzil : public BossAI } } - void OnSuccessfulSpellCast(SpellInfo const* spell) override - { - switch (spell->Id) - { - case SPELL_ZANZILI_FIRE: - _zanzilPosition = me->GetPosition(); - break; - default: - break; - } - - if (spell->Id == SPELL_VOODOO_BOLT) - me->MakeInterruptable(false); - } - - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { if (spell->Id == SPELL_VOODOO_BOLT) me->MakeInterruptable(false); + + if (reason == SPELL_FINISHED_SUCCESSFUL_CAST && spell->Id == SPELL_ZANZILI_FIRE) + _zanzilPosition = me->GetPosition(); } void DoAction(int32 action) override diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp index 421cfb9e3a..86ffedba75 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp @@ -65,7 +65,6 @@ enum Events EVENT_BLESSING_OF_THE_SUN, EVENT_TALK_BLESSING, EVENT_REENGAGE, - EVENT_APPLY_INTERRUPT_IMMUNITY, // Solar Winds EVENT_GROW, @@ -146,13 +145,10 @@ struct boss_rajh : public BossAI _DespawnAtEvade(); } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_SUMMON_SUN_ORB || spell->Id == SPELL_INFERNO_LEAP_VEHICLE) - { me->MakeInterruptable(false); - events.CancelEvent(EVENT_APPLY_INTERRUPT_IMMUNITY); - } } uint32 GetData(uint32 type) const override @@ -222,7 +218,6 @@ struct boss_rajh : public BossAI me->StopMoving(); me->MakeInterruptable(true); DoCastSelf(SPELL_SUMMON_SUN_ORB); - events.ScheduleEvent(EVENT_APPLY_INTERRUPT_IMMUNITY, 3s); events.Repeat(_randomTimerCase == 0 ? 35s, 36s : 31s, 37s); break; case EVENT_SUN_STRIKE: @@ -264,12 +259,8 @@ struct boss_rajh : public BossAI break; case EVENT_INFERNO_LEAP_CAST: me->MakeInterruptable(true); - events.ScheduleEvent(EVENT_APPLY_INTERRUPT_IMMUNITY, 1s + 500ms); DoCastAOE(SPELL_INFERNO_LEAP_VEHICLE); break; - case EVENT_APPLY_INTERRUPT_IMMUNITY: - me->MakeInterruptable(false); - break; default: break; } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 2c94788855..ed12c15312 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -138,8 +138,11 @@ struct boss_temple_guardian_anhuur : public BossAI _DespawnAtEvade(); } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { + if (reason != SPELL_FINISHED_CANCELED) + return; + me->MakeInterruptable(false); if (spell->Id == SPELL_REVERBERATING_HYMN) diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index 70705ee744..24351b086c 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -86,7 +86,6 @@ enum Events EVENT_SUMMON_FOLLOWERS, EVENT_GRAVITY_WELL_AURA_DAMAGE, EVENT_GRAVITY_WELL_AURA_PULL, - EVENT_APPLY_IMMUNITY, EVENT_EARTH_FURY_FLY_UP, EVENT_EARTH_FURY_FLY_ABOVE_PLATFORM, EVENT_EARTH_FURY_PREPARE_SHARD, @@ -198,13 +197,12 @@ class boss_high_priestess_azil : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, !apply); } - void OnSpellCastInterrupt(SpellInfo const* spell) override + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason /*reason*/) override { if (spell->Id == SPELL_FORCE_GRIP) { MakeInterruptable(false); SetVehicleId(VEHICLE_ID_DEFAULT); - events.CancelEvent(EVENT_APPLY_IMMUNITY); _isChannelingForceGrip = false; } } @@ -295,7 +293,6 @@ class boss_high_priestess_azil : public CreatureScript MakeInterruptable(true); SetVehicleId(VEHICLE_ID_FORCE_GRIP); DoCastVictim(SPELL_FORCE_GRIP); - events.ScheduleEvent(EVENT_APPLY_IMMUNITY, 6s + 500ms, 0, PHASE_ONE); events.Repeat(13s, 15s); break; case EVENT_FORCE_GRIP_SMASH: @@ -379,11 +376,6 @@ class boss_high_priestess_azil : public CreatureScript } } break; - case EVENT_APPLY_IMMUNITY: - MakeInterruptable(false); - _isChannelingForceGrip = false; - SetVehicleId(VEHICLE_ID_DEFAULT); - break; default: break; }