mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-26 15:16:24 +00:00
refactor(Core): apply clang-tidy modernize-use-override (#3817)
This commit is contained in:
@@ -49,7 +49,7 @@ class boss_cyanigosa : public CreatureScript
|
||||
public:
|
||||
boss_cyanigosa() : CreatureScript("boss_cyanigosa") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new boss_cyanigosaAI (pCreature);
|
||||
}
|
||||
@@ -64,12 +64,12 @@ public:
|
||||
InstanceScript* pInstance;
|
||||
EventMap events;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
events.Reset();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
DoZoneInCombat();
|
||||
Talk(SAY_AGGRO);
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
events.RescheduleEvent(EVENT_SPELL_MANA_DESTRUCTION, 20000);
|
||||
}
|
||||
|
||||
void SpellHitTarget(Unit* target, const SpellInfo* spell)
|
||||
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
|
||||
{
|
||||
if (!target || !spell)
|
||||
return;
|
||||
@@ -95,7 +95,7 @@ public:
|
||||
}
|
||||
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -144,7 +144,7 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
Talk(SAY_DEATH);
|
||||
if (pInstance)
|
||||
@@ -158,16 +158,16 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* victim)
|
||||
void KilledUnit(Unit* victim) override
|
||||
{
|
||||
if (victim && victim->GetGUID() == me->GetGUID())
|
||||
return;
|
||||
Talk(SAY_SLAY);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
me->SetControlled(false, UNIT_STATE_ROOT);
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
|
||||
@@ -51,7 +51,7 @@ class boss_erekem : public CreatureScript
|
||||
public:
|
||||
boss_erekem() : CreatureScript("boss_erekem") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new boss_erekemAI (pCreature);
|
||||
}
|
||||
@@ -66,12 +66,12 @@ public:
|
||||
InstanceScript* pInstance;
|
||||
EventMap events;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
events.Reset();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* who)
|
||||
void EnterCombat(Unit* who) override
|
||||
{
|
||||
DoZoneInCombat();
|
||||
Talk(SAY_AGGRO);
|
||||
@@ -94,7 +94,7 @@ public:
|
||||
c->AI()->AttackStart(who);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -160,23 +160,23 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
Talk(SAY_DEATH);
|
||||
if (pInstance)
|
||||
pInstance->SetData(DATA_BOSS_DIED, 0);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* victim)
|
||||
void KilledUnit(Unit* victim) override
|
||||
{
|
||||
if (victim && victim->GetGUID() == me->GetGUID())
|
||||
return;
|
||||
Talk(SAY_SLAY);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
events.Reset();
|
||||
@@ -226,7 +226,7 @@ class npc_erekem_guard : public CreatureScript
|
||||
public:
|
||||
npc_erekem_guard() : CreatureScript("npc_erekem_guard") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new npc_erekem_guardAI (pCreature);
|
||||
}
|
||||
@@ -241,12 +241,12 @@ public:
|
||||
InstanceScript* pInstance;
|
||||
EventMap events;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
events.Reset();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* who)
|
||||
void EnterCombat(Unit* who) override
|
||||
{
|
||||
DoZoneInCombat();
|
||||
events.Reset();
|
||||
@@ -259,7 +259,7 @@ public:
|
||||
c->AI()->AttackStart(who);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -290,7 +290,7 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ class boss_ichoron : public CreatureScript
|
||||
public:
|
||||
boss_ichoron() : CreatureScript("boss_ichoron") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new boss_ichoronAI (pCreature);
|
||||
}
|
||||
@@ -86,7 +86,7 @@ public:
|
||||
uint32 uiWaterBoltVolleyTimer;
|
||||
uint32 uiDrainedTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
globules.DespawnAll();
|
||||
bIsExploded = false;
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
me->SetDisplayId(me->GetNativeDisplayId());
|
||||
}
|
||||
|
||||
void DoAction(int32 param)
|
||||
void DoAction(int32 param) override
|
||||
{
|
||||
if (!me->IsAlive())
|
||||
return;
|
||||
@@ -145,7 +145,7 @@ public:
|
||||
me->CastSpell(plr, spellId, triggered);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
bIsExploded = false;
|
||||
bIsFrenzy = false;
|
||||
@@ -158,7 +158,7 @@ public:
|
||||
pInstance->SetData(DATA_ACHIEV, 1);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 uiDiff)
|
||||
void UpdateAI(uint32 uiDiff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -237,7 +237,7 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void JustSummoned(Creature* pSummoned)
|
||||
void JustSummoned(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
{
|
||||
@@ -251,7 +251,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void SummonedCreatureDespawn(Creature* pSummoned)
|
||||
void SummonedCreatureDespawn(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
{
|
||||
@@ -261,7 +261,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
Talk(SAY_DEATH);
|
||||
bIsExploded = false;
|
||||
@@ -272,16 +272,16 @@ public:
|
||||
pInstance->SetData(DATA_BOSS_DIED, 0);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* victim)
|
||||
void KilledUnit(Unit* victim) override
|
||||
{
|
||||
if (victim && victim->GetGUID() == me->GetGUID())
|
||||
return;
|
||||
Talk(SAY_SLAY);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
@@ -298,7 +298,7 @@ class npc_ichor_globule : public CreatureScript
|
||||
public:
|
||||
npc_ichor_globule() : CreatureScript("npc_ichor_globule") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new npc_ichor_globuleAI (pCreature);
|
||||
}
|
||||
@@ -314,13 +314,13 @@ public:
|
||||
InstanceScript* pInstance;
|
||||
uint32 uiRangeCheck_Timer;
|
||||
|
||||
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
|
||||
void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override
|
||||
{
|
||||
if (spell->Id == SPELL_CREATE_GLOBULE_VISUAL)
|
||||
me->CastSpell(me, SPELL_WATER_GLOBULE, true);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 uiDiff)
|
||||
void UpdateAI(uint32 uiDiff) override
|
||||
{
|
||||
if (uiRangeCheck_Timer < uiDiff)
|
||||
{
|
||||
@@ -337,7 +337,7 @@ public:
|
||||
else uiRangeCheck_Timer -= uiDiff;
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
me->CastSpell(me, SPELL_SPLASH, true);
|
||||
if (pInstance)
|
||||
@@ -347,8 +347,8 @@ public:
|
||||
me->DespawnOrUnsummon(2500);
|
||||
}
|
||||
|
||||
void AttackStart(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void AttackStart(Unit* /*who*/) override {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ class boss_lavanthor : public CreatureScript
|
||||
public:
|
||||
boss_lavanthor() : CreatureScript("boss_lavanthor") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new boss_lavanthorAI (pCreature);
|
||||
}
|
||||
@@ -49,12 +49,12 @@ public:
|
||||
InstanceScript* pInstance;
|
||||
EventMap events;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
events.Reset();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
DoZoneInCombat();
|
||||
events.Reset();
|
||||
@@ -65,7 +65,7 @@ public:
|
||||
events.RescheduleEvent(EVENT_SPELL_CAUTERIZING_FLAMES, 3000);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -100,15 +100,15 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
if (pInstance)
|
||||
pInstance->SetData(DATA_BOSS_DIED, 0);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
|
||||
@@ -37,7 +37,7 @@ class boss_moragg : public CreatureScript
|
||||
public:
|
||||
boss_moragg() : CreatureScript("boss_moragg") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new boss_moraggAI (pCreature);
|
||||
}
|
||||
@@ -52,12 +52,12 @@ public:
|
||||
InstanceScript* pInstance;
|
||||
EventMap events;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
events.Reset();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
DoZoneInCombat();
|
||||
me->CastSpell(me, SPELL_RAY_OF_SUFFERING, true);
|
||||
@@ -67,7 +67,7 @@ public:
|
||||
events.RescheduleEvent(EVENT_SPELL_OPTIC_LINK, urand(10000, 11000));
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -99,15 +99,15 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
if (pInstance)
|
||||
pInstance->SetData(DATA_BOSS_DIED, 0);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
events.Reset();
|
||||
@@ -135,13 +135,13 @@ public:
|
||||
GetAura()->GetEffect(0)->SetAmount(aurEff->GetSpellInfo()->Effects[EFFECT_0].BasePoints + (((int32)target->GetExactDist(caster)) * 25) + (aurEff->GetTickNumber() * 100));
|
||||
}
|
||||
|
||||
void Register()
|
||||
void Register() override
|
||||
{
|
||||
OnEffectPeriodic += AuraEffectPeriodicFn(spell_optic_linkAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
|
||||
}
|
||||
};
|
||||
|
||||
AuraScript* GetAuraScript() const
|
||||
AuraScript* GetAuraScript() const override
|
||||
{
|
||||
return new spell_optic_linkAuraScript();
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ class boss_xevozz : public CreatureScript
|
||||
public:
|
||||
boss_xevozz() : CreatureScript("boss_xevozz") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new boss_xevozzAI (pCreature);
|
||||
}
|
||||
@@ -66,13 +66,13 @@ public:
|
||||
EventMap events;
|
||||
SummonList spheres;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
events.Reset();
|
||||
spheres.DespawnAll();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
Talk(SAY_AGGRO);
|
||||
DoZoneInCombat();
|
||||
@@ -81,7 +81,7 @@ public:
|
||||
events.RescheduleEvent(EVENT_SUMMON_SPHERES, 10000);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -147,7 +147,7 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void JustSummoned(Creature* pSummoned)
|
||||
void JustSummoned(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
{
|
||||
@@ -159,7 +159,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void SummonedCreatureDespawn(Creature* pSummoned)
|
||||
void SummonedCreatureDespawn(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
{
|
||||
@@ -169,7 +169,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
Talk(SAY_DEATH);
|
||||
spheres.DespawnAll();
|
||||
@@ -177,7 +177,7 @@ public:
|
||||
pInstance->SetData(DATA_BOSS_DIED, 0);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* pVictim)
|
||||
void KilledUnit(Unit* pVictim) override
|
||||
{
|
||||
if (pVictim && pVictim->GetGUID() == me->GetGUID())
|
||||
return;
|
||||
@@ -185,9 +185,9 @@ public:
|
||||
Talk(SAY_SLAY);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
events.Reset();
|
||||
|
||||
@@ -46,7 +46,7 @@ class boss_zuramat : public CreatureScript
|
||||
public:
|
||||
boss_zuramat() : CreatureScript("boss_zuramat") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new boss_zuramatAI (pCreature);
|
||||
}
|
||||
@@ -62,13 +62,13 @@ public:
|
||||
EventMap events;
|
||||
SummonList summons;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
events.Reset();
|
||||
summons.DespawnAll();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
Talk(SAY_AGGRO);
|
||||
DoZoneInCombat();
|
||||
@@ -80,7 +80,7 @@ public:
|
||||
pInstance->SetData(DATA_ACHIEV, 1);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -116,7 +116,7 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
summons.DespawnAll();
|
||||
Talk(SAY_DEATH);
|
||||
@@ -124,7 +124,7 @@ public:
|
||||
pInstance->SetData(DATA_BOSS_DIED, 0);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* victim)
|
||||
void KilledUnit(Unit* victim) override
|
||||
{
|
||||
if (victim && victim->GetGUID() == me->GetGUID())
|
||||
return;
|
||||
@@ -132,7 +132,7 @@ public:
|
||||
Talk(SAY_SLAY);
|
||||
}
|
||||
|
||||
void JustSummoned(Creature* pSummoned)
|
||||
void JustSummoned(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
{
|
||||
@@ -143,7 +143,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void SummonedCreatureDespawn(Creature* pSummoned)
|
||||
void SummonedCreatureDespawn(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
{
|
||||
@@ -155,9 +155,9 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
events.Reset();
|
||||
@@ -173,7 +173,7 @@ class npc_vh_void_sentry : public CreatureScript
|
||||
public:
|
||||
npc_vh_void_sentry() : CreatureScript("npc_vh_void_sentry") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* pCreature) const override
|
||||
{
|
||||
return new npc_vh_void_sentryAI (pCreature);
|
||||
}
|
||||
@@ -198,14 +198,14 @@ public:
|
||||
uint64 SummonedGUID;
|
||||
uint16 checkTimer;
|
||||
|
||||
void DoAction(int32 a)
|
||||
void DoAction(int32 a) override
|
||||
{
|
||||
if (a == -1337)
|
||||
if (Creature* c = pInstance->instance->GetCreature(SummonedGUID))
|
||||
c->DespawnOrUnsummon();
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
if (pInstance)
|
||||
{
|
||||
@@ -216,13 +216,13 @@ public:
|
||||
me->DespawnOrUnsummon(5000);
|
||||
}
|
||||
|
||||
void SummonedCreatureDespawn(Creature* pSummoned)
|
||||
void SummonedCreatureDespawn(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
pInstance->SetData64(DATA_DELETE_TRASH_MOB, pSummoned->GetGUID());
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (checkTimer <= diff)
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@ class instance_violet_hold : public InstanceMapScript
|
||||
public:
|
||||
instance_violet_hold() : InstanceMapScript("instance_violet_hold", 608) { }
|
||||
|
||||
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
|
||||
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
|
||||
{
|
||||
return new instance_violet_hold_InstanceMapScript(pMap);
|
||||
}
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
uint64 NPC_ZuramatGUID;
|
||||
uint64 NPC_CyanigosaGUID;
|
||||
|
||||
void Initialize()
|
||||
void Initialize() override
|
||||
{
|
||||
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
|
||||
CLEANED = false;
|
||||
@@ -110,12 +110,12 @@ public:
|
||||
NPC_CyanigosaGUID = 0;
|
||||
}
|
||||
|
||||
bool IsEncounterInProgress() const
|
||||
bool IsEncounterInProgress() const override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void OnCreatureCreate(Creature* creature)
|
||||
void OnCreatureCreate(Creature* creature) override
|
||||
{
|
||||
switch(creature->GetEntry())
|
||||
{
|
||||
@@ -170,7 +170,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void OnGameObjectCreate(GameObject* go)
|
||||
void OnGameObjectCreate(GameObject* go) override
|
||||
{
|
||||
switch(go->GetEntry())
|
||||
{
|
||||
@@ -210,7 +210,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void SetData(uint32 type, uint32 data)
|
||||
void SetData(uint32 type, uint32 data) override
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
@@ -280,7 +280,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void SetData64(uint32 type, uint64 data)
|
||||
void SetData64(uint32 type, uint64 data) override
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
@@ -294,7 +294,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
uint32 GetData(uint32 type) const
|
||||
uint32 GetData(uint32 type) const override
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
@@ -313,7 +313,7 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64 GetData64(uint32 identifier) const
|
||||
uint64 GetData64(uint32 identifier) const override
|
||||
{
|
||||
switch(identifier)
|
||||
{
|
||||
@@ -402,7 +402,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void Update(uint32 diff)
|
||||
void Update(uint32 diff) override
|
||||
{
|
||||
events.Update(diff);
|
||||
switch( events.ExecuteEvent() )
|
||||
@@ -513,7 +513,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void OnPlayerEnter(Player* plr)
|
||||
void OnPlayerEnter(Player* plr) override
|
||||
{
|
||||
if( DoNeedCleanup(plr->IsAlive()) )
|
||||
InstanceCleanup();
|
||||
@@ -628,7 +628,7 @@ public:
|
||||
events.RescheduleEvent(EVENT_CHECK_PLAYERS, CLEANUP_CHECK_INTERVAL);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
@@ -641,7 +641,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string GetSaveData()
|
||||
std::string GetSaveData() override
|
||||
{
|
||||
OUT_SAVE_INST_DATA;
|
||||
|
||||
@@ -653,7 +653,7 @@ public:
|
||||
return str_data;
|
||||
}
|
||||
|
||||
void Load(const char* in)
|
||||
void Load(const char* in) override
|
||||
{
|
||||
EncounterStatus = NOT_STARTED;
|
||||
CLEANED = false;
|
||||
|
||||
@@ -102,7 +102,7 @@ class npc_vh_teleportation_portal : public CreatureScript
|
||||
public:
|
||||
npc_vh_teleportation_portal() : CreatureScript("npc_vh_teleportation_portal") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_vh_teleportation_portalAI(creature);
|
||||
}
|
||||
@@ -139,7 +139,7 @@ public:
|
||||
bool bKorG;
|
||||
bool spawned;
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!pInstance)
|
||||
return;
|
||||
@@ -206,7 +206,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
void JustDied(Unit* /*killer*/) override
|
||||
{
|
||||
events.Reset();
|
||||
if (wave % 6 == 0) // just to be sure, shouln't occur
|
||||
@@ -215,7 +215,7 @@ public:
|
||||
pInstance->SetData(DATA_PORTAL_DEFEATED, 0);
|
||||
}
|
||||
|
||||
void JustSummoned(Creature* pSummoned)
|
||||
void JustSummoned(Creature* pSummoned) override
|
||||
{
|
||||
if (pSummoned)
|
||||
{
|
||||
@@ -262,7 +262,7 @@ struct violet_hold_trashAI : public npc_escortAI
|
||||
c->RemoveAura(SPELL_DESTROY_DOOR_SEAL, me->GetGUID());
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* who)
|
||||
void EnterCombat(Unit* who) override
|
||||
{
|
||||
if (!who->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
|
||||
{
|
||||
@@ -271,30 +271,30 @@ struct violet_hold_trashAI : public npc_escortAI
|
||||
}
|
||||
}
|
||||
|
||||
void AttackStart(Unit* who)
|
||||
void AttackStart(Unit* who) override
|
||||
{
|
||||
if (!who->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
|
||||
ScriptedAI::AttackStart(who);
|
||||
}
|
||||
|
||||
void JustReachedHome()
|
||||
void JustReachedHome() override
|
||||
{
|
||||
CreatureStartAttackDoor();
|
||||
}
|
||||
|
||||
void WaypointReached(uint32 id)
|
||||
void WaypointReached(uint32 id) override
|
||||
{
|
||||
if (PLoc < 6)
|
||||
if (id == uint16(PLocWPCount[PLoc] - 1 - (bAlt ? 1 : 0)))
|
||||
CreatureStartAttackDoor();
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* who)
|
||||
void MoveInLineOfSight(Unit* who) override
|
||||
{
|
||||
ScriptedAI::MoveInLineOfSight(who);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
if (!bAddedWP)
|
||||
{
|
||||
@@ -349,7 +349,7 @@ struct violet_hold_trashAI : public npc_escortAI
|
||||
npc_escortAI::UpdateAI(diff);
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*unit*/)
|
||||
void JustDied(Unit* /*unit*/) override
|
||||
{
|
||||
if (pInstance)
|
||||
if (Creature* portal = ObjectAccessor::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL_GUID)))
|
||||
@@ -363,7 +363,7 @@ struct violet_hold_trashAI : public npc_escortAI
|
||||
me->CastSpell((Unit*)NULL, SPELL_DESTROY_DOOR_SEAL, true);
|
||||
}
|
||||
|
||||
void EnterEvadeMode()
|
||||
void EnterEvadeMode() override
|
||||
{
|
||||
if (!HasEscortState(STATE_ESCORT_ESCORTING))
|
||||
{
|
||||
@@ -472,7 +472,7 @@ class npc_azure_invader : public CreatureScript
|
||||
public:
|
||||
npc_azure_invader() : CreatureScript("npc_azure_invader") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_invaderAI (creature);
|
||||
}
|
||||
@@ -486,7 +486,7 @@ public:
|
||||
uint32 uiBrutalStrikeTimer;
|
||||
uint32 uiSunderArmorTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiCleaveTimer = 5000;
|
||||
uiImpaleTimer = 4000;
|
||||
@@ -494,7 +494,7 @@ public:
|
||||
uiSunderArmorTimer = 4000;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -549,7 +549,7 @@ class npc_azure_binder : public CreatureScript
|
||||
public:
|
||||
npc_azure_binder() : CreatureScript("npc_azure_binder") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_binderAI (creature);
|
||||
}
|
||||
@@ -563,7 +563,7 @@ public:
|
||||
uint32 uiFrostNovaTimer;
|
||||
uint32 uiFrostboltTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiArcaneExplosionTimer = 5000;
|
||||
uiArcainBarrageTimer = 4000;
|
||||
@@ -571,7 +571,7 @@ public:
|
||||
uiFrostboltTimer = 4000;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -626,7 +626,7 @@ class npc_azure_mage_slayer : public CreatureScript
|
||||
public:
|
||||
npc_azure_mage_slayer() : CreatureScript("npc_azure_mage_slayer") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_mage_slayerAI (creature);
|
||||
}
|
||||
@@ -638,13 +638,13 @@ public:
|
||||
uint32 uiArcaneEmpowermentTimer;
|
||||
uint32 uiSpellLockTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiArcaneEmpowermentTimer = 5000;
|
||||
uiSpellLockTimer = 5000;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -683,7 +683,7 @@ class npc_azure_raider : public CreatureScript
|
||||
public:
|
||||
npc_azure_raider() : CreatureScript("npc_azure_raider") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_raiderAI (creature);
|
||||
}
|
||||
@@ -695,13 +695,13 @@ public:
|
||||
uint32 uiConcussionBlowTimer;
|
||||
uint32 uiMagicReflectionTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiConcussionBlowTimer = 5000;
|
||||
uiMagicReflectionTimer = 8000;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -732,7 +732,7 @@ class npc_azure_stalker : public CreatureScript
|
||||
public:
|
||||
npc_azure_stalker() : CreatureScript("npc_azure_stalker") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_stalkerAI (creature);
|
||||
}
|
||||
@@ -745,14 +745,14 @@ public:
|
||||
uint32 uiTacticalBlinkTimer;
|
||||
bool TacticalBlinkCasted;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiBackstabTimer = 1300;
|
||||
uiTacticalBlinkTimer = 8000;
|
||||
TacticalBlinkCasted = false;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -794,7 +794,7 @@ class npc_azure_spellbreaker : public CreatureScript
|
||||
public:
|
||||
npc_azure_spellbreaker() : CreatureScript("npc_azure_spellbreaker") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_spellbreakerAI (creature);
|
||||
}
|
||||
@@ -808,7 +808,7 @@ public:
|
||||
uint32 uiChainsOfIceTimer;
|
||||
uint32 uiConeOfColdTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiArcaneBlastTimer = 5000;
|
||||
uiSlowTimer = 4000;
|
||||
@@ -816,7 +816,7 @@ public:
|
||||
uiConeOfColdTimer = 4000;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -873,7 +873,7 @@ class npc_azure_captain : public CreatureScript
|
||||
public:
|
||||
npc_azure_captain() : CreatureScript("npc_azure_captain") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_captainAI (creature);
|
||||
}
|
||||
@@ -885,13 +885,13 @@ public:
|
||||
uint32 uiMortalStrikeTimer;
|
||||
uint32 uiWhirlwindTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiMortalStrikeTimer = 5000;
|
||||
uiWhirlwindTimer = 8000;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -922,7 +922,7 @@ class npc_azure_sorceror : public CreatureScript
|
||||
public:
|
||||
npc_azure_sorceror() : CreatureScript("npc_azure_sorceror") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_sorcerorAI (creature);
|
||||
}
|
||||
@@ -935,14 +935,14 @@ public:
|
||||
uint32 uiArcaneStreamTimerStartingValueHolder;
|
||||
uint32 uiManaDetonationTimer;
|
||||
|
||||
void Reset()
|
||||
void Reset() override
|
||||
{
|
||||
uiArcaneStreamTimer = 4000;
|
||||
uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer;
|
||||
uiManaDetonationTimer = 5000;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
violet_hold_trashAI::UpdateAI(diff);
|
||||
|
||||
@@ -987,7 +987,7 @@ class npc_azure_saboteur : public CreatureScript
|
||||
public:
|
||||
npc_azure_saboteur() : CreatureScript("npc_azure_saboteur") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
{
|
||||
return new npc_azure_saboteurAI (creature);
|
||||
}
|
||||
@@ -1011,7 +1011,7 @@ public:
|
||||
uint32 timer;
|
||||
uint8 count;
|
||||
|
||||
void WaypointReached(uint32 uiWPointId)
|
||||
void WaypointReached(uint32 uiWPointId) override
|
||||
{
|
||||
if (!pInstance)
|
||||
return;
|
||||
@@ -1045,7 +1045,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
void UpdateAI(uint32 diff) override
|
||||
{
|
||||
npc_escortAI::UpdateAI(diff);
|
||||
|
||||
@@ -1125,7 +1125,7 @@ public:
|
||||
me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) override {}
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1150,13 +1150,13 @@ public:
|
||||
pInstance->SetData(DATA_DECRASE_DOOR_HEALTH, 0);
|
||||
}
|
||||
|
||||
void Register()
|
||||
void Register() override
|
||||
{
|
||||
OnEffectPeriodic += AuraEffectPeriodicFn(spell_destroy_door_sealAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
|
||||
}
|
||||
};
|
||||
|
||||
AuraScript* GetAuraScript() const
|
||||
AuraScript* GetAuraScript() const override
|
||||
{
|
||||
return new spell_destroy_door_sealAuraScript();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user