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

28
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
View File

@@ -34,7 +34,7 @@ class boss_anetheron : public CreatureScript
public:
boss_anetheron() : CreatureScript("boss_anetheron") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_anetheronAI>(creature);
}
@@ -53,7 +53,7 @@ public:
uint32 InfernoTimer;
bool go;
void Reset()
void Reset() override
{
damageTaken = 0;
SwarmTimer = 45000;
@@ -65,7 +65,7 @@ public:
instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS);
@@ -73,13 +73,13 @@ public:
Talk(SAY_ONAGGRO);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7)
{
@@ -89,7 +89,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
hyjal_trashAI::JustDied(killer);
if (IsEvent)
@@ -97,7 +97,7 @@ public:
Talk(SAY_ONDEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (IsEvent)
{
@@ -169,7 +169,7 @@ class npc_towering_infernal : public CreatureScript
public:
npc_towering_infernal() : CreatureScript("npc_towering_infernal") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_towering_infernalAI>(creature);
}
@@ -187,33 +187,33 @@ public:
uint64 AnetheronGUID;
InstanceScript* instance;
void Reset()
void Reset() override
{
DoCast(me, SPELL_INFERNO_EFFECT);
ImmolationTimer = 5000;
CheckTimer = 5000;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who))
AttackStart(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (CheckTimer <= diff)
{

40
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
View File

@@ -91,7 +91,7 @@ class npc_ancient_wisp : public CreatureScript
public:
npc_ancient_wisp() : CreatureScript("npc_ancient_wisp") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_ancient_wispAI>(creature);
}
@@ -108,7 +108,7 @@ public:
uint64 ArchimondeGUID;
uint32 CheckTimer;
void Reset()
void Reset() override
{
CheckTimer = 1000;
@@ -117,14 +117,14 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
damage = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (CheckTimer <= diff)
{
@@ -149,7 +149,7 @@ class npc_doomfire : public CreatureScript
public:
npc_doomfire() : CreatureScript("npc_doomfire") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_doomfireAI(creature);
}
@@ -158,13 +158,13 @@ public:
{
npc_doomfireAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() { }
void Reset() override { }
void MoveInLineOfSight(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
damage = 0;
}
@@ -178,7 +178,7 @@ class npc_doomfire_targetting : public CreatureScript
public:
npc_doomfire_targetting() : CreatureScript("npc_doomfire_targetting") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_doomfire_targettingAI(creature);
}
@@ -190,13 +190,13 @@ public:
uint64 TargetGUID;
uint32 ChangeTargetTimer;
void Reset()
void Reset() override
{
TargetGUID = 0;
ChangeTargetTimer = 5000;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
//will update once TargetGUID is 0. In case noone actually moves(not likely) and this is 0
@@ -205,14 +205,14 @@ public:
TargetGUID = who->GetGUID();
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
damage = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (ChangeTargetTimer <= diff)
{
@@ -248,7 +248,7 @@ class boss_archimonde : public CreatureScript
public:
boss_archimonde() : CreatureScript("boss_archimonde") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_archimondeAI>(creature);
}
@@ -704,7 +704,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_red_sky_effect_SpellScript();
}
@@ -733,7 +733,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_finger_of_death_SpellScript();
}
@@ -762,7 +762,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_hand_of_death_SpellScript();
}

30
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
View File

@@ -35,7 +35,7 @@ class boss_azgalor : public CreatureScript
public:
boss_azgalor() : CreatureScript("boss_azgalor") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_azgalorAI>(creature);
}
@@ -57,7 +57,7 @@ public:
bool go;
void Reset()
void Reset() override
{
damageTaken = 0;
RainTimer = 20000;
@@ -71,7 +71,7 @@ public:
instance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS);
@@ -79,12 +79,12 @@ public:
Talk(SAY_ONAGGRO);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && instance)
{
@@ -94,7 +94,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
hyjal_trashAI::JustDied(killer);
if (IsEvent)
@@ -102,7 +102,7 @@ public:
Talk(SAY_ONDEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (IsEvent)
{
@@ -176,7 +176,7 @@ class npc_lesser_doomguard : public CreatureScript
public:
npc_lesser_doomguard() : CreatureScript("npc_lesser_doomguard") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_lesser_doomguardAI>(creature);
}
@@ -195,7 +195,7 @@ public:
uint64 AzgalorGUID;
InstanceScript* instance;
void Reset()
void Reset() override
{
CrippleTimer = 50000;
WarstompTimer = 10000;
@@ -203,30 +203,30 @@ public:
CheckTimer = 5000;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
}
void WaypointReached(uint32 /*waypointId*/)
void WaypointReached(uint32 /*waypointId*/) override
{
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who))
AttackStart(who);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (CheckTimer <= diff)
{

24
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
View File

@@ -36,7 +36,7 @@ class boss_kazrogal : public CreatureScript
public:
boss_kazrogal() : CreatureScript("boss_kazrogal") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_kazrogalAI>(creature);
}
@@ -55,7 +55,7 @@ public:
uint32 MarkTimerBase;
bool go;
void Reset()
void Reset() override
{
damageTaken = 0;
CleaveTimer = 5000;
@@ -67,19 +67,19 @@ public:
instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS);
Talk(SAY_ONAGGRO);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && instance)
{
@@ -89,7 +89,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
hyjal_trashAI::JustDied(killer);
if (IsEvent)
@@ -97,7 +97,7 @@ public:
DoPlaySoundToSet(me, SOUND_ONDEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (IsEvent)
{
@@ -169,7 +169,7 @@ public:
targets.remove_if(acore::PowerCheck(POWER_MANA, false));
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
@@ -179,7 +179,7 @@ public:
{
PrepareAuraScript(spell_mark_of_kazrogal_AuraScript);
bool Validate(SpellInfo const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_MARK_DAMAGE))
return false;
@@ -198,18 +198,18 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_mark_of_kazrogal_SpellScript();
}
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_mark_of_kazrogal_AuraScript();
}

14
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
View File

@@ -31,7 +31,7 @@ class boss_rage_winterchill : public CreatureScript
public:
boss_rage_winterchill() : CreatureScript("boss_rage_winterchill") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_rage_winterchillAI>(creature);
}
@@ -50,7 +50,7 @@ public:
uint32 IceboltTimer;
bool go;
void Reset()
void Reset() override
{
damageTaken = 0;
FrostArmorTimer = 37000;
@@ -62,19 +62,19 @@ public:
instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (IsEvent)
instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS);
Talk(SAY_ONAGGRO);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_ONSLAY);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && instance)
{
@@ -84,7 +84,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
hyjal_trashAI::JustDied(killer);
if (IsEvent)
@@ -92,7 +92,7 @@ public:
Talk(SAY_ONDEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (IsEvent)
{

18
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
View File

@@ -109,15 +109,15 @@ struct hyjalAI : public npc_escortAI
{
hyjalAI(Creature* creature);
void Reset(); // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat
void Reset() override; // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat
void EnterEvadeMode(); // Send creature back to spawn location and evade.
void EnterEvadeMode() override; // Send creature back to spawn location and evade.
void EnterCombat(Unit* /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack
void EnterCombat(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack
void UpdateAI(uint32 diff); // Called to summon waves, check for boss deaths and to cast our spells.
void UpdateAI(uint32 diff) override; // Called to summon waves, check for boss deaths and to cast our spells.
void JustDied(Unit* /*killer*/); // Called on death, informs the raid that they have failed.
void JustDied(Unit* /*killer*/) override; // Called on death, informs the raid that they have failed.
void SetFaction(uint32 _faction) // Set the faction to either Alliance or Horde in Hyjal
{
@@ -128,13 +128,13 @@ struct hyjalAI : public npc_escortAI
void SpawnVeins();
void DeSpawnVeins();
void JustSummoned(Creature* summoned);
void SummonedCreatureDespawn(Creature* summoned);
void JustSummoned(Creature* summoned) override;
void SummonedCreatureDespawn(Creature* summoned) override;
void HideNearPos(float x, float y);
void RespawnNearPos(float x, float y);
void WaypointReached(uint32 waypointId);
void WaypointReached(uint32 waypointId) override;
void DoOverrun(uint32 faction, const uint32 diff);
void MoveInLineOfSight(Unit* who);
void MoveInLineOfSight(Unit* who) override;
void SummonCreature(uint32 entry, float Base[4][3]); // Summons a creature for that wave in that base

110
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
View File

@@ -421,16 +421,16 @@ public:
uint32 FlameBuffetTimer;
bool imol;
void Reset()
void Reset() override
{
spawnTimer = 2000;
FlameBuffetTimer = 2000;
imol = false;
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 0 && !IsOverrun)
{
@@ -443,7 +443,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (Delay <= diff)
{
@@ -522,7 +522,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_giant_infernalAI>(creature);
}
@@ -533,7 +533,7 @@ class npc_abomination : public CreatureScript
public:
npc_abomination() : CreatureScript("npc_abomination") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_abominationAI>(creature);
}
@@ -549,12 +549,12 @@ public:
bool go;
uint32 KnockDownTimer;
void Reset()
void Reset() override
{
KnockDownTimer = 10000;
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -581,9 +581,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
@@ -630,7 +630,7 @@ class npc_ghoul : public CreatureScript
public:
npc_ghoul() : CreatureScript("npc_ghoul") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_ghoulAI>(creature);
}
@@ -648,14 +648,14 @@ public:
uint32 FrenzyTimer;
uint32 MoveTimer;
bool RandomMove;
void Reset()
void Reset() override
{
FrenzyTimer = 5000 + rand() % 5000;
MoveTimer = 2000;
RandomMove = false;
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -683,9 +683,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
@@ -731,7 +731,7 @@ class npc_necromancer : public CreatureScript
public:
npc_necromancer() : CreatureScript("npc_necromancer") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_necromancerAI>(creature);
}
@@ -749,13 +749,13 @@ public:
bool go;
uint32 ShadowBoltTimer;
void Reset()
void Reset() override
{
ShadowBoltTimer = 1000 + rand() % 5000;
summons.DespawnAll();
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true);
if (target)
@@ -763,12 +763,12 @@ public:
summons.Summon(summon);
}
void SummonedCreatureDespawn(Creature* summon)
void SummonedCreatureDespawn(Creature* summon) override
{
summons.Despawn(summon);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -787,7 +787,7 @@ public:
}
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
switch (urand(0, 2))
{
@@ -805,9 +805,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
@@ -857,7 +857,7 @@ class npc_banshee : public CreatureScript
public:
npc_banshee() : CreatureScript("npc_banshee") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_bansheeAI>(creature);
}
@@ -876,14 +876,14 @@ public:
uint32 WailTimer;
uint32 ShellTimer;
void Reset()
void Reset() override
{
CourseTimer = 20000 + rand() % 5000;
WailTimer = 15000 + rand() % 5000;
ShellTimer = 50000 + rand() % 10000;
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -902,9 +902,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
@@ -961,7 +961,7 @@ class npc_crypt_fiend : public CreatureScript
public:
npc_crypt_fiend() : CreatureScript("npc_crypt_fiend") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_crypt_fiendAI>(creature);
}
@@ -978,12 +978,12 @@ public:
bool go;
uint32 WebTimer;
void Reset()
void Reset() override
{
WebTimer = 20000 + rand() % 5000;
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -1002,9 +1002,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
@@ -1049,7 +1049,7 @@ class npc_fel_stalker : public CreatureScript
public:
npc_fel_stalker() : CreatureScript("npc_fel_stalker") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_fel_stalkerAI>(creature);
}
@@ -1066,12 +1066,12 @@ public:
bool go;
uint32 ManaBurnTimer;
void Reset()
void Reset() override
{
ManaBurnTimer = 9000 + rand() % 5000;
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 7 && !IsOverrun)
{
@@ -1090,9 +1090,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
@@ -1137,7 +1137,7 @@ class npc_frost_wyrm : public CreatureScript
public:
npc_frost_wyrm() : CreatureScript("npc_frost_wyrm") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_frost_wyrmAI>(creature);
}
@@ -1155,14 +1155,14 @@ public:
uint32 FrostBreathTimer;
uint32 MoveTimer;
void Reset()
void Reset() override
{
FrostBreathTimer = 5000;
MoveTimer = 0;
me->SetDisableGravity(true);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 2 && !IsOverrun)
{
@@ -1175,7 +1175,7 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (IsEvent)
instance->SetData(DATA_TRASH, 0);//signal trash is dead
@@ -1187,9 +1187,9 @@ public:
me->SetPosition(x, y, z, 0);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
@@ -1255,7 +1255,7 @@ class npc_gargoyle : public CreatureScript
public:
npc_gargoyle() : CreatureScript("npc_gargoyle") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_gargoyleAI>(creature);
}
@@ -1277,7 +1277,7 @@ public:
float Zpos;
bool forcemove;
void Reset()
void Reset() override
{
forcemove = true;
Zpos = 10.0f;
@@ -1286,7 +1286,7 @@ public:
me->SetDisableGravity(true);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (waypointId == 2 && !IsOverrun)
{
@@ -1299,7 +1299,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
float x, y, z;
me->GetPosition(x, y, z);
@@ -1309,7 +1309,7 @@ public:
hyjal_trashAI::JustDied(killer);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
hyjal_trashAI::UpdateAI(diff);
@@ -1399,7 +1399,7 @@ class alliance_rifleman : public CreatureScript
public:
alliance_rifleman() : CreatureScript("alliance_rifleman") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new alliance_riflemanAI(creature);
}
@@ -1413,16 +1413,16 @@ public:
uint32 ExplodeTimer;
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
}
void Reset()
void Reset() override
{
ExplodeTimer = 5000 + rand() % 5000;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!who || me->GetVictim())
@@ -1435,11 +1435,11 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
//Check if we have a target
if (!UpdateVictim())

6
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
View File

@@ -16,11 +16,11 @@ struct hyjal_trashAI : public npc_escortAI
{
hyjal_trashAI(Creature* creature);
void UpdateAI(uint32 diff);
void UpdateAI(uint32 diff) override;
void JustDied(Unit* /*killer*/);
void JustDied(Unit* /*killer*/) override;
void DamageTaken(Unit* done_by, uint32& damage, DamageEffectType, SpellSchoolMask);
void DamageTaken(Unit* done_by, uint32& damage, DamageEffectType, SpellSchoolMask) override;
public:
InstanceScript* instance;

20
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
View File

@@ -36,7 +36,7 @@ class instance_hyjal : public InstanceMapScript
public:
instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_mount_hyjal_InstanceMapScript(map);
}
@@ -45,7 +45,7 @@ public:
{
instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize()
void Initialize() override
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -69,7 +69,7 @@ public:
ArchiYell = false;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < EncounterCount; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -78,7 +78,7 @@ public:
return false;
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -102,7 +102,7 @@ public:
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -133,7 +133,7 @@ public:
}
}
uint64 GetData64(uint32 identifier) const
uint64 GetData64(uint32 identifier) const override
{
switch (identifier)
{
@@ -158,7 +158,7 @@ public:
return 0;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch (type)
{
@@ -278,7 +278,7 @@ public:
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch (type)
{
@@ -304,12 +304,12 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() override
{
return str_data;
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{

14
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
View File

@@ -41,7 +41,7 @@ class boss_epoch : public CreatureScript
public:
boss_epoch() : CreatureScript("boss_epoch") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_epochAI (creature);
}
@@ -54,13 +54,13 @@ public:
EventMap events;
uint8 warps;
void Reset()
void Reset() override
{
events.Reset();
warps = 0;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -72,7 +72,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_TIME_STOP, 20000);
}
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_TIME_STEP_H || spellInfo->Id == SPELL_TIME_STEP_N)
{
@@ -89,7 +89,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -126,12 +126,12 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (!urand(0, 1))
return;

14
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
View File

@@ -32,7 +32,7 @@ class boss_infinite_corruptor : public CreatureScript
public:
boss_infinite_corruptor() : CreatureScript("boss_infinite_corruptor") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_infinite_corruptorAI(creature);
}
@@ -47,7 +47,7 @@ public:
SummonList summons;
uint32 beamTimer;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
@@ -60,9 +60,9 @@ public:
beamTimer = 1;
}
void JustSummoned(Creature* cr) { summons.Summon(cr); }
void JustSummoned(Creature* cr) override { summons.Summon(cr); }
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->InterruptNonMeleeSpells(false);
events.ScheduleEvent(EVENT_SPELL_VOID_STRIKE, 8000);
@@ -70,7 +70,7 @@ public:
Talk(SAY_AGGRO);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
for (SummonList::const_iterator itr = summons.begin(); itr != summons.end(); ++itr)
@@ -90,7 +90,7 @@ public:
pInstance->SetData(DATA_SHOW_INFINITE_TIMER, 0);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (!me->IsAlive())
return;
@@ -103,7 +103,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (beamTimer)
{

14
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
View File

@@ -44,7 +44,7 @@ class boss_mal_ganis : public CreatureScript
public:
boss_mal_ganis() : CreatureScript("boss_mal_ganis") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_mal_ganisAI (creature);
}
@@ -59,7 +59,7 @@ public:
EventMap events;
bool finished;
void Reset()
void Reset() override
{
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK_DEST, true);
@@ -71,7 +71,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_CARRION_SWARM, 6000);
@@ -80,11 +80,11 @@ public:
events.ScheduleEvent(EVENT_SPELL_VAMPIRIC_TOUCH, 15000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (!urand(0, 1))
return;
@@ -92,7 +92,7 @@ public:
Talk(SAY_SLAY);
}
void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (!finished && damage >= me->GetHealth())
{
@@ -120,7 +120,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

12
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
View File

@@ -35,7 +35,7 @@ class boss_meathook : public CreatureScript
public:
boss_meathook() : CreatureScript("boss_meathook") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_meathookAI (creature);
}
@@ -48,9 +48,9 @@ public:
}
EventMap events;
void Reset() { events.Reset(); }
void Reset() override { events.Reset(); }
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.RescheduleEvent(EVENT_SPELL_CONSTRICTING_CHAINS, 15000);
@@ -58,12 +58,12 @@ public:
events.RescheduleEvent(EVENT_SPELL_FRENZY, 20000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (!urand(0, 1))
return;
@@ -71,7 +71,7 @@ public:
Talk(SAY_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

18
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
View File

@@ -45,7 +45,7 @@ class boss_salramm : public CreatureScript
public:
boss_salramm() : CreatureScript("boss_salramm") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_salrammAI (creature);
}
@@ -59,15 +59,15 @@ public:
EventMap events;
SummonList summons;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
}
void JustSummoned(Creature* cr) { summons.Summon(cr); }
void JustSummoned(Creature* cr) override { summons.Summon(cr); }
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_SHADOW_BOLT, 7000);
@@ -78,13 +78,13 @@ public:
events.ScheduleEvent(EVENT_SPELL_CURSE, 25000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
summons.DespawnAll();
Talk(SAY_DEATH);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (!urand(0, 1))
return;
@@ -103,7 +103,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -168,13 +168,13 @@ public:
}
}
void Register()
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_boss_salramm_steal_flesh_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_boss_salramm_steal_flesh_AuraScript();
}

16
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
View File

@@ -1358,7 +1358,7 @@ public:
_marked = false;
}
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
{
if (spell->Id == SPELL_ARCANE_DISRUPTION && !_marked)
{
@@ -1377,7 +1377,7 @@ public:
bool _marked;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_crate_helperAI(creature);
}
@@ -1499,7 +1499,7 @@ public:
InstanceScript* pInstance;
uint32 allowTimer;
void Reset()
void Reset() override
{
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
locked = false;
@@ -1518,7 +1518,7 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!allowTimer && !locked && (who->GetTypeId() == TYPEID_PLAYER || who->IsPet()) && me->GetDistance(who) < 15.0f)
InfectMe(2000);
@@ -1526,7 +1526,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_INFECT_CITIZIEN)
InfectMe(1);
@@ -1540,7 +1540,7 @@ public:
changeTimer = time;
}
void SpellHit(Unit* caster, const SpellInfo* spellInfo)
void SpellHit(Unit* caster, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_ARTHAS_CRUSADER_STRIKE)
{
@@ -1554,7 +1554,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
ScriptedAI::UpdateAI(diff);
@@ -1589,7 +1589,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_cos_stratholme_citizienAI(creature);
}

24
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
View File

@@ -15,7 +15,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
public:
instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", 595) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
return new instance_culling_of_stratholme_InstanceMapScript(pMap);
}
@@ -41,12 +41,12 @@ public:
_loadTimer = 0;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
return false;
}
void FillInitialWorldStates(WorldPacket& data)
void FillInitialWorldStates(WorldPacket& data) override
{
data << uint32(WORLDSTATE_SHOW_CRATES) << uint32(0);
data << uint32(WORLDSTATE_CRATES_REVEALED) << uint32(_crateCount);
@@ -55,7 +55,7 @@ public:
data << uint32(WORLDSTATE_TIME_GUARDIAN_SHOW) << uint32(0);
}
void OnPlayerEnter(Player* plr)
void OnPlayerEnter(Player* plr) override
{
if (instance->GetPlayersCountExceptGMs() == 1)
SetData(DATA_ARTHAS_REPOSITION, 2);
@@ -66,7 +66,7 @@ public:
plr->CastSpell(plr, ((plr->getGender() == GENDER_MALE) ? SPELL_HUMAN_MALE : SPELL_HUMAN_FEMALE), true);
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -83,7 +83,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -100,7 +100,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch (type)
{
@@ -173,7 +173,7 @@ public:
SaveToDB();
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch (type)
{
@@ -185,7 +185,7 @@ public:
return 0;
}
uint64 GetData64(uint32 identifier) const
uint64 GetData64(uint32 identifier) const override
{
switch (identifier)
{
@@ -199,7 +199,7 @@ public:
return 0;
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
if (_loadTimer)
{
@@ -357,7 +357,7 @@ public:
instance->LoadGrid(LeaderIntroPos6.GetPositionX(), LeaderIntroPos6.GetPositionY());
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -368,7 +368,7 @@ public:
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{

18
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
View File

@@ -44,7 +44,7 @@ class boss_captain_skarloc : public CreatureScript
public:
boss_captain_skarloc() : CreatureScript("boss_captain_skarloc") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_captain_skarlocAI>(creature);
}
@@ -57,14 +57,14 @@ public:
EventMap events2;
SummonList summons;
void Reset()
void Reset() override
{
events.Reset();
events2.Reset();
summons.DespawnAll();
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (Creature* thrall = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetData64(DATA_THRALL_GUID)))
@@ -80,7 +80,7 @@ public:
summon->GetMotionMaster()->MovePoint(0, 2056.870f, 234.853f, 63.839f);
}
void InitializeAI()
void InitializeAI() override
{
ScriptedAI::InitializeAI();
@@ -94,7 +94,7 @@ public:
me->Mount(SKARLOC_MOUNT_MODEL);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != ESCORT_MOTION_TYPE)
return;
@@ -122,7 +122,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->CastSpell(me, SPELL_DEVOTION_AURA, true);
@@ -134,19 +134,19 @@ public:
events.ScheduleEvent(EVENT_SPELL_CONSECRATION, 1000);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_SLAY);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
me->GetInstanceScript()->SetData(DATA_ESCORT_PROGRESS, ENCOUNTER_PROGRESS_SKARLOC_KILLED);
me->GetInstanceScript()->SetData(DATA_THRALL_ADD_FLAG, 0);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (events2.ExecuteEvent())

12
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
View File

@@ -30,7 +30,7 @@ class boss_epoch_hunter : public CreatureScript
public:
boss_epoch_hunter() : CreatureScript("boss_epoch_hunter") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_epoch_hunterAI>(creature);
}
@@ -41,11 +41,11 @@ public:
EventMap events;
void Reset()
void Reset() override
{
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -55,13 +55,13 @@ public:
events.ScheduleEvent(EVENT_SPELL_WING_BUFFET, 14000);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
if (killer == me)
return;
@@ -71,7 +71,7 @@ public:
taretha->AI()->DoAction(me->GetEntry());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

16
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
View File

@@ -35,7 +35,7 @@ class boss_lieutenant_drake : public CreatureScript
public:
boss_lieutenant_drake() : CreatureScript("boss_lieutenant_drake") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_lieutenant_drakeAI(creature);
}
@@ -60,14 +60,14 @@ public:
}
}
void InitializeAI()
void InitializeAI() override
{
ScriptedAI::InitializeAI();
//Talk(SAY_ENTER);
JustReachedHome();
}
void JustReachedHome()
void JustReachedHome() override
{
me->SetWalk(true);
Movement::MoveSplineInit init(me);
@@ -76,12 +76,12 @@ public:
init.Launch();
}
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -92,20 +92,20 @@ public:
events.ScheduleEvent(EVENT_EXPLODING_SHOT, 1000);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (InstanceScript* instance = me->GetInstanceScript())
instance->SetData(DATA_ESCORT_PROGRESS, ENCOUNTER_PROGRESS_DRAKE_KILLED);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

22
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
View File

@@ -30,7 +30,7 @@ class instance_old_hillsbrad : public InstanceMapScript
public:
instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", 560) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_old_hillsbrad_InstanceMapScript(map);
}
@@ -39,7 +39,7 @@ public:
{
instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize()
void Initialize() override
{
_encounterProgress = 0;
_barrelCount = 0;
@@ -54,7 +54,7 @@ public:
_events.Reset();
}
void OnPlayerEnter(Player* player)
void OnPlayerEnter(Player* player) override
{
if (instance->GetPlayersCountExceptGMs() == 1)
CleanupInstance();
@@ -79,7 +79,7 @@ public:
SetData(DATA_THRALL_REPOSITION, 2);
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -101,7 +101,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* gameobject)
void OnGameObjectCreate(GameObject* gameobject) override
{
switch (gameobject->GetEntry())
{
@@ -123,7 +123,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch (type)
{
@@ -158,7 +158,7 @@ public:
}
}
uint32 GetData(uint32 data) const
uint32 GetData(uint32 data) const override
{
if (data == DATA_ESCORT_PROGRESS)
return _encounterProgress;
@@ -167,7 +167,7 @@ public:
return 0;
}
uint64 GetData64(uint32 data) const
uint64 GetData64(uint32 data) const override
{
if (data == DATA_THRALL_GUID)
return _thrallGUID;
@@ -176,7 +176,7 @@ public:
return 0;
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
_events.Update(diff);
switch (_events.ExecuteEvent())
@@ -288,7 +288,7 @@ public:
instance->LoadGrid(thrallPositions[i].GetPositionX(), thrallPositions[i].GetPositionY());
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -299,7 +299,7 @@ public:
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{

18
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
View File

@@ -46,19 +46,19 @@ public:
EventMap events;
InstanceScript* instance;
void Reset()
void Reset() override
{
events.Reset();
}
void JustReachedHome()
void JustReachedHome() override
{
if (Unit* medivh = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_MEDIVH)))
if (me->GetDistance2d(medivh) < 20.0f)
me->CastSpell(me, SPELL_CORRUPT_MEDIVH, false);
}
void InitializeAI()
void InitializeAI() override
{
Talk(SAY_ENTER);
ScriptedAI::InitializeAI();
@@ -70,7 +70,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_CLEAVE, 5000);
events.ScheduleEvent(EVENT_SANDBREATH, 20000);
@@ -80,7 +80,7 @@ public:
Talk(SAY_AGGRO);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER)
{
@@ -95,19 +95,19 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
instance->SetData(TYPE_AEONUS, DONE);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -141,7 +141,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_aeonusAI(creature);
}

16
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
View File

@@ -41,7 +41,7 @@ public:
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
}
@@ -52,13 +52,13 @@ public:
Talk(id);
}
void InitializeAI()
void InitializeAI() override
{
OwnTalk(SAY_ENTER);
ScriptedAI::InitializeAI();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ARCANE_BLAST, 10000);
events.ScheduleEvent(EVENT_TIME_LAPSE, 15000);
@@ -69,7 +69,7 @@ public:
OwnTalk(SAY_AGGRO);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER)
{
@@ -84,20 +84,20 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
OwnTalk(SAY_SLAY);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
OwnTalk(SAY_DEATH);
if (InstanceScript* instance = me->GetInstanceScript())
instance->SetData(TYPE_CHRONO_LORD_DEJA, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -130,7 +130,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_chrono_lord_dejaAI(creature);
}

16
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
View File

@@ -46,18 +46,18 @@ public:
Talk(id);
}
void Reset()
void Reset() override
{
events.Reset();
}
void InitializeAI()
void InitializeAI() override
{
OwnTalk(SAY_ENTER);
ScriptedAI::InitializeAI();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_HASTEN, 12000);
events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000);
@@ -68,20 +68,20 @@ public:
OwnTalk(SAY_AGGRO);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
OwnTalk(SAY_SLAY);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
OwnTalk(SAY_DEATH);
if (InstanceScript* instance = me->GetInstanceScript())
instance->SetData(TYPE_TEMPORUS, DONE);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER)
{
@@ -96,7 +96,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -129,7 +129,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_temporusAI(creature);
}

26
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View File

@@ -24,7 +24,7 @@ class instance_the_black_morass : public InstanceMapScript
public:
instance_the_black_morass() : InstanceMapScript("instance_the_black_morass", 269) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_the_black_morass_InstanceMapScript(map);
}
@@ -39,7 +39,7 @@ public:
uint8 _currentRift;
uint8 _shieldPercent;
void Initialize()
void Initialize() override
{
memset(&encounters, 0, sizeof(encounters));
_medivhGUID = 0;
@@ -67,12 +67,12 @@ public:
creature->DespawnOrUnsummon();
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
return false;
}
void OnPlayerEnter(Player* player)
void OnPlayerEnter(Player* player) override
{
if (instance->GetPlayersCountExceptGMs() <= 1 && GetData(TYPE_AEONUS) != DONE)
CleanupInstance();
@@ -82,7 +82,7 @@ public:
player->SendUpdateWorldState(WORLD_STATE_BM_RIFT, _currentRift);
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -109,7 +109,7 @@ public:
}
}
void OnCreatureRemove(Creature* creature)
void OnCreatureRemove(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -133,7 +133,7 @@ public:
}
}
void SetData(uint32 type, uint32 /*data*/)
void SetData(uint32 type, uint32 /*data*/) override
{
switch (type)
{
@@ -194,7 +194,7 @@ public:
}
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch (type)
{
@@ -210,7 +210,7 @@ public:
return 0;
}
void SetData64(uint32 type, uint64 data)
void SetData64(uint32 type, uint64 data) override
{
if (type == DATA_SUMMONED_NPC)
encounterNPCs.insert(data);
@@ -218,7 +218,7 @@ public:
encounterNPCs.erase(data);
}
uint64 GetData64(uint32 data) const
uint64 GetData64(uint32 data) const override
{
if (data == DATA_MEDIVH)
return _medivhGUID;
@@ -278,7 +278,7 @@ public:
}
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
Events.Update(diff);
switch (Events.ExecuteEvent())
@@ -301,7 +301,7 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -312,7 +312,7 @@ public:
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{

32
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
View File

@@ -63,7 +63,7 @@ class NpcRunToHome : public BasicEvent
public:
NpcRunToHome(Creature& owner) : _owner(owner) { }
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/)
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
_owner.GetMotionMaster()->MoveTargetedHome();
return true;
@@ -78,7 +78,7 @@ class npc_medivh_bm : public CreatureScript
public:
npc_medivh_bm() : CreatureScript("npc_medivh_bm") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_medivh_bmAI(creature);
}
@@ -108,7 +108,7 @@ public:
Movement::PointsArray groundArray;
Movement::PointsArray airArray;
void Reset()
void Reset() override
{
events.Reset();
me->CastSpell(me, SPELL_MANA_SHIELD, true);
@@ -117,7 +117,7 @@ public:
me->CastSpell(me, SPELL_MEDIVH_CHANNEL, false);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
if (instance)
instance->SetData64(DATA_SUMMONED_NPC, summon->GetGUID());
@@ -138,13 +138,13 @@ public:
}
}
void SummonedCreatureDespawn(Creature* summon)
void SummonedCreatureDespawn(Creature* summon) override
{
if (instance)
instance->SetData64(DATA_DELETED_NPC, summon->GetGUID());
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!events.Empty() || (instance && instance->GetData(TYPE_AEONUS) == DONE))
return;
@@ -167,9 +167,9 @@ public:
}
}
void AttackStart(Unit* ) { }
void AttackStart(Unit* ) override { }
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_OUTRO)
{
@@ -181,14 +181,14 @@ public:
}
}
void JustDied(Unit* )
void JustDied(Unit* ) override
{
me->SetRespawnTime(DAY);
events.Reset();
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch (uint32 eventId = events.ExecuteEvent())
@@ -279,7 +279,7 @@ class npc_time_rift : public CreatureScript
public:
npc_time_rift() : CreatureScript("npc_time_rift") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_time_riftAI(creature);
}
@@ -296,7 +296,7 @@ public:
InstanceScript* instance;
uint64 riftKeeperGUID;
void Reset()
void Reset() override
{
if (instance && instance->GetData(DATA_RIFT_NUMBER) >= 18)
{
@@ -308,7 +308,7 @@ public:
events.ScheduleEvent(EVENT_CHECK_DEATH, 8000);
}
void SetGUID(uint64 guid, int32)
void SetGUID(uint64 guid, int32) override
{
riftKeeperGUID = guid;
}
@@ -344,7 +344,7 @@ public:
DoSummonAtRift(entry);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch (events.ExecuteEvent())
@@ -390,13 +390,13 @@ public:
instance->SetData(DATA_DAMAGE_SHIELD, 1);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_morass_corrupt_medivh_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_black_morass_corrupt_medivh_AuraScript();
}