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

14
src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
View File

@@ -42,7 +42,7 @@ public:
{
boss_curatorAI(Creature* creature) : BossAI(creature, DATA_CURATOR) { }
void Reset()
void Reset() override
{
BossAI::Reset();
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true);
@@ -51,7 +51,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_POWER_BURN, true);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -60,13 +60,13 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
BossAI::JustDied(killer);
Talk(SAY_DEATH);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
Talk(SAY_AGGRO);
@@ -78,7 +78,7 @@ public:
DoZoneInCombat();
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (Unit* target = summon->SelectNearbyTarget(nullptr, 40.0f))
@@ -90,7 +90,7 @@ public:
summon->SetInCombatWithZone();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -150,7 +150,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_curatorAI>(creature);
}

12
src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
View File

@@ -35,12 +35,12 @@ public:
{
boss_maiden_of_virtueAI(Creature* creature) : BossAI(creature, DATA_MAIDEN) { }
void Reset()
void Reset() override
{
BossAI::Reset();
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -49,13 +49,13 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
BossAI::JustDied(killer);
Talk(SAY_DEATH);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
Talk(SAY_AGGRO);
@@ -68,7 +68,7 @@ public:
DoZoneInCombat();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -102,7 +102,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_maiden_of_virtueAI>(creature);
}

54
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
View File

@@ -75,14 +75,14 @@ public:
{
boss_midnightAI(Creature* creature) : BossAI(creature, DATA_ATTUMEN) { }
void Reset()
void Reset() override
{
BossAI::Reset();
me->SetVisible(true);
_healthPct = 100.0f;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
events.ScheduleEvent(EVENT_CHECK_HEALTH_95, 0);
@@ -90,13 +90,13 @@ public:
DoZoneInCombat();
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (Creature* attumen = summons.GetCreatureWithEntry(NPC_ATTUMEN_THE_HUNTSMAN))
attumen->AI()->Talk(SAY_ATTUMEN_MIDNIGHT_KILL);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
summon->SetInCombatWithZone();
@@ -110,13 +110,13 @@ public:
summon->CastSpell(summon, SPELL_SPAWN_SMOKE1, true);
}
void SetData(uint32 type, uint32 /*data*/)
void SetData(uint32 type, uint32 /*data*/) override
{
if (type == DATA_ATTUMEN_READY)
events.ScheduleEvent(EVENT_SUMMON_ATTUMEN_MOUNTED, 0);
}
void SummonedCreatureDies(Creature* summon, Unit* /*killer*/)
void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override
{
if (summon->GetEntry() == NPC_ATTUMEN_THE_HUNTSMAN_MOUNTED)
{
@@ -125,7 +125,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -175,7 +175,7 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetHomePosition().GetExactDist2d(me) > 50.0f || me->GetPositionZ() > 60.0f;
}
@@ -184,7 +184,7 @@ public:
float _healthPct;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_midnightAI>(creature);
}
@@ -201,12 +201,12 @@ public:
{
}
void Reset()
void Reset() override
{
_events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_ATTUMEN1_APPEAR);
_events.ScheduleEvent(EVENT_CHECK_HEALTH_25, 0);
@@ -215,7 +215,7 @@ public:
_events.ScheduleEvent(EVENT_RANDOM_YELL, urand(25000, 45000));
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (_events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -224,7 +224,7 @@ public:
}
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
if (spellInfo->Mechanic == MECHANIC_DISARM && _events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -237,7 +237,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_MOUNT_TARGET_MIDNIGHT)
{
@@ -247,7 +247,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 point)
void MovementInform(uint32 type, uint32 point) override
{
if (type == POINT_MOTION_TYPE && point == POINT_MOVE_TO_MIDNIGHT)
{
@@ -257,7 +257,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -297,7 +297,7 @@ public:
EventMap _events;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_attumenAI>(creature);
}
@@ -314,12 +314,12 @@ public:
{
}
void Reset()
void Reset() override
{
_events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_events.ScheduleEvent(EVENT_SPELL_SHADOW_CLEAVE, 6000);
_events.ScheduleEvent(EVENT_SPELL_INTANGIBLE_PRESENCE, 15000);
@@ -328,7 +328,7 @@ public:
_events.ScheduleEvent(EVENT_SPELL_KNOCKDOWN, 11000);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (_events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -337,12 +337,12 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_ATTUMEN2_DEATH);
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
if (spellInfo->Mechanic == MECHANIC_DISARM && _events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -351,7 +351,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 point)
void MovementInform(uint32 type, uint32 point) override
{
if (type == POINT_MOTION_TYPE && point == POINT_MOVE_TO_MIDNIGHT)
{
@@ -361,7 +361,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -402,7 +402,7 @@ public:
EventMap _events;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_attumen_midnightAI>(creature);
}
@@ -431,7 +431,7 @@ public:
caster->TauntFadeOut(target);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_midnight_fixate_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_midnight_fixate_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
@@ -439,7 +439,7 @@ public:
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_midnight_fixate_AuraScript();
}

22
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
View File

@@ -80,13 +80,13 @@ public:
InstanceScript* instance;
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
InitializeGuests();
}
void JustReachedHome()
void JustReachedHome() override
{
BossAI::JustReachedHome();
InitializeGuests();
@@ -113,13 +113,13 @@ public:
_events2.ScheduleEvent(EVENT_GUEST_TALK, 10000);
}
void Reset()
void Reset() override
{
BossAI::Reset();
me->CastSpell(me, SPELL_DUAL_WIELD, true);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
Talk(SAY_AGGRO);
@@ -135,7 +135,7 @@ public:
DoZoneInCombat();
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -144,7 +144,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
summons.clear();
BossAI::JustDied(killer);
@@ -153,7 +153,7 @@ public:
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_GARROTE);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
@@ -168,7 +168,7 @@ public:
return acore::Containers::SelectRandomContainerElement(guestList);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
_events2.Update(diff);
switch (_events2.ExecuteEvent())
@@ -239,7 +239,7 @@ public:
uint8 _activeGuests;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_moroesAI>(creature);
}
@@ -268,13 +268,13 @@ public:
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_moroes_vanish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_moroes_vanish_SpellScript();
}

10
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
View File

@@ -58,7 +58,7 @@ class boss_netherspite : public CreatureScript
public:
boss_netherspite() : CreatureScript("boss_netherspite") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_netherspiteAI>(creature);
}
@@ -116,7 +116,7 @@ public:
return sqrt((xa - xb) * (xa - xb) + (ya - yb) * (ya - yb));
}
void Reset()
void Reset() override
{
Berserk = false;
NetherInfusionTimer = 540000;
@@ -246,20 +246,20 @@ public:
Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
HandleDoors(false);
SwitchToPortalPhase();
DoZoneInCombat();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
HandleDoors(true);
DestroyPortals();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

18
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
View File

@@ -58,7 +58,7 @@ class boss_nightbane : public CreatureScript
public:
boss_nightbane() : CreatureScript("boss_nightbane") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_nightbaneAI (creature);
}
@@ -97,7 +97,7 @@ public:
uint32 MovePhase;
void Reset()
void Reset() override
{
BellowingRoarTimer = 30000;
CharredEarthTimer = 15000;
@@ -147,7 +147,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (instance)
instance->SetData64(DATA_NIGHTBANE, IN_PROGRESS);
@@ -156,13 +156,13 @@ public:
Talk(YELL_AGGRO);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!Intro && !Flying)
ScriptedAI::AttackStart(who);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (instance)
instance->SetData(DATA_NIGHTBANE, DONE);
@@ -170,13 +170,13 @@ public:
HandleTerraceDoors(true);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!Intro && !Flying)
ScriptedAI::MoveInLineOfSight(who);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != POINT_MOTION_TYPE)
return;
@@ -216,7 +216,7 @@ public:
}
}
void JustSummoned(Creature* summoned)
void JustSummoned(Creature* summoned) override
{
summoned->AI()->AttackStart(me->GetVictim());
}
@@ -241,7 +241,7 @@ public:
Skeletons = false;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (Intro)
{

16
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
View File

@@ -81,7 +81,7 @@ class netherspite_infernal : public CreatureScript
public:
netherspite_infernal() : CreatureScript("netherspite_infernal") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new netherspite_infernalAI(creature);
}
@@ -96,12 +96,12 @@ public:
uint64 malchezaar;
InfernalPoint* point;
void Reset() { }
void EnterCombat(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) { }
void Reset() override { }
void EnterCombat(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (HellfireTimer)
{
@@ -125,14 +125,14 @@ public:
}
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (Unit* unit = ObjectAccessor::GetUnit(*me, malchezaar))
if (Creature* creature = unit->ToCreature())
creature->AI()->KilledUnit(who);
}
void SpellHit(Unit* /*who*/, const SpellInfo* spell)
void SpellHit(Unit* /*who*/, const SpellInfo* spell) override
{
if (spell->Id == SPELL_INFERNAL_RELAY)
{
@@ -143,7 +143,7 @@ public:
}
}
void DamageTaken(Unit* done_by, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit* done_by, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (!done_by || done_by->GetGUID() != malchezaar)
damage = 0;

12
src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
View File

@@ -44,7 +44,7 @@ public:
{
boss_servant_quartersAI(Creature* creature) : BossAI(creature, DATA_SERVANT_QUARTERS) { }
void Reset()
void Reset() override
{
events.Reset();
me->SetVisible(false);
@@ -59,7 +59,7 @@ public:
me->DespawnOrUnsummon(1);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->setActive(true);
if (me->GetEntry() == NPC_HYAKISS_THE_LURKER)
@@ -79,17 +79,17 @@ public:
}
}
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*who*/) override
{
}
void MovementInform(uint32 type, uint32 point)
void MovementInform(uint32 type, uint32 point) override
{
if (type == POINT_MOTION_TYPE && point == EVENT_CHARGE)
events.ScheduleEvent(EVENT_SPELL_FEAR, 0);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
_events2.Update(diff);
switch (_events2.ExecuteEvent())
@@ -153,7 +153,7 @@ public:
EventMap _events2;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_servant_quartersAI>(creature);
}

24
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
View File

@@ -92,7 +92,7 @@ public:
bool ElementalsSpawned;
bool Drinking;
bool DrinkInturrupted;
void Reset()
void Reset() override
{
SecondarySpellTimer = 5000;
NormalCastTimer = 0;
@@ -121,12 +121,12 @@ public:
instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), true);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_KILL);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
@@ -135,7 +135,7 @@ public:
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -180,7 +180,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -515,13 +515,13 @@ public:
DoMeleeAttackIfReady();
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (!DrinkInturrupted && Drinking && damage)
DrinkInturrupted = true;
}
void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell)
void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell) override
{
//We only care about interrupt effects and only if they are durring a spell currently being cast
if ((Spell->Effects[0].Effect != SPELL_EFFECT_INTERRUPT_CAST &&
@@ -550,7 +550,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_aranAI>(creature);
}
@@ -561,7 +561,7 @@ class npc_aran_elemental : public CreatureScript
public:
npc_aran_elemental() : CreatureScript("npc_aran_elemental") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new water_elementalAI(creature);
}
@@ -575,14 +575,14 @@ public:
uint32 CastTimer;
void Reset()
void Reset() override
{
CastTimer = 2000 + (rand() % 3000);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

50
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
View File

@@ -57,7 +57,7 @@ class npc_kilrek : public CreatureScript
public:
npc_kilrek() : CreatureScript("npc_kilrek") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_kilrekAI>(creature);
}
@@ -75,17 +75,17 @@ public:
uint32 AmplifyTimer;
void Reset()
void Reset() override
{
TerestianGUID = 0;
AmplifyTimer = 2000;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
uint64 TerestianGUID = instance->GetData64(DATA_TERESTIAN);
if (TerestianGUID)
@@ -96,7 +96,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
//Return since we have no target
if (!UpdateVictim())
@@ -122,7 +122,7 @@ class npc_demon_chain : public CreatureScript
public:
npc_demon_chain() : CreatureScript("npc_demon_chain") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_demon_chainAI(creature);
}
@@ -133,17 +133,17 @@ public:
uint64 SacrificeGUID;
void Reset()
void Reset() override
{
SacrificeGUID = 0;
}
void EnterCombat(Unit* /*who*/) { }
void AttackStart(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (SacrificeGUID)
{
@@ -160,7 +160,7 @@ class npc_fiendish_portal : public CreatureScript
public:
npc_fiendish_portal() : CreatureScript("npc_fiendish_portal") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_fiendish_portalAI(creature);
}
@@ -171,12 +171,12 @@ public:
SummonList summons;
void Reset()
void Reset() override
{
DespawnAllImp();
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
DoZoneInCombat(summon);
@@ -194,7 +194,7 @@ class npc_fiendish_imp : public CreatureScript
public:
npc_fiendish_imp() : CreatureScript("npc_fiendish_imp") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_fiendish_impAI(creature);
}
@@ -205,16 +205,16 @@ public:
uint32 FireboltTimer;
void Reset()
void Reset() override
{
FireboltTimer = 2000;
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
//Return since we have no target
if (!UpdateVictim())
@@ -238,7 +238,7 @@ class boss_terestian_illhoof : public CreatureScript
public:
boss_terestian_illhoof() : CreatureScript("boss_terestian_illhoof") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_terestianAI>(creature);
}
@@ -266,7 +266,7 @@ public:
bool SummonedPortals;
bool Berserk;
void Reset()
void Reset() override
{
for (uint8 i = 0; i < 2; ++i)
{
@@ -308,13 +308,13 @@ public:
DoCast(me, SPELL_SUMMON_IMP, true);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();
}
void JustSummoned(Creature* summoned)
void JustSummoned(Creature* summoned) override
{
if (summoned->GetEntry() == NPC_PORTAL)
{
@@ -329,12 +329,12 @@ public:
}
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_SLAY);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
for (uint8 i = 0; i < 2; ++i)
{
@@ -351,7 +351,7 @@ public:
instance->SetData(DATA_TERESTIAN, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

160
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
View File

@@ -106,7 +106,7 @@ class boss_dorothee : public CreatureScript
public:
boss_dorothee() : CreatureScript("boss_dorothee") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_dorotheeAI>(creature);
}
@@ -144,31 +144,31 @@ public:
bool TitoDied;
void Reset()
void Reset() override
{
Initialize();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_DOROTHEE_AGGRO);
DoZoneInCombat();
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void SummonTito();
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DOROTHEE_DEATH);
SummonCroneIfReady(instance, me);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
return;
@@ -176,7 +176,7 @@ public:
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -185,7 +185,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (AggroTimer)
{
@@ -235,7 +235,7 @@ class npc_tito : public CreatureScript
public:
npc_tito() : CreatureScript("npc_tito") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_titoAI(creature);
}
@@ -247,18 +247,18 @@ public:
uint64 DorotheeGUID;
uint32 YipTimer;
void Reset()
void Reset() override
{
DorotheeGUID = 0;
YipTimer = 10000;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
DoZoneInCombat();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (DorotheeGUID)
{
@@ -271,7 +271,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -306,7 +306,7 @@ class boss_strawman : public CreatureScript
public:
boss_strawman() : CreatureScript("boss_strawman") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_strawmanAI>(creature);
}
@@ -324,14 +324,14 @@ public:
uint32 BrainBashTimer;
uint32 BrainWipeTimer;
void Reset()
void Reset() override
{
AggroTimer = 11000;
BrainBashTimer = 5000;
BrainWipeTimer = 7000;
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
return;
@@ -339,7 +339,7 @@ public:
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -348,18 +348,18 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_STRAWMAN_AGGRO);
DoZoneInCombat();
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void SpellHit(Unit* /*caster*/, const SpellInfo* Spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override
{
if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand() % 10)))
{
@@ -372,19 +372,19 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_STRAWMAN_DEATH);
SummonCroneIfReady(instance, me);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_STRAWMAN_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (AggroTimer)
{
@@ -427,7 +427,7 @@ class boss_tinhead : public CreatureScript
public:
boss_tinhead() : CreatureScript("boss_tinhead") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_tinheadAI>(creature);
}
@@ -447,7 +447,7 @@ public:
uint8 RustCount;
void Reset()
void Reset() override
{
AggroTimer = 15000;
CleaveTimer = 5000;
@@ -456,18 +456,18 @@ public:
RustCount = 0;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_TINHEAD_AGGRO);
DoZoneInCombat();
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
return;
@@ -475,7 +475,7 @@ public:
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -484,19 +484,19 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_TINHEAD_DEATH);
SummonCroneIfReady(instance, me);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_TINHEAD_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (AggroTimer)
{
@@ -543,7 +543,7 @@ class boss_roar : public CreatureScript
public:
boss_roar() : CreatureScript("boss_roar") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_roarAI>(creature);
}
@@ -562,7 +562,7 @@ public:
uint32 ShredTimer;
uint32 ScreamTimer;
void Reset()
void Reset() override
{
AggroTimer = 20000;
MangleTimer = 5000;
@@ -570,7 +570,7 @@ public:
ScreamTimer = 15000;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -579,7 +579,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
return;
@@ -587,30 +587,30 @@ public:
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_ROAR_AGGRO);
DoZoneInCombat();
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_ROAR_DEATH);
SummonCroneIfReady(instance, me);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_ROAR_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (AggroTimer)
{
@@ -660,7 +660,7 @@ class boss_crone : public CreatureScript
public:
boss_crone() : CreatureScript("boss_crone") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_croneAI>(creature);
}
@@ -677,37 +677,37 @@ public:
uint32 CycloneTimer;
uint32 ChainLightningTimer;
void Reset()
void Reset() override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
CycloneTimer = 22000;
ChainLightningTimer = 8000;
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_CRONE_SLAY);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_CRONE_AGGRO);
DoZoneInCombat();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_CRONE_DEATH);
instance->SetBossState(DATA_OPERA_PERFORMANCE, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -739,7 +739,7 @@ class npc_cyclone : public CreatureScript
public:
npc_cyclone() : CreatureScript("npc_cyclone") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_cycloneAI(creature);
}
@@ -750,19 +750,19 @@ public:
uint32 MoveTimer;
void Reset()
void Reset() override
{
MoveTimer = 1000;
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/)
void MoveInLineOfSight(Unit* /*who*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!me->HasAura(SPELL_KNOCKBACK))
DoCast(me, SPELL_KNOCKBACK, true);
@@ -835,7 +835,7 @@ class boss_bigbadwolf : public CreatureScript
public:
boss_bigbadwolf() : CreatureScript("boss_bigbadwolf") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_bigbadwolfAI>(creature);
}
@@ -858,7 +858,7 @@ public:
bool IsChasing;
void Reset()
void Reset() override
{
ChaseTimer = 30000;
FearTimer = urand(25000, 35000);
@@ -870,30 +870,30 @@ public:
IsChasing = false;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_WOLF_AGGRO);
DoZoneInCombat();
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_WOLF_SLAY);
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
DoPlaySoundToSet(me, SOUND_WOLF_DEATH);
instance->SetBossState(DATA_OPERA_PERFORMANCE, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -1036,7 +1036,7 @@ class boss_julianne : public CreatureScript
public:
boss_julianne() : CreatureScript("boss_julianne") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_julianneAI>(creature);
}
@@ -1073,7 +1073,7 @@ public:
bool SummonedRomulo;
bool RomuloDead;
void Reset()
void Reset() override
{
RomuloGUID = 0;
Phase = PHASE_JULIANNE;
@@ -1096,12 +1096,12 @@ public:
RomuloDead = false;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
DoZoneInCombat();
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
return;
@@ -1109,7 +1109,7 @@ public:
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -1118,12 +1118,12 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void SpellHit(Unit* /*caster*/, const SpellInfo* Spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override
{
if (Spell->Id == SPELL_DRINK_POISON)
{
@@ -1132,21 +1132,21 @@ public:
}
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask);
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override;
void JustDied(Unit*)
void JustDied(Unit*) override
{
Talk(SAY_JULIANNE_DEATH02);
instance->SetBossState(DATA_OPERA_PERFORMANCE, DONE);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_JULIANNE_SLAY);
}
void UpdateAI(uint32 diff);
void UpdateAI(uint32 diff) override;
};
};
@@ -1155,7 +1155,7 @@ class boss_romulo : public CreatureScript
public:
boss_romulo() : CreatureScript("boss_romulo") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_romuloAI>(creature);
}
@@ -1185,7 +1185,7 @@ public:
bool IsFakingDeath;
bool JulianneDead;
void Reset()
void Reset() override
{
JulianneGUID = 0;
Phase = PHASE_ROMULO;
@@ -1200,12 +1200,12 @@ public:
JulianneDead = false;
}
void JustReachedHome()
void JustReachedHome() override
{
me->DespawnOrUnsummon();
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (damage < me->GetHealth())
return;
@@ -1259,7 +1259,7 @@ public:
//TC_LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen.");
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
DoZoneInCombat();
Talk(SAY_ROMULO_AGGRO);
@@ -1274,7 +1274,7 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -1283,19 +1283,19 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_ROMULO_DEATH);
instance->SetBossState(DATA_OPERA_PERFORMANCE, DONE);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_ROMULO_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() || IsFakingDeath)
return;

12
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
View File

@@ -355,14 +355,14 @@ public:
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_RATTLED, true);
}
void Register()
void Register() override
{
DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_karazhan_brittle_bones_AuraScript::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_karazhan_brittle_bones_AuraScript::Update, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_karazhan_brittle_bones_AuraScript();
}
@@ -384,13 +384,13 @@ public:
GetUnitOwner()->CastCustomSpell(SPELL_OVERLOAD, SPELLVALUE_BASE_POINT0, int32(auraEffect->GetAmount() * pow(2.0, auraEffect->GetTickNumber())), GetUnitOwner(), true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_karazhan_overload_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_karazhan_overload_AuraScript();
}
@@ -413,13 +413,13 @@ public:
GetCaster()->CastSpell(target, SPELL_BLINK, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_karazhan_blink_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_karazhan_blink_SpellScript();
}

8
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
View File

@@ -422,7 +422,7 @@ class npc_image_of_medivh : public CreatureScript
public:
npc_image_of_medivh() : CreatureScript("npc_image_of_medivh") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_image_of_medivhAI(creature);
}
@@ -447,7 +447,7 @@ public:
bool EventStarted;
void Reset()
void Reset() override
{
ArcanagosGUID = 0;
MTimer = 0;
@@ -475,7 +475,7 @@ public:
me->DespawnOrUnsummon();
}
void EnterCombat(Unit* /*who*/) {}
void EnterCombat(Unit* /*who*/) override {}
uint32 NextStep(uint32 Step)
{
@@ -559,7 +559,7 @@ public:
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (YellTimer <= diff)