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

44
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
View File

@@ -61,12 +61,12 @@ public:
EventMap events;
SummonList summons;
void JustReachedHome()
void JustReachedHome() override
{
me->CastSpell(me, SPELL_SOULSTORM_CHANNEL_OOC, true);
}
void Reset()
void Reset() override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
me->CastSpell(me, SPELL_SOULSTORM_CHANNEL_OOC, true);
@@ -76,7 +76,7 @@ public:
pInstance->SetData(DATA_BRONJAHM, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL_OOC);
@@ -91,7 +91,7 @@ public:
pInstance->SetData(DATA_BRONJAHM, IN_PROGRESS);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE) && me->HealthBelowPctDamaged(35, damage))
{
@@ -105,7 +105,7 @@ public:
}
}
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell)
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override
{
if (spell->Id == SPELL_TELEPORT)
{
@@ -114,7 +114,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -166,33 +166,33 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (pInstance)
pInstance->SetData(DATA_BRONJAHM, DONE);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
summon->SetReactState(REACT_PASSIVE);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
ScriptedAI::EnterEvadeMode();
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_bronjahmAI(creature);
}
@@ -214,12 +214,12 @@ public:
uint32 timer;
InstanceScript* pInstance;
void Reset()
void Reset() override
{
timer = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (pInstance)
if (Creature* b = pInstance->instance->GetCreature(pInstance->GetData64(DATA_BRONJAHM)))
@@ -245,7 +245,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_fos_corrupted_soul_fragmentAI(creature);
}
@@ -277,13 +277,13 @@ public:
}
}
void Register()
void Register() override
{
OnHit += SpellHitFn(spell_bronjahm_magic_bane_SpellScript::RecalculateDamage);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_bronjahm_magic_bane_SpellScript();
}
@@ -305,13 +305,13 @@ public:
GetTarget()->CastSpell(GetTarget(), 68904 + (aurEff->GetTickNumber() % 4), true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_channel_ooc_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_bronjahm_soulstorm_channel_ooc_AuraScript();
}
@@ -349,13 +349,13 @@ public:
GetTarget()->CastSpell(GetTarget(), spellId, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_visual_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_bronjahm_soulstorm_visual_AuraScript();
}
@@ -376,13 +376,13 @@ public:
targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 10.0f, false));
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_bronjahm_soulstorm_targeting_SpellScript();
}

28
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
View File

@@ -83,7 +83,7 @@ public:
SummonList summons;
bool bAchiev;
void Reset()
void Reset() override
{
bAchiev = true;
me->SetControlled(false, UNIT_STATE_ROOT);
@@ -95,7 +95,7 @@ public:
pInstance->SetData(DATA_DEVOURER, NOT_STARTED);
}
uint32 GetData(uint32 id) const
uint32 GetData(uint32 id) const override
{
if (id == 1)
return bAchiev;
@@ -103,7 +103,7 @@ public:
return 0;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_FACE_AGGRO);
DoZoneInCombat();
@@ -131,7 +131,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellInfo* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
if (spell->Id == SPELL_PHANTOM_BLAST_H)
bAchiev = false;
@@ -152,9 +152,9 @@ public:
}
}
bool CanAIAttack(const Unit* target) const { return target->GetPositionZ() > 706.5f; }
bool CanAIAttack(const Unit* target) const override { return target->GetPositionZ() > 706.5f; }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -234,7 +234,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_FACE_DEATH);
summons.DespawnAll();
@@ -242,7 +242,7 @@ public:
pInstance->SetData(DATA_DEVOURER, DONE);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
return;
@@ -267,7 +267,7 @@ public:
Talk(textId);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
if (summon->GetEntry() != NPC_CRUCIBLE_OF_SOULS)
summons.Summon(summon);
@@ -280,7 +280,7 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
@@ -288,7 +288,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_devourer_of_soulsAI(creature);
}
@@ -306,7 +306,7 @@ public:
int8 dir;
bool Load()
bool Load() override
{
dir = urand(0, 1) ? 1 : -1;
return true;
@@ -347,13 +347,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_wailing_souls_periodic_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_wailing_souls_periodic_AuraScript();
}

10
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
View File

@@ -223,7 +223,7 @@ public:
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE && id == 1)
{
@@ -237,7 +237,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_fos_leader_secondAI(creature);
}
@@ -256,7 +256,7 @@ public:
int32 amount;
bool fired;
bool Load()
bool Load() override
{
fired = false;
amount = 0;
@@ -274,13 +274,13 @@ public:
}
}
void Register()
void Register() override
{
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_shield_of_bones_AuraScript::HandleAfterEffectAbsorb, EFFECT_0);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_shield_of_bones_AuraScript();
}

20
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
View File

@@ -12,7 +12,7 @@ class instance_forge_of_souls : public InstanceMapScript
public:
instance_forge_of_souls() : InstanceMapScript("instance_forge_of_souls", 632) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_forge_of_souls_InstanceScript(map);
}
@@ -32,7 +32,7 @@ public:
uint64 NPC_GuardFirstGUID;
uint64 NPC_GuardSecondGUID;
void Initialize()
void Initialize() override
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
teamIdInInstance = TEAM_NEUTRAL;
@@ -45,7 +45,7 @@ public:
NPC_GuardSecondGUID = 0;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
@@ -53,7 +53,7 @@ public:
return false;
}
void OnPlayerEnter(Player* /*plr*/)
void OnPlayerEnter(Player* /*plr*/) override
{
// this will happen only after crash and loading the instance from db
if (m_auiEncounter[0] == DONE && m_auiEncounter[1] == DONE && (!NPC_LeaderSecondGUID || !instance->GetCreature(NPC_LeaderSecondGUID)))
@@ -63,7 +63,7 @@ public:
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
if (teamIdInInstance == TEAM_NEUTRAL)
{
@@ -132,7 +132,7 @@ public:
summon->GetMotionMaster()->MovePath(outroPositions[i].pathId, false);
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch(type)
{
@@ -150,7 +150,7 @@ public:
SaveToDB();
}
uint64 GetData64(uint32 type) const
uint64 GetData64(uint32 type) const override
{
switch (type)
{
@@ -161,7 +161,7 @@ public:
return 0;
}
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/)
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{
switch(criteria_id)
{
@@ -185,7 +185,7 @@ public:
return false;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -197,7 +197,7 @@ public:
return str_data;
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{

16
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
View File

@@ -49,7 +49,7 @@ public:
uint8 uiHopelessnessCount;
uint16 startFightTimer;
void Reset()
void Reset() override
{
startFightTimer = 0;
uiHopelessnessCount = 0;
@@ -60,7 +60,7 @@ public:
pInstance->SetData(DATA_FALRIC, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
@@ -69,7 +69,7 @@ public:
events.ScheduleEvent(EVENT_DEFILING_HORROR, 20000);
}
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -78,7 +78,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (startFightTimer)
{
@@ -138,20 +138,20 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (pInstance)
pInstance->SetData(DATA_FALRIC, DONE);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
Talk(RAND(SAY_SLAY_1, SAY_SLAY_2));
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->SetControlled(false, UNIT_STATE_ROOT);
ScriptedAI::EnterEvadeMode();
@@ -160,7 +160,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_falricAI(creature);
}

20
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
View File

@@ -47,7 +47,7 @@ public:
EventMap events;
uint16 startFightTimer;
void Reset()
void Reset() override
{
startFightTimer = 0;
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
@@ -56,7 +56,7 @@ public:
pInstance->SetData(DATA_MARWYN, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
@@ -66,7 +66,7 @@ public:
events.ScheduleEvent(EVENT_SHARED_SUFFERING, 5000);
}
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -75,7 +75,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (startFightTimer)
{
@@ -127,20 +127,20 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (pInstance)
pInstance->SetData(DATA_MARWYN, DONE);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
Talk(RAND(SAY_SLAY_1, SAY_SLAY_2));
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
ScriptedAI::EnterEvadeMode();
if (startFightTimer)
@@ -148,7 +148,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_marwynAI(creature);
}
@@ -184,13 +184,13 @@ public:
}
}
void Register()
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_hor_shared_sufferingAuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_hor_shared_sufferingAuraScript();
}

156
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
View File

@@ -648,7 +648,7 @@ class npc_ghostly_priest : public CreatureScript
public:
npc_ghostly_priest() : CreatureScript("npc_ghostly_priest") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_ghostly_priestAI(creature);
}
@@ -659,7 +659,7 @@ public:
EventMap events;
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -669,12 +669,12 @@ public:
}
}
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000);
events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 8000);
@@ -682,14 +682,14 @@ public:
events.ScheduleEvent(EVENT_DARK_MENDING, 8000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!me->IsVisible() || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
ScriptedAI::AttackStart(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -730,7 +730,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
ScriptedAI::EnterEvadeMode();
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
@@ -744,7 +744,7 @@ class npc_phantom_mage : public CreatureScript
public:
npc_phantom_mage() : CreatureScript("npc_phantom_mage") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_phantom_mageAI(creature);
}
@@ -755,7 +755,7 @@ public:
EventMap events;
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -765,12 +765,12 @@ public:
}
}
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_FIREBALL, 3000);
events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000);
@@ -779,14 +779,14 @@ public:
events.ScheduleEvent(EVENT_HALLUCINATION, 40000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!me->IsVisible() || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
ScriptedAI::AttackStart(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -826,7 +826,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
ScriptedAI::EnterEvadeMode();
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
@@ -840,7 +840,7 @@ class npc_phantom_hallucination : public CreatureScript
public:
npc_phantom_hallucination() : CreatureScript("npc_phantom_hallucination") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_phantom_hallucinationAI(creature);
}
@@ -854,12 +854,12 @@ public:
uint8 numOfUpd;
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*who*/) override
{
me->CastSpell((Unit*)NULL, SPELL_HALLUCINATION_2, false);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (numOfUpd)
{
@@ -871,7 +871,7 @@ public:
npc_phantom_mageAI::UpdateAI(diff);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
if (numOfUpd)
return;
@@ -889,7 +889,7 @@ class npc_shadowy_mercenary : public CreatureScript
public:
npc_shadowy_mercenary() : CreatureScript("npc_shadowy_mercenary") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_shadowy_mercenaryAI(creature);
}
@@ -900,7 +900,7 @@ public:
EventMap events;
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -910,12 +910,12 @@ public:
}
}
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SHADOW_STEP, 4000);
events.ScheduleEvent(EVENT_DEADLY_POISON, 6000);
@@ -923,14 +923,14 @@ public:
events.ScheduleEvent(EVENT_KIDNEY_SHOT, 5000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!me->IsVisible() || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
ScriptedAI::AttackStart(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -970,7 +970,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
ScriptedAI::EnterEvadeMode();
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
@@ -984,7 +984,7 @@ class npc_spectral_footman : public CreatureScript
public:
npc_spectral_footman() : CreatureScript("npc_spectral_footman") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_spectral_footmanAI(creature);
}
@@ -995,7 +995,7 @@ public:
EventMap events;
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -1005,26 +1005,26 @@ public:
}
}
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000);
events.ScheduleEvent(EVENT_SHIELD_BASH, 6000);
events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!me->IsVisible() || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
ScriptedAI::AttackStart(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -1053,7 +1053,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
ScriptedAI::EnterEvadeMode();
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
@@ -1067,7 +1067,7 @@ class npc_tortured_rifleman : public CreatureScript
public:
npc_tortured_rifleman() : CreatureScript("npc_tortured_rifleman") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_tortured_riflemanAI(creature);
}
@@ -1078,7 +1078,7 @@ public:
EventMap events;
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -1088,26 +1088,26 @@ public:
}
}
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_CURSED_ARROW, 10000);
events.ScheduleEvent(EVENT_FROST_TRAP, 15000);
events.ScheduleEvent(EVENT_ICE_SHOT, 15000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!me->IsVisible() || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
return;
ScriptedAI::AttackStart(who);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -1137,7 +1137,7 @@ public:
DoSpellAttackIfReady(SPELL_SHOOT);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
ScriptedAI::EnterEvadeMode();
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
@@ -1161,12 +1161,12 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_FROSTSWORN_GENERAL_AGGRO);
events.ScheduleEvent(EVENT_ACTIVATE_REFLECTIONS, 8000);
@@ -1174,7 +1174,7 @@ public:
pInstance->SetData(ACTION_SPIRITUAL_REFLECTIONS_COPY, 1);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -1207,21 +1207,21 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_FROSTSWORN_GENERAL_DEATH);
if (pInstance)
pInstance->SetData(DATA_FROSTSWORN_GENERAL, DONE);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
pInstance->SetData(ACTION_SPIRITUAL_REFLECTIONS_HIDE, 1);
ScriptedAI::EnterEvadeMode();
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_frostsworn_generalAI(creature);
}
@@ -1240,17 +1240,17 @@ public:
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_BALEFUL_STRIKE, urand(4000, 7000));
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -1271,12 +1271,12 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->CastSpell((Unit*)NULL, SPELL_SPIRIT_BURST, false);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->UpdatePosition(me->GetHomePosition(), true);
ScriptedAI::EnterEvadeMode();
@@ -1284,7 +1284,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_hor_spiritual_reflectionAI(creature);
}
@@ -1295,7 +1295,7 @@ class at_hor_shadow_throne : public AreaTriggerScript
public:
at_hor_shadow_throne() : AreaTriggerScript("at_hor_shadow_throne") { }
bool OnTrigger(Player* player, const AreaTrigger* /*at*/)
bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override
{
if (player->IsGameMaster())
return false;
@@ -1340,7 +1340,7 @@ class npc_hor_lich_king : public CreatureScript
public:
npc_hor_lich_king() : CreatureScript("npc_hor_lich_king") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_hor_lich_kingAI(creature);
}
@@ -1361,7 +1361,7 @@ public:
uint8 reqKillCount;
uint8 div2;
void Reset()
void Reset() override
{
currentWall = 0;
reqKillCount = 0;
@@ -1369,7 +1369,7 @@ public:
events.RescheduleEvent(EVENT_LK_CHECK_COMBAT, 1000);
}
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == ACTION_START_LK_FIGHT_REAL)
events.ScheduleEvent(EVENT_LK_START_FOLLOWING, 1500);
@@ -1394,7 +1394,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 /*id*/)
void MovementInform(uint32 type, uint32 /*id*/) override
{
// Xinef: dont use 0, it is no longer the last point
// Xinef: if type is escort and spline is finalized, it means that we reached last point from the path
@@ -1418,7 +1418,7 @@ public:
}
}
void JustSummoned(Creature* s)
void JustSummoned(Creature* s) override
{
++reqKillCount;
if (events.GetNextEventTime(EVENT_DECREASE_REQ_COUNT_BY_100))
@@ -1435,18 +1435,18 @@ public:
s->SetHomePosition(PathWaypoints[WP_STOP[currentWall + 1]]);
}
void SummonedCreatureDespawn(Creature* s)
void SummonedCreatureDespawn(Creature* s) override
{
summons.Despawn(s);
}
void SpellHitTarget(Unit* target, const SpellInfo* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
if (target && target->IsAlive() && spell->Id == SPELL_LICH_KING_ZAP_PLAYER)
Unit::DealDamage(me, target, 10000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (me->HealthBelowPct(70))
me->SetHealth(me->GetMaxHealth() * 3 / 4);
@@ -1796,12 +1796,12 @@ public:
bool leaped;
void Reset()
void Reset() override
{
leaped = false;
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
if (!UpdateVictim())
return;
@@ -1820,7 +1820,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->SetCorpseDelay(10);
if (InstanceScript* pInstance = me->GetInstanceScript())
@@ -1829,7 +1829,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_hor_raging_ghoulAI(creature);
}
@@ -1846,19 +1846,19 @@ public:
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(1, 10000);
events.ScheduleEvent(2, 4500);
events.ScheduleEvent(3, 9000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -1889,7 +1889,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->SetCorpseDelay(10);
if (InstanceScript* pInstance = me->GetInstanceScript())
@@ -1898,7 +1898,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_hor_risen_witch_doctorAI(creature);
}
@@ -1915,17 +1915,17 @@ public:
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(1, 5000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -1954,7 +1954,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->SetCorpseDelay(10);
if (InstanceScript* pInstance = me->GetInstanceScript())
@@ -1963,7 +1963,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_hor_lumbering_abominationAI(creature);
}
@@ -1986,13 +1986,13 @@ public:
c->CastSpell((Unit*)NULL, 70021, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_hor_gunship_cannon_fireAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_hor_gunship_cannon_fireAuraScript();
}
@@ -2005,7 +2005,7 @@ class at_hor_battered_hilt_start : public AreaTriggerScript
public:
at_hor_battered_hilt_start() : AreaTriggerScript("at_hor_battered_hilt_start") { }
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/) override
{
if (player->HasAura(70013))
if (InstanceScript* instance = player->GetInstanceScript())
@@ -2019,7 +2019,7 @@ class at_hor_battered_hilt_throw : public AreaTriggerScript
public:
at_hor_battered_hilt_throw() : AreaTriggerScript("at_hor_battered_hilt_throw") { }
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/) override
{
if (player->HasAura(70013))
if (InstanceScript* instance = player->GetInstanceScript())

26
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
View File

@@ -11,7 +11,7 @@ class UtherBatteredHiltEvent : public BasicEvent
public:
UtherBatteredHiltEvent(Creature& owner, uint8 eventId) : _owner(owner), _eventId(eventId) { }
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/)
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
switch (_eventId)
{
@@ -106,7 +106,7 @@ class instance_halls_of_reflection : public InstanceMapScript
public:
instance_halls_of_reflection() : InstanceMapScript("instance_halls_of_reflection", 668) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
return new instance_halls_of_reflection_InstanceMapScript(pMap);
}
@@ -159,7 +159,7 @@ public:
uint8 outroStep;
MotionTransport* T1;
void Initialize()
void Initialize() override
{
EncounterMask = 0;
TeamIdInInstance = TEAM_NEUTRAL;
@@ -206,12 +206,12 @@ public:
T1 = nullptr;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
return (instance->HavePlayers() && WaveNumber) || IsDuringLKFight; // during LK fight npcs are active and will unset this variable
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
if (TeamIdInInstance == TEAM_NEUTRAL)
{
@@ -372,7 +372,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch(go->GetEntry())
{
@@ -408,7 +408,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch(type)
{
@@ -663,7 +663,7 @@ public:
SaveToDB();
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch(type)
{
@@ -683,7 +683,7 @@ public:
return 0;
}
uint64 GetData64(uint32 type) const
uint64 GetData64(uint32 type) const override
{
switch(type)
{
@@ -717,7 +717,7 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -728,7 +728,7 @@ public:
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{
@@ -755,7 +755,7 @@ public:
OUT_LOAD_INST_DATA_COMPLETE;
}
void OnUnitDeath(Unit* unit)
void OnUnitDeath(Unit* unit) override
{
if (WaveNumber && reqKillCount)
if (unit->GetEntry() == NPC_WAVE_MERCENARY || unit->GetEntry() == NPC_WAVE_FOOTMAN || unit->GetEntry() == NPC_WAVE_RIFLEMAN || unit->GetEntry() == NPC_WAVE_PRIEST || unit->GetEntry() == NPC_WAVE_MAGE)
@@ -947,7 +947,7 @@ public:
reqKillCount = 0;
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
if (!instance->HavePlayers())
return;

28
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
View File

@@ -75,7 +75,7 @@ public:
uint8 phase;
bool bCanSayBoulderHit;
void Reset()
void Reset() override
{
me->RemoveAura(SPELL_PERMAFROST);
SetEquipmentSlots(true);
@@ -90,13 +90,13 @@ public:
pInstance->SetData(DATA_GARFROST, NOT_STARTED);
}
void SetData(uint32 id, uint32 /*data*/)
void SetData(uint32 id, uint32 /*data*/) override
{
if (id == 1 && pInstance)
pInstance->SetData(DATA_ACHIEV_ELEVEN, 0);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->CastSpell(me, SPELL_PERMAFROST, true);
@@ -108,7 +108,7 @@ public:
pInstance->SetData(DATA_GARFROST, IN_PROGRESS);
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType /*damagetype*/, SpellSchoolMask /*damageSchoolMask*/)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType /*damagetype*/, SpellSchoolMask /*damageSchoolMask*/) override
{
if (phase == 0 && !HealthAbovePct(66) && !me->HasUnitState(UNIT_STATE_ROOT))
{
@@ -136,7 +136,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != EFFECT_MOTION_TYPE || id != 0)
return;
@@ -156,7 +156,7 @@ public:
}
}
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell)
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override
{
if (spell->Id == uint32(SPELL_SARONITE_TRIGGERED))
{
@@ -194,7 +194,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -263,20 +263,20 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (pInstance)
pInstance->SetData(DATA_GARFROST, DONE);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY_1);
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
@@ -284,7 +284,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_garfrostAI(creature);
}
@@ -301,7 +301,7 @@ public:
std::list<WorldObject*> targetList;
void Unload()
void Unload() override
{
targetList.clear();
}
@@ -351,7 +351,7 @@ public:
targets = targetList;
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_garfrost_permafrost_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_garfrost_permafrost_SpellScript::FilterTargetsNext, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
@@ -359,7 +359,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_garfrost_permafrost_SpellScript();
}

34
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
View File

@@ -72,7 +72,7 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
me->SetReactState(REACT_AGGRESSIVE);
events.Reset();
@@ -80,12 +80,12 @@ public:
pInstance->SetData(DATA_ICK, NOT_STARTED);
}
bool CanAIAttack(const Unit* /*who*/) const
bool CanAIAttack(const Unit* /*who*/) const override
{
return pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) >= INSTANCE_PROGRESS_FINISHED_INTRO;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (Creature* k = GetKrick())
k->AI()->Talk(SAY_AGGRO);
@@ -100,7 +100,7 @@ public:
pInstance->SetData(DATA_ICK, IN_PROGRESS);
}
void SpellHitTarget(Unit* target, const SpellInfo* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
if (!target || !spell)
return;
@@ -125,7 +125,7 @@ public:
return (Creature*)NULL;
}
void DamageTaken(Unit* /*doneBy*/, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit* /*doneBy*/, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (damage >= me->GetHealth())
if (Creature* krick = GetKrick())
@@ -146,7 +146,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -241,14 +241,14 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (pInstance)
pInstance->SetData(DATA_ICK, DONE);
me->RemoveAllAuras();
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
// if during pursuit ick kills his target, set to aggressive again
if (who && me->GetVictim() && who->GetGUID() == me->GetVictim()->GetGUID())
@@ -260,12 +260,12 @@ public:
k->AI()->Talk(RAND(SAY_SLAY_1, SAY_SLAY_2));
}
void JustSummoned(Creature* /*summon*/)
void JustSummoned(Creature* /*summon*/) override
{
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_ickAI(creature);
}
@@ -286,7 +286,7 @@ public:
InstanceScript* pInstance;
EventMap events;
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1)
{
@@ -295,7 +295,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch(events.ExecuteEvent())
@@ -444,7 +444,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_krickAI(creature);
}
@@ -473,13 +473,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_krick_explosive_barrage_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_krick_explosive_barrage_AuraScript();
}
@@ -509,13 +509,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_exploding_orb_auto_grow_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_exploding_orb_auto_grow_AuraScript();
}

14
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
View File

@@ -60,7 +60,7 @@ public:
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
events.Reset();
@@ -88,7 +88,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == 1)
{
@@ -116,7 +116,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -186,7 +186,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (pInstance)
@@ -195,13 +195,13 @@ public:
me->ToTempSummon()->SetTempSummonType(TEMPSUMMON_MANUAL_DESPAWN);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
Talk(RAND(SAY_SLAY_1, SAY_SLAY_2));
}
bool CanAIAttack(const Unit* who) const
bool CanAIAttack(const Unit* who) const override
{
switch (who->GetEntry())
{
@@ -220,7 +220,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_tyrannusAI(creature);
}

28
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
View File

@@ -40,7 +40,7 @@ public:
bool bAchievEleven;
bool bAchievDontLookUp;
void Initialize()
void Initialize() override
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
teamIdInInstance = TEAM_NEUTRAL;
@@ -66,7 +66,7 @@ public:
bAchievDontLookUp = true;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
@@ -74,14 +74,14 @@ public:
return false;
}
void OnPlayerEnter(Player* /*plr*/)
void OnPlayerEnter(Player* /*plr*/) override
{
instance->LoadGrid(LeaderIntroPos.GetPositionX(), LeaderIntroPos.GetPositionY());
if (Creature* c = instance->GetCreature(GetData64(DATA_LEADER_FIRST_GUID)))
c->AI()->SetData(DATA_START_INTRO, 0);
}
uint32 GetCreatureEntry(uint32 /*guidLow*/, CreatureData const* data)
uint32 GetCreatureEntry(uint32 /*guidLow*/, CreatureData const* data) override
{
if (teamIdInInstance == TEAM_NEUTRAL)
{
@@ -107,7 +107,7 @@ public:
return entry;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
if (teamIdInInstance == TEAM_NEUTRAL)
{
@@ -247,7 +247,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -259,7 +259,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch(type)
{
@@ -304,7 +304,7 @@ public:
SaveToDB();
}
void SetData64(uint32 type, uint64 data)
void SetData64(uint32 type, uint64 data) override
{
switch(type)
{
@@ -320,7 +320,7 @@ public:
}
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch (type)
{
@@ -339,7 +339,7 @@ public:
return 0;
}
uint64 GetData64(uint32 type) const
uint64 GetData64(uint32 type) const override
{
switch (type)
{
@@ -372,7 +372,7 @@ public:
return 0;
}
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/)
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{
switch(criteria_id)
{
@@ -382,7 +382,7 @@ public:
return false;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -394,7 +394,7 @@ public:
return str_data;
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{
@@ -427,7 +427,7 @@ public:
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_pit_of_saron_InstanceScript(map);
}

116
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
View File

@@ -30,7 +30,7 @@ public:
InstanceScript* pInstance;
uint8 counter;
void Reset()
void Reset() override
{
counter = 0;
events.Reset();
@@ -46,7 +46,7 @@ public:
}
}
void SetData(uint32 type, uint32 /*val*/)
void SetData(uint32 type, uint32 /*val*/) override
{
if (type == DATA_START_INTRO && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_NONE && counter == 0 && !me->IsVisible())
{
@@ -55,7 +55,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch(events.ExecuteEvent())
@@ -349,21 +349,21 @@ public:
DoMeleeAttackIfReady();
}
void JustSummoned(Creature* s)
void JustSummoned(Creature* s) override
{
summons.Summon(s);
}
void SummonedCreatureDespawn(Creature* s)
void SummonedCreatureDespawn(Creature* s) override
{
summons.Despawn(s);
}
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) override {}
void MoveInLineOfSight(Unit* /*who*/) override {}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_leaderAI(creature);
}
@@ -386,12 +386,12 @@ public:
InstanceScript* pInstance;
bool isInvincible;
void Reset()
void Reset() override
{
events.Reset();
}
void InitializeAI()
void InitializeAI() override
{
if (pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_NONE)
{
@@ -416,13 +416,13 @@ public:
}
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE && id == 1)
me->SetFacingTo(M_PI);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
// TODO This spell check is invalid
// if (SPELL_NECROLYTE_CHANNELING)
@@ -435,19 +435,19 @@ public:
c->AI()->SetData(DATA_START_INTRO, 0);
}
void DamageTaken(Unit* /*doneBy*/, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit* /*doneBy*/, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (isInvincible && damage >= me->GetHealth())
damage = me->GetHealth() - 1;
}
void DoAction(int32 a)
void DoAction(int32 a) override
{
if (a == 1337)
isInvincible = false;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -475,10 +475,10 @@ public:
DoMeleeAttackIfReady();
}
void MoveInLineOfSight(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_deathwhisper_necrolyteAI(creature);
}
@@ -500,12 +500,12 @@ public:
EventMap events;
InstanceScript* pInstance;
void Reset()
void Reset() override
{
events.Reset();
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != POINT_MOTION_TYPE)
return;
@@ -517,7 +517,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch(events.ExecuteEvent())
@@ -559,7 +559,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_after_first_bossAI(creature);
}
@@ -585,7 +585,7 @@ public:
uint32 killsLeft;
uint64 deathbringerGUID[2];
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE)
{
@@ -609,7 +609,7 @@ public:
events.ScheduleEvent(6, 0);
}
void SetData(uint32 type, uint32 id)
void SetData(uint32 type, uint32 id) override
{
if (!me->IsAlive() || pInstance->GetData(DATA_GARFROST) != DONE || pInstance->GetData(DATA_ICK) != DONE)
return;
@@ -658,7 +658,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch (events.ExecuteEvent())
@@ -808,7 +808,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_tyrannus_eventsAI(creature);
}
@@ -830,7 +830,7 @@ public:
InstanceScript* pInstance;
uint16 timer;
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!pInstance)
return;
@@ -845,7 +845,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_icicle_triggerAI(creature);
}
@@ -869,13 +869,13 @@ public:
uint16 timer1;
uint16 timer2;
void SpellHitTarget(Unit* target, const SpellInfo* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
if (target && spell && target->GetTypeId() == TYPEID_PLAYER && spell->Id == 70827 && pInstance)
pInstance->SetData(DATA_ACHIEV_DONT_LOOK_UP, 0);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (timer1 <= diff)
{
@@ -896,7 +896,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_collapsing_icicleAI(creature);
}
@@ -938,7 +938,7 @@ public:
SummonList summons;
uint8 i;
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE && id == 2)
{
@@ -946,7 +946,7 @@ public:
}
}
void DoAction(int32 p)
void DoAction(int32 p) override
{
if (p == 1)
summons.DespawnAll();
@@ -989,17 +989,17 @@ public:
}
}
void JustSummoned(Creature* s)
void JustSummoned(Creature* s) override
{
summons.Summon(s);
}
void SummonedCreatureDespawn(Creature* s)
void SummonedCreatureDespawn(Creature* s) override
{
summons.Despawn(s);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
@@ -1083,7 +1083,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_martin_or_gorkun_secondAI(creature);
}
@@ -1104,12 +1104,12 @@ public:
me->ApplySpellImmune(0, IMMUNITY_ID, 70827, true);
}
bool CanAIAttack(const Unit* who) const
bool CanAIAttack(const Unit* who) const override
{
return who->GetEntry() == NPC_FALLEN_WARRIOR;
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
if (!me->IsAlive() || me->IsInEvadeMode())
return;
@@ -1124,7 +1124,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_freed_slaveAI(creature);
}
@@ -1164,7 +1164,7 @@ public:
EventMap events;
uint64 barrierGUID;
void DoAction(int32 p)
void DoAction(int32 p) override
{
if (p == 1)
{
@@ -1173,7 +1173,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellInfo* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
if ((spell->Id == SPELL_TELEPORT_JAINA || spell->Id == SPELL_TELEPORT_SYLVANAS) && target && target->GetTypeId() == TYPEID_PLAYER)
{
@@ -1183,7 +1183,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != WAYPOINT_MOTION_TYPE)
return;
@@ -1205,7 +1205,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
@@ -1284,7 +1284,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pos_leader_secondAI(creature);
}
@@ -1310,7 +1310,7 @@ public:
uint16 timer;
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (timer)
{
@@ -1326,7 +1326,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_frostbite_invisible_stalkerAI(creature);
}
@@ -1348,13 +1348,13 @@ public:
caster->CastSpell((float)urand(447, 480), (float)urand(200, 235), 528.71f, 70131, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pos_empowered_blizzardAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_pos_empowered_blizzardAuraScript();
}
@@ -1373,7 +1373,7 @@ class SlaveRunEvent : public BasicEvent
public:
SlaveRunEvent(Creature& owner) : _owner(owner) { }
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/)
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
uint32 pointId = 0;
float minDist = _owner.GetExactDist2dSq(&slaveFreePos[pointId]);
@@ -1427,13 +1427,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pos_slave_trigger_closestSpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_pos_slave_trigger_closestSpellScript();
}
@@ -1459,13 +1459,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pos_rimefang_frost_novaSpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_pos_rimefang_frost_novaSpellScript();
}
@@ -1487,13 +1487,13 @@ public:
target->CastSpell(target, 69604, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pos_blightAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_pos_blightAuraScript();
}
@@ -1519,13 +1519,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pos_glacial_strikeAuraScript::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_pos_glacial_strikeAuraScript();
}
@@ -1536,7 +1536,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript
public:
at_tyrannus_event_starter() : AreaTriggerScript("at_tyrannus_event_starter") { }
bool OnTrigger(Player* player, const AreaTrigger* /*at*/)
bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override
{
InstanceScript* inst = player->GetInstanceScript();
if (!inst)