nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-30 00:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/TempestKeep): revamp Kael'Thas (#19648)

Browse Source 
* fix(Scripts/TempestKeep): force attackstop for all player during the last phase and cleanup the script of Kael'Thas

* few new fixes

* fix codestyle

* fix codestyle and remove misc stuff

*remove the useless DisableSpline
*remove also a misc change use only during the dev

* pass the health to DamageTaken instead UpdateIA

* avoid to iterate over the threatlist and use RemoveAllAttackers() instead

* Revert "avoid to iterate over the threatlist and use RemoveAllAttackers() instead"

This reverts commit 0623c0075191c91c2530496c83d017d3b6a824db.

* Revert "pass the health to DamageTaken instead UpdateIA"

This reverts commit 7f8609af603ecc042c819801a2f04d9d65c5031a.

* revert recents commits

* avoid potential conflicts with others enums

* fix build
This commit is contained in:
Grimdhex
2024-08-30 21:10:51 +02:00
committed by GitHub
parent b1bae64171
commit e4aab5b4f0
1 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -23,7 +23,7 @@
#include "WorldPacket.h" #include "WorldPacket.h"
#include "the_eye.h" #include "the_eye.h"
enum Yells enum KTYells
{ {
// Kael'thas Speech // Kael'thas Speech
SAY_INTRO = 0, SAY_INTRO = 0,
@@ -54,7 +54,7 @@ enum Yells
EMOTE_THALADRED_FIXATE = 2 EMOTE_THALADRED_FIXATE = 2
}; };
enum Spells enum KTSpells
{ {
// _phase 2 spells // _phase 2 spells
SPELL_SUMMON_WEAPONS = 36976, SPELL_SUMMON_WEAPONS = 36976,
@@ -79,7 +79,7 @@ enum Spells
SPELL_FLAME_STRIKE = 36735, SPELL_FLAME_STRIKE = 36735,
SPELL_FLAME_STRIKE_DAMAGE = 36731, SPELL_FLAME_STRIKE_DAMAGE = 36731,
// Event // transition scene spells
SPELL_NETHERBEAM_AURA1 = 36364, SPELL_NETHERBEAM_AURA1 = 36364,
SPELL_NETHERBEAM_AURA2 = 36370, SPELL_NETHERBEAM_AURA2 = 36370,
SPELL_NETHERBEAM_AURA3 = 36371, SPELL_NETHERBEAM_AURA3 = 36371,
@@ -138,57 +138,44 @@ enum Spells
SPELL_SILENCE = 30225 SPELL_SILENCE = 30225
}; };
enum Misc enum KTPhases
{ {
POINT_MIDDLE = 1,
POINT_AIR = 2,
POINT_START_LAST_PHASE = 3,
DATA_RESURRECT_CAST = 1,
NPC_WORLD_TRIGGER = 19871,
NPC_NETHER_VAPOR = 21002,
NPC_NETHERSTRAND_LONGBOW = 21268,
NPC_STAFF_OF_DISINTEGRATION = 21274,
PHASE_NONE = 0, PHASE_NONE = 0,
PHASE_SINGLE_ADVISOR = 1, PHASE_SINGLE_ADVISOR = 1,
PHASE_WEAPONS = 2, PHASE_WEAPONS = 2,
PHASE_TRANSITION = 3, PHASE_TRANSITION = 3,
PHASE_ALL_ADVISORS = 4, PHASE_ALL_ADVISORS = 4,
PHASE_FINAL = 5, PHASE_FINAL = 5
};
EVENT_PREFIGHT_PHASE11 = 1, enum KTMisc
EVENT_PREFIGHT_PHASE12 = 2, {
EVENT_PREFIGHT_PHASE21 = 3, POINT_MIDDLE = 1,
EVENT_PREFIGHT_PHASE22 = 4, POINT_AIR = 2,
EVENT_PREFIGHT_PHASE31 = 5, POINT_LAND = 3,
EVENT_PREFIGHT_PHASE32 = 6, POINT_START_LAST_PHASE = 4,
EVENT_PREFIGHT_PHASE41 = 7,
EVENT_PREFIGHT_PHASE42 = 8,
EVENT_PREFIGHT_PHASE51 = 9,
EVENT_PREFIGHT_PHASE52 = 10,
EVENT_PREFIGHT_PHASE61 = 11,
EVENT_PREFIGHT_PHASE62 = 12,
EVENT_PREFIGHT_PHASE63 = 13,
EVENT_PREFIGHT_PHASE71 = 14,
EVENT_GATHER_ADVISORS = 15,
EVENT_SPELL_SEQ_1 = 30, DATA_RESURRECT_CAST = 1,
EVENT_SPELL_SEQ_2 = 31,
EVENT_SPELL_SEQ_3 = 32,
EVENT_SPELL_FIREBALL = 33,
EVENT_SPELL_PYROBLAST = 34,
EVENT_SPELL_FLAMESTRIKE = 35,
EVENT_SPELL_ARCANE_DISRUPTION = 36,
EVENT_SPELL_MIND_CONTROL = 37,
EVENT_SPELL_SUMMON_PHOENIX = 38,
EVENT_CHECK_HEALTH = 39,
EVENT_SPELL_GRAVITY_LAPSE = 40,
EVENT_GRAVITY_LAPSE_END = 41,
EVENT_SPELL_SHOCK_BARRIER = 42,
EVENT_SPELL_NETHER_BEAM = 43,
EVENT_SPELL_NETHER_VAPOR = 44,
EVENT_SCENE_1 = 50, NPC_WORLD_TRIGGER = 19871,
NPC_NETHER_VAPOR = 21002,
NPC_NETHERSTRAND_LONGBOW = 21268,
NPC_STAFF_OF_DISINTEGRATION = 21274,
};
enum KTPreFightEvents
{
EVENT_PREFIGHT_PHASE1_01 = 1,
EVENT_PREFIGHT_PHASE1_02 = 2,
EVENT_PREFIGHT_PHASE5_01 = 3,
EVENT_PREFIGHT_PHASE5_02 = 4,
EVENT_PREFIGHT_PHASE6_02 = 5,
EVENT_PREFIGHT_PHASE6_03 = 6,
};
enum KTTransitionScene
{
EVENT_SCENE_1 = 50, // NYI
EVENT_SCENE_2 = 51, EVENT_SCENE_2 = 51,
EVENT_SCENE_3 = 52, EVENT_SCENE_3 = 52,
EVENT_SCENE_4 = 53, EVENT_SCENE_4 = 53,
@@ -206,7 +193,7 @@ enum Misc
EVENT_SCENE_16 = 65 EVENT_SCENE_16 = 65
}; };
enum KaelActions enum KTActions
{ {
ACTION_START_SANGUINAR = 0, ACTION_START_SANGUINAR = 0,
ACTION_START_CAPERNIAN = 1, ACTION_START_CAPERNIAN = 1,
@@ -215,7 +202,7 @@ enum KaelActions
ACTION_PROGRESS_PHASE_CHECK = 4 ACTION_PROGRESS_PHASE_CHECK = 4
}; };
enum SpellGroups enum KTSpellGroups
{ {
GROUP_PROGRESS_PHASE = 0, GROUP_PROGRESS_PHASE = 0,
GROUP_PYROBLAST = 1, GROUP_PYROBLAST = 1,
@@ -288,7 +275,9 @@ struct boss_kaelthas : public BossAI
{ {
PrepareAdvisors(); PrepareAdvisors();
}); });
_phase = PHASE_NONE; _phase = PHASE_NONE;
_transitionSceneReached = false;
me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_HOVER, true); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_HOVER, true);
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
@@ -296,15 +285,6 @@ struct boss_kaelthas : public BossAI
SetRoomState(GO_STATE_READY); SetRoomState(GO_STATE_READY);
me->SetDisableGravity(false); me->SetDisableGravity(false);
me->SetWalk(false); me->SetWalk(false);
ScheduleHealthCheckEvent(50, [&]{
scheduler.CancelAll();
me->CastStop();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetReactState(REACT_PASSIVE);
me->GetMotionMaster()->MovePoint(POINT_MIDDLE, me->GetHomePosition(), true, true);
me->ClearUnitState(UNIT_STATE_MELEE_ATTACKING);
me->SendMeleeAttackStop();
});
} }
void AttackStart(Unit* who) override void AttackStart(Unit* who) override
@@ -313,17 +293,23 @@ struct boss_kaelthas : public BossAI
BossAI::AttackStart(who); BossAI::AttackStart(who);
} }
void JustReachedHome() override
{
Reset();
}
void MoveInLineOfSight(Unit* who) override void MoveInLineOfSight(Unit* who) override
{ {
if (_phase == PHASE_NONE && who->IsPlayer() && me->IsValidAttackTarget(who)) if (_phase == PHASE_NONE && who->IsPlayer() && me->IsValidAttackTarget(who))
{ {
_phase = PHASE_SINGLE_ADVISOR; _phase = PHASE_SINGLE_ADVISOR;
me->SetInCombatWithZone(); me->SetInCombatWithZone();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_DISABLE_MOVE);
Talk(SAY_INTRO); Talk(SAY_INTRO);
ScheduleUniqueTimedEvent(23s, [&] ScheduleUniqueTimedEvent(23s, [&]
{ {
Talk(SAY_INTRO_THALADRED); Talk(SAY_INTRO_THALADRED);
}, EVENT_PREFIGHT_PHASE11); }, EVENT_PREFIGHT_PHASE1_01);
ScheduleUniqueTimedEvent(30s, [&] ScheduleUniqueTimedEvent(30s, [&]
{ {
if (Creature* thaladred = summons.GetCreatureWithEntry(NPC_THALADRED)) if (Creature* thaladred = summons.GetCreatureWithEntry(NPC_THALADRED))
@@ -334,15 +320,10 @@ struct boss_kaelthas : public BossAI
thaladred->AI()->AttackStart(target); thaladred->AI()->AttackStart(target);
thaladred->SetInCombatWithZone(); thaladred->SetInCombatWithZone();
} }
}, EVENT_PREFIGHT_PHASE12); }, EVENT_PREFIGHT_PHASE1_02);
} }
} }
void JustEngagedWith(Unit* who) override
{
BossAI::JustEngagedWith(who);
}
void KilledUnit(Unit* victim) override void KilledUnit(Unit* victim) override
{ {
if (victim->IsPlayer()) if (victim->IsPlayer())
@@ -376,7 +357,7 @@ struct boss_kaelthas : public BossAI
Talk(SAY_PHASE2_WEAPON); Talk(SAY_PHASE2_WEAPON);
DoCastSelf(SPELL_SUMMON_WEAPONS); DoCastSelf(SPELL_SUMMON_WEAPONS);
_phase = PHASE_WEAPONS; _phase = PHASE_WEAPONS;
}, EVENT_PREFIGHT_PHASE51); }, EVENT_PREFIGHT_PHASE5_01);
ScheduleUniqueTimedEvent(9s, [&]{ ScheduleUniqueTimedEvent(9s, [&]{
summons.DoForAllSummons([&](WorldObject* summon) summons.DoForAllSummons([&](WorldObject* summon)
{ {
@@ -397,7 +378,7 @@ struct boss_kaelthas : public BossAI
{ {
PhaseAllAdvisorsExecute(); PhaseAllAdvisorsExecute();
}); });
}, EVENT_PREFIGHT_PHASE52); }, EVENT_PREFIGHT_PHASE5_02);
break; break;
case ACTION_PROGRESS_PHASE_CHECK: case ACTION_PROGRESS_PHASE_CHECK:
if (_phase == PHASE_ALL_ADVISORS) if (_phase == PHASE_ALL_ADVISORS)
@@ -511,7 +492,6 @@ struct boss_kaelthas : public BossAI
me->SetTarget(); me->SetTarget();
DoCastSelf(SPELL_KAEL_EXPLODES1, true); DoCastSelf(SPELL_KAEL_EXPLODES1, true);
DoCastSelf(SPELL_KAEL_GAINING_POWER); DoCastSelf(SPELL_KAEL_GAINING_POWER);
me->SetDisableGravity(true);
}, EVENT_SCENE_2); }, EVENT_SCENE_2);
ScheduleUniqueTimedEvent(4000ms, [&] ScheduleUniqueTimedEvent(4000ms, [&]
{ {
@@ -519,7 +499,9 @@ struct boss_kaelthas : public BossAI
for (uint8 i = 0; i < 2; ++i) for (uint8 i = 0; i < 2; ++i)
if (Creature* trigger = me->SummonCreature(WORLD_TRIGGER, triggersPos[i], TEMPSUMMON_TIMED_DESPAWN, 60000)) if (Creature* trigger = me->SummonCreature(WORLD_TRIGGER, triggersPos[i], TEMPSUMMON_TIMED_DESPAWN, 60000))
trigger->CastSpell(me, SPELL_NETHERBEAM1 + i, false); trigger->CastSpell(me, SPELL_NETHERBEAM1 + i, false);
me->GetMotionMaster()->MovePoint(POINT_AIR, me->GetPositionX(), me->GetPositionY(), 76.0f, false, true); me->SetDisableGravity(true);
me->SendMovementFlagUpdate();
me->GetMotionMaster()->MoveTakeoff(POINT_AIR, me->GetPositionX(), me->GetPositionY(), 75.0f, 2.99);
DoCastSelf(SPELL_GROW, true); DoCastSelf(SPELL_GROW, true);
}, EVENT_SCENE_3); }, EVENT_SCENE_3);
ScheduleUniqueTimedEvent(7000ms, [&] ScheduleUniqueTimedEvent(7000ms, [&]
@@ -551,8 +533,6 @@ struct boss_kaelthas : public BossAI
ScheduleUniqueTimedEvent(17500ms, [&] ScheduleUniqueTimedEvent(17500ms, [&]
{ {
SetRoomState(GO_STATE_ACTIVE); SetRoomState(GO_STATE_ACTIVE);
me->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_WALKING | MOVEMENTFLAG_DISABLE_GRAVITY);
me->SendMovementFlagUpdate();
}, EVENT_SCENE_7); }, EVENT_SCENE_7);
ScheduleUniqueTimedEvent(19000ms, [&] ScheduleUniqueTimedEvent(19000ms, [&]
{ {
@@ -612,8 +592,6 @@ struct boss_kaelthas : public BossAI
DoCastSelf(SPELL_PURE_NETHER_BEAM4, true); DoCastSelf(SPELL_PURE_NETHER_BEAM4, true);
DoCastSelf(SPELL_PURE_NETHER_BEAM5, true); DoCastSelf(SPELL_PURE_NETHER_BEAM5, true);
DoCastSelf(SPELL_PURE_NETHER_BEAM6, true); DoCastSelf(SPELL_PURE_NETHER_BEAM6, true);
me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_WALKING);
me->SendMovementFlagUpdate();
}, EVENT_SCENE_15); }, EVENT_SCENE_15);
ScheduleUniqueTimedEvent(36000ms, [&] ScheduleUniqueTimedEvent(36000ms, [&]
{ {
@@ -621,11 +599,12 @@ struct boss_kaelthas : public BossAI
me->CastStop(); me->CastStop();
me->GetMotionMaster()->Clear(); me->GetMotionMaster()->Clear();
me->RemoveAurasDueToSpell(SPELL_DARK_BANISH_STATE); // WRONG VISUAL me->RemoveAurasDueToSpell(SPELL_DARK_BANISH_STATE); // WRONG VISUAL
me->GetMotionMaster()->MoveLand(POINT_LAND, me->GetPositionX(), me->GetPositionY(), 48.0f, 2.99f); // Moveland doesn't handle POINT_START_LAST_PHASE so we need to use MovePoint
me->GetMotionMaster()->MovePoint(POINT_START_LAST_PHASE, me->GetHomePosition(), false, true); me->GetMotionMaster()->MovePoint(POINT_START_LAST_PHASE, me->GetHomePosition(), false, true);
}, EVENT_SCENE_16); }, EVENT_SCENE_16);
} }
void IntroduceNewAdvisor(Yells talkIntroduction, KaelActions kaelAction) void IntroduceNewAdvisor(KTYells talkIntroduction, KTActions kaelAction)
{ {
std::chrono::milliseconds attackStartTimer = 0ms; std::chrono::milliseconds attackStartTimer = 0ms;
EyeNPCs advisorNPCId = NPC_THALADRED; EyeNPCs advisorNPCId = NPC_THALADRED;
@@ -671,7 +650,7 @@ struct boss_kaelthas : public BossAI
Talk(SAY_PHASE3_ADVANCE); Talk(SAY_PHASE3_ADVANCE);
ScheduleUniqueTimedEvent(6s, [&]{ ScheduleUniqueTimedEvent(6s, [&]{
DoCastSelf(SPELL_RESURRECTION); DoCastSelf(SPELL_RESURRECTION);
}, EVENT_PREFIGHT_PHASE62); }, EVENT_PREFIGHT_PHASE6_02);
ScheduleUniqueTimedEvent(12s, [&]{ ScheduleUniqueTimedEvent(12s, [&]{
_phase = PHASE_ALL_ADVISORS; _phase = PHASE_ALL_ADVISORS;
summons.DoForAllSummons([&](WorldObject* summon) summons.DoForAllSummons([&](WorldObject* summon)
@@ -694,7 +673,7 @@ struct boss_kaelthas : public BossAI
{ {
PhaseKaelExecute(); PhaseKaelExecute();
}); });
}, EVENT_PREFIGHT_PHASE63); }, EVENT_PREFIGHT_PHASE6_03);
} }
void PhaseKaelExecute() void PhaseKaelExecute()
@@ -703,11 +682,33 @@ struct boss_kaelthas : public BossAI
Talk(SAY_PHASE4_INTRO2); Talk(SAY_PHASE4_INTRO2);
_phase = PHASE_FINAL; _phase = PHASE_FINAL;
DoResetThreatList(); DoResetThreatList();
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_DISABLE_MOVE);
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
{ {
AttackStart(target); AttackStart(target);
} }
ScheduleHealthCheckEvent(50, [&]{
if(!_transitionSceneReached)
{
_transitionSceneReached = true;
scheduler.CancelAll();
me->CastStop();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->SetReactState(REACT_PASSIVE);
me->GetMotionMaster()->MovePoint(POINT_MIDDLE, me->GetHomePosition(), true, true);
me->ClearUnitState(UNIT_STATE_MELEE_ATTACKING);
me->SendMeleeAttackStop();
ThreatContainer::StorageType threatList = me->GetThreatMgr().GetThreatList();
for (ThreatContainer::StorageType::const_iterator i = threatList.begin(); i != threatList.end(); ++i)
{
if (Unit* target = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid()))
{
target->AttackStop();
}
}
}
});
ScheduleTimedEvent(1000ms, [&] ScheduleTimedEvent(1000ms, [&]
{ {
DoCastVictim(SPELL_FIREBALL); DoCastVictim(SPELL_FIREBALL);
@@ -721,7 +722,6 @@ struct boss_kaelthas : public BossAI
Talk(SAY_SUMMON_PHOENIX); Talk(SAY_SUMMON_PHOENIX);
DoCastSelf(SPELL_PHOENIX); DoCastSelf(SPELL_PHOENIX);
}, 35450ms, 41550ms); }, 35450ms, 41550ms);
//sequence
ScheduleTimedEvent(20s, 23s, [&] ScheduleTimedEvent(20s, 23s, [&]
{ {
if (roll_chance_i(50)) if (roll_chance_i(50))
@@ -762,8 +762,10 @@ struct boss_kaelthas : public BossAI
{ {
return me->GetHomePosition().GetExactDist2d(me) > 165.0f || !SelectTargetFromPlayerList(165.0f); return me->GetHomePosition().GetExactDist2d(me) > 165.0f || !SelectTargetFromPlayerList(165.0f);
} }
private: private:
uint32 _phase; uint32 _phase;
bool _transitionSceneReached = false;
}; };
struct npc_lord_sanguinar : public ScriptedAI struct npc_lord_sanguinar : public ScriptedAI
{ {