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

38
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
View File

@@ -89,13 +89,13 @@ public:
uint8 noQuillTimes;
bool startPath;
void JustReachedHome()
void JustReachedHome() override
{
BossAI::JustReachedHome();
startPath = true;
}
void Reset()
void Reset() override
{
BossAI::Reset();
platform = 0;
@@ -105,13 +105,13 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
events.ScheduleEvent(EVENT_SWITCH_PLATFORM, 0);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
me->SetModelVisible(true);
BossAI::JustDied(killer);
@@ -127,16 +127,16 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (summon->GetEntry() == NPC_EMBER_OF_ALAR)
summon->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_FIRE, true);
}
void MoveInLineOfSight(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (damage >= me->GetHealth() && platform < POINT_MIDDLE)
{
@@ -157,7 +157,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != POINT_MOTION_TYPE)
{
@@ -177,7 +177,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (startPath)
{
@@ -326,7 +326,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_alarAI>(creature);
}
@@ -339,7 +339,7 @@ public:
{
}
bool Execute(uint64 /*execTime*/, uint32 /*diff*/)
bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
{
_caster->CastSpell(_caster, _spellId, true);
return true;
@@ -371,13 +371,13 @@ public:
GetUnitOwner()->m_Events.AddEvent(new CastQuill(GetUnitOwner(), SPELL_QUILL_MISSILE_2 + 2), GetUnitOwner()->m_Events.CalculateTime(24 * 40));
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_alar_flame_quills_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_alar_flame_quills_AuraScript();
}
@@ -400,13 +400,13 @@ public:
Unit::DealDamage(GetCaster(), alar, alar->CountPctFromMaxHealth(2));
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alar_ember_blast_SpellScript::HandleForceCast, EFFECT_2, SPELL_EFFECT_FORCE_CAST);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_alar_ember_blast_SpellScript();
}
@@ -441,14 +441,14 @@ public:
GetUnitOwner()->SetStandState(UNIT_STAND_STATE_STAND);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_alar_ember_blast_death_AuraScript::OnApply, EFFECT_2, SPELL_AURA_MOD_INVISIBILITY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_alar_ember_blast_death_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_MOD_INVISIBILITY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_alar_ember_blast_death_AuraScript();
}
@@ -469,13 +469,13 @@ public:
GetUnitOwner()->SetDisplayId(DISPLAYID_INVISIBLE);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_alar_dive_bomb_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_alar_dive_bomb_AuraScript();
}

26
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
View File

@@ -67,32 +67,32 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
me->SetModelVisible(true);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (who && me->Attack(who, true))
me->GetMotionMaster()->MoveChase(who, (events.GetNextEventTime(EVENT_SPELL_VOID_BOLT) == 0 ? 30.0f : 0.0f));
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50))
Talk(SAY_KILL);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
me->SetModelVisible(true);
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -105,14 +105,14 @@ public:
events.ScheduleEvent(EVENT_SPAWN_PORTALS, 50000);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (!summon->IsTrigger())
summon->SetInCombatWithZone();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -221,13 +221,13 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetDistance2d(432.59f, -371.93f) > 105.0f;
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_high_astromancer_solarianAI>(creature);
}
@@ -251,13 +251,13 @@ public:
target->CastSpell(target, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), false);
}
void Register()
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_astromancer_wrath_of_the_astromancer_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_astromancer_wrath_of_the_astromancer_AuraScript();
}
@@ -282,14 +282,14 @@ public:
GetUnitOwner()->HandleStatModifier(UnitMods(UNIT_MOD_ARMOR), TOTAL_PCT, 400.0f, false);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_astromancer_solarian_transform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_astromancer_solarian_transform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_astromancer_solarian_transform_AuraScript();
}

74
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -193,7 +193,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
if (type == DATA_RESURRECT_CAST && data == DATA_RESURRECT_CAST)
{
@@ -218,7 +218,7 @@ public:
window->SetGoState(state);
}
void Reset()
void Reset() override
{
BossAI::Reset();
events2.Reset();
@@ -233,13 +233,13 @@ public:
me->SetWalk(false);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (phase == PHASE_FINAL && events.GetNextEventTime(EVENT_GRAVITY_LAPSE_END) == 0)
BossAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (phase == PHASE_NONE && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who))
{
@@ -251,25 +251,25 @@ public:
}
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (summon->GetEntry() == NPC_NETHER_VAPOR)
summon->GetMotionMaster()->MoveRandom(20.0f);
}
void SummonedCreatureDies(Creature* summon, Unit*)
void SummonedCreatureDies(Creature* summon, Unit*) override
{
if (phase == PHASE_FINAL)
return;
@@ -307,7 +307,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -315,7 +315,7 @@ public:
BossAI::JustDied(killer);
}
void MovementInform(uint32 type, uint32 point)
void MovementInform(uint32 type, uint32 point) override
{
if (type != POINT_MOTION_TYPE)
return;
@@ -359,7 +359,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (EnterEvadeIfOutOfCombatArea())
return;
@@ -700,13 +700,13 @@ public:
DoMeleeAttackIfReady();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetHomePosition().GetExactDist2d(me) > 165.0f || !SelectTargetFromPlayerList(165.0f);
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_kaelthasAI>(creature);
}
@@ -721,7 +721,7 @@ public:
{
PrepareSpellScript(spell_kaelthas_kael_phase_two_SpellScript);
bool Load()
bool Load() override
{
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -730,12 +730,12 @@ public:
return true;
}
void Register()
void Register() override
{
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_kael_phase_two_SpellScript();
}
@@ -757,13 +757,13 @@ public:
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_REMOTE_TOY_STUN, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_kaelthas_remote_toy_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_kaelthas_remote_toy_AuraScript();
}
@@ -785,13 +785,13 @@ public:
GetCaster()->CastSpell(GetCaster(), i, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_summon_weapons_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_summon_weapons_SpellScript();
}
@@ -811,13 +811,13 @@ public:
GetCaster()->GetAI()->SetData(DATA_RESURRECT_CAST, DATA_RESURRECT_CAST);
}
void Register()
void Register() override
{
BeforeCast += SpellCastFn(spell_kaelthas_resurrection_SpellScript::HandleBeforeCast);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_resurrection_SpellScript();
}
@@ -838,13 +838,13 @@ public:
targets.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true));
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kaelthas_mind_control_SpellScript::SelectTarget, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_mind_control_SpellScript();
}
@@ -864,13 +864,13 @@ public:
Unit::DealDamage(GetUnitOwner(), GetUnitOwner(), GetUnitOwner()->CountPctFromMaxHealth(5) + 1);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_kaelthas_burn_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_kaelthas_burn_AuraScript();
}
@@ -885,7 +885,7 @@ public:
{
PrepareAuraScript(spell_kaelthas_flame_strike_AuraScript);
bool Load()
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
}
@@ -897,13 +897,13 @@ public:
GetUnitOwner()->ToCreature()->DespawnOrUnsummon(2000);
}
void Register()
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_kaelthas_flame_strike_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_kaelthas_flame_strike_AuraScript();
}
@@ -916,7 +916,7 @@ public:
{
}
bool Execute(uint64 /*execTime*/, uint32 /*diff*/)
bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
{
if (_owner->IsBeingTeleportedNear())
_owner->m_Events.AddEvent(new lapseTeleport(_owner), _owner->m_Events.CalculateTime(1));
@@ -941,7 +941,7 @@ public:
{
PrepareSpellScript(spell_kaelthas_gravity_lapse_SpellScript);
bool Load()
bool Load() override
{
_currentSpellId = SPELL_GRAVITY_LAPSE_TELEPORT1;
return true;
@@ -958,7 +958,7 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_gravity_lapse_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
@@ -967,7 +967,7 @@ public:
uint32 _currentSpellId;
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_gravity_lapse_SpellScript();
}
@@ -1000,13 +1000,13 @@ public:
GetCaster()->CastSpell(*itr, SPELL_NETHER_BEAM_DAMAGE, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_nether_beam_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_nether_beam_SpellScript();
}
@@ -1028,13 +1028,13 @@ public:
GetCaster()->SummonCreature(NPC_NETHER_VAPOR, GetCaster()->GetPositionX() + 6 * cos(i / 5.0f * 2 * M_PI), GetCaster()->GetPositionY() + 6 * sin(i / 5.0f * 2 * M_PI), GetCaster()->GetPositionZ() + 7.0f + i, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_summon_nether_vapor_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_summon_nether_vapor_SpellScript();
}

14
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
View File

@@ -41,24 +41,24 @@ public:
me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_PERIODIC_MANA_LEECH, true);
}
void Reset()
void Reset() override
{
BossAI::Reset();
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50))
Talk(SAY_SLAY);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -70,7 +70,7 @@ public:
me->CallForHelp(105.0f);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -106,13 +106,13 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetDistance2d(432.59f, 371.93f) > 105.0f;
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_void_reaverAI>(creature);
}

18
src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
View File

@@ -25,7 +25,7 @@ public:
uint64 KaelStateRightGUID;
uint64 KaelStateLeftGUID;
void Initialize()
void Initialize() override
{
SetBossNumber(MAX_ENCOUNTER);
AlarGUID = 0;
@@ -39,7 +39,7 @@ public:
KaelStateLeftGUID = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -64,7 +64,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* gobject)
void OnGameObjectCreate(GameObject* gobject) override
{
switch (gobject->GetEntry())
{
@@ -80,7 +80,7 @@ public:
}
}
uint64 GetData64(uint32 identifier) const
uint64 GetData64(uint32 identifier) const override
{
switch (identifier)
{
@@ -106,7 +106,7 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -117,7 +117,7 @@ public:
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) override
{
if (!str)
{
@@ -150,7 +150,7 @@ public:
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_the_eye_InstanceMapScript(map);
}
@@ -172,13 +172,13 @@ public:
return true;
}
void Register()
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_the_eye_counterchargeScript::PrepareProc);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_the_eye_counterchargeScript();
}

10
src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
View File

@@ -37,13 +37,13 @@ public:
{
boss_gatewatcher_gyrokillAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_GYROKILL) { }
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000);
@@ -52,13 +52,13 @@ public:
Talk(SAY_AGGRO);
}
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;
@@ -89,7 +89,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_gatewatcher_gyrokillAI(creature);
}

10
src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
View File

@@ -38,7 +38,7 @@ public:
{
boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { }
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 15000);
@@ -47,19 +47,19 @@ public:
Talk(SAY_AGGRO);
}
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
{
_JustDied();
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -92,7 +92,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_gatewatcher_iron_handAI(creature);
}

20
src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
View File

@@ -50,7 +50,7 @@ public:
{
boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { }
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(YELL_AGGRO);
@@ -60,25 +60,25 @@ public:
events.ScheduleEvent(IsHeroic() ? EVENT_POSITIVE_SHIFT : EVENT_REFLECTIVE_DAMAGE_SHIELD, 15000);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(YELL_KILL);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*victim*/) override
{
_JustDied();
Talk(YELL_DEATH);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
summon->GetMotionMaster()->MoveRandom(30.0f);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -124,7 +124,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_mechano_lord_capacitusAI(creature);
}
@@ -176,14 +176,14 @@ public:
SetHitDamage(0);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_capacitus_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_capacitus_polarity_charge_SpellScript();
}
@@ -204,13 +204,13 @@ public:
target->CastSpell(target, roll_chance_i(50) ? SPELL_POSITIVE_POLARITY : SPELL_NEGATIVE_POLARITY, true, nullptr, nullptr, GetCaster()->GetGUID());
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_capacitus_polarity_shift_SpellScript();
}

24
src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
View File

@@ -39,7 +39,7 @@ public:
{
boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { }
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_FROST_ATTACK, 6000);
@@ -50,7 +50,7 @@ public:
me->CastSpell(me, SPELL_SUMMON_RAGIN_FLAMES, true);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (Unit* victim = me->GetVictim())
@@ -61,13 +61,13 @@ public:
}
}
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
{
events.Reset();
if (instance)
@@ -82,7 +82,7 @@ public:
Unit::Kill(summon, summon);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -113,7 +113,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_nethermancer_sepethreaAI(creature);
}
@@ -140,18 +140,18 @@ public:
EventMap events;
void Reset()
void Reset() override
{
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, true);
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
events.ScheduleEvent(EVENT_SPELL_FIRE_TAIL, 500);
events.ScheduleEvent(EVENT_SPELL_INFERNO, urand(10000, 20000));
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -178,7 +178,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_ragin_flamesAI(creature);
}
@@ -198,13 +198,13 @@ public:
GetUnitOwner()->CastCustomSpell(SPELL_INFERNO_DAMAGE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetUnitOwner(), TRIGGERED_FULL_MASK);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_ragin_flames_inferno_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_ragin_flames_inferno_AuraScript();
}

14
src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
View File

@@ -49,14 +49,14 @@ public:
{
boss_pathaleon_the_calculatorAI(Creature* creature) : BossAI(creature, DATA_PATHALEON_THE_CALCULATOR) { }
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
me->SetVisible(false);
me->SetReactState(REACT_PASSIVE);
}
void DoAction(int32 /*param*/)
void DoAction(int32 /*param*/) override
{
me->SetVisible(true);
me->CastSpell(me, SPELL_TELEPORT_VISUAL, true);
@@ -65,7 +65,7 @@ public:
Talk(SAY_APPEAR);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_SUMMON, 30000);
@@ -77,19 +77,19 @@ public:
Talk(SAY_AGGRO);
}
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
{
_JustDied();
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -144,7 +144,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_pathaleon_the_calculatorAI(creature);
}

18
src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
View File

@@ -32,7 +32,7 @@ public:
_passageGUIDs.clear();
}
void OnGameObjectCreate(GameObject* gameObject)
void OnGameObjectCreate(GameObject* gameObject) override
{
switch (gameObject->GetEntry())
{
@@ -46,7 +46,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* gameObject)
void OnGameObjectRemove(GameObject* gameObject) override
{
switch (gameObject->GetEntry())
{
@@ -60,13 +60,13 @@ public:
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
if (creature->GetEntry() == NPC_PATHALEON_THE_CALCULATOR)
_pathaleonGUID = creature->GetGUID();
}
void OnUnitDeath(Unit* unit)
void OnUnitDeath(Unit* unit) override
{
if (unit->GetTypeId() == TYPEID_UNIT)
if (_passageEncounter > ENCOUNTER_PASSAGE_NOT_STARTED && _passageEncounter < ENCOUNTER_PASSAGE_DONE)
@@ -91,7 +91,7 @@ public:
_passageGUIDs.insert(summon->GetGUID());
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
if (_passageEncounter == ENCOUNTER_PASSAGE_DONE)
return;
@@ -180,7 +180,7 @@ public:
}
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) override
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -188,7 +188,7 @@ public:
return true;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -200,7 +200,7 @@ public:
return saveStream.str();
}
void Load(const char* str)
void Load(const char* str) override
{
if (!str)
{
@@ -243,7 +243,7 @@ public:
std::set<uint64> _passageGUIDs;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_mechanar_InstanceMapScript(map);
}

42
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
View File

@@ -75,7 +75,7 @@ public:
EventMap events;
EventMap events2;
void InitializeAI()
void InitializeAI() override
{
ScriptedAI::InitializeAI();
@@ -86,28 +86,28 @@ public:
events2.ScheduleEvent(EVENT_MILLHOUSE_INTRO1, 3000);
}
void Reset()
void Reset() override
{
events.Reset();
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (who && me->Attack(who, true))
me->GetMotionMaster()->MoveChase(who, 20.0f);
}
void KilledUnit(Unit* /*who*/)
void KilledUnit(Unit* /*who*/) override
{
Talk(SAY_KILL);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
events.ScheduleEvent(EVENT_MILL_CHECK_HEALTH, 1000);
events.ScheduleEvent(EVENT_MILL_PYROBLAST, 30000);
@@ -115,7 +115,7 @@ public:
events.ScheduleEvent(EVENT_MILL_ICEBLOCK, 1000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (events2.ExecuteEvent())
@@ -232,7 +232,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_millhouse_manastormAI(creature);
}
@@ -321,12 +321,12 @@ public:
{
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
void SummonedCreatureDies(Creature* summon, Unit*)
void SummonedCreatureDies(Creature* summon, Unit*) override
{
if (summon->GetEntry() == NPC_HARBINGER_SKYRISS)
{
@@ -342,16 +342,16 @@ public:
}
}
void MoveInLineOfSight(Unit*) { }
void AttackStart(Unit*) { }
void EnterCombat(Unit*) { }
void MoveInLineOfSight(Unit*) override { }
void AttackStart(Unit*) override { }
void EnterCombat(Unit*) override { }
void JustDied(Unit*)
void JustDied(Unit*) override
{
me->setActive(false);
}
void Reset()
void Reset() override
{
_Reset();
me->setActive(false);
@@ -364,7 +364,7 @@ public:
}
void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (attacker && IS_PLAYER_GUID(attacker->GetCharmerOrOwnerOrOwnGUID()) && damage > 0 && !me->isActiveObject())
{
@@ -378,7 +378,7 @@ public:
damage = 0;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
if (data == FAIL)
{
@@ -402,7 +402,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch (events.ExecuteEvent())
@@ -562,7 +562,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_warden_mellicharAI(creature);
}
@@ -589,14 +589,14 @@ public:
caster->RemoveAurasDueToSpell(SPELL_SOUL_STEAL);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_arcatraz_soul_steal_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_arcatraz_soul_steal_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_arcatraz_soul_steal_AuraScript();
}

16
src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
View File

@@ -49,21 +49,21 @@ public:
{
boss_dalliah_the_doomsayerAI(Creature* creature) : BossAI(creature, DATA_DALLIAH) { }
void Reset()
void Reset() override
{
_Reset();
events2.Reset();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
if (instance->GetBossState(DATA_SOCCOTHRATES) != DONE)
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
@@ -73,7 +73,7 @@ public:
soccothrates->AI()->SetData(1, 1);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -87,19 +87,19 @@ public:
events.ScheduleEvent(EVENT_SHADOW_WAVE, urand(11000, 16000));
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void SetData(uint32 /*type*/, uint32 data)
void SetData(uint32 /*type*/, uint32 data) override
{
if (data == 1)
events2.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (events2.ExecuteEvent())
@@ -159,7 +159,7 @@ public:
EventMap events2;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_dalliah_the_doomsayerAI(creature);
}

14
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
View File

@@ -58,14 +58,14 @@ public:
SummonList summons;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
me->SetInCombatWithZone();
@@ -79,13 +79,13 @@ public:
events.ScheduleEvent(EVENT_SPELL_MANA_BURN, 25000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
summons.DespawnAll();
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summon->SetHealth(summon->CountPctFromMaxHealth(summon->GetEntry() == NPC_HARBINGER_SKYRISS_66 ? 66 : 33));
summons.Summon(summon);
@@ -94,13 +94,13 @@ public:
me->SendMovementFlagUpdate();
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_KILL);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -161,7 +161,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_harbinger_skyrissAI(creature);
}

18
src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
View File

@@ -69,7 +69,7 @@ public:
preFight = instance->GetBossState(DATA_DALLIAH) == DONE;
}
void Reset()
void Reset() override
{
_Reset();
events2.Reset();
@@ -77,14 +77,14 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
if (!preFight)
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
@@ -94,7 +94,7 @@ public:
dalliah->AI()->SetData(1, 1);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events2.Reset();
@@ -105,13 +105,13 @@ public:
Talk(SAY_AGGRO);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!preFight && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 70.0f))
{
@@ -121,13 +121,13 @@ public:
}
}
void SetData(uint32 /*type*/, uint32 data)
void SetData(uint32 /*type*/, uint32 data) override
{
if (data == 1)
events2.RescheduleEvent(EVENT_DALLIAH_DEATH, 6000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (events2.ExecuteEvent())
@@ -240,7 +240,7 @@ public:
EventMap events2;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_wrath_scryer_soccothratesAI(creature);
}

10
src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
View File

@@ -38,13 +38,13 @@ public:
boss_zereketh_the_unboundAI(Creature* creature) : BossAI(creature, DATA_ZEREKETH) { }
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_VOID_ZONE, 6000);
@@ -53,13 +53,13 @@ public:
Talk(SAY_AGGRO);
}
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;
@@ -92,7 +92,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_zereketh_the_unboundAI(creature);
}

20
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
View File

@@ -33,7 +33,7 @@ public:
memset(StasisPodGUIDs, 0, 5 * sizeof(uint64));
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -49,7 +49,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -80,7 +80,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -93,7 +93,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch (type)
{
@@ -110,12 +110,12 @@ public:
}
}
uint32 GetData(uint32 /*type*/) const
uint32 GetData(uint32 /*type*/) const override
{
return 0;
}
uint64 GetData64(uint32 data) const
uint64 GetData64(uint32 data) const override
{
switch (data)
{
@@ -129,7 +129,7 @@ public:
return 0;
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) override
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -147,7 +147,7 @@ public:
return true;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -158,7 +158,7 @@ public:
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) override
{
if (!str)
{
@@ -198,7 +198,7 @@ public:
uint64 WardensShieldGUID;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_arcatraz_InstanceMapScript(map);
}

16
src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
View File

@@ -41,12 +41,12 @@ public:
{
boss_commander_sarannisAI(Creature* creature) : BossAI(creature, DATA_COMMANDER_SARANNIS) { }
void Reset()
void Reset() override
{
_Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -55,19 +55,19 @@ public:
events.ScheduleEvent(EVENT_HEALTH_CHECK, 500);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_KILL);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -106,7 +106,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_commander_sarannisAI(creature);
}
@@ -144,13 +144,13 @@ public:
GetCaster()->SummonCreature(NPC_SUMMONED_BLOODWARDER_RESERVIST, PosSummonReinforcements[3], TEMPSUMMON_CORPSE_DESPAWN);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_commander_sarannis_summon_reinforcements_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_commander_sarannis_summon_reinforcements_SpellScript();
}

14
src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
View File

@@ -49,12 +49,12 @@ public:
{
boss_high_botanist_freywinnAI(Creature* creature) : BossAI(creature, DATA_HIGH_BOTANIST_FREYWINN) { }
void Reset()
void Reset() override
{
_Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -63,24 +63,24 @@ public:
events.ScheduleEvent(EVENT_TREE_FORM, 30000);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_KILL);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
_JustDied();
}
void SummonedCreatureDies(Creature* summon, Unit*)
void SummonedCreatureDies(Creature* summon, Unit*) override
{
summons.Despawn(summon);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -136,7 +136,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_high_botanist_freywinnAI(creature);
}

8
src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
View File

@@ -52,7 +52,7 @@ public:
{
boss_lajAI(Creature* creature) : BossAI(creature, DATA_LAJ) { }
void Reset()
void Reset() override
{
_Reset();
me->SetDisplayId(MODEL_DEFAULT);
@@ -86,7 +86,7 @@ public:
me->CastSpell(me, _lastTransform, true);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
@@ -95,7 +95,7 @@ public:
events.ScheduleEvent(EVENT_TELEPORT, 20000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -132,7 +132,7 @@ public:
uint32 _lastTransform;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_lajAI(creature);
}

14
src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
View File

@@ -48,12 +48,12 @@ public:
_intro = false;
}
void Reset()
void Reset() override
{
_Reset();
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!_intro && who->GetTypeId() == TYPEID_PLAYER)
{
@@ -64,7 +64,7 @@ public:
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -75,19 +75,19 @@ public:
events.ScheduleEvent(EVENT_HEALTH_CHECK_20, 500);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_KILL);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -142,7 +142,7 @@ public:
bool _intro;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_thorngrin_the_tenderAI(creature);
}

12
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
View File

@@ -40,12 +40,12 @@ public:
{
boss_warp_splinterAI(Creature* creature) : BossAI(creature, DATA_WARP_SPLINTER) { }
void Reset()
void Reset() override
{
_Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -55,19 +55,19 @@ public:
events.ScheduleEvent(EVENT_SUMMON_TREANT, 20000);
}
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
{
_JustDied();
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -99,7 +99,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_warp_splinterAI(creature);
}

20
src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
View File

@@ -18,7 +18,7 @@ public:
SetBossNumber(MAX_ENCOUNTER);
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) override
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -26,7 +26,7 @@ public:
return true;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -37,7 +37,7 @@ public:
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) override
{
if (!str)
{
@@ -70,7 +70,7 @@ public:
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_the_botanica_InstanceMapScript(map);
}
@@ -85,7 +85,7 @@ public:
{
PrepareAuraScript(spell_botanica_call_of_the_falcon_AuraScript)
bool Load()
bool Load() override
{
_falconSet.clear();
return true;
@@ -113,7 +113,7 @@ public:
}
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_botanica_call_of_the_falcon_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_botanica_call_of_the_falcon_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
@@ -123,7 +123,7 @@ public:
std::set<uint64> _falconSet;
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_botanica_call_of_the_falcon_AuraScript();
}
@@ -138,7 +138,7 @@ public:
{
PrepareAuraScript(spell_botanica_shift_form_AuraScript);
bool Load()
bool Load() override
{
_lastSchool = 0;
_lastForm = 0;
@@ -185,7 +185,7 @@ public:
return false;
}
void Register()
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_botanica_shift_form_AuraScript::CheckProc);
}
@@ -196,7 +196,7 @@ public:
uint32 _swapTime;
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_botanica_shift_form_AuraScript();
}