nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-17 17:24:33 +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

22
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
View File

@@ -43,7 +43,7 @@ public:
{
}
bool Execute(uint64 /*execTime*/, uint32 /*diff*/)
bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
{
_caster->AI()->Talk(EMOTE_SHIELD);
_caster->CastSpell(_caster, SPELL_CHARGE_RIFTS, true);
@@ -59,7 +59,7 @@ class boss_anomalus : public CreatureScript
public:
boss_anomalus() : CreatureScript("boss_anomalus") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_anomalusAI (creature);
}
@@ -73,21 +73,21 @@ public:
bool achievement;
uint16 activeRifts;
void Reset()
void Reset() override
{
BossAI::Reset();
achievement = true;
me->CastSpell(me, SPELL_CLOSE_RIFTS, true);
}
uint32 GetData(uint32 data) const
uint32 GetData(uint32 data) const override
{
if (data == me->GetEntry())
return achievement;
return 0;
}
void SetData(uint32 type, uint32)
void SetData(uint32 type, uint32) override
{
if (type == me->GetEntry())
{
@@ -101,13 +101,13 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
activeRifts++;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -121,14 +121,14 @@ public:
events.ScheduleEvent(EVENT_ANOMALUS_ARCANE_ATTRACTION, 8000);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
me->CastSpell(me, SPELL_CLOSE_RIFTS, true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -182,7 +182,7 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetHomePosition().GetExactDist2d(me) > 60.0f;
}
@@ -196,7 +196,7 @@ public:
{
}
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
if (!target)
return false;

12
src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
View File

@@ -35,7 +35,7 @@ class boss_commander_stoutbeard : public CreatureScript
public:
boss_commander_stoutbeard() : CreatureScript("boss_commander_stoutbeard") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_commander_stoutbeardAI>(creature);
}
@@ -46,12 +46,12 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
Talk(SAY_AGGRO);
@@ -63,7 +63,7 @@ public:
me->RemoveAllAuras();
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -72,13 +72,13 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
BossAI::JustDied(killer);
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

18
src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
View File

@@ -44,7 +44,7 @@ class boss_keristrasza : public CreatureScript
public:
boss_keristrasza() : CreatureScript("boss_keristrasza") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_keristraszaAI>(creature);
}
@@ -57,14 +57,14 @@ public:
std::set<uint32> aGuids;
void Reset()
void Reset() override
{
BossAI::Reset();
RemovePrison(CanRemovePrison());
aGuids.clear();
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -77,13 +77,13 @@ public:
events.ScheduleEvent(EVENT_ACHIEVEMENT_CHECK, 1000);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -92,7 +92,7 @@ public:
}
}
void SetData(uint32 type, uint32)
void SetData(uint32 type, uint32) override
{
if (type == me->GetEntry() && CanRemovePrison())
RemovePrison(true);
@@ -120,12 +120,12 @@ public:
}
}
uint32 GetData(uint32 guid) const
uint32 GetData(uint32 guid) const override
{
return aGuids.find(guid) == aGuids.end();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -186,7 +186,7 @@ public:
{
}
bool OnCheck(Player* player, Unit* target)
bool OnCheck(Player* player, Unit* target) override
{
if (!target)
return false;

32
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
View File

@@ -65,7 +65,7 @@ class boss_magus_telestra : public CreatureScript
public:
boss_magus_telestra() : CreatureScript("boss_magus_telestra") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_magus_telestraAI>(creature);
}
@@ -79,7 +79,7 @@ public:
uint8 copiesDied;
bool achievement;
void Reset()
void Reset() override
{
BossAI::Reset();
copiesDied = 0;
@@ -89,14 +89,14 @@ public:
me->AddAura(SPELL_WEAR_CHRISTMAS_HAT, me);
}
uint32 GetData(uint32 data) const
uint32 GetData(uint32 data) const override
{
if (data == me->GetEntry())
return achievement;
return 0;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
Talk(SAY_AGGRO);
@@ -109,19 +109,19 @@ public:
events.ScheduleEvent(EVENT_MAGUS_HEALTH2, 1000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (who && me->Attack(who, true))
me->GetMotionMaster()->MoveChase(who, 20.0f);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
BossAI::JustDied(killer);
Talk(SAY_DEATH);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -130,13 +130,13 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
summon->SetInCombatWithZone();
}
void SpellHit(Unit* caster, const SpellInfo* spellInfo)
void SpellHit(Unit* caster, const SpellInfo* spellInfo) override
{
if (spellInfo->Id >= SPELL_FIRE_MAGUS_DEATH && spellInfo->Id <= SPELL_ARCANE_MAGUS_DEATH && caster->ToCreature())
{
@@ -153,7 +153,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -224,7 +224,7 @@ public:
{
PrepareAuraScript(spell_boss_magus_telestra_summon_telestra_clones_AuraScript);
bool Load()
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
}
@@ -248,14 +248,14 @@ public:
GetUnitOwner()->ToCreature()->LoadEquipment(1, true);
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_boss_magus_telestra_summon_telestra_clones_AuraScript::HandleApply, EFFECT_1, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_boss_magus_telestra_summon_telestra_clones_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_boss_magus_telestra_summon_telestra_clones_AuraScript();
}
@@ -299,14 +299,14 @@ public:
target->GetMotionMaster()->MoveJump(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), speedXY, speedZ);
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_boss_magus_telestra_gravity_well_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_boss_magus_telestra_gravity_well_SpellScript::HandlePull, EFFECT_0, SPELL_EFFECT_PULL_TOWARDS_DEST);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_boss_magus_telestra_gravity_well_SpellScript();
}
@@ -319,7 +319,7 @@ public:
{
}
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
if (!target)
return false;

20
src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
View File

@@ -52,7 +52,7 @@ class boss_ormorok : public CreatureScript
public:
boss_ormorok() : CreatureScript("boss_ormorok") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_ormorokAI>(creature);
}
@@ -65,13 +65,13 @@ public:
uint8 _spikesCount;
void Reset()
void Reset() override
{
_spikesCount = 0;
BossAI::Reset();
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -84,13 +84,13 @@ public:
events.ScheduleEvent(EVENT_ORMOROK_SUMMON, 17000);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -99,12 +99,12 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -172,7 +172,7 @@ class npc_crystal_spike : public CreatureScript
public:
npc_crystal_spike() : CreatureScript("npc_crystal_spike") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return GetInstanceAI<npc_crystal_spikeAI>(pCreature);
}
@@ -186,7 +186,7 @@ public:
int32 _damageTimer;
uint64 _gameObjectGUID;
void Reset()
void Reset() override
{
if (GameObject* gameobject = me->SummonGameObject(GO_CRYSTAL_SPIKE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3500))
_gameObjectGUID = gameobject->GetGUID();
@@ -194,7 +194,7 @@ public:
_damageTimer = 1;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (_damageTimer)
{

30
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
View File

@@ -19,7 +19,7 @@ class instance_nexus : public InstanceMapScript
public:
instance_nexus() : InstanceMapScript("instance_nexus", 576) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_nexus_InstanceMapScript(map);
}
@@ -28,13 +28,13 @@ public:
{
instance_nexus_InstanceMapScript(Map* map) : InstanceScript(map) {}
void Initialize()
void Initialize() override
{
SetBossNumber(MAX_ENCOUNTERS);
LoadDoorData(doorData);
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
Map::PlayerList const& players = instance->GetPlayers();
TeamId TeamIdInInstance = TEAM_NEUTRAL;
@@ -72,7 +72,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* gameObject)
void OnGameObjectCreate(GameObject* gameObject) override
{
switch (gameObject->GetEntry())
{
@@ -94,7 +94,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* gameObject)
void OnGameObjectRemove(GameObject* gameObject) override
{
switch (gameObject->GetEntry())
{
@@ -106,7 +106,7 @@ public:
}
}
void SetData(uint32 type, uint32)
void SetData(uint32 type, uint32) override
{
switch (type)
{
@@ -125,7 +125,7 @@ public:
}
}
bool SetBossState(uint32 id, EncounterState state)
bool SetBossState(uint32 id, EncounterState state) override
{
if (!InstanceScript::SetBossState(id, state))
return false;
@@ -139,14 +139,14 @@ public:
return true;
}
std::string GetSaveData()
std::string GetSaveData() override
{
std::ostringstream saveStream;
saveStream << "N E X " << GetBossSaveData();
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if( !in )
return;
@@ -183,7 +183,7 @@ class npc_crystalline_frayer : public CreatureScript
public:
npc_crystalline_frayer() : CreatureScript("npc_crystalline_frayer") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_crystalline_frayerAI>(creature);
}
@@ -199,7 +199,7 @@ public:
uint32 abilityTimer1;
uint32 abilityTimer2;
void Reset()
void Reset() override
{
restoreTimer = 0;
abilityTimer1 = 0;
@@ -208,18 +208,18 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
_allowDeath = me->GetInstanceScript()->GetBossState(DATA_ORMOROK_EVENT) == DONE;
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
if (me->isRegeneratingHealth())
ScriptedAI::EnterEvadeMode();
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (damage >= me->GetHealth())
{
@@ -242,7 +242,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (restoreTimer)
{

28
src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
View File

@@ -47,7 +47,7 @@ class boss_drakos : public CreatureScript
public:
boss_drakos() : CreatureScript("boss_drakos") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_drakosAI (pCreature);
}
@@ -62,7 +62,7 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
if (pInstance)
pInstance->SetData(DATA_DRAKOS, NOT_STARTED);
@@ -70,7 +70,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -84,7 +84,7 @@ public:
events.RescheduleEvent(EVENT_SUMMON, 2000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
@@ -103,15 +103,15 @@ public:
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_KILL);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void JustSummoned(Creature* /*summon*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void JustSummoned(Creature* /*summon*/) override {}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;
@@ -173,7 +173,7 @@ class npc_oculus_unstable_sphere : public CreatureScript
public:
npc_oculus_unstable_sphere() : CreatureScript("npc_oculus_unstable_sphere") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_oculus_unstable_sphereAI (pCreature);
}
@@ -192,7 +192,7 @@ public:
me->GetMotionMaster()->MovePoint(1, 961.29f + dist * cos(angle), 1049.0f + dist * sin(angle), 360.0f);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if( type != POINT_MOTION_TYPE || id != 1 )
return;
@@ -201,7 +201,7 @@ public:
gonext = true;
}
void Reset()
void Reset() override
{
me->SetReactState(REACT_PASSIVE);
me->SetSpeed(MOVE_RUN, 1.4f, true);
@@ -214,10 +214,10 @@ public:
PickNewLocation();
}
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) override {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( timer == 0 )
me->CastSpell(me, SPELL_TELEPORT_VISUAL, true);

18
src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
View File

@@ -58,7 +58,7 @@ class boss_eregos : public CreatureScript
public:
boss_eregos() : CreatureScript("boss_eregos") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_eregosAI (pCreature);
}
@@ -74,7 +74,7 @@ public:
EventMap events;
uint8 shiftNumber;
void Reset()
void Reset() override
{
if (pInstance)
{
@@ -88,7 +88,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -122,7 +122,7 @@ public:
events.RescheduleEvent(EVENT_SUMMON_WHELPS, 40000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
@@ -132,7 +132,7 @@ public:
me->SummonGameObject(GO_SPOTLIGHT, 1018.06f, 1051.09f, 605.619019f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0);
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
if( !me->GetMap()->IsHeroic() )
return;
@@ -144,14 +144,14 @@ public:
}
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_KILL);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void JustSummoned(Creature* pSummon)
void JustSummoned(Creature* pSummon) override
{
if( pSummon->GetEntry() != NPC_LEY_GUARDIAN_WHELP )
return;
@@ -159,7 +159,7 @@ public:
DoZoneInCombat(pSummon, 300.0f);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;

22
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
View File

@@ -80,7 +80,7 @@ class boss_urom : public CreatureScript
public:
boss_urom() : CreatureScript("boss_urom") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_uromAI (pCreature);
}
@@ -107,7 +107,7 @@ public:
return 0;
}
void Reset()
void Reset() override
{
if (pInstance)
{
@@ -128,7 +128,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_ID, 49838, true);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if( lock )
return;
@@ -175,7 +175,7 @@ public:
}
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if( lock )
return;
@@ -184,7 +184,7 @@ public:
ScriptedAI::AttackStart(who);
}
void JustSummoned(Creature* pSummon)
void JustSummoned(Creature* pSummon) override
{
pSummon->SetInCombatWithZone();
if( Unit* v = pSummon->SelectVictim() )
@@ -202,7 +202,7 @@ public:
me->ResetPlayerDamageReq();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
@@ -210,12 +210,12 @@ public:
pInstance->SetData(DATA_UROM, DONE);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_PLAYER_KILL);
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
{
switch( spell->Id )
{
@@ -278,9 +278,9 @@ public:
}
}
void MoveInLineOfSight(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( releaseLockTimer )
{
@@ -344,7 +344,7 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->SetCanFly(false);
me->SetDisableGravity(false);

16
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
View File

@@ -67,7 +67,7 @@ class boss_varos : public CreatureScript
public:
boss_varos() : CreatureScript("boss_varos") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_varosAI (pCreature);
}
@@ -82,7 +82,7 @@ public:
EventMap events;
float ZapAngle;
void Reset()
void Reset() override
{
if (pInstance)
{
@@ -107,7 +107,7 @@ public:
me->DisableRotate(false);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -121,7 +121,7 @@ public:
events.RescheduleEvent(EVENT_ENERGIZE_CORES_THIN, 0);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
@@ -132,17 +132,17 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
}
void MoveInLineOfSight(Unit* /*who*/) {}
void JustSummoned(Creature* /*summon*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void JustSummoned(Creature* /*summon*/) override {}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
return;

24
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
View File

@@ -14,7 +14,7 @@ class instance_oculus : public InstanceMapScript
public:
instance_oculus() : InstanceMapScript("instance_oculus", 578) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
return new instance_oculus_InstanceMapScript(pMap);
}
@@ -37,7 +37,7 @@ public:
bool bEmeraldVoid;
bool bRubyVoid;
void Initialize()
void Initialize() override
{
EregosCacheGUID = 0;
uiDrakosGUID = 0;
@@ -53,7 +53,7 @@ public:
memset(&DragonCageDoorGUID, 0, sizeof(DragonCageDoorGUID));
}
void OnCreatureCreate(Creature* pCreature)
void OnCreatureCreate(Creature* pCreature) override
{
switch( pCreature->GetEntry() )
{
@@ -72,7 +72,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* pGo)
void OnGameObjectCreate(GameObject* pGo) override
{
switch( pGo->GetEntry() )
{
@@ -99,7 +99,7 @@ public:
}
}
void OnPlayerEnter(Player* player)
void OnPlayerEnter(Player* player) override
{
if (m_auiEncounter[DATA_DRAKOS] == DONE && m_auiEncounter[DATA_VAROS] != DONE)
{
@@ -113,13 +113,13 @@ public:
}
}
void OnUnitDeath(Unit* unit)
void OnUnitDeath(Unit* unit) override
{
if (unit->GetEntry() == NPC_CENTRIFUGE_CONSTRUCT)
SetData(DATA_CC_COUNT, DONE);
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch( type )
{
@@ -184,7 +184,7 @@ public:
SaveToDB();
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch( type )
{
@@ -200,7 +200,7 @@ public:
return 0;
}
uint64 GetData64(uint32 identifier) const
uint64 GetData64(uint32 identifier) const override
{
switch( identifier )
{
@@ -222,7 +222,7 @@ public:
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -233,7 +233,7 @@ public:
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if( !in )
{
@@ -262,7 +262,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)
{

78
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
View File

@@ -200,7 +200,7 @@ class npc_oculus_drake : public CreatureScript
public:
npc_oculus_drake() : CreatureScript("npc_oculus_drake") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_oculus_drakeAI (creature);
}
@@ -217,7 +217,7 @@ public:
bool JustSummoned;
uint16 despawnTimer;
void IsSummonedBy(Unit* summoner)
void IsSummonedBy(Unit* summoner) override
{
if (m_pInstance->GetBossState(DATA_EREGOS) == IN_PROGRESS)
if (Creature* eregos = me->FindNearestCreature(NPC_EREGOS, 450.0f, true))
@@ -244,13 +244,13 @@ public:
me->GetMotionMaster()->MovePoint(POINT_LAND, pos);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE && id == POINT_LAND)
me->SetDisableGravity(false); // Needed this for proper animation after spawn, the summon in air fall to ground bug leave no other option for now, if this isn't used the drake will only walk on move.
}
void PassengerBoarded(Unit* passenger, int8 /*seatid*/, bool add)
void PassengerBoarded(Unit* passenger, int8 /*seatid*/, bool add) override
{
if (passenger->GetTypeId() != TYPEID_PLAYER)
return;
@@ -272,7 +272,7 @@ public:
}
}
void SpellHitTarget(Unit* target, SpellInfo const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell) override
{
for( uint8 i = 0; i < 8; ++i )
if( me->m_spells[i] == spell->Id )
@@ -286,7 +286,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( JustSummoned )
{
@@ -360,14 +360,14 @@ public:
{
npc_centrifuge_constructAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() {}
void Reset() override {}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
DoCast(IsHeroic() ? H_SPELL_EMPOWERING_BLOWS : SPELL_EMPOWERING_BLOWS);
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
if (!UpdateVictim())
return;
@@ -375,7 +375,7 @@ public:
DoMeleeAttackIfReady();
}
void DamageTaken(Unit* attacker, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit* attacker, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
if (attacker)
{
@@ -385,7 +385,7 @@ public:
}
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_centrifuge_constructAI(creature);
}
@@ -401,7 +401,7 @@ public:
{
PrepareAuraScript(spell_oculus_stop_time_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_AMBER_SHOCK_CHARGE))
return false;
@@ -419,13 +419,13 @@ public:
caster->CastSpell(target, SPELL_AMBER_SHOCK_CHARGE, true);
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_oculus_stop_time_AuraScript::Apply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_stop_time_AuraScript();
}
@@ -441,7 +441,7 @@ public:
{
PrepareAuraScript(spell_oculus_evasive_maneuvers_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_RUBY_EVASIVE_CHARGES))
return false;
@@ -456,13 +456,13 @@ public:
SetDuration(0);
}
void Register()
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_oculus_evasive_maneuvers_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_evasive_maneuvers_AuraScript();
}
@@ -478,7 +478,7 @@ public:
{
PrepareSpellScript(spell_oculus_shock_lance_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_AMBER_SHOCK_CHARGE))
return false;
@@ -498,13 +498,13 @@ public:
SetHitDamage(damage);
}
void Register()
void Register() override
{
OnHit += SpellHitFn(spell_oculus_shock_lance_SpellScript::CalcDamage);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_oculus_shock_lance_SpellScript();
}
@@ -520,7 +520,7 @@ public:
{
PrepareAuraScript(spell_oculus_temporal_rift_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_AMBER_SHOCK_CHARGE))
return false;
@@ -543,13 +543,13 @@ public:
const_cast<AuraEffect*>(aurEff)->SetAmount(amount - 15000 * num);
}
void Register()
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_oculus_temporal_rift_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_temporal_rift_AuraScript();
}
@@ -570,13 +570,13 @@ public:
SetHitDamage(int32(GetCaster()->CountPctFromMaxHealth(30)));
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_oculus_touch_the_nightmare_SpellScript::HandleDamageCalc, EFFECT_2, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_oculus_touch_the_nightmare_SpellScript();
}
@@ -600,14 +600,14 @@ public:
canBeRecalculated = false;
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_dream_funnel_AuraScript();
}
@@ -629,13 +629,13 @@ public:
dest.RelocateOffset(offset);
}
void Register()
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_oculus_call_ruby_emerald_amber_drake_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_oculus_call_ruby_emerald_amber_drake_SpellScript();
}
@@ -658,13 +658,13 @@ public:
GetTarget()->CastSpell(caster, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript();
}
@@ -694,14 +694,14 @@ public:
}
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_oculus_evasive_chargesAuraScript::HandleOnEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectRemove += AuraEffectRemoveFn(spell_oculus_evasive_chargesAuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_evasive_chargesAuraScript();
}
@@ -751,14 +751,14 @@ public:
caster->CastSpell(caster, SPELL_SOAR_BUFF, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_oculus_soarAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectApply += AuraEffectApplyFn(spell_oculus_soarAuraScript::HandleOnEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_soarAuraScript();
}
@@ -824,7 +824,7 @@ public:
caster->RemoveAurasDueToSpell(SPELL_DRAKE_FLAG_VISUAL);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_oculus_rider_auraAuraScript::HandleOnEffectApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectApply += AuraEffectApplyFn(spell_oculus_rider_auraAuraScript::HandleOnEffectApply, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
@@ -832,7 +832,7 @@ public:
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_rider_auraAuraScript();
}
@@ -863,13 +863,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_oculus_drake_flagAuraScript::HandleOnEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_oculus_drake_flagAuraScript();
}