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

126
src/server/scripts/Events/brewfest.cpp
View File

@@ -29,7 +29,7 @@ public:
struct npc_brewfest_revelerAI : public ScriptedAI
{
npc_brewfest_revelerAI(Creature* c) : ScriptedAI(c) {}
void ReceiveEmote(Player* player, uint32 emote)
void ReceiveEmote(Player* player, uint32 emote) override
{
if (!IsHolidayActive(HOLIDAY_BREWFEST))
return;
@@ -39,7 +39,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_brewfest_revelerAI(creature);
}
@@ -251,7 +251,7 @@ class npc_coren_direbrew_sisters : public CreatureScript
public:
npc_coren_direbrew_sisters() : CreatureScript("npc_coren_direbrew_sisters") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_coren_direbrew_sistersAI (creature);
}
@@ -264,13 +264,13 @@ public:
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
me->setFaction(FACTION_HOSTILE);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_RELEASE_LOOT && me->GetEntry() == NPC_ILSA_DIREBREW)
me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
@@ -285,7 +285,7 @@ public:
return nullptr;
}
void JustDied(Unit*)
void JustDied(Unit*) override
{
if (Creature* coren = GetSummoner())
{
@@ -298,7 +298,7 @@ public:
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (me->GetEntry() == NPC_URSULA_DIREBREW)
events.ScheduleEvent(EVENT_SISTERS_BARREL, 18000);
@@ -306,14 +306,14 @@ public:
events.ScheduleEvent(EVENT_SISTERS_CHUCK_MUG, 12000);
}
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_CHUCK_MUG)
if (target->ToPlayer())
target->ToPlayer()->AddItem(ITEM_DARK_BREW, 1);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -381,7 +381,7 @@ public:
{
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->GetDistance(who) < 10.0f && who->GetTypeId() == TYPEID_PLAYER && who->GetMountID() == RAM_DISPLAY_ID)
{
@@ -390,7 +390,7 @@ public:
}
}
bool CanBeSeen(const Player* player)
bool CanBeSeen(const Player* player) override
{
if (player->GetMountID() == RAM_DISPLAY_ID)
return true;
@@ -399,7 +399,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_brewfest_keg_throwerAI(creature);
}
@@ -497,7 +497,7 @@ public:
{
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->GetDistance(who) < 10.0f && who->GetTypeId() == TYPEID_PLAYER && who->GetMountID() == RAM_DISPLAY_ID)
{
@@ -599,7 +599,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_brewfest_bark_triggerAI(creature);
}
@@ -668,7 +668,7 @@ public:
uint32 kegCounter, guzzlerCounter;
uint8 thrown;
void Reset()
void Reset() override
{
summons.DespawnAll();
events.Reset();
@@ -679,10 +679,10 @@ public:
}
// DARK IRON ATTACK EVENT
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterCombat(Unit*) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterCombat(Unit*) override {}
void SpellHit(Unit* caster, const SpellInfo* spellInfo)
void SpellHit(Unit* caster, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_REPORT_DEATH)
{
@@ -697,7 +697,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
switch (events.ExecuteEvent())
@@ -870,7 +870,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_dark_iron_attack_generatorAI(creature);
}
@@ -887,18 +887,18 @@ public:
{
}
void EnterCombat(Unit*) {}
void MoveInLineOfSight(Unit*) {}
void AttackStart(Unit*) {}
void EnterCombat(Unit*) override {}
void MoveInLineOfSight(Unit*) override {}
void AttackStart(Unit*) override {}
uint32 goTimer, summonTimer;
void Reset()
void Reset() override
{
goTimer = 1;
summonTimer = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (goTimer)
{
@@ -933,7 +933,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_dark_iron_attack_mole_machineAI(creature);
}
@@ -953,11 +953,11 @@ public:
uint32 timer;
uint64 targetGUID;
void EnterCombat(Unit*) {}
void MoveInLineOfSight(Unit*) {}
void AttackStart(Unit*) {}
void EnterCombat(Unit*) override {}
void MoveInLineOfSight(Unit*) override {}
void AttackStart(Unit*) override {}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
damage = 0;
}
@@ -1004,7 +1004,7 @@ public:
Unit* GetTarget() { return ObjectAccessor::GetUnit(*me, targetGUID); }
void Reset()
void Reset() override
{
timer = 0;
targetGUID = 0;
@@ -1040,12 +1040,12 @@ public:
}
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
who->CastSpell(who, SPELL_REPORT_DEATH, true);
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
if (me->IsAlive() && spellInfo->Id == SPELL_PLAYER_MUG)
{
@@ -1055,7 +1055,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
timer += diff;
if (timer < 2000)
@@ -1072,7 +1072,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_dark_iron_guzzlerAI(creature);
}
@@ -1090,20 +1090,20 @@ public:
}
uint32 timer;
void EnterCombat(Unit*) {}
void MoveInLineOfSight(Unit* /*who*/)
void EnterCombat(Unit*) override {}
void MoveInLineOfSight(Unit* /*who*/) override
{
}
void AttackStart(Unit*) {}
void AttackStart(Unit*) override {}
void Reset()
void Reset() override
{
timer = 0;
me->SummonGameObject(186478, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 30000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
timer += diff;
if (timer >= 500)
@@ -1123,7 +1123,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_brewfest_super_brew_triggerAI(creature);
}
@@ -1160,7 +1160,7 @@ public:
uint8 privateLevel;
uint32 questTick;
bool Load()
bool Load() override
{
questTick = 0;
privateLevel = 0;
@@ -1280,14 +1280,14 @@ public:
target->RemoveAurasDueToSpell(SPELL_RAM_FATIGUE);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_main_ram_buff_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectRemove += AuraEffectRemoveFn(spell_brewfest_main_ram_buff_AuraScript::HandleEffectRemove, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_brewfest_main_ram_buff_AuraScript();
}
@@ -1340,7 +1340,7 @@ public:
}
}
void Register()
void Register() override
{
if (m_scriptSpellId != 43332)
OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_ram_fatigue_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
@@ -1349,7 +1349,7 @@ public:
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_brewfest_ram_fatigue_AuraScript();
}
@@ -1371,13 +1371,13 @@ public:
aur->Remove();
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_brewfest_apple_trap_SpellScript::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_brewfest_apple_trap_SpellScript();
};
@@ -1413,14 +1413,14 @@ public:
}
}
void Register()
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_q11117_catch_the_wild_wolpertinger_SpellScript::CheckTarget);
OnEffectHitTarget += SpellEffectFn(spell_q11117_catch_the_wild_wolpertinger_SpellScript::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_q11117_catch_the_wild_wolpertinger_SpellScript();
};
@@ -1474,13 +1474,13 @@ public:
}
}
void Register()
void Register() override
{
AfterHit += SpellHitFn(spell_brewfest_fill_keg_SpellScript::HandleAfterHit);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_brewfest_fill_keg_SpellScript();
};
@@ -1541,13 +1541,13 @@ public:
}
}
void Register()
void Register() override
{
AfterHit += SpellHitFn(spell_brewfest_unfill_keg_SpellScript::HandleAfterHit);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_brewfest_unfill_keg_SpellScript();
};
@@ -1638,7 +1638,7 @@ public:
}
void Register()
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_brewfest_toss_mug_SpellScript::CheckCast);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_brewfest_toss_mug_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
@@ -1647,7 +1647,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_brewfest_toss_mug_SpellScript();
};
@@ -1668,13 +1668,13 @@ public:
target->CastSpell(target, SPELL_ADD_MUG, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_brewfest_add_mug_SpellScript::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_brewfest_add_mug_SpellScript();
};
@@ -1699,19 +1699,19 @@ public:
uint32 timer;
void Reset()
void Reset() override
{
me->SetReactState(REACT_AGGRESSIVE);
me->GetMotionMaster()->MoveRandom(15.0f);
timer = 0;
}
void DoAction(int32)
void DoAction(int32) override
{
timer = 0;
}
void MoveInLineOfSight(Unit* target)
void MoveInLineOfSight(Unit* target) override
{
if (target->GetEntry() == me->GetEntry())
if (me->IsWithinDist(target, 1.0f))
@@ -1738,7 +1738,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
timer += diff;
if (timer >= 25000)
@@ -1749,7 +1749,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_brew_bubbleAI(creature);
}

68
src/server/scripts/Events/childrens_week.cpp
View File

@@ -141,7 +141,7 @@ public:
{
npc_winterfin_playmateAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
void Reset() override
{
timer = 0;
phase = 0;
@@ -149,7 +149,7 @@ public:
orphanGUID = 0;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -162,7 +162,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -221,7 +221,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_winterfin_playmateAI(creature);
}
@@ -239,7 +239,7 @@ public:
{
npc_snowfall_glade_playmateAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
void Reset() override
{
timer = 0;
phase = 0;
@@ -247,7 +247,7 @@ public:
orphanGUID = 0;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -260,7 +260,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -318,7 +318,7 @@ public:
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_snowfall_glade_playmateAI(pCreature);
}
@@ -339,7 +339,7 @@ public:
me->SetDisplayId(DISPLAY_INVISIBLE);
}
void Reset()
void Reset() override
{
timer = 1000;
phase = 0;
@@ -347,7 +347,7 @@ public:
orphanGUID = 0;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -360,7 +360,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -407,7 +407,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_the_biggest_treeAI(creature);
}
@@ -425,7 +425,7 @@ public:
{
npc_high_oracle_soo_rooAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
void Reset() override
{
timer = 0;
phase = 0;
@@ -433,7 +433,7 @@ public:
orphanGUID = 0;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -446,7 +446,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -495,7 +495,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_high_oracle_soo_rooAI(creature);
}
@@ -513,7 +513,7 @@ public:
{
npc_elder_kekekAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
void Reset() override
{
timer = 0;
phase = 0;
@@ -521,7 +521,7 @@ public:
orphanGUID = 0;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -534,7 +534,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -582,7 +582,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_elder_kekekAI(creature);
}
@@ -601,7 +601,7 @@ public:
{
npc_the_etymidianAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
void Reset() override
{
timer = 0;
phase = 0;
@@ -609,7 +609,7 @@ public:
orphanGUID = 0;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -622,7 +622,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -678,7 +678,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_the_etymidianAI(creature);
}
@@ -696,7 +696,7 @@ public:
{
npc_alexstraza_the_lifebinderAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
void Reset() override
{
timer = 0;
phase = 0;
@@ -704,7 +704,7 @@ public:
orphanGUID = 0;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
// Existing SmartAI
if (type == 0)
@@ -721,7 +721,7 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -743,7 +743,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -838,7 +838,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_alexstraza_the_lifebinderAI(creature);
}
@@ -853,7 +853,7 @@ class at_bring_your_orphan_to : public AreaTriggerScript
public:
at_bring_your_orphan_to() : AreaTriggerScript("at_bring_your_orphan_to") { }
bool OnTrigger(Player* player, AreaTrigger const* trigger)
bool OnTrigger(Player* player, AreaTrigger const* trigger) override
{
if (player->isDead() || !player->HasAura(SPELL_ORPHAN_OUT))
return false;
@@ -915,7 +915,7 @@ public:
me->SetDisplayId(DISPLAY_INVISIBLE);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (who && me->GetDistance2d(who) < 20.0f)
if (Player* player = who->ToPlayer())
@@ -990,7 +990,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_cw_area_triggerAI(creature);
}
@@ -1011,7 +1011,7 @@ public:
me->SetDisplayId(DISPLAY_INVISIBLE);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -1024,7 +1024,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_grizzlemaw_cw_triggerAI(creature);
}

112
src/server/scripts/Events/hallows_end.cpp
View File

@@ -77,13 +77,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallows_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_hallows_end_trick_SpellScript();
}
@@ -107,7 +107,7 @@ public:
GetCaster()->CastSpell(target, target->getGender() ? _femaleSpell : _maleSpell, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallows_end_put_costume_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
@@ -117,7 +117,7 @@ public:
uint32 _femaleSpell;
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_hallows_end_put_costume_SpellScript(_maleSpell, _femaleSpell);
}
@@ -153,13 +153,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallows_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_hallows_end_trick_or_treat_SpellScript();
}
@@ -191,13 +191,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallows_end_candy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_hallows_end_candy_SpellScript();
}
@@ -226,13 +226,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallows_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_hallows_end_tricky_treat_SpellScript();
}
@@ -280,7 +280,7 @@ public:
PrepareSpellScript(spell_hallows_end_bucket_lands_SpellScript);
bool handled;
bool Load() { handled = false; return true; }
bool Load() override { handled = false; return true; }
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (handled || !GetCaster())
@@ -293,13 +293,13 @@ public:
GetCaster()->CastSpell(tgt, SPELL_WATER_SPLASH, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallows_end_bucket_lands_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_hallows_end_bucket_lands_SpellScript();
}
@@ -342,14 +342,14 @@ public:
aEff->SetAmount(1);
}
void Register()
void Register() override
{
OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_hallows_end_base_fire_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectApply += AuraEffectApplyFn(spell_hallows_end_base_fire_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_hallows_end_base_fire_AuraScript();
}
@@ -543,12 +543,12 @@ public:
{
}
void Reset()
void Reset() override
{
me->SetDisableGravity(true);
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_START_FIRE)
{
@@ -580,7 +580,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_soh_fire_triggerAI(creature);
}
@@ -608,10 +608,10 @@ public:
uint32 counter;
std::list<uint64> unitList;
int32 pos;
void EnterCombat(Unit*) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterCombat(Unit*) override {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void DoAction(int32 param)
void DoAction(int32 param) override
{
pos = param;
}
@@ -658,7 +658,7 @@ public:
}
}
void Reset()
void Reset() override
{
unitList.clear();
std::list<Creature*> temp;
@@ -673,7 +673,7 @@ public:
events.ScheduleEvent(3, 15000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
@@ -788,7 +788,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 point)
void MovementInform(uint32 type, uint32 point) override
{
if (type == POINT_MOTION_TYPE && point == 8)
{
@@ -796,7 +796,7 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->MonsterYell("So eager you are, for my blood to spill. Yet to vanquish me, 'tis my head you must kill!", LANG_UNIVERSAL, 0);
me->PlayDirectSound(11969);
@@ -824,7 +824,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_hallows_end_sohAI(creature);
}
@@ -842,12 +842,12 @@ public:
}
uint32 timer;
void Reset()
void Reset() override
{
timer = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
timer += diff;
if (timer >= 5000)
@@ -855,7 +855,7 @@ public:
me->CastSpell(me, SPELL_FIRE_AURA_BASE, true);
}
void SpellHit(Unit* caster, const SpellInfo* spellInfo)
void SpellHit(Unit* caster, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_WATER_SPLASH && caster->ToPlayer())
{
@@ -873,7 +873,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_hallows_end_train_fireAI(creature);
}
@@ -961,7 +961,7 @@ public:
uint8 phase;
uint32 health;
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
summons.DespawnAll();
me->MonsterSay("This end have I reached before. What new adventure lies in store?", LANG_UNIVERSAL, 0);
@@ -977,18 +977,18 @@ public:
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 285, me->FindMap());
}
void KilledUnit(Unit* /*who*/)
void KilledUnit(Unit* /*who*/) override
{
me->MonsterYell("Your body lies beaten, battered and broken. Let my curse be your own, fate has spoken.", LANG_UNIVERSAL, 0);
me->PlayDirectSound(SOUND_SLAY);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
health = param;
}
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_SUMMONING_RHYME_TARGET)
{
@@ -997,7 +997,7 @@ public:
}
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_THROW_HEAD_BACK)
{
@@ -1020,7 +1020,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 point)
void MovementInform(uint32 type, uint32 point) override
{
if (type == WAYPOINT_MOTION_TYPE)
{
@@ -1041,10 +1041,10 @@ public:
Player* GetRhymePlayer() { return playerGUID ? ObjectAccessor::GetPlayer(*me, playerGUID) : nullptr; }
void EnterCombat(Unit*) { me->SetInCombatWithZone(); }
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterCombat(Unit*) override { me->SetInCombatWithZone(); }
void MoveInLineOfSight(Unit* /*who*/) override {}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
// We die... :(
if (damage >= me->GetHealth())
@@ -1075,9 +1075,9 @@ public:
}
}
void JustSummoned(Creature* cr) { summons.Summon(cr); }
void JustSummoned(Creature* cr) override { summons.Summon(cr); }
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
@@ -1091,7 +1091,7 @@ public:
me->SetSpeed(MOVE_WALK, 5.0f, true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
@@ -1207,7 +1207,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_headless_horsemanAI(creature);
}
@@ -1228,7 +1228,7 @@ public:
uint32 timer;
bool handled;
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_THROW_HEAD_BACK)
{
@@ -1239,7 +1239,7 @@ public:
}
}
void SpellHit(Unit* caster, const SpellInfo* spellInfo)
void SpellHit(Unit* caster, const SpellInfo* spellInfo) override
{
switch (spellInfo->Id)
{
@@ -1279,7 +1279,7 @@ public:
return nullptr;
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
// We die... :(
if (damage >= me->GetHealth())
@@ -1306,7 +1306,7 @@ public:
}
}
void Reset()
void Reset() override
{
pct = 0;
timer = 0;
@@ -1314,7 +1314,7 @@ public:
me->SetInCombatWithZone();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
timer += diff;
if (timer >= 30000)
@@ -1338,7 +1338,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_headless_horseman_headAI(creature);
}
@@ -1357,10 +1357,10 @@ public:
uint32 timer;
void AttackStart(Unit* ) { }
void MoveInLineOfSight(Unit* ) { }
void AttackStart(Unit* ) override { }
void MoveInLineOfSight(Unit* ) override { }
void Reset()
void Reset() override
{
if (Player* player = me->SelectNearestPlayer(3.0f))
me->CastSpell(player, SPELL_SQUASH_SOUL, true);
@@ -1369,7 +1369,7 @@ public:
me->CastSpell(me, SPELL_PUMPKIN_VISUAL, true);
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_SPROUTING)
{
@@ -1380,7 +1380,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (timer)
{
@@ -1394,7 +1394,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_headless_horseman_pumpkinAI(creature);
}
@@ -1405,7 +1405,7 @@ class go_loosely_turned_soil : public GameObjectScript
public:
go_loosely_turned_soil() : GameObjectScript("go_loosely_turned_soil") { }
bool OnQuestReward(Player* player, GameObject* go, Quest const* /*quest*/, uint32 /*opt*/)
bool OnQuestReward(Player* player, GameObject* go, Quest const* /*quest*/, uint32 /*opt*/) override
{
if (player->FindNearestCreature(NPC_HEADLESS_HORSEMAN_MOUNTED, 100.0f))
return true;

64
src/server/scripts/Events/love_in_air.cpp
View File

@@ -42,7 +42,7 @@ public:
uint32 lock;
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (lock > 1000 && me->GetDistance(who) < 10.0f && who->GetTypeId() == TYPEID_PLAYER && who->HasAura(SPELL_GOBLIN_DISGUISE) && !who->HasAura(SPELL_GOBLIN_CARRY_CRATE))
{
@@ -61,13 +61,13 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
lock += diff;
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_love_in_air_supply_sentryAI(creature);
}
@@ -101,7 +101,7 @@ public:
int32 delay;
void Reset()
void Reset() override
{
delay = 0;
me->SetReactState(REACT_AGGRESSIVE);
@@ -120,7 +120,7 @@ public:
return false;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (delay == 0 && me->GetDistance(who) < 7.0f && who->GetTypeId() == TYPEID_PLAYER)
{
@@ -134,14 +134,14 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (delay > 0)
delay -= std::min<int32>(delay, diff);
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_love_in_air_snivelAI(creature);
}
@@ -224,7 +224,7 @@ public:
return true;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
actionTimer += diff;
if (actionTimer >= 7000)
@@ -243,7 +243,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_love_in_air_snivel_realAI(creature);
}
@@ -297,7 +297,7 @@ public:
EventMap events;
uint32 speachTimer;
void Reset()
void Reset() override
{
speachTimer = 0;
me->setFaction(35);
@@ -307,13 +307,13 @@ public:
me->SummonCreature(NPC_APOTHECARY_BAXTER, -209.602f, 2215.42f, 79.7633f, 0.723503f);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_START_EVENT)
speachTimer = 1;
}
void JustDied(Unit* )
void JustDied(Unit* ) override
{
me->MonsterSay("...please don't think less of me.", LANG_UNIVERSAL, 0);
Map::PlayerList const& players = me->GetMap()->GetPlayers();
@@ -321,7 +321,7 @@ public:
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 288, me->FindMap());
}
void JustSummoned(Creature* cr)
void JustSummoned(Creature* cr) override
{
summons.Summon(cr);
cr->setFaction(35);
@@ -329,7 +329,7 @@ public:
cr->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (speachTimer)
{
@@ -401,12 +401,12 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_love_in_air_hummelAI(creature);
}
bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest* _Quest, uint32 /*slot*/)
bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest* _Quest, uint32 /*slot*/) override
{
if (_Quest->GetQuestId() == QUEST_YOUVE_BEEN_SERVED)
creature->AI()->DoAction(ACTION_START_EVENT);
@@ -428,11 +428,11 @@ public:
EventMap events;
void Reset()
void Reset() override
{
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_RELEASE_HELPER)
{
@@ -453,9 +453,9 @@ public:
}
}
void JustDied(Unit* ) { me->MonsterSay("...please don't think less of me.", LANG_UNIVERSAL, 0); }
void JustDied(Unit* ) override { me->MonsterSay("...please don't think less of me.", LANG_UNIVERSAL, 0); }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -490,7 +490,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_love_in_air_hummel_helperAI(creature);
}
@@ -539,14 +539,14 @@ public:
}
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_love_in_air_perfume_immune_AuraScript::HandleEffectApply, EFFECT_2, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_love_in_air_perfume_immune_AuraScript::HandleEffectRemove, EFFECT_2, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_love_in_air_perfume_immune_AuraScript();
}
@@ -574,13 +574,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_love_in_air_periodic_perfumes_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_love_in_air_periodic_perfumes_AuraScript();
}
@@ -624,13 +624,13 @@ public:
target->AddItem(items[urand(0, 7)], 1);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_item_create_heart_candy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_item_create_heart_candy_SpellScript();
}
@@ -705,14 +705,14 @@ public:
target->RemoveAura(SPELL_ROMANTIC_PICNIC_ACHIEV);
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_love_is_in_the_air_romantic_picnic_AuraScript();
}
@@ -735,7 +735,7 @@ public:
{
PrepareAuraScript(spell_gen_aura_service_uniform_AuraScript);
bool Validate(SpellInfo const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_SERVICE_UNIFORM))
return false;
@@ -762,14 +762,14 @@ public:
target->RestoreDisplayId();
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_gen_aura_service_uniform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_gen_aura_service_uniform_AuraScript();
}

40
src/server/scripts/Events/midsummer.cpp
View File

@@ -50,7 +50,7 @@ public:
uint64 goGUID;
void SpellHit(Unit*, SpellInfo const* spellInfo)
void SpellHit(Unit*, SpellInfo const* spellInfo) override
{
if (!goGUID)
return;
@@ -73,7 +73,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_midsummer_bonfireAI(creature);
}
@@ -110,12 +110,12 @@ public:
maxCount = cnt;
}
bool CanBeSeen(Player const* seer)
bool CanBeSeen(Player const* seer) override
{
return seer->GetGUID() == playerGUID;
}
void SpellHit(Unit* caster, SpellInfo const* spellInfo)
void SpellHit(Unit* caster, SpellInfo const* spellInfo) override
{
if (posVec.empty())
return;
@@ -134,7 +134,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (startTimer)
{
@@ -190,7 +190,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_midsummer_torch_targetAI(creature);
}
@@ -217,7 +217,7 @@ public:
{
PrepareAuraScript(spell_gen_crab_disguise_AuraScript);
bool Validate(SpellInfo const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_CRAB_DISGUISE))
return false;
@@ -243,14 +243,14 @@ public:
}
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectRemoveFn(spell_gen_crab_disguise_AuraScript::OnApply, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_gen_crab_disguise_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_gen_crab_disguise_AuraScript();
}
@@ -311,14 +311,14 @@ public:
ar->CastSpell(ar, SPELL_RIBBON_POLE_CHANNEL_VISUAL, true);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_midsummer_ribbon_pole_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_midsummer_ribbon_pole_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_midsummer_ribbon_pole_AuraScript();
}
@@ -333,7 +333,7 @@ public:
{
PrepareAuraScript(spell_midsummer_torch_quest_AuraScript)
bool Load()
bool Load() override
{
torchGUID = 0;
return true;
@@ -357,14 +357,14 @@ public:
cr->DespawnOrUnsummon(1);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_midsummer_torch_quest_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DETECT_AMORE, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_midsummer_torch_quest_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DETECT_AMORE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_midsummer_torch_quest_AuraScript();
}
@@ -390,7 +390,7 @@ public:
PrepareSpellScript(spell_midsummer_fling_torch_SpellScript);
bool handled;
bool Load() { handled = false; return true; }
bool Load() override { handled = false; return true; }
void ThrowNextTorch(Unit* caster)
{
@@ -472,7 +472,7 @@ public:
}
}
void Register()
void Register() override
{
AfterCast += SpellCastFn(spell_midsummer_fling_torch_SpellScript::HandleFinish);
if (m_scriptSpellId == 45671)
@@ -480,7 +480,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_midsummer_fling_torch_SpellScript();
}
@@ -508,7 +508,7 @@ public:
PrepareSpellScript(spell_midsummer_juggling_torch_SpellScript);
bool handled;
bool Load() { handled = false; return true; }
bool Load() override { handled = false; return true; }
void HandleFinish()
{
Unit* caster = GetCaster();
@@ -545,7 +545,7 @@ public:
}
}
void Register()
void Register() override
{
if (m_scriptSpellId == SPELL_TORCH_CHECK)
OnEffectHitTarget += SpellEffectFn(spell_midsummer_juggling_torch_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
@@ -554,7 +554,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_midsummer_juggling_torch_SpellScript();
}

50
src/server/scripts/Events/pilgrims_bounty.cpp
View File

@@ -102,10 +102,10 @@ public:
me->SetReactState(REACT_PASSIVE);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void AttackStart(Unit*) {}
void MoveInLineOfSight(Unit* /*who*/) override {}
void AttackStart(Unit*) override {}
void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply)
void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override
{
if (apply && who->GetTypeId() == TYPEID_PLAYER)
who->ToPlayer()->SetClientControl(me, 0, true);
@@ -117,12 +117,12 @@ public:
Creature* GetPlate() { return plateGUID ? ObjectAccessor::GetCreature(*me, plateGUID) : nullptr; }
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
damage = 0;
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
switch (param)
{
@@ -191,7 +191,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override
{
Unit* charm = target->GetCharm();
if (!charm || !charm->ToCreature())
@@ -200,7 +200,7 @@ public:
charm->ToCreature()->AI()->DoAction(spellInfo->Id);
}
void SpellHit(Unit* /*target*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*target*/, const SpellInfo* spellInfo) override
{
switch (spellInfo->Id)
{
@@ -227,7 +227,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (timerSpawnPlate)
{
@@ -267,7 +267,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pilgrims_bounty_chairAI(creature);
}
@@ -284,7 +284,7 @@ public:
{
}
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
switch (spellInfo->Id)
{
@@ -301,7 +301,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_pilgrims_bounty_plateAI(creature);
}
@@ -412,13 +412,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_pass_generic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_pilgrims_bounty_pass_generic_SpellScript();
}
@@ -502,13 +502,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_feast_on_generic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_pilgrims_bounty_feast_on_generic_SpellScript();
}
@@ -555,13 +555,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_turkey_tracker_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_pilgrims_bounty_turkey_tracker_SpellScript();
}
@@ -583,13 +583,13 @@ public:
target->ToCreature()->AI()->DoAction(GetSpellInfo()->Id);
}
void Register()
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_pilgrims_bounty_serve_generic_AuraScript::OnAuraRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_pilgrims_bounty_serve_generic_AuraScript();
}
@@ -616,7 +616,7 @@ public:
canBeRecalculated = true;
}
void Register()
void Register() override
{
if (m_scriptSpellId == 66041)
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pilgrims_bounty_food_AuraScript::RecalculateHook, EFFECT_0, SPELL_AURA_MOD_POWER_REGEN);
@@ -625,7 +625,7 @@ public:
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_pilgrims_bounty_food_AuraScript();
}
@@ -644,14 +644,14 @@ public:
}
}
void Register()
void Register() override
{
if (m_scriptSpellId == 66477)
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_food_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_pilgrims_bounty_food_SpellScript();
}
@@ -673,7 +673,7 @@ class achievement_pb_pilgrims_peril : public AchievementCriteriaScript
public:
achievement_pb_pilgrims_peril() : AchievementCriteriaScript("achievement_pb_pilgrims_peril") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
if (source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_DRESS, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ROBE, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ATTIRE, 1))
return true;
@@ -687,7 +687,7 @@ class achievement_pb_terokkar_turkey_time : public AchievementCriteriaScript
public:
achievement_pb_terokkar_turkey_time() : AchievementCriteriaScript("achievement_pb_terokkar_turkey_time") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
if (source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_HAT, 1) && (source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_DRESS, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ROBE, 1) || source->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ATTIRE, 1)))
return true;

22
src/server/scripts/Events/winter_veil.cpp
View File

@@ -28,7 +28,7 @@ public:
{
PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript);
bool Validate(SpellInfo const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_MISTLETOE) ||
!sSpellMgr->GetSpellInfo(SPELL_CREATE_HOLLY) ||
@@ -46,13 +46,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_mistletoe_SpellScript();
}
@@ -95,13 +95,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_winter_wondervolt_trap_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_winter_wondervolt_trap_SpellScript();
}
@@ -177,13 +177,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_winter_veil_racer_rocket_slam_SpellScript::HandleTriggerSpell, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_racer_rocket_slam_SpellScript();
}
@@ -217,13 +217,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_racer_slam_hit_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_racer_slam_hit_SpellScript();
}
@@ -271,7 +271,7 @@ public:
}
}
void Register()
void Register() override
{
if (m_scriptSpellId == SPELL_AIR_RIFLE_HIT_TRIGGER)
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_shoot_air_rifle_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
@@ -280,7 +280,7 @@ public:
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_shoot_air_rifle_SpellScript();
}