nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-15 00:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): apply clang-tidy modernize-use-override (#3817)

Browse Source
This commit is contained in:
Francesco Borzì
2020-12-06 18:04:55 +01:00
committed by GitHub
parent 9facd81e54
commit d4a58700d4
561 changed files with 9574 additions and 9574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
View File

@@ -88,7 +88,7 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
me->SetReactState(REACT_PASSIVE);
@@ -96,13 +96,13 @@ public:
pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if( type == POINT_MOTION_TYPE && id == 1 )
me->SetFacingTo(3 * M_PI / 2);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if( who->GetTypeId() == TYPEID_PLAYER )
{
@@ -113,7 +113,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(EVENT_SPELL_RADIANCE, 16000);
@@ -124,13 +124,13 @@ public:
pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS);
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
if (spell->Id == 66905 && me->GetHealth() == 1) // hammer throw back damage (15k)
me->CastSpell(me, 68197, true);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if( damage >= me->GetHealth() )
{
@@ -152,7 +152,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -189,7 +189,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_eadricAI(pCreature);
}
@@ -212,7 +212,7 @@ public:
bool summoned;
uint64 MemoryGUID;
void Reset()
void Reset() override
{
events.Reset();
summoned = false;
@@ -227,13 +227,13 @@ public:
pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if( type == POINT_MOTION_TYPE && id == 1 )
me->SetFacingTo(3 * M_PI / 2);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if( who->GetTypeId() == TYPEID_PLAYER )
{
@@ -244,7 +244,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(EVENT_SPELL_HOLY_FIRE, urand(9000, 12000));
@@ -255,7 +255,7 @@ public:
pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if( param == 1 )
{
@@ -274,7 +274,7 @@ public:
}
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
//if( me->HasAura(SPELL_SHIELD) )
// return;
@@ -302,7 +302,7 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
if( pInstance )
pInstance->SetData(DATA_MEMORY_ENTRY, summon->GetEntry());
@@ -316,7 +316,7 @@ public:
me->CastSpell(me, uiSpells[uiRandom], true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -372,7 +372,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_paletressAI(pCreature);
}
@@ -397,9 +397,9 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset() {}
void Reset() override {}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->DespawnOrUnsummon(20000);
if( pInstance )
@@ -407,7 +407,7 @@ public:
paletress->AI()->DoAction(1);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
UpdateVictim();
@@ -457,7 +457,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_memoryAI(pCreature);
}
@@ -525,13 +525,13 @@ public:
uint8 uiWaypoint;
bool bCheck;
void Reset()
void Reset() override
{
events.Reset();
bCheck = false;
}
void WaypointReached(uint32 uiPoint)
void WaypointReached(uint32 uiPoint) override
{
if( uiPoint == 1 )
{
@@ -550,7 +550,7 @@ public:
}
}
void SetData(uint32 uiType, uint32 /*uiData*/)
void SetData(uint32 uiType, uint32 /*uiData*/) override
{
AddWaypoint(0, me->GetPositionX(), 660.0f, 411.80f);
switch( me->GetEntry() )
@@ -603,7 +603,7 @@ public:
uiWaypoint = uiType;
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if( bCheck && damage >= me->GetHealth() )
{
@@ -615,7 +615,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
switch( me->GetEntry() )
{
@@ -641,7 +641,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
@@ -712,7 +712,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
me->DespawnOrUnsummon(10000);
if( pInstance )
@@ -720,7 +720,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_argent_soldierAI(pCreature);
}
@@ -747,14 +747,14 @@ public:
targets.push_back(*itr);
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_eadric_radiance_SpellScript();
}
@@ -784,13 +784,13 @@ public:
}
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc5_light_rain_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_toc5_light_rain_SpellScript();
}
@@ -815,13 +815,13 @@ public:
}
}
void Register()
void Register() override
{
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_reflective_shield_AuraScript::HandleAfterEffectAbsorb, EFFECT_0);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_reflective_shield_AuraScript();
}

42
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
View File

@@ -102,7 +102,7 @@ public:
SummonList summons;
uint8 Phase;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
@@ -116,13 +116,13 @@ public:
//me->SetLootMode(0); // [LOOT]
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->DespawnOrUnsummon(1);
ScriptedAI::EnterEvadeMode();
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
{
@@ -150,7 +150,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if( param == -1 )
{
@@ -176,7 +176,7 @@ public:
}
}
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell)
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override
{
switch( spell->Id )
{
@@ -221,7 +221,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -280,7 +280,7 @@ public:
DoMeleeAttackIfReady();
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if( Unit* target = summon->SelectNearestTarget(200.0f) )
@@ -290,7 +290,7 @@ public:
}
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if( victim->GetTypeId() == TYPEID_PLAYER )
{
@@ -301,7 +301,7 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->CastSpell((Unit*)NULL, SPELL_BK_KILL_CREDIT, true);
Talk(TEXT_BK_DEATH);
@@ -312,7 +312,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_black_knightAI (pCreature);
}
@@ -327,13 +327,13 @@ public:
{
npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) {}
void Reset()
void Reset() override
{
Start(false, true, 0, NULL);
SetDespawnAtEnd(true);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if( param == 1 )
{
@@ -344,7 +344,7 @@ public:
}
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 i) override
{
if( i == 12 )
{
@@ -359,14 +359,14 @@ public:
}
}
void UpdateAI(uint32 uiDiff)
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_black_knight_skeletal_gryphonAI(pCreature);
}
@@ -387,12 +387,12 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
if (me->GetEntry() == NPC_RISEN_JAEREN || me->GetEntry() == NPC_RISEN_ARELAS)
@@ -400,7 +400,7 @@ public:
events.RescheduleEvent(2, urand(3000, 4000)); // claw
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
if (spell->Id == SPELL_BK_GHOUL_EXPLODE)
{
@@ -409,7 +409,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellInfo* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
switch(spell->Id)
{
@@ -430,7 +430,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -465,7 +465,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_black_knight_ghoulAI (pCreature);
}

48
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
View File

@@ -127,7 +127,7 @@ class npc_toc5_player_vehicle : public CreatureScript
public:
npc_toc5_player_vehicle() : CreatureScript("npc_toc5_player_vehicle") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc5_player_vehicleAI(pCreature);
}
@@ -143,13 +143,13 @@ public:
ConditionList conditions;
uint16 m_ConditionsTimer;
void Reset()
void Reset() override
{
me->SetReactState(REACT_PASSIVE);
me->getHostileRefManager().setOnlineOfflineState(false);
}
void OnCharmed(bool apply)
void OnCharmed(bool apply) override
{
if (me->IsDuringRemoveFromWorld())
return;
@@ -169,7 +169,7 @@ public:
}
// just in case, should be done in spell_gen_defend
void PassengerBoarded(Unit* who, int8 /*seat*/, bool apply)
void PassengerBoarded(Unit* who, int8 /*seat*/, bool apply) override
{
if (me->IsDuringRemoveFromWorld())
return;
@@ -184,8 +184,8 @@ public:
}
//void EnterEvadeMode() { CreatureAI::EnterEvadeMode(); }
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(uint32 diff)
void MoveInLineOfSight(Unit* /*who*/) override {}
void UpdateAI(uint32 diff) override
{
if (m_ConditionsTimer <= diff)
{
@@ -198,8 +198,8 @@ public:
else
m_ConditionsTimer -= diff;
}
void AttackStart(Unit* /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) override {}
void EnterCombat(Unit* /*who*/) override {}
};
};
@@ -208,7 +208,7 @@ class npc_toc5_grand_champion_minion : public CreatureScript
public:
npc_toc5_grand_champion_minion() : CreatureScript("npc_toc5_grand_champion_minion") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc5_grand_champion_minionAI(pCreature);
}
@@ -224,13 +224,13 @@ public:
int32 ShieldTimer;
EventMap events;
void Reset()
void Reset() override
{
ShieldTimer = 0;
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(EVENT_MOUNT_CHARGE, urand(2500, 4000));
@@ -239,7 +239,7 @@ public:
me->CastSpell(me, SPELL_TRAMPLE_AURA, true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( ShieldTimer <= (int32)diff )
{
@@ -322,7 +322,7 @@ public:
}
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
me->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 0);
me->DespawnOrUnsummon(10000);
@@ -382,7 +382,7 @@ public:
uint64 NewMountGUID;
uint64 UnitTargetGUID;
void Reset()
void Reset() override
{
if( pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED )
{
@@ -394,7 +394,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if( pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED )
me->CallForHelp(100.0f);
@@ -466,7 +466,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if( param == 1 )
{
@@ -486,7 +486,7 @@ public:
ScheduleAbilitiesEvents();
}
void SetData(uint32 uiType, uint32 uiData)
void SetData(uint32 uiType, uint32 uiData) override
{
BossOrder = uiType;
if( uiData > 1 )
@@ -525,7 +525,7 @@ public:
Start(false, true, 0, nullptr);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if( MountPhase )
{
@@ -578,9 +578,9 @@ public:
}
}
void EnterEvadeMode() {}
void EnterEvadeMode() override {}
void WaypointReached(uint32 i)
void WaypointReached(uint32 i) override
{
if( !pInstance )
return;
@@ -589,7 +589,7 @@ public:
pInstance->SetData(DATA_GRAND_CHAMPION_REACHED_DEST, BossOrder);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if( id < 4 )
npc_escortAI::MovementInform(type, id);
@@ -629,7 +629,7 @@ public:
}
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
switch( spell->Id )
{
@@ -643,7 +643,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
npc_escortAI::UpdateAI(diff);
@@ -927,7 +927,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_grand_championAI(pCreature);
}

26
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
View File

@@ -19,7 +19,7 @@ class instance_trial_of_the_champion : public InstanceMapScript
public:
instance_trial_of_the_champion() : InstanceMapScript("instance_trial_of_the_champion", 650) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
return new instance_trial_of_the_champion_InstanceMapScript(pMap);
}
@@ -53,7 +53,7 @@ public:
uint64 GO_MainGateGUID;
uint64 GO_EnterGateGUID;
void Initialize()
void Initialize() override
{
TeamIdInInstance = TEAM_NEUTRAL;
InstanceProgress = 0;
@@ -82,7 +82,7 @@ public:
GO_EnterGateGUID = 0;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
for( uint8 i = 0; i < MAX_ENCOUNTER; ++i )
if( m_auiEncounter[i] == IN_PROGRESS )
@@ -91,7 +91,7 @@ public:
return false;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
if (TeamIdInInstance == TEAM_NEUTRAL)
{
@@ -185,7 +185,7 @@ public:
creature->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, ca->mount);
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch( go->GetEntry() )
{
@@ -204,7 +204,7 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
@@ -214,7 +214,7 @@ public:
return str_data;
}
void Load(const char* in)
void Load(const char* in) override
{
CLEANED = false;
events.Reset();
@@ -255,7 +255,7 @@ public:
// EVENT STUFF BELOW:
void OnPlayerEnter(Player*)
void OnPlayerEnter(Player*) override
{
if( DoNeedCleanup(true) )
InstanceCleanup();
@@ -432,7 +432,7 @@ public:
CLEANED = true;
}
uint32 GetData(uint32 uiData) const
uint32 GetData(uint32 uiData) const override
{
switch( uiData )
{
@@ -445,7 +445,7 @@ public:
return 0;
}
uint64 GetData64(uint32 uiData) const
uint64 GetData64(uint32 uiData) const override
{
switch( uiData )
{
@@ -458,7 +458,7 @@ public:
return 0;
}
void SetData(uint32 uiType, uint32 uiData)
void SetData(uint32 uiType, uint32 uiData) override
{
switch( uiType )
{
@@ -756,7 +756,7 @@ public:
}
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
events.Update(diff);
switch( events.ExecuteEvent() )
@@ -1219,7 +1219,7 @@ public:
}
}
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/)
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{
switch(criteria_id)
{

84
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
View File

@@ -58,7 +58,7 @@ class HideNpcEvent : public BasicEvent
public:
HideNpcEvent(Creature& owner) : _owner(owner) { }
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/)
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
_owner.SetVisible(false);
return true;
@@ -135,7 +135,7 @@ class boss_anubarak_trial : public CreatureScript
public:
boss_anubarak_trial() : CreatureScript("boss_anubarak_trial") {}
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_anubarak_trialAI(pCreature);
};
@@ -160,7 +160,7 @@ public:
uint64 SphereGUID[6];
uint64 BurrowGUID[4];
void Reset()
void Reset() override
{
me->SetStandState(UNIT_STAND_STATE_SUBMERGED);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -178,7 +178,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
switch( param )
{
@@ -188,7 +188,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->setActive(true);
events.Reset();
@@ -223,12 +223,12 @@ public:
pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS);
}
void JustReachedHome()
void JustReachedHome() override
{
me->setActive(false);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -353,7 +353,7 @@ public:
DoMeleeAttackIfReady();
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
if( !summon )
return;
@@ -361,7 +361,7 @@ public:
summons.Summon(summon);
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
events.Reset();
summons.DespawnAll();
@@ -387,13 +387,13 @@ public:
}
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if( who->GetTypeId() == TYPEID_PLAYER )
Talk(SAY_KILL_PLAYER);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
events.Reset();
summons.DespawnAll();
@@ -402,7 +402,7 @@ public:
pInstance->SetData(TYPE_FAILED, 1);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER || me->GetExactDistSq(who) > 6400.0f) // 80yd*80yd
return;
@@ -420,7 +420,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
bool CanAIAttack(const Unit* target) const
bool CanAIAttack(const Unit* target) const override
{
return target->GetEntry() != NPC_FROST_SPHERE;
}
@@ -432,7 +432,7 @@ class npc_swarm_scarab : public CreatureScript
public:
npc_swarm_scarab() : CreatureScript("npc_swarm_scarab") {}
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_swarm_scarabAI(pCreature);
};
@@ -444,13 +444,13 @@ public:
int32 determinationTimer;
int32 despawnTimer;
void DoAction(int32 param)
void DoAction(int32 param) override
{
if( param == 1 )
despawnTimer = 2000;
}
void Reset()
void Reset() override
{
me->SetCorpseDelay(10 * 60);
me->CastSpell(me, SPELL_ACID_MANDIBLE, true);
@@ -469,12 +469,12 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
DoZoneInCombat();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( despawnTimer )
{
@@ -503,13 +503,13 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->CastSpell(me, RAID_MODE(SPELL_TRAITOR_KING_10, SPELL_TRAITOR_KING_25, SPELL_TRAITOR_KING_10, SPELL_TRAITOR_KING_25), true);
me->m_Events.AddEvent(new HideNpcEvent(*me), me->m_Events.CalculateTime(5000));
}
bool CanAIAttack(const Unit* target) const
bool CanAIAttack(const Unit* target) const override
{
return target->GetEntry() != NPC_FROST_SPHERE && !me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@@ -521,7 +521,7 @@ class npc_frost_sphere : public CreatureScript
public:
npc_frost_sphere() : CreatureScript("npc_frost_sphere") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_frost_sphereAI(pCreature);
};
@@ -558,7 +558,7 @@ public:
uint32 permafrostTimer;
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if( me->GetHealth() <= damage )
{
@@ -573,7 +573,7 @@ public:
}
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
if( spell->Id == SPELL_SPIKE_FAIL )
{
@@ -582,7 +582,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( permafrostTimer )
{
@@ -610,7 +610,7 @@ class npc_nerubian_burrower : public CreatureScript
public:
npc_nerubian_burrower() : CreatureScript("npc_nerubian_burrower") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_nerubian_burrowerAI(pCreature);
};
@@ -628,7 +628,7 @@ public:
EventMap events;
void Reset()
void Reset() override
{
me->SetCorpseDelay(10 * 60);
me->CastSpell(me, SPELL_EXPOSE_WEAKNESS, true);
@@ -644,7 +644,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellInfo* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
if( !target || !spell )
return;
@@ -663,7 +663,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -712,12 +712,12 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->m_Events.AddEvent(new HideNpcEvent(*me), me->m_Events.CalculateTime(5000));
}
bool CanAIAttack(const Unit* target) const
bool CanAIAttack(const Unit* target) const override
{
return target->GetEntry() != NPC_FROST_SPHERE;
}
@@ -729,7 +729,7 @@ class npc_anubarak_spike : public CreatureScript
public:
npc_anubarak_spike() : CreatureScript("npc_anubarak_spike") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_anubarak_spikeAI(pCreature);
};
@@ -745,7 +745,7 @@ public:
EventMap events;
uint64 TargetGUID;
void DoAction(int32 param)
void DoAction(int32 param) override
{
if( param == -1 )
{
@@ -788,12 +788,12 @@ public:
}
}
void Reset()
void Reset() override
{
SelectNewTarget(false);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( TargetGUID )
{
@@ -826,7 +826,7 @@ public:
}
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
damage = 0;
}
@@ -859,13 +859,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pursuing_spikesAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_pursuing_spikesAuraScript();
}
@@ -887,7 +887,7 @@ public:
{
PrepareAuraScript(spell_gen_leeching_swarm_AuraScript);
bool Validate(SpellInfo const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_DMG))
return false;
@@ -909,13 +909,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_leeching_swarm_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_gen_leeching_swarm_AuraScript();
}
@@ -941,13 +941,13 @@ public:
}
void Register()
void Register() override
{
AfterHit += SpellHitFn(spell_gen_leeching_swarm_dmg_SpellScript::HandleAfterHit);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_gen_leeching_swarm_dmg_SpellScript();
}

92
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
View File

@@ -38,7 +38,7 @@ struct boss_faction_championsAI : public ScriptedAI
uint32 threatTimer;
uint32 powerTimer;
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->SetInCombatWithZone();
RecalculateThreat();
@@ -46,7 +46,7 @@ struct boss_faction_championsAI : public ScriptedAI
pInstance->SetData(TYPE_FACTION_CHAMPIONS_START, 0);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if( !who )
return;
@@ -109,19 +109,19 @@ struct boss_faction_championsAI : public ScriptedAI
e.DelayEventsToMax(delay, gcd);
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
if( pInstance && mAIType != AI_PET )
pInstance->SetData(TYPE_FACTION_CHAMPIONS, DONE);
}
void KilledUnit(Unit* /*who*/)
void KilledUnit(Unit* /*who*/) override
{
if( pInstance )
pInstance->SetData(TYPE_FACTION_CHAMPIONS_PLAYER_DIED, 1);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
if( pInstance )
pInstance->SetData(TYPE_FAILED, 0);
@@ -189,7 +189,7 @@ struct boss_faction_championsAI : public ScriptedAI
return nullptr;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!me->IsInCombat())
return;
@@ -254,7 +254,7 @@ class npc_toc_druid : public CreatureScript
public:
npc_toc_druid() : CreatureScript("npc_toc_druid") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_druidAI (pCreature);
}
@@ -282,7 +282,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -384,7 +384,7 @@ class npc_toc_shaman : public CreatureScript
public:
npc_toc_shaman() : CreatureScript("npc_toc_shaman") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_shamanAI (pCreature);
}
@@ -411,7 +411,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -506,7 +506,7 @@ class npc_toc_paladin : public CreatureScript
public:
npc_toc_paladin() : CreatureScript("npc_toc_paladin") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_paladinAI (pCreature);
}
@@ -534,7 +534,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -641,7 +641,7 @@ class npc_toc_priest : public CreatureScript
public:
npc_toc_priest() : CreatureScript("npc_toc_priest") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_priestAI (pCreature);
}
@@ -667,7 +667,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -761,7 +761,7 @@ class npc_toc_shadow_priest : public CreatureScript
public:
npc_toc_shadow_priest() : CreatureScript("npc_toc_shadow_priest") {}
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_shadow_priestAI (pCreature);
}
@@ -790,7 +790,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -915,7 +915,7 @@ class npc_toc_warlock : public CreatureScript
public:
npc_toc_warlock() : CreatureScript("npc_toc_warlock") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_warlockAI (pCreature);
}
@@ -944,13 +944,13 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void JustSummoned(Creature* c)
void JustSummoned(Creature* c) override
{
if( Unit* target = c->SelectNearestTarget(200.0f) )
c->AI()->AttackStart(target);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -1059,7 +1059,7 @@ class npc_toc_mage : public CreatureScript
public:
npc_toc_mage() : CreatureScript("npc_toc_mage") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_mageAI (pCreature);
}
@@ -1087,7 +1087,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -1206,7 +1206,7 @@ class npc_toc_hunter : public CreatureScript
public:
npc_toc_hunter() : CreatureScript("npc_toc_hunter") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_hunterAI (pCreature);
}
@@ -1235,13 +1235,13 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISARM_RANGED) || IsCCed());
}
void JustSummoned(Creature* c)
void JustSummoned(Creature* c) override
{
if( Unit* target = c->SelectNearestTarget(200.0f) )
c->AI()->AttackStart(target);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -1359,7 +1359,7 @@ class npc_toc_boomkin : public CreatureScript
public:
npc_toc_boomkin() : CreatureScript("npc_toc_boomkin") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_boomkinAI (pCreature);
}
@@ -1388,13 +1388,13 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void JustSummoned(Creature* c)
void JustSummoned(Creature* c) override
{
if( Unit* target = c->SelectNearestTarget(200.0f) )
c->AI()->AttackStart(target);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -1504,7 +1504,7 @@ class npc_toc_warrior : public CreatureScript
public:
npc_toc_warrior() : CreatureScript("npc_toc_warrior") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_warriorAI (pCreature);
}
@@ -1533,7 +1533,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -1698,7 +1698,7 @@ class npc_toc_dk : public CreatureScript
public:
npc_toc_dk() : CreatureScript("npc_toc_dk") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_dkAI (pCreature);
}
@@ -1725,7 +1725,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -1854,7 +1854,7 @@ class npc_toc_rogue : public CreatureScript
public:
npc_toc_rogue() : CreatureScript("npc_toc_rogue") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_rogueAI (pCreature);
}
@@ -1882,7 +1882,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -2013,7 +2013,7 @@ class npc_toc_enh_shaman : public CreatureScript
public:
npc_toc_enh_shaman() : CreatureScript("npc_toc_enh_shaman") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_enh_shamanAI (pCreature);
}
@@ -2041,7 +2041,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -2152,7 +2152,7 @@ class npc_toc_retro_paladin : public CreatureScript
public:
npc_toc_retro_paladin() : CreatureScript("npc_toc_retro_paladin") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_retro_paladinAI (pCreature);
}
@@ -2180,7 +2180,7 @@ public:
return !(me->HasUnitState(UNIT_STATE_CASTING) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -2304,7 +2304,7 @@ class npc_toc_pet_warlock : public CreatureScript
public:
npc_toc_pet_warlock() : CreatureScript("npc_toc_pet_warlock") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_pet_warlockAI (pCreature);
}
@@ -2325,7 +2325,7 @@ public:
return !(me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED) || IsCCed());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -2357,7 +2357,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->DespawnOrUnsummon();
}
@@ -2380,7 +2380,7 @@ class npc_toc_pet_hunter : public CreatureScript
public:
npc_toc_pet_hunter() : CreatureScript("npc_toc_pet_hunter") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_toc_pet_hunterAI (pCreature);
}
@@ -2400,7 +2400,7 @@ public:
return !IsCCed();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
boss_faction_championsAI::UpdateAI(diff);
if( !UpdateVictim() )
@@ -2425,7 +2425,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->DespawnOrUnsummon();
}
@@ -2469,7 +2469,7 @@ public:
{
PrepareAuraScript(spell_faction_champion_warl_unstable_affliction_AuraScript);
bool Validate(SpellInfo const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_UNSTABLE_AFFLICTION_DISPEL))
return false;
@@ -2482,13 +2482,13 @@ public:
caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, NULL, GetEffect(EFFECT_0));
}
void Register()
void Register() override
{
AfterDispel += AuraDispelFn(spell_faction_champion_warl_unstable_affliction_AuraScript::HandleDispel);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_faction_champion_warl_unstable_affliction_AuraScript();
}

50
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
View File

@@ -82,7 +82,7 @@ class boss_jaraxxus : public CreatureScript
public:
boss_jaraxxus() : CreatureScript("boss_jaraxxus") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_jaraxxusAI(pCreature);
}
@@ -100,7 +100,7 @@ public:
EventMap events;
SummonList summons;
void Reset()
void Reset() override
{
events.Reset();
if( pInstance )
@@ -113,7 +113,7 @@ public:
c->DespawnOrUnsummon();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->setActive(true);
events.Reset();
@@ -133,7 +133,7 @@ public:
pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS);
}
void SpellHit(Unit* caster, const SpellInfo* spell)
void SpellHit(Unit* caster, const SpellInfo* spell) override
{
switch( spell->Id )
{
@@ -179,7 +179,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -249,7 +249,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
summons.DespawnAll();
Talk(SAY_DEATH);
@@ -257,17 +257,17 @@ public:
pInstance->SetData(TYPE_JARAXXUS, DONE);
}
void JustReachedHome()
void JustReachedHome() override
{
me->setActive(false);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
events.Reset();
summons.DespawnAll();
@@ -276,7 +276,7 @@ public:
pInstance->SetData(TYPE_FAILED, 1);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
};
};
@@ -285,7 +285,7 @@ class npc_fel_infernal : public CreatureScript
public:
npc_fel_infernal() : CreatureScript("npc_fel_infernal") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_fel_infernalAI(pCreature);
}
@@ -296,7 +296,7 @@ public:
EventMap events;
void Reset()
void Reset() override
{
if( Unit* target = me->SelectNearestTarget(200.0f) )
{
@@ -307,7 +307,7 @@ public:
events.RescheduleEvent(EVENT_SPELL_FEL_STEAK, urand(7000, 20000));
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -338,12 +338,12 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->DespawnOrUnsummon(10000);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->DespawnOrUnsummon();
}
@@ -356,7 +356,7 @@ class npc_mistress_of_pain : public CreatureScript
public:
npc_mistress_of_pain() : CreatureScript("npc_mistress_of_pain") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_mistress_of_painAI(pCreature);
}
@@ -367,7 +367,7 @@ public:
EventMap events;
void Reset()
void Reset() override
{
if( Unit* target = me->SelectNearestTarget(200.0f) )
{
@@ -381,13 +381,13 @@ public:
events.RescheduleEvent(EVENT_SPELL_MISTRESS_KISS, urand(10000, 15000));
}
void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/)
void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) override
{
//if (caster && spell && spell->Id == 66287 /*control vehicle*/)
// caster->ClearUnitState(UNIT_STATE_ONVEHICLE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -420,12 +420,12 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->DespawnOrUnsummon(10000);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->DespawnOrUnsummon();
}
@@ -453,13 +453,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_toc25_mistress_kiss_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_toc25_mistress_kiss_AuraScript();
}
@@ -492,14 +492,14 @@ public:
GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true);
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mistress_kiss_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_mistress_kiss_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_mistress_kiss_area_SpellScript();
}

70
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
View File

@@ -66,7 +66,7 @@ class npc_snobold_vassal : public CreatureScript
public:
npc_snobold_vassal() : CreatureScript("npc_snobold_vassal") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_snobold_vassalAI(pCreature);
}
@@ -84,13 +84,13 @@ public:
EventMap events;
uint64 TargetGUID;
void Reset()
void Reset() override
{
events.Reset();
events.ScheduleEvent(EVENT_SPELL_FIRE_BOMB, urand(10000, 30000));
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(EVENT_SPELL_SNOBOLLED, 1500);
@@ -98,16 +98,16 @@ public:
events.ScheduleEvent(EVENT_SPELL_HEAD_CRACK, 25000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if( who->GetGUID() != TargetGUID )
return;
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !TargetGUID && !me->GetVehicle() )
return;
@@ -194,7 +194,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
if( Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID))
{
@@ -204,7 +204,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if( param == 1 && !TargetGUID )
me->DespawnOrUnsummon();
@@ -217,7 +217,7 @@ class boss_gormok : public CreatureScript
public:
boss_gormok() : CreatureScript("boss_gormok") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_gormokAI(pCreature);
}
@@ -236,14 +236,14 @@ public:
SummonList summons;
uint64 PlayerGUID;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
PlayerGUID = 0;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->setActive(true);
events.Reset();
@@ -258,14 +258,14 @@ public:
snobold->SendMovementFlagUpdate();
}
void JustReachedHome()
void JustReachedHome() override
{
me->setActive(false);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -366,7 +366,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
summons.DoAction(1);
@@ -374,12 +374,12 @@ public:
pInstance->SetData(TYPE_GORMOK, DONE);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
switch( param )
{
@@ -389,7 +389,7 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
events.Reset();
summons.DespawnAll();
@@ -474,7 +474,7 @@ struct boss_jormungarAI : public ScriptedAI
uint32 _MODEL_MOBILE;
uint32 _TYPE_OTHER;
void DoAction(int32 param)
void DoAction(int32 param) override
{
switch( param )
{
@@ -515,18 +515,18 @@ struct boss_jormungarAI : public ScriptedAI
events.RescheduleEvent(EVENT_SUBMERGE, urand(45000, 50000));
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->setActive(true);
ScheduleEvents();
}
void JustReachedHome()
void JustReachedHome() override
{
me->setActive(false);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if( me->GetDisplayId() == _MODEL_STATIONARY )
{
@@ -539,7 +539,7 @@ struct boss_jormungarAI : public ScriptedAI
ScriptedAI::AttackStart(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -644,7 +644,7 @@ struct boss_jormungarAI : public ScriptedAI
}
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
if( pInstance )
{
@@ -655,7 +655,7 @@ struct boss_jormungarAI : public ScriptedAI
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
events.Reset();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -685,7 +685,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_acidmawAI(creature);
}
@@ -710,7 +710,7 @@ public:
}
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_dreadscaleAI(pCreature);
}
@@ -755,7 +755,7 @@ class boss_icehowl : public CreatureScript
public:
boss_icehowl() : CreatureScript("boss_icehowl") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_icehowlAI(pCreature);
}
@@ -782,13 +782,13 @@ public:
uint64 TargetGUID;
float destX, destY, destZ;
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->GetReactState() != REACT_PASSIVE)
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->setActive(true);
events.Reset();
@@ -798,7 +798,7 @@ public:
events.RescheduleEvent(EVENT_JUMP_MIDDLE, 30000);
}
void JustReachedHome()
void JustReachedHome() override
{
me->setActive(false);
}
@@ -817,7 +817,7 @@ public:
return false;
}
void MovementInform(uint32 /*type*/, uint32 id)
void MovementInform(uint32 /*type*/, uint32 id) override
{
if( id == EVENT_CHARGE )
{
@@ -850,7 +850,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -990,7 +990,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
events.Reset();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -998,7 +998,7 @@ public:
pInstance->SetData(TYPE_FAILED, 1);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if( !pInstance )
return;

46
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
View File

@@ -126,7 +126,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
int32 LastSynchroHP;
uint8 SpecialMask;
void DoAction(int32 a)
void DoAction(int32 a) override
{
switch( a )
{
@@ -197,7 +197,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
me->GetMotionMaster()->MoveChase(victim, 0.0f, 0.0f, 6.0f);
}*/
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->setActive(true);
me->LowerPlayerDamageReq(me->GetMaxHealth());
@@ -214,7 +214,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, 21853);
}
void JustReachedHome()
void JustReachedHome() override
{
me->setActive(false);
}
@@ -265,7 +265,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -455,7 +455,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
myDoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
DoAction(-1);
Talk(SAY_DEATH);
@@ -472,17 +472,17 @@ struct boss_twin_valkyrAI : public ScriptedAI
}
}
void JustSummoned(Creature* s)
void JustSummoned(Creature* s) override
{
summons.Summon(s);
}
void SummonedCreatureDespawn(Creature* s)
void SummonedCreatureDespawn(Creature* s) override
{
summons.Despawn(s);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if( who->GetTypeId() == TYPEID_PLAYER )
{
@@ -493,7 +493,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
if( pInstance )
pInstance->SetData(TYPE_FAILED, 0);
@@ -505,7 +505,7 @@ class boss_eydis : public CreatureScript
public:
boss_eydis() : CreatureScript("boss_eydis") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_eydisAI(pCreature);
}
@@ -522,7 +522,7 @@ public:
boss_twin_valkyrAI::JustSummoned(c);
}
void JustSummoned(Creature* /*s*/) {}
void JustSummoned(Creature* /*s*/) override {}
};
};
@@ -531,7 +531,7 @@ class boss_fjola : public CreatureScript
public:
boss_fjola() : CreatureScript("boss_fjola") {}
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_fjolaAI(pCreature);
}
@@ -548,7 +548,7 @@ public:
boss_twin_valkyrAI::JustSummoned(c);
}
void JustSummoned(Creature* /*s*/) {}
void JustSummoned(Creature* /*s*/) override {}
};
};
@@ -666,7 +666,7 @@ class npc_concentrated_ball : public CreatureScript
public:
npc_concentrated_ball() : CreatureScript("npc_concentrated_ball") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_concentrated_ballAI(pCreature);
}
@@ -684,13 +684,13 @@ public:
bool despawning;
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == 1)
despawning = true;
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if( type != POINT_MOTION_TYPE || id != 0 )
return;
@@ -705,7 +705,7 @@ public:
me->GetMotionMaster()->MovePoint(0, Locs[LOC_CENTER].GetPositionX() + cos(angle) * 47.0f, Locs[LOC_CENTER].GetPositionY() + sin(angle) * 47.0f, me->GetPositionZ());
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
if( despawning )
return;
@@ -795,13 +795,13 @@ public:
}
}
void Register()
void Register() override
{
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_valkyr_essence_auraAuraScript::HandleAfterEffectAbsorb, EFFECT_0);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_valkyr_essence_auraAuraScript();
}
@@ -849,13 +849,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_valkyr_touchAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_valkyr_touchAuraScript();
}
@@ -886,13 +886,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_valkyr_ball_periodic_dummyAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_valkyr_ball_periodic_dummyAuraScript();
}

28
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
View File

@@ -136,7 +136,7 @@ public:
}
}
void OnUnitDeath(Unit* u)
void OnUnitDeath(Unit* u) override
{
if (bNooneDied && u->GetTypeId() == TYPEID_PLAYER)
{
@@ -145,7 +145,7 @@ public:
}
}
void Initialize()
void Initialize() override
{
CLEANED = false;
EncounterStatus = NOT_STARTED;
@@ -187,7 +187,7 @@ public:
GO_FloorGUID = 0;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
Map::PlayerList const& pl = instance->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
@@ -200,7 +200,7 @@ public:
return false;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch( creature->GetEntry() )
{
@@ -250,7 +250,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch( go->GetEntry() )
{
@@ -278,7 +278,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch( type )
{
@@ -539,7 +539,7 @@ public:
}
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch( type )
{
@@ -549,7 +549,7 @@ public:
return 0;
}
uint64 GetData64(uint32 type) const
uint64 GetData64(uint32 type) const override
{
switch( type )
{
@@ -569,7 +569,7 @@ public:
return 0;
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
events.Update(diff);
switch( events.ExecuteEvent() )
@@ -1416,7 +1416,7 @@ public:
}
}
void OnPlayerEnter(Player* plr)
void OnPlayerEnter(Player* plr) override
{
if( instance->IsHeroic() )
{
@@ -1602,7 +1602,7 @@ public:
events.RescheduleEvent(EVENT_CHECK_PLAYERS, CLEANUP_CHECK_INTERVAL);
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
@@ -1614,7 +1614,7 @@ public:
return str_data;
}
void Load(const char* in)
void Load(const char* in) override
{
EncounterStatus = NOT_STARTED;
CLEANED = false;
@@ -1652,7 +1652,7 @@ public:
OUT_LOAD_INST_DATA_COMPLETE;
}
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/)
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{
switch(criteria_id)
{
@@ -1717,7 +1717,7 @@ public:
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_trial_of_the_crusader_InstanceMapScript(map);
}