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

18
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
View File

@@ -91,7 +91,7 @@ class boss_ingvar_the_plunderer : public CreatureScript
public:
boss_ingvar_the_plunderer() : CreatureScript("boss_ingvar_the_plunderer") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_ingvar_the_plundererAI(pCreature);
}
@@ -109,7 +109,7 @@ public:
uint64 ValkyrGUID;
uint64 ThrowGUID;
void Reset()
void Reset() override
{
ValkyrGUID = 0;
ThrowGUID = 0;
@@ -126,7 +126,7 @@ public:
pInstance->SetData(DATA_INGVAR, NOT_STARTED);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (me->GetDisplayId() == DISPLAYID_DEFAULT && damage >= me->GetHealth())
{
@@ -146,7 +146,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
// schedule Phase 1 abilities
@@ -162,7 +162,7 @@ public:
pInstance->SetData(DATA_INGVAR, IN_PROGRESS);
}
void JustSummoned(Creature* s)
void JustSummoned(Creature* s) override
{
summons.Summon(s);
if (s->GetEntry() == NPC_ANNHYLDE)
@@ -182,7 +182,7 @@ public:
}
}
void KilledUnit(Unit* /*who*/)
void KilledUnit(Unit* /*who*/) override
{
if (me->GetDisplayId() == DISPLAYID_DEFAULT)
Talk(YELL_KILL_2);
@@ -208,7 +208,7 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
events.Reset();
summons.DespawnAll();
@@ -220,14 +220,14 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

32
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
View File

@@ -48,7 +48,7 @@ class npc_frost_tomb : public CreatureScript
public:
npc_frost_tomb() : CreatureScript("npc_frost_tomb") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_frost_tombAI(pCreature);
}
@@ -72,7 +72,7 @@ public:
}
uint64 PrisonerGUID;
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
if (killer->GetGUID() != me->GetGUID())
if (InstanceScript* pInstance = me->GetInstanceScript())
@@ -84,7 +84,7 @@ public:
me->DespawnOrUnsummon(5000);
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
if (PrisonerGUID)
{
@@ -106,7 +106,7 @@ class boss_keleseth : public CreatureScript
public:
boss_keleseth() : CreatureScript("boss_keleseth") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_kelesethAI (pCreature);
}
@@ -121,14 +121,14 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
if (pInstance)
pInstance->SetData(DATA_KELESETH, NOT_STARTED);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
/*void KilledUnit(Unit * victim)
{
@@ -137,14 +137,14 @@ public:
DoScriptText(SAY_KILL, me);
}*/
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (pInstance)
pInstance->SetData(DATA_KELESETH, DONE);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
events.RescheduleEvent(EVENT_SPELL_SHADOWBOLT, 0);
@@ -158,7 +158,7 @@ public:
pInstance->SetData(DATA_KELESETH, IN_PROGRESS);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if( !who )
return;
@@ -166,7 +166,7 @@ public:
UnitAI::AttackStartCaster(who, 12.0f);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -235,7 +235,7 @@ class npc_vrykul_skeleton : public CreatureScript
public:
npc_vrykul_skeleton() : CreatureScript("npc_vrykul_skeleton") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_vrykul_skeletonAI (pCreature);
}
@@ -250,7 +250,7 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
events.RescheduleEvent(EVENT_SPELL_DECREPIFY, urand(10000, 20000));
@@ -258,7 +258,7 @@ public:
events.RescheduleEvent(EVENT_SPELL_BONE_ARMOR, urand(25000, 120000));
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (damage >= me->GetHealth())
{
@@ -278,7 +278,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if( pInstance && pInstance->GetData(DATA_KELESETH) != IN_PROGRESS )
{
@@ -349,13 +349,13 @@ public:
target->CastSpell((Unit*)NULL, SPELL_FROST_TOMB_SUMMON, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_frost_tombAuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_frost_tombAuraScript();
}

30
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
View File

@@ -58,7 +58,7 @@ class boss_skarvald_the_constructor : public CreatureScript
public:
boss_skarvald_the_constructor() : CreatureScript("boss_skarvald_the_constructor") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_skarvald_the_constructorAI (pCreature);
}
@@ -73,7 +73,7 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
me->SetLootMode(0);
events.Reset();
@@ -90,7 +90,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
switch(param)
{
@@ -100,7 +100,7 @@ public:
}
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
events.Reset();
events.RescheduleEvent(EVENT_SPELL_CHARGE, 5000);
@@ -121,13 +121,13 @@ public:
}
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (me->GetEntry() == NPC_SKARVALD)
Talk(YELL_SKARVALD_KILL);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*Killer*/) override
{
if( me->GetEntry() != NPC_SKARVALD )
return;
@@ -153,7 +153,7 @@ public:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_SKARVALD_GHOST, true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -200,7 +200,7 @@ class boss_dalronn_the_controller : public CreatureScript
public:
boss_dalronn_the_controller() : CreatureScript("boss_dalronn_the_controller") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_dalronn_the_controllerAI (pCreature);
}
@@ -216,7 +216,7 @@ public:
EventMap events;
SummonList summons;
void Reset()
void Reset() override
{
me->SetLootMode(0);
events.Reset();
@@ -234,7 +234,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
switch(param)
{
@@ -247,7 +247,7 @@ public:
}
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
events.Reset();
events.RescheduleEvent(EVENT_SPELL_SHADOW_BOLT, 1000);
@@ -270,18 +270,18 @@ public:
}
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (me->GetEntry() == NPC_DALRONN)
Talk(YELL_DALRONN_KILL);
}
void JustSummoned(Creature* s)
void JustSummoned(Creature* s) override
{
summons.Summon(s);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*Killer*/) override
{
if( me->GetEntry() != NPC_DALRONN )
return;
@@ -306,7 +306,7 @@ public:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_DALRONN_GHOST, true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

24
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
View File

@@ -12,7 +12,7 @@ class instance_utgarde_keep : public InstanceMapScript
public:
instance_utgarde_keep() : InstanceMapScript("instance_utgarde_keep", 574) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
return new instance_utgarde_keep_InstanceMapScript(pMap);
}
@@ -40,7 +40,7 @@ public:
uint64 NPC_SpecialDrakeGUID;
bool bRocksAchiev;
void Initialize()
void Initialize() override
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
ForgeEventMask = 0;
@@ -61,7 +61,7 @@ public:
bRocksAchiev = true;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
@@ -69,7 +69,7 @@ public:
return false;
}
void OnPlayerEnter(Player* plr)
void OnPlayerEnter(Player* plr) override
{
if (Creature* c = instance->GetCreature(NPC_DarkRangerMarrahGUID))
{
@@ -86,7 +86,7 @@ public:
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch(creature->GetEntry())
{
@@ -117,7 +117,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch(go->GetEntry())
{
@@ -168,7 +168,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch(type)
{
@@ -284,7 +284,7 @@ public:
}
}
uint64 GetData64(uint32 id) const
uint64 GetData64(uint32 id) const override
{
switch(id)
{
@@ -300,7 +300,7 @@ public:
return 0;
}
uint32 GetData(uint32 id) const
uint32 GetData(uint32 id) const override
{
switch(id)
{
@@ -316,7 +316,7 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -329,7 +329,7 @@ public:
return str_data;
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{
@@ -361,7 +361,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)
{

24
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
View File

@@ -13,7 +13,7 @@ class npc_dragonflayer_forge_master : public CreatureScript
public:
npc_dragonflayer_forge_master() : CreatureScript("npc_dragonflayer_forge_master") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_dragonflayer_forge_masterAI(pCreature);
}
@@ -47,20 +47,20 @@ public:
uint32 dataId;
uint32 prevDataId;
void Reset()
void Reset() override
{
if (pInstance)
pInstance->SetData(dataId, NOT_STARTED);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (pInstance)
pInstance->SetData(dataId, DONE);
me->SaveRespawnTime();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (pInstance)
{
@@ -108,7 +108,7 @@ public:
_setData = false;
}
void Reset()
void Reset() override
{
_events.Reset();
_events.ScheduleEvent(EVENT_REND, urand(2000, 3000));
@@ -116,7 +116,7 @@ public:
_events.ScheduleEvent(EVENT_KNOCKAWAY, urand(3500, 6000));
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == WAYPOINT_MOTION_TYPE && id == POINT_LAST)
{
@@ -134,7 +134,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
if (type == TYPE_PROTODRAKE_AT && data == DATA_PROTODRAKE_MOVE && !_setData && me->IsAlive() && me->GetDistance(protodrakeCheckPos) < 10.0f)
{
@@ -146,7 +146,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -186,7 +186,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_enslaved_proto_drakeAI(creature);
}
@@ -206,7 +206,7 @@ public:
{
PrepareAuraScript(spell_ticking_time_bomb_AuraScript);
bool Validate(SpellInfo const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/) override
{
return (bool) sSpellMgr->GetSpellInfo(SPELL_TICKING_TIME_BOMB_EXPLODE);
}
@@ -219,13 +219,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_ticking_time_bomb_AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_ticking_time_bomb_AuraScript();
}

82
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
View File

@@ -99,7 +99,7 @@ class boss_palehoof : public CreatureScript
public:
boss_palehoof() : CreatureScript("boss_palehoof") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_palehoofAI (pCreature);
}
@@ -118,7 +118,7 @@ public:
uint8 Counter;
uint8 RandomUnfreeze[4];
void Reset()
void Reset() override
{
for (uint8 i = 0; i < 4; ++i)
{
@@ -173,7 +173,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_START_EVENT)
{
@@ -197,13 +197,13 @@ public:
events.RescheduleEvent(EVENT_UNFREEZE_MONSTER, 3000);
}
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*pWho*/) override
{
if (m_pInstance)
m_pInstance->SetData(DATA_GORTOK_PALEHOOF, IN_PROGRESS);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
return;
@@ -211,12 +211,12 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustReachedHome()
void JustReachedHome() override
{
me->SetStandState(UNIT_STAND_STATE_STAND);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -305,14 +305,14 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
me->SendPlaySound(SOUND_DEATH, false);
if(m_pInstance)
m_pInstance->SetData(DATA_GORTOK_PALEHOOF, DONE);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
return;
@@ -331,7 +331,7 @@ class npc_massive_jormungar : public CreatureScript
public:
npc_massive_jormungar() : CreatureScript("npc_massive_jormungar") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_massive_jormungarAI (pCreature);
}
@@ -347,16 +347,16 @@ public:
EventMap events;
SummonList summons;
void Reset()
void Reset() override
{
summons.DespawnAll();
events.Reset();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) {}
void EnterCombat(Unit*) override {}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_UNFREEZE)
{
@@ -376,7 +376,7 @@ public:
summons.DespawnAll();
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
@@ -384,12 +384,12 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustReachedHome()
void JustReachedHome() override
{
me->SetStandState(UNIT_STAND_STATE_STAND);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -439,7 +439,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
if (m_pInstance)
{
@@ -459,7 +459,7 @@ class npc_ferocious_rhino : public CreatureScript
public:
npc_ferocious_rhino() : CreatureScript("npc_ferocious_rhino") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_ferocious_rhinoAI (pCreature);
}
@@ -474,15 +474,15 @@ public:
InstanceScript* m_pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) {}
void EnterCombat(Unit*) override {}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_UNFREEZE)
{
@@ -500,7 +500,7 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
@@ -508,12 +508,12 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustReachedHome()
void JustReachedHome() override
{
me->SetStandState(UNIT_STAND_STATE_STAND);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -549,7 +549,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
if (m_pInstance)
{
@@ -569,7 +569,7 @@ class npc_ravenous_furbolg : public CreatureScript
public:
npc_ravenous_furbolg() : CreatureScript("npc_ravenous_furbolg") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_ravenous_furbolgAI (pCreature);
}
@@ -584,15 +584,15 @@ public:
InstanceScript* m_pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) {}
void EnterCombat(Unit*) override {}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_UNFREEZE)
{
@@ -610,7 +610,7 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
@@ -618,12 +618,12 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustReachedHome()
void JustReachedHome() override
{
me->SetStandState(UNIT_STAND_STATE_STAND);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -657,7 +657,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
if (m_pInstance)
{
@@ -677,7 +677,7 @@ class npc_frenzied_worgen : public CreatureScript
public:
npc_frenzied_worgen() : CreatureScript("npc_frenzied_worgen") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_frenzied_worgenAI (pCreature);
}
@@ -692,15 +692,15 @@ public:
InstanceScript* m_pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) {}
void EnterCombat(Unit*) override {}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_UNFREEZE)
{
@@ -718,7 +718,7 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
@@ -726,12 +726,12 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustReachedHome()
void JustReachedHome() override
{
me->SetStandState(UNIT_STAND_STATE_STAND);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -765,7 +765,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
if (m_pInstance)
{

28
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
View File

@@ -98,7 +98,7 @@ class boss_skadi : public CreatureScript
public:
boss_skadi() : CreatureScript("boss_skadi") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_skadiAI (pCreature);
}
@@ -116,7 +116,7 @@ public:
uint64 GraufGUID;
bool SecondPhase, EventStarted;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
@@ -145,7 +145,7 @@ public:
Creature* GetGrauf() { return ObjectAccessor::GetCreature(*me, GraufGUID); }
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*pWho*/) override
{
if (!EventStarted)
{
@@ -165,7 +165,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_PHASE2)
@@ -182,7 +182,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() && SecondPhase)
return;
@@ -232,7 +232,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
summons.DespawnAll();
Talk(SAY_DEATH);
@@ -244,7 +244,7 @@ public:
}
}
void KilledUnit(Unit* /*pVictim*/)
void KilledUnit(Unit* /*pVictim*/) override
{
if (urand(0, 1))
return;
@@ -259,7 +259,7 @@ class boss_skadi_grauf : public CreatureScript
public:
boss_skadi_grauf() : CreatureScript("boss_skadi_grauf") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_skadi_graufAI (pCreature);
}
@@ -277,7 +277,7 @@ public:
uint8 currentPos;
uint8 AchievementHitCount;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
@@ -286,7 +286,7 @@ public:
me->RemoveAllAuras();
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_START_EVENT)
{
@@ -310,7 +310,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == 47593) // SPELL_FLAME_VISUAL trigger
target->CastSpell(target, me->GetMap()->IsHeroic() ? SPELL_FLAME_BREATH_H : SPELL_FLAME_BREATH_N, true);
@@ -340,7 +340,7 @@ public:
}
}
void MovementInform(uint32 /*uiType*/, uint32 Id)
void MovementInform(uint32 /*uiType*/, uint32 Id) override
{
switch(Id)
{
@@ -375,7 +375,7 @@ public:
}
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
me->SetInCombatWithZone();
}
@@ -426,7 +426,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch (events.ExecuteEvent())

30
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
View File

@@ -90,7 +90,7 @@ class boss_svala : public CreatureScript
public:
boss_svala() : CreatureScript("boss_svala") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_svalaAI (creature);
}
@@ -111,7 +111,7 @@ public:
EventMap events2;
SummonList summons;
void Reset()
void Reset() override
{
if (instance)
{
@@ -131,13 +131,13 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->SetControlled(false, UNIT_STATE_ROOT);
ScriptedAI::EnterEvadeMode();
}
void SetData(uint32 data, uint32 param)
void SetData(uint32 data, uint32 param) override
{
if (data != 1 || param != 1 || Started || (instance && instance->GetData(DATA_SVALA_SORROWGRAVE) == DONE))
return;
@@ -157,14 +157,14 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (summon->GetEntry() == NPC_RITUAL_CHANNELER)
summon->CastSpell(summon, SPELL_TELEPORT_VISUAL, true);
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
me->SetInCombatWithZone();
Talk(SAY_AGGRO);
@@ -177,7 +177,7 @@ public:
instance->SetData(DATA_SVALA_SORROWGRAVE, IN_PROGRESS);
}
void JustDied(Unit*)
void JustDied(Unit*) override
{
summons.DespawnAll();
Talk(SAY_DEATH);
@@ -185,7 +185,7 @@ public:
instance->SetData(DATA_SVALA_SORROWGRAVE, DONE);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetEntry() == NPC_SCOURGE_HULK && instance)
{
@@ -197,7 +197,7 @@ public:
Talk(SAY_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (events2.ExecuteEvent())
@@ -361,7 +361,7 @@ class npc_ritual_channeler : public CreatureScript
public:
npc_ritual_channeler() : CreatureScript("npc_ritual_channeler") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_ritual_channelerAI (pCreature);
}
@@ -370,7 +370,7 @@ public:
{
npc_ritual_channelerAI(Creature* pCreature) : NullCreatureAI(pCreature) {}
void AttackStart(Unit* pWho)
void AttackStart(Unit* pWho) override
{
if (me->GetMap()->GetDifficulty() == DUNGEON_DIFFICULTY_HEROIC)
me->AddAura(SPELL_SHADOWS_IN_THE_DARK, me);
@@ -404,13 +404,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_svala_ritual_strike_SpellScript::HandleDummyEffect, EFFECT_2, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_svala_ritual_strike_SpellScript();
}
@@ -425,13 +425,13 @@ public:
amount = (GetCaster()->GetMap()->IsHeroic() ? 2000 : 1000);
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_svala_ritual_strike_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_svala_ritual_strike_AuraScript();
}

18
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
View File

@@ -90,7 +90,7 @@ class boss_ymiron : public CreatureScript
public:
boss_ymiron() : CreatureScript("boss_ymiron") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_ymironAI (pCreature);
}
@@ -109,7 +109,7 @@ public:
uint8 BoatNum;
uint8 BoatOrder[4];
void Reset()
void Reset() override
{
for (uint8 i = 0; i < 4; ++i)
{
@@ -146,13 +146,13 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
ScriptedAI::EnterEvadeMode();
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*pWho*/) override
{
Talk(SAY_AGGRO);
if(pInstance)
@@ -168,7 +168,7 @@ public:
events.RescheduleEvent(EVENT_YMIRON_HEALTH_CHECK, 1000);
}
void MovementInform(uint32 uiType, uint32 point)
void MovementInform(uint32 uiType, uint32 point) override
{
if(uiType != POINT_MOTION_TYPE)
return;
@@ -183,13 +183,13 @@ public:
}
}
void SpellHitTarget(Unit*, const SpellInfo* spellInfo)
void SpellHitTarget(Unit*, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == 59302 && pInstance) // Bane trigger
pInstance->SetData(DATA_YMIRON_ACHIEVEMENT, false);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -320,7 +320,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*pKiller*/)
void JustDied(Unit* /*pKiller*/) override
{
Talk(SAY_DEATH);
summons.DespawnAll();
@@ -330,7 +330,7 @@ public:
pInstance->SetData(DATA_KING_YMIRON, DONE);
}
void KilledUnit(Unit* /*pVictim*/)
void KilledUnit(Unit* /*pVictim*/) override
{
if (urand(0, 1))
return;

22
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
View File

@@ -11,7 +11,7 @@ class instance_pinnacle : public InstanceMapScript
public:
instance_pinnacle() : InstanceMapScript("instance_pinnacle", 575) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
return new instance_pinnacle_InstanceMapScript(pMap);
}
@@ -43,7 +43,7 @@ public:
bool skadiAchievement;
bool ymironAchievement;
void Initialize()
void Initialize() override
{
SvalaSorrowgrave = 0;
GortokPalehoof = 0;
@@ -71,7 +71,7 @@ public:
Encounters[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
for(uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
if(Encounters[i] == IN_PROGRESS)
@@ -79,7 +79,7 @@ public:
return false;
}
void OnCreatureCreate(Creature* pCreature)
void OnCreatureCreate(Creature* pCreature) override
{
switch(pCreature->GetEntry())
{
@@ -113,7 +113,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* pGo)
void OnGameObjectCreate(GameObject* pGo) override
{
switch(pGo->GetEntry())
{
@@ -136,7 +136,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)
{
@@ -150,7 +150,7 @@ public:
return false;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch(type)
{
@@ -196,14 +196,14 @@ public:
OUT_SAVE_INST_DATA_COMPLETE;
}
std::string GetSaveData()
std::string GetSaveData() override
{
std::ostringstream saveStream;
saveStream << "U P " << Encounters[0] << ' ' << Encounters[1] << ' ' << Encounters[2] << ' ' << Encounters[3];
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{
@@ -236,7 +236,7 @@ public:
OUT_LOAD_INST_DATA_COMPLETE;
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch(type)
{
@@ -256,7 +256,7 @@ public:
return 0;
}
uint64 GetData64(uint32 identifier) const
uint64 GetData64(uint32 identifier) const override
{
switch(identifier)
{