Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Spells: remove PrepareSpellScript and PrepareAuraScript macros and make Hooklist use emplace behaivior (#174)

Browse Source
This commit is contained in:
Warpten authored and GitHub committed 2020-08-28 15:40:26 +02:00
1 parent 677990a1b8
commit 2b2fc5fb8a
252 files changed
+3275 -7394
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
+2 -4
View File
@@ -204,8 +204,6 @@ private:
class spell_alizabal_seething_hate : public SpellScript
{
PrepareSpellScript(spell_alizabal_seething_hate);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -233,8 +231,8 @@ class spell_alizabal_seething_hate : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alizabal_seething_hate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_alizabal_seething_hate::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_alizabal_seething_hate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_alizabal_seething_hate::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
+5 -13
View File
@@ -233,8 +233,6 @@ class spell_occuthar_focused_fire : public SpellScriptLoader
class spell_occuthar_focused_fire_SpellScript : public SpellScript
{
PrepareSpellScript(spell_occuthar_focused_fire_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -248,7 +246,7 @@ class spell_occuthar_focused_fire : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_occuthar_focused_fire_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_occuthar_focused_fire_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -266,8 +264,6 @@ class spell_occuthar_eyes_of_occuthar : public SpellScriptLoader
class spell_occuthar_eyes_of_occuthar_SpellScript : public SpellScript
{
PrepareSpellScript(spell_occuthar_eyes_of_occuthar_SpellScript);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_0].CalcValue()) });
@@ -295,8 +291,8 @@ class spell_occuthar_eyes_of_occuthar : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_occuthar_eyes_of_occuthar_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_occuthar_eyes_of_occuthar_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_occuthar_eyes_of_occuthar_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_occuthar_eyes_of_occuthar_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -314,8 +310,6 @@ class spell_occuthar_eyes_of_occuthar_vehicle : public SpellScriptLoader
class spell_occuthar_eyes_of_occuthar_vehicle_SpellScript : public SpellScript
{
PrepareSpellScript(spell_occuthar_eyes_of_occuthar_vehicle_SpellScript);
bool Load() override
{
return GetCaster()->GetInstanceScript() != nullptr;
@@ -334,7 +328,7 @@ class spell_occuthar_eyes_of_occuthar_vehicle : public SpellScriptLoader
void Register() override
{
AfterHit += SpellHitFn(spell_occuthar_eyes_of_occuthar_vehicle_SpellScript::HandleScript);
AfterHit.Register(&spell_occuthar_eyes_of_occuthar_vehicle_SpellScript::HandleScript);
}
};
@@ -352,8 +346,6 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader
class spell_occuthar_occuthars_destruction_AuraScript : public AuraScript
{
PrepareAuraScript(spell_occuthar_occuthars_destruction_AuraScript);
bool Load() override
{
return GetCaster() && GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -372,7 +364,7 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_occuthar_occuthars_destruction_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove.Register(&spell_occuthar_occuthars_destruction_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
+5 -14
View File
@@ -219,8 +219,6 @@ private:
// 88954 / 95173 - Consuming Darkness
class spell_argaloth_consuming_darkness : public SpellScript
{
PrepareSpellScript(spell_argaloth_consuming_darkness);
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3);
@@ -228,15 +226,12 @@ class spell_argaloth_consuming_darkness : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_consuming_darkness::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_argaloth_consuming_darkness::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_argaloth_consuming_darkness_AuraScript : public AuraScript
{
PrepareAuraScript(spell_argaloth_consuming_darkness_AuraScript);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (AuraEffect* aurEff = GetEffect(EFFECT_0))
@@ -248,15 +243,13 @@ class spell_argaloth_consuming_darkness_AuraScript : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_argaloth_consuming_darkness_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_argaloth_consuming_darkness_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
// 88942 / 95172 - Meteor Slash
class spell_argaloth_meteor_slash : public SpellScript
{
PrepareSpellScript(spell_argaloth_meteor_slash);
bool Load() override
{
_targetCount = 0;
@@ -278,8 +271,8 @@ class spell_argaloth_meteor_slash : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_meteor_slash::CountTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104);
BeforeHit += SpellHitFn(spell_argaloth_meteor_slash::SplitDamage);
OnObjectAreaTargetSelect.Register(&spell_argaloth_meteor_slash::CountTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104);
BeforeHit.Register(&spell_argaloth_meteor_slash::SplitDamage);
}
private:
@@ -289,8 +282,6 @@ private:
// 88987 / 95176 - Fel Firestorm
class spell_argaloth_fel_firestorm : public SpellScript
{
PrepareSpellScript(spell_argaloth_fel_firestorm);
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3);
@@ -298,7 +289,7 @@ class spell_argaloth_fel_firestorm : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_fel_firestorm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_argaloth_fel_firestorm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp
+45 -113
View File
@@ -1891,8 +1891,6 @@ class npc_ascendant_council_flame_strike : public CreatureScript
class spell_feludius_water_bomb_targeting : public SpellScript
{
PrepareSpellScript(spell_feludius_water_bomb_targeting);
void HandleHit(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -1902,14 +1900,12 @@ class spell_feludius_water_bomb_targeting : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_feludius_water_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_feludius_water_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_feludius_water_bomb : public SpellScript
{
PrepareSpellScript(spell_feludius_water_bomb);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WATER_BOMB_TRIGGERED });
@@ -1926,14 +1922,12 @@ class spell_feludius_water_bomb : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_feludius_water_bomb::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_feludius_water_bomb::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_feludius_glaciate : public SpellScript
{
PrepareSpellScript(spell_feludius_glaciate);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1971,15 +1965,13 @@ class spell_feludius_glaciate : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_feludius_glaciate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_feludius_glaciate::FreezeTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_feludius_glaciate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_feludius_glaciate::FreezeTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_feludius_heart_of_ice : public AuraScript
{
PrepareAuraScript(spell_feludius_heart_of_ice);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2008,15 +2000,13 @@ class spell_feludius_heart_of_ice : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_feludius_heart_of_ice::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_feludius_heart_of_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE);
AfterEffectApply.Register(&spell_feludius_heart_of_ice::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_feludius_heart_of_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE);
}
};
class spell_feludius_frost_imbued : public SpellScript
{
PrepareSpellScript(spell_feludius_frost_imbued);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2027,14 +2017,12 @@ class spell_feludius_frost_imbued : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_feludius_frost_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_feludius_frost_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
class spell_feludius_frost_imbued_AuraScript : public AuraScript
{
PrepareAuraScript(spell_feludius_frost_imbued_AuraScript);
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
if (Unit* caster = GetCaster())
@@ -2051,15 +2039,13 @@ class spell_feludius_frost_imbued_AuraScript : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_feludius_frost_imbued_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_feludius_frost_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_feludius_frost_imbued_AuraScript::CheckProc);
OnEffectProc.Register(&spell_feludius_frost_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_feludius_frozen_orb_targeting : public SpellScript
{
PrepareSpellScript(spell_feludius_frozen_orb_targeting);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2070,14 +2056,12 @@ class spell_feludius_frozen_orb_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_feludius_frozen_orb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_feludius_frozen_orb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_ignacious_rising_flames : public AuraScript
{
PrepareAuraScript(spell_ignacious_rising_flames);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_RISING_FLAMES_BUFF });
@@ -2100,15 +2084,13 @@ class spell_ignacious_rising_flames : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignacious_rising_flames::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
AfterEffectRemove += AuraEffectRemoveFn(spell_ignacious_rising_flames::HandleAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_ignacious_rising_flames::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
AfterEffectRemove.Register(&spell_ignacious_rising_flames::HandleAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_ignacious_burning_blood : public AuraScript
{
PrepareAuraScript(spell_ignacious_burning_blood);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2137,15 +2119,13 @@ class spell_ignacious_burning_blood : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_ignacious_burning_blood::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignacious_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE);
AfterEffectApply.Register(&spell_ignacious_burning_blood::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_ignacious_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE);
}
};
class spell_ignacious_flame_imbued : public SpellScript
{
PrepareSpellScript(spell_ignacious_flame_imbued);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2156,14 +2136,12 @@ class spell_ignacious_flame_imbued : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ignacious_flame_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_ignacious_flame_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
class spell_ignacious_flame_imbued_AuraScript : public AuraScript
{
PrepareAuraScript(spell_ignacious_flame_imbued_AuraScript);
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
if (Unit* caster = GetCaster())
@@ -2180,15 +2158,13 @@ class spell_ignacious_flame_imbued_AuraScript : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_ignacious_flame_imbued_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_ignacious_flame_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_ignacious_flame_imbued_AuraScript::CheckProc);
OnEffectProc.Register(&spell_ignacious_flame_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_ignacious_inferno_leap : public SpellScript
{
PrepareSpellScript(spell_ignacious_inferno_leap);
void HandleInfernoRush()
{
if (Unit* caster = GetCaster())
@@ -2199,14 +2175,12 @@ class spell_ignacious_inferno_leap : public SpellScript
void Register()
{
AfterCast += SpellCastFn(spell_ignacious_inferno_leap::HandleInfernoRush);
AfterCast.Register(&spell_ignacious_inferno_leap::HandleInfernoRush);
}
};
class spell_ignacious_inferno_rush : public SpellScript
{
PrepareSpellScript(spell_ignacious_inferno_rush);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2225,14 +2199,12 @@ class spell_ignacious_inferno_rush : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_ignacious_inferno_rush::HandleAuraRemoval, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_ignacious_inferno_rush::HandleAuraRemoval, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_ignacious_flame_strike : public SpellScript
{
PrepareSpellScript(spell_ignacious_flame_strike);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2249,15 +2221,13 @@ class spell_ignacious_flame_strike : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ignacious_flame_strike::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_ignacious_flame_strike::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_ignacious_flame_strike::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_ignacious_flame_strike::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_arion_lashing_winds : public SpellScript
{
PrepareSpellScript(spell_arion_lashing_winds);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2281,14 +2251,12 @@ class spell_arion_lashing_winds : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_arion_lashing_winds::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_arion_lashing_winds::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_arion_thundershock : public SpellScript
{
PrepareSpellScript(spell_arion_thundershock);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_GROUNDED });
@@ -2302,14 +2270,12 @@ class spell_arion_thundershock : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_arion_thundershock::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_arion_thundershock::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_arion_lightning_rod : public SpellScript
{
PrepareSpellScript(spell_arion_lightning_rod);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2321,14 +2287,12 @@ class spell_arion_lightning_rod : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_rod::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_arion_lightning_rod::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_arion_chain_lightning_targeting : public SpellScript
{
PrepareSpellScript(spell_arion_chain_lightning_targeting);
void HandleHit(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -2346,7 +2310,7 @@ class spell_arion_chain_lightning_targeting : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_arion_chain_lightning_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_arion_chain_lightning_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -2366,8 +2330,6 @@ class ArionDisperseDistanceCheck
class spell_arion_disperse : public SpellScript
{
PrepareSpellScript(spell_arion_disperse);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2395,15 +2357,13 @@ class spell_arion_disperse : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_arion_disperse::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_disperse::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_arion_disperse::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_arion_disperse::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_arion_lightning_blast : public SpellScript
{
PrepareSpellScript(spell_arion_lightning_blast);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2414,15 +2374,13 @@ class spell_arion_lightning_blast : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_blast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_arion_lightning_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_arion_lightning_blast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_arion_lightning_blast_dummy : public SpellScript
{
PrepareSpellScript(spell_arion_lightning_blast_dummy);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2433,14 +2391,12 @@ class spell_arion_lightning_blast_dummy : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_blast_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_arion_lightning_blast_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_arion_static_overload : public SpellScript
{
PrepareSpellScript(spell_arion_static_overload);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_GRAVITY_CORE });
@@ -2461,14 +2417,12 @@ class spell_arion_static_overload : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_static_overload::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_arion_static_overload::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_arion_static_overload_triggered : public SpellScript
{
PrepareSpellScript(spell_arion_static_overload_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2488,14 +2442,12 @@ class spell_arion_static_overload_triggered : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_arion_static_overload_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_arion_static_overload_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_terrastra_gravity_well : public SpellScript
{
PrepareSpellScript(spell_terrastra_gravity_well);
void HandleHit(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -2512,14 +2464,12 @@ class spell_terrastra_gravity_well : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_terrastra_gravity_well::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_terrastra_gravity_well::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_terrastra_harden_skin : public AuraScript
{
PrepareAuraScript(spell_terrastra_harden_skin);
bool Load() override
{
_absorbedDamage = 0;
@@ -2548,15 +2498,13 @@ private:
void Register() override
{
OnEffectAbsorb += AuraEffectAbsorbFn(spell_terrastra_harden_skin::OnAbsorb, EFFECT_1);
AfterEffectRemove += AuraEffectRemoveFn(spell_terrastra_harden_skin::OnAuraRemoveHandler, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
OnEffectAbsorb.Register(&spell_terrastra_harden_skin::OnAbsorb, EFFECT_1);
AfterEffectRemove.Register(&spell_terrastra_harden_skin::OnAuraRemoveHandler, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_terrastra_quake : public SpellScript
{
PrepareSpellScript(spell_terrastra_quake);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SWIRLING_WINDS });
@@ -2572,14 +2520,12 @@ class spell_terrastra_quake : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_terrastra_quake::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_terrastra_quake::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_terrastra_eruption : public SpellScript
{
PrepareSpellScript(spell_terrastra_eruption);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ERUPTION_SUMMON });
@@ -2605,14 +2551,12 @@ class spell_terrastra_eruption : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_terrastra_eruption::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_terrastra_eruption::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_terrastra_gravity_core : public SpellScript
{
PrepareSpellScript(spell_terrastra_gravity_core);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_STATIC_OVERLOAD });
@@ -2633,14 +2577,12 @@ class spell_terrastra_gravity_core : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_terrastra_gravity_core::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_terrastra_gravity_core::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_terrastra_gravity_core_triggered : public SpellScript
{
PrepareSpellScript(spell_terrastra_gravity_core_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2660,14 +2602,12 @@ class spell_terrastra_gravity_core_triggered : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_terrastra_gravity_core_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_terrastra_gravity_core_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_elementium_monstrosity_lava_seed : public SpellScript
{
PrepareSpellScript(spell_elementium_monstrosity_lava_seed);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_LAVA_SEED_DUMMY });
@@ -2681,14 +2621,12 @@ class spell_elementium_monstrosity_lava_seed : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_elementium_monstrosity_lava_seed::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_elementium_monstrosity_lava_seed::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_elementium_monstrosity_cryogenic_aura : public AuraScript
{
PrepareAuraScript(spell_elementium_monstrosity_cryogenic_aura);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2715,14 +2653,12 @@ class spell_elementium_monstrosity_cryogenic_aura : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_elementium_monstrosity_cryogenic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_elementium_monstrosity_cryogenic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_elementium_monstrosity_liquid_ice : public AuraScript
{
PrepareAuraScript(spell_elementium_monstrosity_liquid_ice);
void HandlePeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -2736,14 +2672,12 @@ class spell_elementium_monstrosity_liquid_ice : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_elementium_monstrosity_liquid_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_elementium_monstrosity_liquid_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_elementium_monstrosity_electric_instability : public SpellScript
{
PrepareSpellScript(spell_elementium_monstrosity_electric_instability);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2776,15 +2710,13 @@ class spell_elementium_monstrosity_electric_instability : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elementium_monstrosity_electric_instability::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_elementium_monstrosity_electric_instability::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_elementium_monstrosity_electric_instability::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_elementium_monstrosity_electric_instability::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_elementium_monstrosity_gravity_crush : public SpellScript
{
PrepareSpellScript(spell_elementium_monstrosity_gravity_crush);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2800,7 +2732,7 @@ class spell_elementium_monstrosity_gravity_crush : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elementium_monstrosity_gravity_crush::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_elementium_monstrosity_gravity_crush::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp
+27 -71
View File
@@ -961,8 +961,6 @@ private:
class spell_chogall_absorb_elemental_reverse_cast : public SpellScript
{
PrepareSpellScript(spell_chogall_absorb_elemental_reverse_cast);
void HandleScriptEffect(SpellEffIndex effIndex)
{
GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[effIndex].BasePoints);
@@ -970,14 +968,12 @@ class spell_chogall_absorb_elemental_reverse_cast : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_absorb_elemental_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_absorb_elemental_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_absorb_elemental : public SpellScript
{
PrepareSpellScript(spell_chogall_absorb_elemental);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -986,14 +982,12 @@ class spell_chogall_absorb_elemental : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_absorb_elemental::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_absorb_elemental::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_absorb_elemental_heroic : public SpellScript
{
PrepareSpellScript(spell_chogall_absorb_elemental_heroic);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -1002,14 +996,12 @@ class spell_chogall_absorb_elemental_heroic : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_absorb_elemental_heroic::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_absorb_elemental_heroic::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_absorb_elemental_heroic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_chogall_absorb_elemental_heroic_AuraScript);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
Unit* target = GetTarget();
@@ -1024,14 +1016,12 @@ class spell_chogall_absorb_elemental_heroic_AuraScript : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_absorb_elemental_heroic_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_chogall_absorb_elemental_heroic_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_chogall_elemental_power : public AuraScript
{
PrepareAuraScript(spell_chogall_elemental_power);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (uint8 stackAmount = std::ceil(GetTarget()->GetHealthPct() / 10))
@@ -1041,14 +1031,12 @@ class spell_chogall_elemental_power : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_elemental_power::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_chogall_elemental_power::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_chogall_flaming_destruction_heroic : public AuraScript
{
PrepareAuraScript(spell_chogall_flaming_destruction_heroic);
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
@@ -1070,14 +1058,12 @@ class spell_chogall_flaming_destruction_heroic : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_chogall_flaming_destruction_heroic::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_chogall_flaming_destruction_heroic::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
class spell_chogall_empowered_shadows_heroic : public AuraScript
{
PrepareAuraScript(spell_chogall_empowered_shadows_heroic);
void HandlePeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -1095,14 +1081,12 @@ class spell_chogall_empowered_shadows_heroic : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_empowered_shadows_heroic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_chogall_empowered_shadows_heroic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_chogall_summon_corrupted_adherent : public SpellScript
{
PrepareSpellScript(spell_chogall_summon_corrupted_adherent);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1131,7 +1115,7 @@ class spell_chogall_summon_corrupted_adherent : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_summon_corrupted_adherent::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_summon_corrupted_adherent::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1154,8 +1138,6 @@ class CorruptorDeathStateCheck
class spell_chogall_fester_blood : public SpellScript
{
PrepareSpellScript(spell_chogall_fester_blood);
void FilterAliveTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1174,15 +1156,13 @@ class spell_chogall_fester_blood : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_fester_blood::FilterAliveTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_fester_blood::FilterDeadTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_chogall_fester_blood::FilterAliveTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_chogall_fester_blood::FilterDeadTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_chogall_fester_blood_summon : public SpellScript
{
PrepareSpellScript(spell_chogall_fester_blood_summon);
void HandleScriptEffect(SpellEffIndex effIndex)
{
for (uint8 i = 0; i < 4; i++)
@@ -1191,14 +1171,12 @@ class spell_chogall_fester_blood_summon : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_fester_blood_summon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_fester_blood_summon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_conversion : public SpellScript
{
PrepareSpellScript(spell_chogall_conversion);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WORSHIPPING });
@@ -1227,15 +1205,13 @@ class spell_chogall_conversion : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_conversion::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_chogall_conversion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_chogall_conversion::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_chogall_conversion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_worshipping : public AuraScript
{
PrepareAuraScript(spell_chogall_worshipping);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WORSHIPPING });
@@ -1263,15 +1239,13 @@ class spell_chogall_worshipping : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_chogall_worshipping::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_chogall_worshipping::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_chogall_worshipping::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_chogall_worshipping::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_chogall_consume_blood_of_the_old_god : public AuraScript
{
PrepareAuraScript(spell_chogall_consume_blood_of_the_old_god);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CONSUME_BLOOD_OF_THE_OLD_GOD_TRIGGERED });
@@ -1294,15 +1268,13 @@ class spell_chogall_consume_blood_of_the_old_god : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_chogall_consume_blood_of_the_old_god::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_consume_blood_of_the_old_god::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
AfterEffectRemove.Register(&spell_chogall_consume_blood_of_the_old_god::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_chogall_consume_blood_of_the_old_god::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_chogall_consume_blood_of_the_old_god_triggered : public SpellScript
{
PrepareSpellScript(spell_chogall_consume_blood_of_the_old_god_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CORRUPTED_CHOGALL });
@@ -1319,14 +1291,12 @@ class spell_chogall_consume_blood_of_the_old_god_triggered : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_consume_blood_of_the_old_god_triggered::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_consume_blood_of_the_old_god_triggered::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_corruption_significant : public SpellScript
{
PrepareSpellScript(spell_chogall_corruption_significant);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_SIGNIFICANT);
@@ -1334,14 +1304,12 @@ class spell_chogall_corruption_significant : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_significant::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_corruption_significant::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_corruption_normal : public SpellScript
{
PrepareSpellScript(spell_chogall_corruption_normal);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_NORMAL);
@@ -1349,14 +1317,12 @@ class spell_chogall_corruption_normal : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_normal::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_corruption_normal::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_corruption_normal_alternative : public SpellScript
{
PrepareSpellScript(spell_chogall_corruption_normal_alternative);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_NORMAL);
@@ -1364,14 +1330,12 @@ class spell_chogall_corruption_normal_alternative : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_normal_alternative::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_corruption_normal_alternative::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_corruption_of_the_old_god : public SpellScript
{
PrepareSpellScript(spell_chogall_corruption_of_the_old_god);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_NORMAL);
@@ -1379,14 +1343,12 @@ class spell_chogall_corruption_of_the_old_god : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_of_the_old_god::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_chogall_corruption_of_the_old_god::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_chogall_corruption_sickness : public AuraScript
{
PrepareAuraScript(spell_chogall_corruption_sickness);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Player* player = GetTarget()->ToPlayer())
@@ -1395,14 +1357,12 @@ class spell_chogall_corruption_sickness : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_chogall_corruption_sickness::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_chogall_corruption_sickness::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_chogall_corruption_malformation : public AuraScript
{
PrepareAuraScript(spell_chogall_corruption_malformation);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -1422,8 +1382,8 @@ class spell_chogall_corruption_malformation : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_chogall_corruption_malformation::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_chogall_corruption_malformation::OnRemove, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_chogall_corruption_malformation::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove.Register(&spell_chogall_corruption_malformation::OnRemove, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1442,8 +1402,6 @@ class VehicleCheck
class spell_chogall_shadow_bolt : public SpellScript
{
PrepareSpellScript(spell_chogall_shadow_bolt);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1456,14 +1414,12 @@ class spell_chogall_shadow_bolt : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_shadow_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_chogall_shadow_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_chogall_debilitating_beam : public AuraScript
{
PrepareAuraScript(spell_chogall_debilitating_beam);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
CorruptionHandler::AddCorruption(GetTarget(), CORRUPTION_NORMAL);
@@ -1471,7 +1427,7 @@ class spell_chogall_debilitating_beam : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_debilitating_beam::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_chogall_debilitating_beam::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
+6 -16
View File
@@ -633,8 +633,6 @@ class spell_halfus_bind_will : public SpellScriptLoader
class spell_halfus_bind_will_SpellScript : public SpellScript
{
PrepareSpellScript(spell_halfus_bind_will_SpellScript);
void HandleHit(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -644,7 +642,7 @@ class spell_halfus_bind_will : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_halfus_bind_will_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_halfus_bind_will_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -661,8 +659,6 @@ class spell_halfus_fireball : public SpellScriptLoader
class spell_halfus_fireball_SpellScript : public SpellScript
{
PrepareSpellScript(spell_halfus_fireball_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -693,8 +689,8 @@ class spell_halfus_fireball : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halfus_fireball_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_halfus_fireball_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_halfus_fireball_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_halfus_fireball_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -711,8 +707,6 @@ class spell_halfus_stone_touch : public SpellScriptLoader
class spell_halfus_stone_touch_AuraScript : public AuraScript
{
PrepareAuraScript(spell_halfus_stone_touch_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PARALYSIS });
@@ -726,7 +720,7 @@ class spell_halfus_stone_touch : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_halfus_stone_touch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_halfus_stone_touch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -743,8 +737,6 @@ class spell_halfus_cyclone_winds : public SpellScriptLoader
class spell_halfus_cyclone_winds_SpellScript : public SpellScript
{
PrepareSpellScript(spell_halfus_cyclone_winds_SpellScript);
void SetDestPosition(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -761,7 +753,7 @@ class spell_halfus_cyclone_winds : public SpellScriptLoader
void Register()
{
OnEffectLaunch += SpellEffectFn(spell_halfus_cyclone_winds_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON);
OnEffectLaunch.Register(&spell_halfus_cyclone_winds_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON);
}
};
@@ -791,8 +783,6 @@ class spell_halfus_dancing_flames : public SpellScriptLoader
class spell_halfus_dancing_flames_SpellScript : public SpellScript
{
PrepareSpellScript(spell_halfus_dancing_flames_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -809,7 +799,7 @@ class spell_halfus_dancing_flames : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halfus_dancing_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_halfus_dancing_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp
+42 -92
View File
@@ -927,8 +927,6 @@ class spell_theralion_dazzling_destruction_dummy : public SpellScriptLoader
class spell_theralion_dazzling_destruction_dummy_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_dazzling_destruction_dummy_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -945,8 +943,8 @@ class spell_theralion_dazzling_destruction_dummy : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -989,8 +987,6 @@ class spell_theralion_dazzling_destruction : public SpellScriptLoader
class spell_theralion_dazzling_destruction_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_dazzling_destruction_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1033,11 +1029,11 @@ class spell_theralion_dazzling_destruction : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffectTrigger, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffectTrigger, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1065,8 +1061,6 @@ class spell_theralion_dazzling_destruction_twilight_realm: public SpellScriptLoa
class spell_theralion_dazzling_destruction_twilight_realm_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_dazzling_destruction_twilight_realm_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1077,7 +1071,7 @@ class spell_theralion_dazzling_destruction_twilight_realm: public SpellScriptLoa
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
@@ -1094,8 +1088,6 @@ class spell_theralion_fabulous_flames_targeting : public SpellScriptLoader
class spell_theralion_fabulous_flames_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_fabulous_flames_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.size() <= 1)
@@ -1117,8 +1109,8 @@ class spell_theralion_fabulous_flames_targeting : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_theralion_fabulous_flames_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_fabulous_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_theralion_fabulous_flames_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_theralion_fabulous_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -1152,8 +1144,6 @@ class spell_theralion_engulfing_magic_targeting : public SpellScriptLoader
class spell_theralion_engulfing_magic_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_engulfing_magic_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.size() <= 1)
@@ -1175,7 +1165,7 @@ class spell_theralion_engulfing_magic_targeting : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_engulfing_magic_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_theralion_engulfing_magic_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -1192,8 +1182,6 @@ class spell_theralion_engulfing_magic : public SpellScriptLoader
class spell_theralion_engulfing_magic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_theralion_engulfing_magic_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ENGULFING_MAGIC_TRIGGERED });
@@ -1215,7 +1203,7 @@ class spell_theralion_engulfing_magic : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_theralion_engulfing_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
OnEffectProc.Register(&spell_theralion_engulfing_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
}
};
@@ -1232,9 +1220,7 @@ class spell_valiona_blackout_dummy : public SpellScriptLoader
class spell_valiona_blackout_dummy_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_blackout_dummy_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, 1);
}
@@ -1247,8 +1233,8 @@ class spell_valiona_blackout_dummy : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_valiona_blackout_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_blackout_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_valiona_blackout_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_valiona_blackout_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -1265,8 +1251,6 @@ class spell_valiona_blackout: public SpellScriptLoader
class spell_valiona_blackout_AuraScript : public AuraScript
{
PrepareAuraScript(spell_valiona_blackout_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_BLACKOUT_DAMAGE });
@@ -1281,7 +1265,7 @@ class spell_valiona_blackout: public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_valiona_blackout_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_valiona_blackout_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1298,8 +1282,6 @@ class spell_valiona_blackout_damage : public SpellScriptLoader
class spell_valiona_blackout_damage_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_blackout_damage_SpellScript);
bool Load() override
{
_targetCount = 0;
@@ -1321,8 +1303,8 @@ class spell_valiona_blackout_damage : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_blackout_damage_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnHit += SpellHitFn(spell_valiona_blackout_damage_SpellScript::SplitDamage);
OnObjectAreaTargetSelect.Register(&spell_valiona_blackout_damage_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnHit.Register(&spell_valiona_blackout_damage_SpellScript::SplitDamage);
}
private:
@@ -1342,8 +1324,6 @@ class spell_valiona_devouring_flames : public SpellScriptLoader
class spell_valiona_devouring_flames_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_devouring_flames_SpellScript);
void ChangeDamage()
{
if (Unit* caster = GetCaster())
@@ -1355,7 +1335,7 @@ class spell_valiona_devouring_flames : public SpellScriptLoader
void Register() override
{
OnHit += SpellHitFn(spell_valiona_devouring_flames_SpellScript::ChangeDamage);
OnHit.Register(&spell_valiona_devouring_flames_SpellScript::ChangeDamage);
}
};
@@ -1372,8 +1352,6 @@ class spell_valiona_devouring_flames_targeting : public SpellScriptLoader
class spell_valiona_devouring_flames_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_devouring_flames_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1389,7 +1367,7 @@ class spell_valiona_devouring_flames_targeting : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_devouring_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_valiona_devouring_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -1430,8 +1408,6 @@ class spell_valiona_twilight_meteorite_targeting : public SpellScriptLoader
class spell_valiona_twilight_meteorite_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_twilight_meteorite_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1461,8 +1437,8 @@ class spell_valiona_twilight_meteorite_targeting : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_meteorite_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_valiona_twilight_meteorite_targeting_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_meteorite_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_valiona_twilight_meteorite_targeting_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
@@ -1479,8 +1455,6 @@ class spell_valiona_twilight_meteorite : public SpellScriptLoader
class spell_valiona_twilight_meteorite_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_twilight_meteorite_SpellScript);
bool Load() override
{
_targetCount = 0;
@@ -1502,8 +1476,8 @@ class spell_valiona_twilight_meteorite : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_meteorite_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnHit += SpellHitFn(spell_valiona_twilight_meteorite_SpellScript::SplitDamage);
OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_meteorite_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnHit.Register(&spell_valiona_twilight_meteorite_SpellScript::SplitDamage);
}
private:
@@ -1555,8 +1529,6 @@ class spell_valiona_strafe : public SpellScriptLoader
class spell_valiona_strafe_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_strafe_SpellScript);
void SetTarget(WorldObject*& target)
{
Unit* caster = GetCaster();
@@ -1575,14 +1547,12 @@ class spell_valiona_strafe : public SpellScriptLoader
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_valiona_strafe_SpellScript::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_valiona_strafe_SpellScript::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
class spell_valiona_strafe_AuraScript : public AuraScript
{
PrepareAuraScript(spell_valiona_strafe_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1607,8 +1577,8 @@ class spell_valiona_strafe : public SpellScriptLoader
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_valiona_strafe_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_valiona_strafe_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_valiona_strafe_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_valiona_strafe_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1630,8 +1600,6 @@ class spell_valiona_summon_twilight_portal : public SpellScriptLoader
class spell_valiona_summon_twilight_portal_AuraScript : public AuraScript
{
PrepareAuraScript(spell_valiona_summon_twilight_portal_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_PORTAL });
@@ -1648,7 +1616,7 @@ class spell_valiona_summon_twilight_portal : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_valiona_summon_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_valiona_summon_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1665,8 +1633,6 @@ class spell_valiona_summon_twilight_sentry : public SpellScriptLoader
class spell_valiona_summon_twilight_sentry_AuraScript : public AuraScript
{
PrepareAuraScript(spell_valiona_summon_twilight_sentry_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_SENTRY });
@@ -1682,7 +1648,7 @@ class spell_valiona_summon_twilight_sentry : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_valiona_summon_twilight_sentry_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_valiona_summon_twilight_sentry_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1699,8 +1665,6 @@ class spell_valiona_twilight_flames : public SpellScriptLoader
class spell_valiona_twilight_flames_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_twilight_flames_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TRIGGER_ACTION_THERALION });
@@ -1728,10 +1692,10 @@ class spell_valiona_twilight_flames : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_valiona_twilight_flames_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_valiona_twilight_flames_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_valiona_twilight_flames_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_valiona_twilight_flames_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1760,8 +1724,6 @@ class spell_valiona_twilight_flame_twilight_realm: public SpellScriptLoader
class spell_valiona_twilight_flame_twilight_realm_SpellScript : public SpellScript
{
PrepareSpellScript(spell_valiona_twilight_flame_twilight_realm_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1772,7 +1734,7 @@ class spell_valiona_twilight_flame_twilight_realm: public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_flame_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_flame_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -1789,8 +1751,6 @@ class spell_theralion_and_valiona_twilight_shift : public SpellScriptLoader
class spell_theralion_and_valiona_twilight_shift_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1817,7 +1777,7 @@ class spell_theralion_and_valiona_twilight_shift : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_twilight_shift_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_theralion_and_valiona_twilight_shift_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1834,8 +1794,6 @@ class spell_theralion_and_valiona_twilight_shift_phase: public SpellScriptLoader
class spell_theralion_and_valiona_twilight_shift_phase_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_phase_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1846,7 +1804,7 @@ class spell_theralion_and_valiona_twilight_shift_phase: public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_and_valiona_twilight_shift_phase_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_theralion_and_valiona_twilight_shift_phase_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -1863,8 +1821,6 @@ class spell_theralion_and_valiona_twilight_shift_phase_ally: public SpellScriptL
class spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1875,7 +1831,7 @@ class spell_theralion_and_valiona_twilight_shift_phase_ally: public SpellScriptL
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
}
};
@@ -1892,8 +1848,6 @@ class spell_theralion_and_valiona_twilight_shift_spellclick : public SpellScript
class spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TWILIGHT_SHIFT_ALLY });
@@ -1911,8 +1865,8 @@ class spell_theralion_and_valiona_twilight_shift_spellclick : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1929,8 +1883,6 @@ class spell_theralion_and_valiona_shifting_reality : public SpellScriptLoader
class spell_theralion_and_valiona_shifting_reality_SpellScript : public SpellScript
{
PrepareSpellScript(spell_theralion_and_valiona_shifting_reality_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1951,7 +1903,7 @@ class spell_theralion_and_valiona_shifting_reality : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_shifting_reality_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_theralion_and_valiona_shifting_reality_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -1968,8 +1920,6 @@ class spell_theralion_and_valiona_collapsing_twilight_portal : public SpellScrip
class spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript : public AuraScript
{
PrepareAuraScript(spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Unit* target = GetTarget())
@@ -1990,8 +1940,8 @@ class spell_theralion_and_valiona_collapsing_twilight_portal : public SpellScrip
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectApply += AuraEffectApplyFn(spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::Apply, EFFECT_1, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectPeriodic.Register(&spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectApply.Register(&spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::Apply, EFFECT_1, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
+7 -19
View File
@@ -240,8 +240,6 @@ private:
class spell_obsidius_twitchy : public AuraScript
{
PrepareAuraScript(spell_obsidius_twitchy);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
@@ -260,14 +258,12 @@ class spell_obsidius_twitchy : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_obsidius_twitchy::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_obsidius_twitchy::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_obsidius_transformation : public SpellScript
{
PrepareSpellScript(spell_obsidius_transformation);
void HandleEffect(SpellEffIndex /*effIndex*/)
{
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; i++)
@@ -278,14 +274,12 @@ class spell_obsidius_transformation : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_obsidius_transformation::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_obsidius_transformation::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_obsidius_transformation_not_selectable : public AuraScript
{
PrepareAuraScript(spell_obsidius_transformation_not_selectable);
void AfterRemmove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* caster = GetCaster();
@@ -304,14 +298,12 @@ class spell_obsidius_transformation_not_selectable : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_obsidius_transformation_not_selectable::AfterRemmove, EFFECT_0, SPELL_AURA_MOD_UNATTACKABLE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_obsidius_transformation_not_selectable::AfterRemmove, EFFECT_0, SPELL_AURA_MOD_UNATTACKABLE, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_obsidius_transformation_scale : public AuraScript
{
PrepareAuraScript(spell_obsidius_transformation_scale);
void HandlePeriodic(AuraEffect const* aurEff)
{
if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[aurEff->GetEffIndex()].BasePoints))
@@ -322,14 +314,12 @@ class spell_obsidius_transformation_scale : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_obsidius_transformation_scale::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_obsidius_transformation_scale::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_obsidius_crepuscular_veil : public SpellScript
{
PrepareSpellScript(spell_obsidius_crepuscular_veil);
void HandleAchievement()
{
Unit* target = GetHitUnit();
@@ -353,14 +343,12 @@ class spell_obsidius_crepuscular_veil : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_obsidius_crepuscular_veil::HandleAchievement);
AfterHit.Register(&spell_obsidius_crepuscular_veil::HandleAchievement);
}
};
class spell_obsidius_shadow_of_obsidius : public AuraScript
{
PrepareAuraScript(spell_obsidius_shadow_of_obsidius);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
amount = -1;
@@ -373,8 +361,8 @@ class spell_obsidius_shadow_of_obsidius : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_obsidius_shadow_of_obsidius::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_obsidius_shadow_of_obsidius::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_obsidius_shadow_of_obsidius::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_obsidius_shadow_of_obsidius::Absorb, EFFECT_0);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
+1 -3
View File
@@ -223,8 +223,6 @@ private:
class spell_beauty_magma_spit : public AuraScript
{
PrepareAuraScript(spell_beauty_magma_spit);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -247,7 +245,7 @@ class spell_beauty_magma_spit : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_beauty_magma_spit::AfterRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_beauty_magma_spit::AfterRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp
+6 -16
View File
@@ -332,8 +332,6 @@ private:
class spell_corla_nether_dragon_essence : public AuraScript
{
PrepareAuraScript(spell_corla_nether_dragon_essence);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -352,14 +350,12 @@ class spell_corla_nether_dragon_essence : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_corla_nether_dragon_essence::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_corla_nether_dragon_essence::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_corla_nether_dragon_essence_visual : public SpellScript
{
PrepareSpellScript(spell_corla_nether_dragon_essence_visual);
void ModDestHeight(SpellDestination& dest)
{
Position offset = { frand(-35.0f, 35.0f), frand(-25.0f, 25.0f), 0.0f, 0.0f };
@@ -384,14 +380,12 @@ class spell_corla_nether_dragon_essence_visual : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_corla_nether_dragon_essence_visual::ModDestHeight, EFFECT_0, TARGET_DEST_CASTER_RANDOM);
OnDestinationTargetSelect.Register(&spell_corla_nether_dragon_essence_visual::ModDestHeight, EFFECT_0, TARGET_DEST_CASTER_RANDOM);
}
};
class spell_corla_nether_beam : public SpellScript
{
PrepareSpellScript(spell_corla_nether_beam);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -454,8 +448,8 @@ class spell_corla_nether_beam : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_corla_nether_beam::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_corla_nether_beam::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_corla_nether_beam::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY);
OnEffectHitTarget.Register(&spell_corla_nether_beam::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
private:
uint32 _evolutionSpellId = SPELL_EVOLUTION_STACKS_N;
@@ -463,8 +457,6 @@ private:
class spell_corla_evolution : public SpellScript
{
PrepareSpellScript(spell_corla_evolution);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TWILIGHT_EVOLUTION });
@@ -507,14 +499,12 @@ class spell_corla_evolution : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_corla_evolution::HandleEvolve);
AfterHit.Register(&spell_corla_evolution::HandleEvolve);
}
};
class spell_corla_grievous_whirl : public AuraScript
{
PrepareAuraScript(spell_corla_grievous_whirl);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
if (GetTarget()->GetHealth() == GetTarget()->GetMaxHealth())
@@ -523,7 +513,7 @@ class spell_corla_grievous_whirl : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_corla_grievous_whirl::HandleProc, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectProc.Register(&spell_corla_grievous_whirl::HandleProc, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
+6 -14
View File
@@ -171,8 +171,6 @@ struct boss_karsh_steelbender : public BossAI
class spell_karsh_quicksilver_armor : public AuraScript
{
PrepareAuraScript(spell_karsh_quicksilver_armor);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -198,14 +196,12 @@ class spell_karsh_quicksilver_armor : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_karsh_quicksilver_armor::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_karsh_quicksilver_armor::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_karsh_superheated_quicksilver_armor : public SpellScript
{
PrepareSpellScript(spell_karsh_superheated_quicksilver_armor);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HEAT_WAVE });
@@ -228,14 +224,12 @@ class spell_karsh_superheated_quicksilver_armor : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_karsh_superheated_quicksilver_armor::HandleHeatWave);
AfterHit.Register(&spell_karsh_superheated_quicksilver_armor::HandleHeatWave);
}
};
class spell_karsh_superheated_quicksilver_armor_AuraScript : public AuraScript
{
PrepareAuraScript(spell_karsh_superheated_quicksilver_armor_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -267,15 +261,13 @@ class spell_karsh_superheated_quicksilver_armor_AuraScript : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_karsh_superheated_quicksilver_armor_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_karsh_superheated_quicksilver_armor_AuraScript::AfterRemmove, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_karsh_superheated_quicksilver_armor_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_karsh_superheated_quicksilver_armor_AuraScript::AfterRemmove, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_karsh_superheated_quicksilver_armor_proc : public AuraScript
{
PrepareAuraScript(spell_karsh_superheated_quicksilver_armor_proc);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SUPERHEATED_QUICKSILVER_ARMOR });
@@ -305,8 +297,8 @@ class spell_karsh_superheated_quicksilver_armor_proc : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_karsh_superheated_quicksilver_armor_proc::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_karsh_superheated_quicksilver_armor_proc::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_karsh_superheated_quicksilver_armor_proc::CheckProc);
OnEffectProc.Register(&spell_karsh_superheated_quicksilver_armor_proc::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
+6 -18
View File
@@ -219,8 +219,6 @@ private:
class spell_romogg_quake : public SpellScript
{
PrepareSpellScript(spell_romogg_quake);
void HandleScriptEffect(SpellEffIndex effIndex)
{
GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[effIndex].BasePoints, true);
@@ -228,14 +226,12 @@ class spell_romogg_quake : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_romogg_quake::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_romogg_quake::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_romogg_chains_of_woe : public SpellScript
{
PrepareSpellScript(spell_romogg_chains_of_woe);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, 1.6f, 0.0f });
@@ -243,14 +239,12 @@ class spell_romogg_chains_of_woe : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_romogg_chains_of_woe::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT);
OnDestinationTargetSelect.Register(&spell_romogg_chains_of_woe::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT);
}
};
class spell_romogg_chains_of_woe_teleport : public SpellScript
{
PrepareSpellScript(spell_romogg_chains_of_woe_teleport);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -259,14 +253,12 @@ class spell_romogg_chains_of_woe_teleport : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_romogg_chains_of_woe_teleport::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_romogg_chains_of_woe_teleport::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_romogg_chains_of_woe_teleport_dest : public SpellScript
{
PrepareSpellScript(spell_romogg_chains_of_woe_teleport_dest);
void SetDest(SpellDestination& dest)
{
Position pos = dest._position;
@@ -284,14 +276,12 @@ class spell_romogg_chains_of_woe_teleport_dest : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_romogg_chains_of_woe_teleport_dest::SetDest, EFFECT_0, TARGET_DEST_TARGET_RADIUS);
OnDestinationTargetSelect.Register(&spell_romogg_chains_of_woe_teleport_dest::SetDest, EFFECT_0, TARGET_DEST_TARGET_RADIUS);
}
};
class spell_romogg_chains_of_woe_root : public SpellScript
{
PrepareSpellScript(spell_romogg_chains_of_woe_root);
void HandleScriptEffect(SpellEffIndex effIndex)
{
GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[effIndex].BasePoints, true);
@@ -299,14 +289,12 @@ class spell_romogg_chains_of_woe_root : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_romogg_chains_of_woe_root::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_romogg_chains_of_woe_root::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_romogg_call_for_help : public SpellScript
{
PrepareSpellScript(spell_romogg_call_for_help);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Creature* creature = GetHitCreature())
@@ -316,7 +304,7 @@ class spell_romogg_call_for_help : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_romogg_call_for_help::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_romogg_call_for_help::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
+8 -20
View File
@@ -471,8 +471,6 @@ class spell_direbrew_disarm : public SpellScriptLoader
class spell_direbrew_disarm_AuraScript : public AuraScript
{
PrepareAuraScript(spell_direbrew_disarm_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DIREBREW_DISARM, SPELL_DIREBREW_DISARM_GROW });
@@ -495,8 +493,8 @@ class spell_direbrew_disarm : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_direbrew_disarm_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectApply += AuraEffectRemoveFn(spell_direbrew_disarm_AuraScript::OnApply, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_direbrew_disarm_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectApply.Register(&spell_direbrew_disarm_AuraScript::OnApply, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -514,8 +512,6 @@ class spell_direbrew_summon_mole_machine_target_picker : public SpellScriptLoade
class spell_direbrew_summon_mole_machine_target_picker_SpellScript : public SpellScript
{
PrepareSpellScript(spell_direbrew_summon_mole_machine_target_picker_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MOLE_MACHINE_MINION_SUMMONER });
@@ -528,7 +524,7 @@ class spell_direbrew_summon_mole_machine_target_picker : public SpellScriptLoade
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_direbrew_summon_mole_machine_target_picker_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_direbrew_summon_mole_machine_target_picker_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -546,8 +542,6 @@ class spell_send_mug_target_picker : public SpellScriptLoader
class spell_send_mug_target_picker_SpellScript : public SpellScript
{
PrepareSpellScript(spell_send_mug_target_picker_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
Unit* caster = GetCaster();
@@ -579,8 +573,8 @@ class spell_send_mug_target_picker : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_send_mug_target_picker_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_send_mug_target_picker_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_send_mug_target_picker_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_send_mug_target_picker_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -598,8 +592,6 @@ class spell_request_second_mug : public SpellScriptLoader
class spell_request_second_mug_SpellScript : public SpellScript
{
PrepareSpellScript(spell_request_second_mug_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SEND_SECOND_MUG });
@@ -612,7 +604,7 @@ class spell_request_second_mug : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_request_second_mug_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_request_second_mug_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -630,8 +622,6 @@ class spell_send_mug_control_aura : public SpellScriptLoader
class spell_send_mug_control_aura_AuraScript : public AuraScript
{
PrepareAuraScript(spell_send_mug_control_aura_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SEND_MUG_TARGET_PICKER });
@@ -644,7 +634,7 @@ class spell_send_mug_control_aura : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_send_mug_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_send_mug_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -662,8 +652,6 @@ class spell_barreled_control_aura : public SpellScriptLoader
class spell_barreled_control_aura_AuraScript : public AuraScript
{
PrepareAuraScript(spell_barreled_control_aura_AuraScript);
void PeriodicTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -672,7 +660,7 @@ class spell_barreled_control_aura : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_barreled_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_barreled_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp
+6 -18
View File
@@ -546,8 +546,6 @@ Position const DragonOrb2Offset = { -28.80208f, -232.4497f, 71.34686f };
class spell_bwd_dragon_orb : public SpellScript
{
PrepareSpellScript(spell_bwd_dragon_orb);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRAGON_ORB_1 });
@@ -566,14 +564,12 @@ class spell_bwd_dragon_orb : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_bwd_dragon_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM);
OnDestinationTargetSelect.Register(&spell_bwd_dragon_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM);
}
};
class spell_bwd_grievous_wound : public AuraScript
{
PrepareAuraScript(spell_bwd_grievous_wound);
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
if (GetUnitOwner()->HealthAbovePct(90))
@@ -585,14 +581,12 @@ class spell_bwd_grievous_wound : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_bwd_grievous_wound::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_bwd_grievous_wound::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
class spell_bwd_execution_sentence_visual : public SpellScript
{
PrepareSpellScript(spell_bwd_execution_sentence_visual);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, 15.0f, 0.0f });
@@ -600,14 +594,12 @@ class spell_bwd_execution_sentence_visual : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_bwd_execution_sentence_visual::SetDest, EFFECT_0, TARGET_DEST_TARGET_ENEMY);
OnDestinationTargetSelect.Register(&spell_bwd_execution_sentence_visual::SetDest, EFFECT_0, TARGET_DEST_TARGET_ENEMY);
}
};
class spell_bwd_execution_sentence_dummy : public SpellScript
{
PrepareSpellScript(spell_bwd_execution_sentence_dummy);
void HandleDummyEffect(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -622,14 +614,12 @@ class spell_bwd_execution_sentence_dummy : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_bwd_execution_sentence_dummy::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_bwd_execution_sentence_dummy::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_bwd_execution_sentence : public AuraScript
{
PrepareAuraScript(spell_bwd_execution_sentence);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_EXECUTION_SENTENCE_DUMMY });
@@ -644,14 +634,12 @@ class spell_bwd_execution_sentence : public AuraScript
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_bwd_execution_sentence::HandleRemove, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove.Register(&spell_bwd_execution_sentence::HandleRemove, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_bwd_stoneblood : public SpellScript
{
PrepareSpellScript(spell_bwd_stoneblood);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
std::unordered_set<Aura*> aurasToRemove;
@@ -677,7 +665,7 @@ class spell_bwd_stoneblood : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_bwd_stoneblood::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_bwd_stoneblood::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp
+18 -52
View File
@@ -695,8 +695,6 @@ private:
class spell_atramedes_modulation : public SpellScript
{
PrepareSpellScript(spell_atramedes_modulation);
void ChangeDamage(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitUnit();
@@ -710,14 +708,12 @@ class spell_atramedes_modulation : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_atramedes_modulation::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_atramedes_modulation::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_atramedes_roaring_flame_breath_reverse_cast : public SpellScript
{
PrepareSpellScript(spell_atramedes_roaring_flame_breath_reverse_cast);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -726,14 +722,12 @@ class spell_atramedes_roaring_flame_breath_reverse_cast : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_atramedes_roaring_flame_breath_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_atramedes_roaring_flame_breath_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_atramedes_roaring_flame_breath : public AuraScript
{
PrepareAuraScript(spell_atramedes_roaring_flame_breath);
void HandleTick(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -742,14 +736,12 @@ class spell_atramedes_roaring_flame_breath : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_roaring_flame_breath::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_atramedes_roaring_flame_breath::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_atramedes_roaring_flame_breath_fire_periodic : public SpellScript
{
PrepareSpellScript(spell_atramedes_roaring_flame_breath_fire_periodic);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROARING_FLAME_SUMMON });
@@ -763,14 +755,12 @@ class spell_atramedes_roaring_flame_breath_fire_periodic : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_atramedes_roaring_flame_breath_fire_periodic::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_atramedes_roaring_flame_breath_fire_periodic::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_atramedes_resonating_clash_ground : public SpellScript
{
PrepareSpellScript(spell_atramedes_resonating_clash_ground);
void HandleScriptEffect(SpellEffIndex effIndex)
{
Unit* caster = GetCaster();
@@ -788,14 +778,12 @@ class spell_atramedes_resonating_clash_ground : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_atramedes_resonating_clash_ground::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_atramedes_resonating_clash_ground::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_atramedes_resonating_clash_air : public SpellScript
{
PrepareSpellScript(spell_atramedes_resonating_clash_air);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -814,14 +802,12 @@ class spell_atramedes_resonating_clash_air : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_atramedes_resonating_clash_air::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_atramedes_resonating_clash_air::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_atramedes_resonating_clash: public SpellScript
{
PrepareSpellScript(spell_atramedes_resonating_clash);
void HandleScriptEffect(SpellEffIndex effIndex)
{
GetHitUnit()->RemoveAurasDueToSpell(GetSpellInfo()->Effects[effIndex].BasePoints);
@@ -829,14 +815,12 @@ class spell_atramedes_resonating_clash: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_atramedes_resonating_clash::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_atramedes_resonating_clash::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_atramedes_sound_bar : public AuraScript
{
PrepareAuraScript(spell_atramedes_sound_bar);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_NOISY });
@@ -864,14 +848,12 @@ class spell_atramedes_sound_bar : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_sound_bar::HandleNoisyAura, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_atramedes_sound_bar::HandleNoisyAura, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_atramedes_noisy : public AuraScript
{
PrepareAuraScript(spell_atramedes_noisy);
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (InstanceScript* instance = GetTarget()->GetInstanceScript())
@@ -881,14 +863,12 @@ class spell_atramedes_noisy : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_atramedes_noisy::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_atramedes_noisy::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_atramedes_vertigo : public AuraScript
{
PrepareAuraScript(spell_atramedes_vertigo);
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -913,14 +893,12 @@ class spell_atramedes_vertigo : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_atramedes_vertigo::AfterRemove, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_atramedes_vertigo::AfterRemove, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_atramedes_sonic_flames : public SpellScript
{
PrepareSpellScript(spell_atramedes_sonic_flames);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -931,14 +909,12 @@ class spell_atramedes_sonic_flames : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_atramedes_sonic_flames::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_atramedes_sonic_flames::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
class spell_atramedes_sonic_flames_AuraScript : public AuraScript
{
PrepareAuraScript(spell_atramedes_sonic_flames_AuraScript);
void HandlePeriodic(AuraEffect const* aurEff)
{
Unit* caster = GetCaster();
@@ -951,7 +927,7 @@ class spell_atramedes_sonic_flames_AuraScript : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_sonic_flames_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_atramedes_sonic_flames_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -970,8 +946,6 @@ private:
class spell_atramedes_devastation_trigger : public AuraScript
{
PrepareAuraScript(spell_atramedes_devastation_trigger);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Creature* target = GetTarget()->ToCreature())
@@ -982,14 +956,12 @@ class spell_atramedes_devastation_trigger : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_devastation_trigger::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_atramedes_devastation_trigger::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_atramedes_sonic_breath : public SpellScript
{
PrepareSpellScript(spell_atramedes_sonic_breath);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1003,14 +975,12 @@ class spell_atramedes_sonic_breath : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_atramedes_sonic_breath::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_atramedes_sonic_breath::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_atramedes_destroy_shield : public SpellScript
{
PrepareSpellScript(spell_atramedes_destroy_shield);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1027,14 +997,12 @@ class spell_atramedes_destroy_shield : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_atramedes_destroy_shield::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_atramedes_destroy_shield::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_atramedes_pestered : public AuraScript
{
PrepareAuraScript(spell_atramedes_pestered);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* caster = GetCaster())
@@ -1053,15 +1021,13 @@ class spell_atramedes_pestered : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_atramedes_pestered::AfterApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_atramedes_pestered::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_atramedes_pestered::AfterApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_atramedes_pestered::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_atramedes_apply_vehicle_periodic : public AuraScript
{
PrepareAuraScript(spell_atramedes_apply_vehicle_periodic);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE);
@@ -1069,7 +1035,7 @@ class spell_atramedes_apply_vehicle_periodic : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_atramedes_apply_vehicle_periodic::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_atramedes_apply_vehicle_periodic::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
+12 -26
View File
@@ -528,8 +528,6 @@ private:
class spell_chimaeron_caustic_slime_targeting : public SpellScript
{
PrepareSpellScript(spell_chimaeron_caustic_slime_targeting);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -550,15 +548,13 @@ class spell_chimaeron_caustic_slime_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chimaeron_caustic_slime_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_chimaeron_caustic_slime_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_chimaeron_caustic_slime_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_chimaeron_caustic_slime_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_chimaeron_caustic_slime: public SpellScript
{
PrepareSpellScript(spell_chimaeron_caustic_slime);
void CountTargets(std::list<WorldObject*>& targets)
{
_targetCount = targets.size();
@@ -574,8 +570,8 @@ class spell_chimaeron_caustic_slime: public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chimaeron_caustic_slime::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
BeforeHit += SpellHitFn(spell_chimaeron_caustic_slime::SplitDamage);
OnObjectAreaTargetSelect.Register(&spell_chimaeron_caustic_slime::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
BeforeHit.Register(&spell_chimaeron_caustic_slime::SplitDamage);
}
private:
@@ -584,8 +580,6 @@ private:
class spell_chimaeron_double_attack : public AuraScript
{
PrepareAuraScript(spell_chimaeron_double_attack);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DOUBLE_ATTACK_TRIGGERED });
@@ -600,14 +594,12 @@ class spell_chimaeron_double_attack : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_chimaeron_double_attack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_chimaeron_double_attack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_chimaeron_finkles_mixture : public AuraScript
{
PrepareAuraScript(spell_chimaeron_finkles_mixture);
bool Load() override
{
healthThreshold = GetSpellInfo()->Effects[EFFECT_0].BasePoints;
@@ -645,9 +637,9 @@ class spell_chimaeron_finkles_mixture : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_chimaeron_finkles_mixture::HandleMixtureDuration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_chimaeron_finkles_mixture::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_chimaeron_finkles_mixture::Absorb, EFFECT_1);
OnEffectPeriodic.Register(&spell_chimaeron_finkles_mixture::HandleMixtureDuration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
DoEffectCalcAmount.Register(&spell_chimaeron_finkles_mixture::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_chimaeron_finkles_mixture::Absorb, EFFECT_1);
}
private:
@@ -656,8 +648,6 @@ private:
class spell_chimaeron_reroute_power : public AuraScript
{
PrepareAuraScript(spell_chimaeron_reroute_power);
void HandleActivation(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* target = GetTarget()->ToCreature())
@@ -667,14 +657,12 @@ class spell_chimaeron_reroute_power : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_chimaeron_reroute_power::HandleActivation, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_chimaeron_reroute_power::HandleActivation, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_chimaeron_feud : public AuraScript
{
PrepareAuraScript(spell_chimaeron_feud);
void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* target = GetTarget()->ToCreature())
@@ -691,15 +679,13 @@ class spell_chimaeron_feud : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_chimaeron_feud::HandleApply, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_chimaeron_feud::HandleRemove, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_chimaeron_feud::HandleApply, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_chimaeron_feud::HandleRemove, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_chimaeron_shadow_whip : public SpellScript
{
PrepareSpellScript(spell_chimaeron_shadow_whip);
void HandleDummyEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->InterruptNonMeleeSpells(true);
@@ -707,7 +693,7 @@ class spell_chimaeron_shadow_whip : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_chimaeron_shadow_whip::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_chimaeron_shadow_whip::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp
+20 -48
View File
@@ -806,8 +806,6 @@ class IsOnVehicleCheck
class spell_magmaw_magma_spit: public SpellScript
{
PrepareSpellScript(spell_magmaw_magma_spit);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGMA_SPIT_MISSILE });
@@ -834,8 +832,8 @@ class spell_magmaw_magma_spit: public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_magma_spit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_magmaw_magma_spit::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_magmaw_magma_spit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_magmaw_magma_spit::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -854,8 +852,6 @@ class VictimCheck
class spell_magmaw_mangle : public SpellScript
{
PrepareSpellScript(spell_magmaw_mangle);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MANGLE_1 });
@@ -881,15 +877,13 @@ class spell_magmaw_mangle : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_mangle::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_magmaw_mangle::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_magmaw_mangle::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_magmaw_mangle::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_magmaw_pillar_of_flame_dummy : public SpellScript
{
PrepareSpellScript(spell_magmaw_pillar_of_flame_dummy);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -911,7 +905,7 @@ class spell_magmaw_pillar_of_flame_dummy : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_magmaw_pillar_of_flame_dummy::HandleHit, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_magmaw_pillar_of_flame_dummy::HandleHit, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
@@ -933,8 +927,6 @@ class DistanceCheck
class spell_magmaw_pillar_of_flame_forcecast : public SpellScript
{
PrepareSpellScript(spell_magmaw_pillar_of_flame_forcecast);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -956,14 +948,12 @@ class spell_magmaw_pillar_of_flame_forcecast : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_pillar_of_flame_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_magmaw_pillar_of_flame_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_magmaw_ride_vehicle : public SpellScript
{
PrepareSpellScript(spell_magmaw_ride_vehicle);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -980,14 +970,12 @@ class spell_magmaw_ride_vehicle : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_magmaw_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_TARGET_ANY);
OnObjectTargetSelect.Register(&spell_magmaw_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_TARGET_ANY);
}
};
class spell_magmaw_launch_hook : public AuraScript
{
PrepareAuraScript(spell_magmaw_launch_hook);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1018,15 +1006,13 @@ class spell_magmaw_launch_hook : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_magmaw_launch_hook::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_magmaw_launch_hook::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_magmaw_eject_passenger : public SpellScript
{
PrepareSpellScript(spell_magmaw_eject_passenger);
void EjectPassenger(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitUnit();
@@ -1038,14 +1024,12 @@ class spell_magmaw_eject_passenger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_magmaw_eject_passenger::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_magmaw_eject_passenger::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_magmaw_lava_parasite : public AuraScript
{
PrepareAuraScript(spell_magmaw_lava_parasite);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1075,14 +1059,12 @@ class spell_magmaw_lava_parasite : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_magmaw_lava_parasite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_magmaw_lava_parasite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_magmaw_blazing_inferno_targeting : public SpellScript
{
PrepareSpellScript(spell_magmaw_blazing_inferno_targeting);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_BLAZING_INFERNO });
@@ -1123,15 +1105,13 @@ class spell_magmaw_blazing_inferno_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_blazing_inferno_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_magmaw_blazing_inferno_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_magmaw_blazing_inferno_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_magmaw_blazing_inferno_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_magmaw_shadow_breath_targeting : public SpellScript
{
PrepareSpellScript(spell_magmaw_shadow_breath_targeting);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHADOW_BREATH });
@@ -1158,15 +1138,13 @@ class spell_magmaw_shadow_breath_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_shadow_breath_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_magmaw_shadow_breath_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_magmaw_shadow_breath_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_magmaw_shadow_breath_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_magmaw_lava_parasite_summon : public SpellScript
{
PrepareSpellScript(spell_magmaw_lava_parasite_summon);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, frand(13.0f, 15.0f), 0.0f });
@@ -1174,14 +1152,12 @@ class spell_magmaw_lava_parasite_summon : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_magmaw_lava_parasite_summon::SetDest, EFFECT_0, TARGET_DEST_DEST_RANDOM);
OnDestinationTargetSelect.Register(&spell_magmaw_lava_parasite_summon::SetDest, EFFECT_0, TARGET_DEST_DEST_RANDOM);
}
};
class spell_magmaw_massive_crash : public AuraScript
{
PrepareAuraScript(spell_magmaw_massive_crash);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* magmaw = GetTarget()->ToCreature())
@@ -1198,15 +1174,13 @@ class spell_magmaw_massive_crash : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_magmaw_massive_crash::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_magmaw_massive_crash::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_magmaw_massive_crash::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_magmaw_massive_crash::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_magmaw_impale_self : public AuraScript
{
PrepareAuraScript(spell_magmaw_impale_self);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* magmaw = GetTarget()->ToCreature())
@@ -1223,15 +1197,13 @@ class spell_magmaw_impale_self : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_magmaw_impale_self::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_magmaw_impale_self::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_magmaw_impale_self::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_magmaw_impale_self::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_magmaw_captured : public AuraScript
{
PrepareAuraScript(spell_magmaw_captured);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1248,7 +1220,7 @@ class spell_magmaw_captured : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_magmaw_captured::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_magmaw_captured::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp
+18 -42
View File
@@ -880,8 +880,6 @@ private:
class spell_maloriak_throw_bottle : public SpellScript
{
PrepareSpellScript(spell_maloriak_throw_bottle);
void HandleDummyEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -890,14 +888,12 @@ class spell_maloriak_throw_bottle : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_maloriak_throw_bottle::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectLaunchTarget.Register(&spell_maloriak_throw_bottle::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_maloriak_throw_bottle_triggered : public SpellScript
{
PrepareSpellScript(spell_maloriak_throw_bottle_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -939,14 +935,12 @@ class spell_maloriak_throw_bottle_triggered : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_maloriak_throw_bottle_triggered::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_maloriak_throw_bottle_triggered::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_maloriak_consuming_flames: public AuraScript
{
PrepareAuraScript(spell_maloriak_consuming_flames);
bool CheckProc(ProcEventInfo& eventInfo)
{
return eventInfo.GetSpellInfo() && eventInfo.GetDamageInfo();
@@ -960,14 +954,12 @@ class spell_maloriak_consuming_flames: public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_maloriak_consuming_flames::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectProc.Register(&spell_maloriak_consuming_flames::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
class spell_maloriak_flash_freeze_targeting : public SpellScript
{
PrepareSpellScript(spell_maloriak_flash_freeze_targeting);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FLASH_FREEZE_SUMMON });
@@ -1011,15 +1003,13 @@ class spell_maloriak_flash_freeze_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_flash_freeze_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_maloriak_flash_freeze_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_maloriak_flash_freeze_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_maloriak_flash_freeze_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_maloriak_flash_freeze_dummy : public SpellScript
{
PrepareSpellScript(spell_maloriak_flash_freeze_dummy);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FLASH_FREEZE_STUN_NORMAL });
@@ -1049,14 +1039,12 @@ class spell_maloriak_flash_freeze_dummy : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_flash_freeze_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_maloriak_flash_freeze_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_maloriak_release_experiments : public SpellScript
{
PrepareSpellScript(spell_maloriak_release_experiments);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1086,20 +1074,18 @@ class spell_maloriak_release_experiments : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_release_experiments::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_maloriak_release_experiments::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
if (m_scriptSpellId == SPELL_RELEASE_ALL_MINIONS)
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_release_experiments::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_maloriak_release_experiments::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
}
}
};
class spell_maloriak_magma_jets_script : public SpellScript
{
PrepareSpellScript(spell_maloriak_magma_jets_script);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGMA_JETS_SUMMON });
@@ -1126,15 +1112,13 @@ class spell_maloriak_magma_jets_script : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_magma_jets_script::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_maloriak_magma_jets_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_maloriak_magma_jets_script::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_maloriak_magma_jets_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_maloriak_magma_jets_periodic : public AuraScript
{
PrepareAuraScript(spell_maloriak_magma_jets_periodic);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGMA_JETS_SUMMON_FIRE });
@@ -1158,14 +1142,12 @@ class spell_maloriak_magma_jets_periodic : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_maloriak_magma_jets_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_maloriak_magma_jets_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_maloriak_absolute_zero : public SpellScript
{
PrepareSpellScript(spell_maloriak_absolute_zero);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ABSOLUTE_ZERO_EXPLOSION });
@@ -1185,14 +1167,12 @@ class spell_maloriak_absolute_zero : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_absolute_zero::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_maloriak_absolute_zero::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_maloriak_vile_swill: public AuraScript
{
PrepareAuraScript(spell_maloriak_vile_swill);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_VILE_SWILL_SUMMON });
@@ -1208,14 +1188,12 @@ class spell_maloriak_vile_swill: public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_maloriak_vile_swill::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_maloriak_vile_swill::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_maloriak_vile_swill_summon: public AuraScript
{
PrepareAuraScript(spell_maloriak_vile_swill_summon);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
int32 summonSpellId = GetSpellInfo()->Effects[EFFECT_0].TriggerSpell;
@@ -1237,14 +1215,12 @@ class spell_maloriak_vile_swill_summon: public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_maloriak_vile_swill_summon::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_maloriak_vile_swill_summon::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_maloriak_master_adventurer_award : public AuraScript
{
PrepareAuraScript(spell_maloriak_master_adventurer_award);
void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Player* player = GetTarget()->ToPlayer();
@@ -1277,8 +1253,8 @@ class spell_maloriak_master_adventurer_award : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_maloriak_master_adventurer_award::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_maloriak_master_adventurer_award::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_maloriak_master_adventurer_award::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_maloriak_master_adventurer_award::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp
+25 -71
View File
@@ -1380,8 +1380,6 @@ private:
class spell_nefarians_end_electrical_charge : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_electrical_charge);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ELECTRICAL_CHARGE_ONYXIA });
@@ -1418,14 +1416,12 @@ class spell_nefarians_end_electrical_charge : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_electrical_charge::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_nefarians_end_electrical_charge::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_nefarians_end_lightning_discharge_triggered_periodic_aura : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_lightning_discharge_triggered_periodic_aura);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1454,14 +1450,12 @@ class spell_nefarians_end_lightning_discharge_triggered_periodic_aura : public A
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_lightning_discharge_triggered_periodic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_nefarians_end_lightning_discharge_triggered_periodic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_nefarians_end_lightning_discharge_cone : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_lightning_discharge_cone);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_LIGHTNING_DISCHARGE_DAMAGE });
@@ -1485,14 +1479,12 @@ class spell_nefarians_end_lightning_discharge_cone : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_nefarians_end_lightning_discharge_cone::HandleImmunity, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectLaunchTarget.Register(&spell_nefarians_end_lightning_discharge_cone::HandleImmunity, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_nefarians_end_lightning_discharge_damage : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_lightning_discharge_damage);
void FilterTargets(std::list<WorldObject*>& targets)
{
SpellInfo const* spell = GetSpellInfo();
@@ -1507,14 +1499,12 @@ class spell_nefarians_end_lightning_discharge_damage : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nefarians_end_lightning_discharge_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_nefarians_end_lightning_discharge_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_nefarians_end_children_of_deathwing : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_children_of_deathwing);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CHILDREN_OF_DEATHWING_NEFARIAN });
@@ -1532,14 +1522,12 @@ class spell_nefarians_end_children_of_deathwing : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_children_of_deathwing::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_nefarians_end_children_of_deathwing::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_nefarians_end_animate_bones : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_animate_bones);
void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -1548,14 +1536,12 @@ class spell_nefarians_end_animate_bones : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_animate_bones::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_nefarians_end_animate_bones::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_nefarians_end_animate_bones_dummy : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_animate_bones_dummy);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1585,14 +1571,12 @@ class spell_nefarians_end_animate_bones_dummy : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_animate_bones_dummy::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_nefarians_end_animate_bones_dummy::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_nefarians_end_shadowflame_breath : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_shadowflame_breath);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1624,14 +1608,12 @@ class spell_nefarians_end_shadowflame_breath : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_shadowflame_breath::HandleHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_nefarians_end_shadowflame_breath::HandleHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_nefarians_end_jump_down_to_platform : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_jump_down_to_platform);
void SetDest(SpellDestination& dest)
{
Position positions[MaxChromaticPrototypes];
@@ -1664,14 +1646,12 @@ class spell_nefarians_end_jump_down_to_platform : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_nefarians_end_jump_down_to_platform::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
OnDestinationTargetSelect.Register(&spell_nefarians_end_jump_down_to_platform::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
};
class spell_nefarians_end_shadow_of_cowardice : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_shadow_of_cowardice);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHADOW_OF_COWARDICE_DAMAGE });
@@ -1690,14 +1670,12 @@ class spell_nefarians_end_shadow_of_cowardice : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_shadow_of_cowardice::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_nefarians_end_shadow_of_cowardice::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_nefarians_end_onyxia_start_fight_2_effect : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_onyxia_start_fight_2_effect);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHADOW_OF_COWARDICE_DAMAGE });
@@ -1727,15 +1705,13 @@ class spell_nefarians_end_onyxia_start_fight_2_effect : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_onyxia_start_fight_2_effect::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nefarians_end_onyxia_start_fight_2_effect::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_nefarians_end_onyxia_start_fight_2_effect::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_nefarians_end_onyxia_start_fight_2_effect::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_nefarians_end_empowering_strikes : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_empowering_strikes);
void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -1744,14 +1720,12 @@ class spell_nefarians_end_empowering_strikes : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_empowering_strikes::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_nefarians_end_empowering_strikes::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_nefarians_end_brushfire_pre_start_periodic : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_brushfire_pre_start_periodic);
bool Load() override
{
_nextTriggerTickNumber = 1;
@@ -1781,7 +1755,7 @@ class spell_nefarians_end_brushfire_pre_start_periodic : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_brushfire_pre_start_periodic::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_nefarians_end_brushfire_pre_start_periodic::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
private:
@@ -1791,8 +1765,6 @@ private:
class spell_nefarians_end_brushfire_start : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_brushfire_start);
void HandleDummyEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -1801,14 +1773,12 @@ class spell_nefarians_end_brushfire_start : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_brushfire_start::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_nefarians_end_brushfire_start::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_nefarians_end_brushfire_growth : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_brushfire_growth);
void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
{
if (Creature* creature = GetTarget()->ToCreature())
@@ -1818,14 +1788,12 @@ class spell_nefarians_end_brushfire_growth : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_brushfire_growth::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_nefarians_end_brushfire_growth::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_nefarians_end_shadowblaze : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_shadowblaze);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1859,14 +1827,12 @@ class spell_nefarians_end_shadowblaze : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_shadowblaze::HandleHit, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_nefarians_end_shadowblaze::HandleHit, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_nefarians_end_dominion_dummy : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_dominion_dummy);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DOMINION_OVERRIDE_ACTION_BAR });
@@ -1882,14 +1848,12 @@ class spell_nefarians_end_dominion_dummy : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nefarians_end_dominion_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_nefarians_end_dominion_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_nefarians_end_dominion : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_dominion);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1922,15 +1886,13 @@ class spell_nefarians_end_dominion : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_nefarians_end_dominion::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_nefarians_end_dominion::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_nefarians_end_dominion::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_nefarians_end_dominion::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_nefarians_end_determine_farthest_portal_stalker : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_determine_farthest_portal_stalker);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DOMINION_PORTAL_TRIGGER });
@@ -1971,14 +1933,12 @@ class spell_nefarians_end_determine_farthest_portal_stalker : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_determine_farthest_portal_stalker::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_nefarians_end_determine_farthest_portal_stalker::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_nefarians_end_dominion_portal_trigger : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_dominion_portal_trigger);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2012,14 +1972,12 @@ class spell_nefarians_end_dominion_portal_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_dominion_portal_trigger::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_nefarians_end_dominion_portal_trigger::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_nefarians_end_free_your_mind : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_free_your_mind);
void AfterRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -2029,14 +1987,12 @@ class spell_nefarians_end_free_your_mind : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_nefarians_end_free_your_mind::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_nefarians_end_free_your_mind::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_nefarians_end_siphon_power : public SpellScript
{
PrepareSpellScript(spell_nefarians_end_siphon_power);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_STOLEN_POWER });
@@ -2049,14 +2005,12 @@ class spell_nefarians_end_siphon_power : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_siphon_power::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_nefarians_end_siphon_power::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_nefarians_end_explosive_cinders : public AuraScript
{
PrepareAuraScript(spell_nefarians_end_explosive_cinders);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_EXPLOSIVE_CINDERS_EXPLOSION });
@@ -2070,7 +2024,7 @@ class spell_nefarians_end_explosive_cinders : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_nefarians_end_explosive_cinders::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_nefarians_end_explosive_cinders::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp
+20 -50
View File
@@ -1217,8 +1217,6 @@ class GuidCheck
class spell_omnotron_controller_recharge : public SpellScript
{
PrepareSpellScript(spell_omnotron_controller_recharge);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1277,15 +1275,13 @@ class spell_omnotron_controller_recharge : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_controller_recharge::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_omnotron_controller_recharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_omnotron_controller_recharge::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_omnotron_controller_recharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_omnotron_recharging : public AuraScript
{
PrepareAuraScript(spell_omnotron_recharging);
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired))
@@ -1296,14 +1292,12 @@ class spell_omnotron_recharging : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_omnotron_recharging::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_omnotron_recharging::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_omnotron_activated : public AuraScript
{
PrepareAuraScript(spell_omnotron_activated);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHUTTING_DOWN });
@@ -1325,15 +1319,13 @@ class spell_omnotron_activated : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_omnotron_activated::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
AfterEffectRemove += AuraEffectRemoveFn(spell_omnotron_activated::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_omnotron_activated::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
AfterEffectRemove.Register(&spell_omnotron_activated::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_omnotron_inactive : public SpellScript
{
PrepareSpellScript(spell_omnotron_inactive);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_RECHARGING_ELECTRON });
@@ -1350,14 +1342,12 @@ class spell_omnotron_inactive : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_omnotron_inactive::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_omnotron_inactive::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_omnotron_electrical_discharge_trigger : public SpellScript
{
PrepareSpellScript(spell_omnotron_electrical_discharge_trigger);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1374,15 +1364,13 @@ class spell_omnotron_electrical_discharge_trigger : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_electrical_discharge_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_omnotron_electrical_discharge_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_omnotron_electrical_discharge_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_omnotron_electrical_discharge_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_omnotron_electrical_discharge : public SpellScript
{
PrepareSpellScript(spell_omnotron_electrical_discharge);
bool Load() override
{
_chainTargetCount = 0;
@@ -1398,7 +1386,7 @@ class spell_omnotron_electrical_discharge : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_omnotron_electrical_discharge::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_omnotron_electrical_discharge::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
private:
uint8 _chainTargetCount;
@@ -1406,8 +1394,6 @@ private:
class spell_omnotron_unstable_shield : public AuraScript
{
PrepareAuraScript(spell_omnotron_unstable_shield);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_STATIC_SHOCK });
@@ -1435,15 +1421,13 @@ class spell_omnotron_unstable_shield : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_omnotron_unstable_shield::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_omnotron_unstable_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_omnotron_unstable_shield::CheckProc);
OnEffectProc.Register(&spell_omnotron_unstable_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
class spell_omnotron_aquiring_target : public SpellScript
{
PrepareSpellScript(spell_omnotron_aquiring_target);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1463,15 +1447,13 @@ class spell_omnotron_aquiring_target : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_aquiring_target::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_omnotron_aquiring_target::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_omnotron_aquiring_target::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_omnotron_aquiring_target::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_omnotron_acquiring_target_periodic : public AuraScript
{
PrepareAuraScript(spell_omnotron_acquiring_target_periodic);
void HandleTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -1481,14 +1463,12 @@ class spell_omnotron_acquiring_target_periodic : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_omnotron_acquiring_target_periodic::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_omnotron_acquiring_target_periodic::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_omnotron_barrier : public AuraScript
{
PrepareAuraScript(spell_omnotron_barrier);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_BACKDRAFT });
@@ -1503,14 +1483,12 @@ class spell_omnotron_barrier : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_omnotron_barrier::HandleAbsorbRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_omnotron_barrier::HandleAbsorbRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_omnotron_shadow_infusion : public SpellScript
{
PrepareSpellScript(spell_omnotron_shadow_infusion);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHADOW_CONDUCTOR });
@@ -1523,14 +1501,12 @@ class spell_omnotron_shadow_infusion : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_omnotron_shadow_infusion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_omnotron_shadow_infusion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_omnotron_shadow_conductor : public SpellScript
{
PrepareSpellScript(spell_omnotron_shadow_conductor);
void ChangeDamage(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -1545,14 +1521,12 @@ class spell_omnotron_shadow_conductor : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_omnotron_shadow_conductor::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_omnotron_shadow_conductor::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_omnotron_overcharge : public SpellScript
{
PrepareSpellScript(spell_omnotron_overcharge);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1583,14 +1557,12 @@ class spell_omnotron_overcharge : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_omnotron_overcharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_omnotron_overcharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_omnotron_overcharged_power_generator : public AuraScript
{
PrepareAuraScript(spell_omnotron_overcharged_power_generator);
void HandlePeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -1604,14 +1576,12 @@ class spell_omnotron_overcharged_power_generator : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_omnotron_overcharged_power_generator::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_omnotron_overcharged_power_generator::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_omnotron_flamethrower : public SpellScript
{
PrepareSpellScript(spell_omnotron_flamethrower);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.size() >= 2)
@@ -1622,7 +1592,7 @@ class spell_omnotron_flamethrower : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104);
OnObjectAreaTargetSelect.Register(&spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+1 -3
View File
@@ -208,8 +208,6 @@ class spell_egg_event : public SpellScriptLoader
class spell_egg_eventSpellScript : public SpellScript
{
PrepareSpellScript(spell_egg_eventSpellScript);
void HandleOnHit()
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -218,7 +216,7 @@ class spell_egg_event : public SpellScriptLoader
void Register() override
{
OnHit += SpellHitFn(spell_egg_eventSpellScript::HandleOnHit);
OnHit.Register(&spell_egg_eventSpellScript::HandleOnHit);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+1 -3
View File
@@ -252,8 +252,6 @@ public:
class spell_vael_burning_adrenaline_AuraScript : public AuraScript
{
PrepareAuraScript(spell_vael_burning_adrenaline_AuraScript);
void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
//The tooltip says the on death the AoE occurs. According to information: http://qaliaresponse.stage.lithium.com/t5/WoW-Mayhem/Surviving-Burning-Adrenaline-For-tanks/td-p/48609
@@ -264,7 +262,7 @@ public:
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_vael_burning_adrenaline_AuraScript::OnAuraRemoveHandler, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_vael_burning_adrenaline_AuraScript::OnAuraRemoveHandler, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+1 -3
View File
@@ -131,8 +131,6 @@ class spell_baron_geddon_inferno : public SpellScriptLoader
class spell_baron_geddon_inferno_AuraScript : public AuraScript
{
PrepareAuraScript(spell_baron_geddon_inferno_AuraScript);
void OnPeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -142,7 +140,7 @@ class spell_baron_geddon_inferno : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_baron_geddon_inferno_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_baron_geddon_inferno_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+2 -4
View File
@@ -127,8 +127,6 @@ class spell_shazzrah_gate_dummy : public SpellScriptLoader
class spell_shazzrah_gate_dummy_SpellScript : public SpellScript
{
PrepareSpellScript(spell_shazzrah_gate_dummy_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAZZRAH_GATE });
@@ -156,8 +154,8 @@ class spell_shazzrah_gate_dummy : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_shazzrah_gate_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_shazzrah_gate_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_shazzrah_gate_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_shazzrah_gate_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp
+4 -8
View File
@@ -377,8 +377,6 @@ class spell_ripsnarl_go_for_the_throat_targeting : public SpellScriptLoader
class spell_ripsnarl_go_for_the_throat_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_ripsnarl_go_for_the_throat_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -400,8 +398,8 @@ class spell_ripsnarl_go_for_the_throat_targeting : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ripsnarl_go_for_the_throat_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_ripsnarl_go_for_the_throat_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_ripsnarl_go_for_the_throat_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_ripsnarl_go_for_the_throat_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -418,8 +416,6 @@ class spell_ripsnarl_summon_vapor_targeting : public SpellScriptLoader
class spell_ripsnarl_summon_vapor_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_ripsnarl_summon_vapor_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -448,8 +444,8 @@ class spell_ripsnarl_summon_vapor_targeting : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ripsnarl_summon_vapor_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_ripsnarl_summon_vapor_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_ripsnarl_summon_vapor_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_ripsnarl_summon_vapor_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp
+3 -7
View File
@@ -284,8 +284,6 @@ class spell_cookie_throw_food_targeting : public SpellScriptLoader
class spell_cookie_throw_food_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_cookie_throw_food_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -302,8 +300,8 @@ class spell_cookie_throw_food_targeting : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_cookie_throw_food_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_cookie_throw_food_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_cookie_throw_food_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_cookie_throw_food_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -320,8 +318,6 @@ class spell_cookie_satiated : public SpellScriptLoader
class spell_cookie_satiated_SpellScript : public SpellScript
{
PrepareSpellScript(spell_cookie_satiated_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -340,7 +336,7 @@ class spell_cookie_satiated : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_cookie_satiated_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_cookie_satiated_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp
+5 -11
View File
@@ -461,8 +461,6 @@ class spell_foe_reaper_5000_acquire_target : public SpellScriptLoader
class spell_foe_reaper_5000_acquire_target_SpellScript : public SpellScript
{
PrepareSpellScript(spell_foe_reaper_5000_acquire_target_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -479,8 +477,8 @@ class spell_foe_reaper_5000_acquire_target : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_foe_reaper_5000_acquire_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_foe_reaper_5000_acquire_target_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_foe_reaper_5000_acquire_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_foe_reaper_5000_acquire_target_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -512,8 +510,6 @@ class spell_foe_reaper_5000_fixate_targeting : public SpellScriptLoader
class spell_foe_reaper_5000_fixate_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_foe_reaper_5000_fixate_targeting_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -535,8 +531,8 @@ class spell_foe_reaper_5000_fixate_targeting : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_foe_reaper_5000_fixate_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_foe_reaper_5000_fixate_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_foe_reaper_5000_fixate_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_foe_reaper_5000_fixate_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -553,8 +549,6 @@ class spell_foe_reaper_5000_fixate : public SpellScriptLoader
class spell_foe_reaper_5000_fixate_SpellScript : public SpellScript
{
PrepareSpellScript(spell_foe_reaper_5000_fixate_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FIXATE_TAUNT });
@@ -568,7 +562,7 @@ class spell_foe_reaper_5000_fixate : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_foe_reaper_5000_fixate_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_foe_reaper_5000_fixate_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp
+2 -4
View File
@@ -345,8 +345,6 @@ private:
class spell_glubtok_blossom_targeting : public SpellScript
{
PrepareSpellScript(spell_glubtok_blossom_targeting);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -385,8 +383,8 @@ class spell_glubtok_blossom_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_glubtok_blossom_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_glubtok_blossom_targeting::HandleBlossomEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnObjectAreaTargetSelect.Register(&spell_glubtok_blossom_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_glubtok_blossom_targeting::HandleBlossomEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
+14 -36
View File
@@ -573,8 +573,6 @@ private:
class spell_helix_throw_bomb_targeting : public SpellScript
{
PrepareSpellScript(spell_helix_throw_bomb_targeting);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -591,15 +589,13 @@ class spell_helix_throw_bomb_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_helix_throw_bomb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_helix_throw_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_helix_throw_bomb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_helix_throw_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_helix_sticky_bomb_periodic_trigger : public AuraScript
{
PrepareAuraScript(spell_helix_sticky_bomb_periodic_trigger);
void HandleTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -623,14 +619,12 @@ class spell_helix_sticky_bomb_periodic_trigger : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_helix_sticky_bomb_periodic_trigger::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_helix_sticky_bomb_periodic_trigger::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_helix_oaf_grab_targeting : public SpellScript
{
PrepareSpellScript(spell_helix_oaf_grab_targeting);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -647,15 +641,13 @@ class spell_helix_oaf_grab_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_helix_oaf_grab_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_helix_oaf_grab_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_helix_oaf_grab_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_helix_oaf_grab_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_helix_force_player_to_ride_oaf : public SpellScript
{
PrepareSpellScript(spell_helix_force_player_to_ride_oaf);
void HandleHit(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -664,14 +656,12 @@ class spell_helix_force_player_to_ride_oaf : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_helix_force_player_to_ride_oaf::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_helix_force_player_to_ride_oaf::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_helix_oaf_smash : public SpellScript
{
PrepareSpellScript(spell_helix_oaf_smash);
void HandleLaunch(SpellEffIndex effIndex)
{
// We do our own knockback here because the boss is immune to knockback effects
@@ -696,14 +686,12 @@ class spell_helix_oaf_smash : public SpellScript
void Register()
{
OnEffectLaunch += SpellEffectFn(spell_helix_oaf_smash::HandleLaunch, EFFECT_0, SPELL_EFFECT_KNOCK_BACK);
OnEffectLaunch.Register(&spell_helix_oaf_smash::HandleLaunch, EFFECT_0, SPELL_EFFECT_KNOCK_BACK);
}
};
class spell_helix_helix_ride : public AuraScript
{
PrepareAuraScript(spell_helix_helix_ride);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE);
@@ -711,14 +699,12 @@ class spell_helix_helix_ride : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_helix_helix_ride::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_helix_helix_ride::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_helix_ride_face_targeting : public SpellScript
{
PrepareSpellScript(spell_helix_ride_face_targeting);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -771,15 +757,13 @@ class spell_helix_ride_face_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_helix_ride_face_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_helix_ride_face_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_helix_ride_face_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_helix_ride_face_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_helix_helix_ride_face_timer_aura : public AuraScript
{
PrepareAuraScript(spell_helix_helix_ride_face_timer_aura);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -816,14 +800,12 @@ class spell_helix_helix_ride_face_timer_aura : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_helix_helix_ride_face_timer_aura::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_helix_helix_ride_face_timer_aura::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_helix_chest_bomb_emote : public SpellScript
{
PrepareSpellScript(spell_helix_chest_bomb_emote);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -834,14 +816,12 @@ class spell_helix_chest_bomb_emote : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_helix_chest_bomb_emote::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_helix_chest_bomb_emote::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_helix_chest_bomb : public AuraScript
{
PrepareAuraScript(spell_helix_chest_bomb);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CHEST_BOMB_DAMAGE });
@@ -855,14 +835,12 @@ class spell_helix_chest_bomb : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_helix_chest_bomb::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_helix_chest_bomb::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_helix_ride_vehicle : public AuraScript
{
PrepareAuraScript(spell_helix_ride_vehicle);
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE);
@@ -870,7 +848,7 @@ class spell_helix_ride_vehicle : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_helix_ride_vehicle::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_helix_ride_vehicle::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
+2 -4
View File
@@ -704,8 +704,6 @@ class spell_vanessa_backslash_targeting : public SpellScriptLoader
class spell_vanessa_backslash_targeting_SpellScript : public SpellScript
{
PrepareSpellScript(spell_vanessa_backslash_targeting_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_BACKSLASH });
@@ -727,8 +725,8 @@ class spell_vanessa_backslash_targeting : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_vanessa_backslash_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_vanessa_backslash_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_vanessa_backslash_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_vanessa_backslash_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+4 -12
View File
@@ -562,8 +562,6 @@ class go_deadmines_defias_cannon : public GameObjectScript
class spell_deadmines_on_fire : public AuraScript
{
PrepareAuraScript(spell_deadmines_on_fire);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_EXPLOSIVE_SUICIDE });
@@ -576,7 +574,7 @@ class spell_deadmines_on_fire : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_deadmines_on_fire::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE_PERCENT, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_deadmines_on_fire::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE_PERCENT, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -587,8 +585,6 @@ class spell_deadmines_ride_magma_vehicle : public SpellScriptLoader
class spell_deadmines_ride_magma_vehicle_SpellScript : public SpellScript
{
PrepareSpellScript(spell_deadmines_ride_magma_vehicle_SpellScript);
void HandleHit(SpellEffIndex effIndex)
{
Unit* target = GetHitUnit();
@@ -597,7 +593,7 @@ class spell_deadmines_ride_magma_vehicle : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_deadmines_ride_magma_vehicle_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_deadmines_ride_magma_vehicle_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -615,8 +611,6 @@ class spell_deadmines_magma_trap_throw_to_location : public SpellScriptLoader
class spell_deadmines_magma_trap_throw_to_location_SpellScript : public SpellScript
{
PrepareSpellScript(spell_deadmines_magma_trap_throw_to_location_SpellScript);
void HandleScript(SpellEffIndex /*effIndex*/)
{
if (GetHitDest())
@@ -625,7 +619,7 @@ class spell_deadmines_magma_trap_throw_to_location : public SpellScriptLoader
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_deadmines_magma_trap_throw_to_location_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_JUMP_DEST);
OnEffectLaunch.Register(&spell_deadmines_magma_trap_throw_to_location_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_JUMP_DEST);
}
};
@@ -642,8 +636,6 @@ class spell_deadmines_bloodbath : public SpellScriptLoader
class spell_deadmines_bloodbath_AuraScript : public AuraScript
{
PrepareAuraScript(spell_deadmines_bloodbath_AuraScript);
void HandleTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -654,7 +646,7 @@ class spell_deadmines_bloodbath : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_deadmines_bloodbath_AuraScript::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_deadmines_bloodbath_AuraScript::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp
+7 -19
View File
@@ -198,8 +198,6 @@ Position const CynthiaEscapePos[] =
class spell_gilneas_quest_save_the_children : public SpellScript
{
PrepareSpellScript(spell_gilneas_quest_save_the_children);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_GILNEAS_QUEST_SAVE_JAMES });
@@ -221,9 +219,9 @@ class spell_gilneas_quest_save_the_children : public SpellScript
void Register() override
{
if (m_scriptSpellId == SPELL_GILNEAS_QUEST_SAVE_JAMES)
OnEffectHitTarget += SpellEffectFn(spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
else
OnEffectHitTarget += SpellEffectFn(spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
@@ -482,8 +480,6 @@ private:
class spell_gilneas_launch : public SpellScript
{
PrepareSpellScript(spell_gilneas_launch);
void TransferDestination(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -494,7 +490,7 @@ class spell_gilneas_launch : public SpellScript
void Register()
{
OnEffectLaunch += SpellEffectFn(spell_gilneas_launch::TransferDestination, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectLaunch.Register(&spell_gilneas_launch::TransferDestination, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -517,8 +513,6 @@ class FireBoulderInFrontCheck
class spell_gilneas_fiery_boulder : public SpellScript
{
PrepareSpellScript(spell_gilneas_fiery_boulder);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -534,7 +528,7 @@ class spell_gilneas_fiery_boulder : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gilneas_fiery_boulder::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_gilneas_fiery_boulder::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
@@ -559,8 +553,6 @@ Position const AttackMastiffSummonPositions[] =
class spell_gilneas_call_attack_mastiff : public SpellScript
{
PrepareSpellScript(spell_gilneas_call_attack_mastiff);
void HandleHit(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -573,14 +565,12 @@ class spell_gilneas_call_attack_mastiff : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gilneas_call_attack_mastiff::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_gilneas_call_attack_mastiff::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_gilneas_forcecast_cataclysm_1 : public SpellScript
{
PrepareSpellScript(spell_gilneas_forcecast_cataclysm_1);
void HandleForcecast(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -590,7 +580,7 @@ class spell_gilneas_forcecast_cataclysm_1 : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gilneas_forcecast_cataclysm_1::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_gilneas_forcecast_cataclysm_1::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -617,8 +607,6 @@ private:
class spell_gilneas_worgen_intro_completion : public SpellScript
{
PrepareSpellScript(spell_gilneas_worgen_intro_completion);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -629,7 +617,7 @@ class spell_gilneas_worgen_intro_completion : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gilneas_worgen_intro_completion::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_gilneas_worgen_intro_completion::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+2 -4
View File
@@ -553,8 +553,6 @@ class spell_collecting_fallout : public SpellScriptLoader
class spell_collecting_fallout_SpellScript : public SpellScript
{
PrepareSpellScript(spell_collecting_fallout_SpellScript);
void OnLaunch(SpellEffIndex effIndex)
{
// estimated 25% chance of success
@@ -572,8 +570,8 @@ class spell_collecting_fallout : public SpellScriptLoader
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_collecting_fallout_SpellScript::OnLaunch, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL);
OnEffectLaunch += SpellEffectFn(spell_collecting_fallout_SpellScript::HandleFail, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
OnEffectLaunch.Register(&spell_collecting_fallout_SpellScript::OnLaunch, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL);
OnEffectLaunch.Register(&spell_collecting_fallout_SpellScript::HandleFail, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
}
bool _spellFail = true;
src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
+2 -6
View File
@@ -506,8 +506,6 @@ private:
class spell_drahga_burning_shadowbolt : public SpellScript
{
PrepareSpellScript(spell_drahga_burning_shadowbolt);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_BURNING_SHADOWBOLT_DUMMY });
@@ -521,14 +519,12 @@ class spell_drahga_burning_shadowbolt : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_drahga_burning_shadowbolt::CastDummySpell, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_drahga_burning_shadowbolt::CastDummySpell, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_drahga_devouring_flames : public SpellScript
{
PrepareSpellScript(spell_drahga_devouring_flames);
void ChangeDamage()
{
if (Unit* caster = GetCaster())
@@ -542,7 +538,7 @@ class spell_drahga_devouring_flames : public SpellScript
void Register() override
{
OnHit += SpellHitFn(spell_drahga_devouring_flames::ChangeDamage);
OnHit.Register(&spell_drahga_devouring_flames::ChangeDamage);
}
};
src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
+7 -17
View File
@@ -423,8 +423,6 @@ private:
class spell_erudax_shadow_gale_trigger : public SpellScript
{
PrepareSpellScript(spell_erudax_shadow_gale_trigger);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_SHADOW_GALE_STALKER });
@@ -437,14 +435,12 @@ class spell_erudax_shadow_gale_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_erudax_shadow_gale_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_erudax_shadow_gale_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_erudax_shadow_gale : public SpellScript
{
PrepareSpellScript(spell_erudax_shadow_gale);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -465,15 +461,13 @@ class spell_erudax_shadow_gale : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_shadow_gale::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_shadow_gale::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_erudax_shadow_gale::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_erudax_shadow_gale::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_erudax_shadow_gale_aura : public SpellScript
{
PrepareSpellScript(spell_erudax_shadow_gale_aura);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -487,14 +481,12 @@ class spell_erudax_shadow_gale_aura : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_shadow_gale_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_erudax_shadow_gale_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_erudax_twilight_corruption : public SpellScript
{
PrepareSpellScript(spell_erudax_twilight_corruption);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -508,14 +500,12 @@ class spell_erudax_twilight_corruption : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_twilight_corruption::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_erudax_twilight_corruption::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_erudax_twilight_corruption_AuraScript : public AuraScript
{
PrepareAuraScript(spell_erudax_twilight_corruption_AuraScript);
void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -552,8 +542,8 @@ class spell_erudax_twilight_corruption_AuraScript : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_erudax_twilight_corruption_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectRemove += AuraEffectRemoveFn(spell_erudax_twilight_corruption_AuraScript::OnAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_erudax_twilight_corruption_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectRemove.Register(&spell_erudax_twilight_corruption_AuraScript::OnAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp
+19 -43
View File
@@ -334,8 +334,6 @@ class spell_throngus_mighty_stomp : public SpellScriptLoader
class spell_throngus_mighty_stomp_SpellScript : public SpellScript
{
PrepareSpellScript(spell_throngus_mighty_stomp_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -353,8 +351,8 @@ class spell_throngus_mighty_stomp : public SpellScriptLoader
void Register()
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_mighty_stomp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_throngus_mighty_stomp_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_throngus_mighty_stomp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_throngus_mighty_stomp_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -371,8 +369,6 @@ class spell_throngus_pick_weapon : public SpellScriptLoader
class spell_throngus_pick_weapon_SpellScript : public SpellScript
{
PrepareSpellScript(spell_throngus_pick_weapon_SpellScript);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (GetCaster()->GetEntry() == BOSS_FORGEMASTER_THRONGUS)
@@ -381,7 +377,7 @@ class spell_throngus_pick_weapon : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_throngus_pick_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_throngus_pick_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -398,8 +394,6 @@ class spell_throngus_flame_arrow_barrage : public SpellScriptLoader
class spell_throngus_flame_arrow_barrage_SpellScript : public SpellScript
{
PrepareSpellScript(spell_throngus_flame_arrow_barrage_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -417,8 +411,8 @@ class spell_throngus_flame_arrow_barrage : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_flame_arrow_barrage_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_throngus_flame_arrow_barrage_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_throngus_flame_arrow_barrage_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_throngus_flame_arrow_barrage_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -435,8 +429,6 @@ class spell_throngus_flaming_arrow : public SpellScriptLoader
class spell_throngus_flaming_arrow_SpellScript : public SpellScript
{
PrepareSpellScript(spell_throngus_flaming_arrow_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -447,7 +439,7 @@ class spell_throngus_flaming_arrow : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_flaming_arrow_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_throngus_flaming_arrow_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -464,8 +456,6 @@ class spell_throngus_personal_phalanx : public SpellScriptLoader
class spell_throngus_personal_phalanx_AuraScript : public AuraScript
{
PrepareAuraScript(spell_throngus_personal_phalanx_AuraScript);
void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -490,8 +480,8 @@ class spell_throngus_personal_phalanx : public SpellScriptLoader
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_throngus_personal_phalanx_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_personal_phalanx_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_throngus_personal_phalanx_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_throngus_personal_phalanx_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -508,8 +498,6 @@ class spell_throngus_personal_phalanx_aoe : public SpellScriptLoader
class spell_throngus_personal_phalanx_aoe_SpellScript : public SpellScript
{
PrepareSpellScript(spell_throngus_personal_phalanx_aoe_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -526,8 +514,8 @@ class spell_throngus_personal_phalanx_aoe : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_personal_phalanx_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_throngus_personal_phalanx_aoe_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_throngus_personal_phalanx_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_throngus_personal_phalanx_aoe_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -544,8 +532,6 @@ class spell_throngus_fixate_effect : public SpellScriptLoader
class spell_throngus_fixate_effect_SpellScript : public SpellScript
{
PrepareSpellScript(spell_throngus_fixate_effect_SpellScript);
void HandleHit(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -554,7 +540,7 @@ class spell_throngus_fixate_effect : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_throngus_fixate_effect_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_throngus_fixate_effect_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
@@ -571,8 +557,6 @@ class spell_throngus_burning_dual_blades : public SpellScriptLoader
class spell_throngus_burning_dual_blades_AuraScript : public AuraScript
{
PrepareAuraScript(spell_throngus_burning_dual_blades_AuraScript);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -591,8 +575,8 @@ class spell_throngus_burning_dual_blades : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_throngus_burning_dual_blades_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_burning_dual_blades_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_throngus_burning_dual_blades_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_throngus_burning_dual_blades_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -609,8 +593,6 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader
class spell_throngus_disorienting_roar_SpellScript : public SpellScript
{
PrepareSpellScript(spell_throngus_disorienting_roar_SpellScript);
void HandleHeroicDifficulty()
{
if (Unit* target = GetHitUnit())
@@ -621,7 +603,7 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader
void Register() override
{
AfterHit += SpellHitFn(spell_throngus_disorienting_roar_SpellScript::HandleHeroicDifficulty);
AfterHit.Register(&spell_throngus_disorienting_roar_SpellScript::HandleHeroicDifficulty);
}
};
@@ -632,8 +614,6 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader
class spell_throngus_disorienting_roar_AuraScript : public AuraScript
{
PrepareAuraScript(spell_throngus_disorienting_roar_AuraScript);
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
if (Aura* aura = GetAura())
@@ -652,7 +632,7 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_throngus_disorienting_roar_AuraScript::CheckProc);
DoCheckProc.Register(&spell_throngus_disorienting_roar_AuraScript::CheckProc);
}
};
@@ -669,8 +649,6 @@ class spell_throngus_encumbered : public SpellScriptLoader
class spell_throngus_encumbered_AuraScript : public AuraScript
{
PrepareAuraScript(spell_throngus_encumbered_AuraScript);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, WEAPON_MODEL_MACE);
@@ -683,8 +661,8 @@ class spell_throngus_encumbered : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_throngus_encumbered_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_encumbered_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_throngus_encumbered_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_throngus_encumbered_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -701,8 +679,6 @@ class spell_throngus_impaling_slam : public SpellScriptLoader
class spell_throngus_impaling_slam_AuraScript : public AuraScript
{
PrepareAuraScript(spell_throngus_impaling_slam_AuraScript);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* caster = GetCaster())
@@ -719,8 +695,8 @@ class spell_throngus_impaling_slam : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_throngus_impaling_slam_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_impaling_slam_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_throngus_impaling_slam_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_throngus_impaling_slam_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp
+5 -11
View File
@@ -309,8 +309,6 @@ private:
class spell_umbriss_summon_blitz_trigger : public SpellScript
{
PrepareSpellScript(spell_umbriss_summon_blitz_trigger);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -332,15 +330,13 @@ class spell_umbriss_summon_blitz_trigger : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_umbriss_summon_blitz_trigger::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_umbriss_summon_blitz_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_umbriss_summon_blitz_trigger::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_umbriss_summon_blitz_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
class spell_umbriss_summon_ground_siege_trigger : public SpellScript
{
PrepareSpellScript(spell_umbriss_summon_ground_siege_trigger);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -357,15 +353,13 @@ class spell_umbriss_summon_ground_siege_trigger : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_umbriss_summon_ground_siege_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_umbriss_summon_ground_siege_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_umbriss_summon_ground_siege_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_umbriss_summon_ground_siege_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
class spell_umbriss_bleeding_wound : public AuraScript
{
PrepareAuraScript(spell_umbriss_bleeding_wound);
void HandleRemoval(AuraEffect const* aurEff)
{
if (Unit* owner = GetOwner()->ToUnit())
@@ -375,7 +369,7 @@ class spell_umbriss_bleeding_wound : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_umbriss_bleeding_wound::HandleRemoval, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_umbriss_bleeding_wound::HandleRemoval, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
}
};
src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp
+1 -3
View File
@@ -280,8 +280,6 @@ private:
class spell_grim_batol_engulfing_flames : public SpellScript
{
PrepareSpellScript(spell_grim_batol_engulfing_flames);
void HandleEffect(SpellEffIndex /*effIndex*/)
{
if (Creature* creature = GetHitCreature())
@@ -290,7 +288,7 @@ class spell_grim_batol_engulfing_flames : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_grim_batol_engulfing_flames::HandleEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_grim_batol_engulfing_flames::HandleEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+1 -3
View File
@@ -392,8 +392,6 @@ class spell_rain_of_bones : public SpellScriptLoader
class spell_rain_of_bones_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rain_of_bones_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_SKELETON });
@@ -407,7 +405,7 @@ class spell_rain_of_bones : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_rain_of_bones_AuraScript::OnTrigger, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_rain_of_bones_AuraScript::OnTrigger, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+1 -3
View File
@@ -483,8 +483,6 @@ private:
class spell_felblood_kaelthas_flame_strike : public AuraScript
{
PrepareAuraScript(spell_felblood_kaelthas_flame_strike);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FLAME_STRIKE_DAMAGE });
@@ -498,7 +496,7 @@ class spell_felblood_kaelthas_flame_strike : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_felblood_kaelthas_flame_strike::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_felblood_kaelthas_flame_strike::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave_chapter_1.cpp
+1 -3
View File
@@ -1039,8 +1039,6 @@ enum GiftOfTheHarvester
class spell_gift_of_the_harvester : public SpellScript
{
PrepareSpellScript(spell_gift_of_the_harvester);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1061,7 +1059,7 @@ class spell_gift_of_the_harvester : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gift_of_the_harvester::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_gift_of_the_harvester::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+2 -6
View File
@@ -169,8 +169,6 @@ class spell_shadow_portal : public SpellScriptLoader
class spell_shadow_portal_SpellScript : public SpellScript
{
PrepareSpellScript(spell_shadow_portal_SpellScript);
public:
spell_shadow_portal_SpellScript()
{
@@ -235,7 +233,7 @@ class spell_shadow_portal : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_shadow_portal_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_shadow_portal_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY);
}
InstanceScript* _instance;
@@ -298,8 +296,6 @@ class spell_shadow_portal_rooms : public SpellScriptLoader
class spell_shadow_portal_rooms_SpellScript : public SpellScript
{
PrepareSpellScript(spell_shadow_portal_rooms_SpellScript);
bool Load() override
{
_instance = GetCaster()->GetInstanceScript();
@@ -370,7 +366,7 @@ class spell_shadow_portal_rooms : public SpellScriptLoader
void Register() override
{
OnEffectHit += SpellEffectFn(spell_shadow_portal_rooms_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT);
OnEffectHit.Register(&spell_shadow_portal_rooms_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT);
}
InstanceScript* _instance = nullptr;
src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+3 -7
View File
@@ -150,8 +150,6 @@ class spell_kormok_summon_bone_mages : SpellScriptLoader
class spell_kormok_summon_bone_magesSpellScript : public SpellScript
{
PrepareSpellScript(spell_kormok_summon_bone_magesSpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(SummonMageSpells);
@@ -166,7 +164,7 @@ class spell_kormok_summon_bone_mages : SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kormok_summon_bone_magesSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_kormok_summon_bone_magesSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -184,9 +182,7 @@ class spell_kormok_summon_bone_minions : SpellScriptLoader
class spell_kormok_summon_bone_minionsSpellScript : public SpellScript
{
PrepareSpellScript(spell_kormok_summon_bone_minionsSpellScript);
bool Validate(SpellInfo const* /*spell*/) override
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_BONE_MINIONS });
}
@@ -202,7 +198,7 @@ class spell_kormok_summon_bone_minions : SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kormok_summon_bone_minionsSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_kormok_summon_bone_minionsSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+8 -20
View File
@@ -402,8 +402,6 @@ class spell_apothecary_lingering_fumes : public SpellScriptLoader
class spell_apothecary_lingering_fumes_SpellScript : public SpellScript
{
PrepareSpellScript(spell_apothecary_lingering_fumes_SpellScript);
void HandleAfterCast()
{
Unit* caster = GetCaster();
@@ -425,8 +423,8 @@ class spell_apothecary_lingering_fumes : public SpellScriptLoader
void Register() override
{
AfterCast += SpellCastFn(spell_apothecary_lingering_fumes_SpellScript::HandleAfterCast);
OnEffectHitTarget += SpellEffectFn(spell_apothecary_lingering_fumes_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast.Register(&spell_apothecary_lingering_fumes_SpellScript::HandleAfterCast);
OnEffectHitTarget.Register(&spell_apothecary_lingering_fumes_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -444,8 +442,6 @@ class spell_apothecary_validate_area : public SpellScriptLoader
class spell_apothecary_validate_area_SpellScript : public SpellScript
{
PrepareSpellScript(spell_apothecary_validate_area_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_BUNNY_LOCKDOWN));
@@ -466,8 +462,8 @@ class spell_apothecary_validate_area : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_apothecary_validate_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_apothecary_validate_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_apothecary_validate_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_apothecary_validate_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -485,8 +481,6 @@ class spell_apothecary_throw_cologne : public SpellScriptLoader
class spell_apothecary_throw_cologne_SpellScript : public SpellScript
{
PrepareSpellScript(spell_apothecary_throw_cologne_SpellScript);
void HandleScript(SpellEffIndex /*effindex*/)
{
GetHitUnit()->CastSpell(GetHitUnit(), SPELL_COLOGNE_SPILL, true);
@@ -494,7 +488,7 @@ class spell_apothecary_throw_cologne : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_apothecary_throw_cologne_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_apothecary_throw_cologne_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -512,8 +506,6 @@ class spell_apothecary_throw_perfume : public SpellScriptLoader
class spell_apothecary_throw_perfume_SpellScript : public SpellScript
{
PrepareSpellScript(spell_apothecary_throw_perfume_SpellScript);
void HandleScript(SpellEffIndex /*effindex*/)
{
GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PERFUME_SPILL, true);
@@ -521,7 +513,7 @@ class spell_apothecary_throw_perfume : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_apothecary_throw_perfume_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_apothecary_throw_perfume_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -539,8 +531,6 @@ class spell_apothecary_perfume_spill : public SpellScriptLoader
class spell_apothecary_perfume_spill_AuraScript : public AuraScript
{
PrepareAuraScript(spell_apothecary_perfume_spill_AuraScript);
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
GetTarget()->CastSpell(GetTarget(), SPELL_PERFUME_SPILL_DAMAGE, true);
@@ -548,7 +538,7 @@ class spell_apothecary_perfume_spill : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_apothecary_perfume_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_apothecary_perfume_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -566,8 +556,6 @@ class spell_apothecary_cologne_spill : public SpellScriptLoader
class spell_apothecary_cologne_spill_AuraScript : public AuraScript
{
PrepareAuraScript(spell_apothecary_cologne_spill_AuraScript);
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
GetTarget()->CastSpell(GetTarget(), SPELL_COLOGNE_SPILL_DAMAGE, true);
@@ -575,7 +563,7 @@ class spell_apothecary_cologne_spill : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_apothecary_cologne_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_apothecary_cologne_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
+3 -9
View File
@@ -221,8 +221,6 @@ private:
class spell_ashbury_asphyxiate : public AuraScript
{
PrepareAuraScript(spell_ashbury_asphyxiate);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ASPHYXIATE_ROOT });
@@ -251,14 +249,12 @@ class spell_ashbury_asphyxiate : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_ashbury_asphyxiate::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_ashbury_asphyxiate::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_ashbury_pain_and_suffering : public AuraScript
{
PrepareAuraScript(spell_ashbury_pain_and_suffering);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PAIN_AND_SUFFERING_DUMMY });
@@ -276,14 +272,12 @@ class spell_ashbury_pain_and_suffering : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_ashbury_pain_and_suffering::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_ashbury_pain_and_suffering::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
class spell_ashbury_dark_archangel_form : public AuraScript
{
PrepareAuraScript(spell_ashbury_dark_archangel_form);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CALAMITY });
@@ -300,7 +294,7 @@ class spell_ashbury_dark_archangel_form : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_ashbury_dark_archangel_form::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_ashbury_dark_archangel_form::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
+2 -4
View File
@@ -546,9 +546,7 @@ public:
class spell_sfk_summon_worgen_spirit_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sfk_summon_worgen_spirit_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
@@ -583,7 +581,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_sfk_summon_worgen_spirit_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_sfk_summon_worgen_spirit_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
+3 -11
View File
@@ -408,10 +408,6 @@ class spell_sfk_forsaken_ability : public SpellScriptLoader
class spell_sfk_forsaken_ability_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sfk_forsaken_ability_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -451,7 +447,7 @@ class spell_sfk_forsaken_ability : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_sfk_forsaken_ability_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_sfk_forsaken_ability_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -468,8 +464,6 @@ public:
class spell_sfk_unholy_power_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sfk_unholy_power_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -498,7 +492,7 @@ public:
void Register() override
{
AfterHit += SpellHitFn(spell_sfk_unholy_power_SpellScript::HandleStacks);
AfterHit.Register(&spell_sfk_unholy_power_SpellScript::HandleStacks);
}
};
@@ -515,8 +509,6 @@ public:
class spell_sfk_unholy_empowerment_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sfk_unholy_empowerment_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -549,7 +541,7 @@ public:
void Register() override
{
AfterHit += SpellHitFn(spell_sfk_unholy_empowerment_SpellScript::HandleStacks);
AfterHit.Register(&spell_sfk_unholy_empowerment_SpellScript::HandleStacks);
}
};
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
+6 -14
View File
@@ -247,8 +247,6 @@ private:
class spell_godfrey_summon_bloodthirsty_ghouls : public AuraScript
{
PrepareAuraScript(spell_godfrey_summon_bloodthirsty_ghouls);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -267,7 +265,7 @@ class spell_godfrey_summon_bloodthirsty_ghouls : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_godfrey_summon_bloodthirsty_ghouls::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_godfrey_summon_bloodthirsty_ghouls::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
private:
bool _useLeftGun = true;
@@ -275,8 +273,6 @@ private:
class spell_godfrey_pistol_barrage : public AuraScript
{
PrepareAuraScript(spell_godfrey_pistol_barrage);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -318,9 +314,9 @@ class spell_godfrey_pistol_barrage : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_godfrey_pistol_barrage::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_godfrey_pistol_barrage::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_godfrey_pistol_barrage::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
AfterEffectApply.Register(&spell_godfrey_pistol_barrage::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_godfrey_pistol_barrage::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_godfrey_pistol_barrage::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
private:
bool _useLeftGun = true;
@@ -328,8 +324,6 @@ private:
class spell_godfrey_pistol_barrage_aoe : public SpellScript
{
PrepareSpellScript(spell_godfrey_pistol_barrage_aoe);
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, 1);
@@ -337,14 +331,12 @@ class spell_godfrey_pistol_barrage_aoe : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_godfrey_pistol_barrage_aoe::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_godfrey_pistol_barrage_aoe::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_godfrey_cursed_bullets : public AuraScript
{
PrepareAuraScript(spell_godfrey_cursed_bullets);
void OnPeriodic(AuraEffect const* aurEff)
{
if (aurEff->GetTickNumber() == 1)
@@ -355,7 +347,7 @@ class spell_godfrey_cursed_bullets : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_godfrey_cursed_bullets::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_godfrey_cursed_bullets::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
}
private:
uint32 _baseDamage = 0;
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
+5 -15
View File
@@ -221,8 +221,6 @@ struct boss_lord_walden : public BossAI
class spell_walden_toxic_coagulent : public AuraScript
{
PrepareAuraScript(spell_walden_toxic_coagulent);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FULLY_COAGULATED });
@@ -239,14 +237,12 @@ class spell_walden_toxic_coagulent : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_walden_toxic_coagulent::AfterApply, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectApply.Register(&spell_walden_toxic_coagulent::AfterApply, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
class spell_walden_conjure_poisonous_mixture : public SpellScript
{
PrepareSpellScript(spell_walden_conjure_poisonous_mixture);
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, 1);
@@ -254,14 +250,12 @@ class spell_walden_conjure_poisonous_mixture : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_walden_conjure_poisonous_mixture::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_walden_conjure_poisonous_mixture::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
class spell_walden_ice_shards : public AuraScript
{
PrepareAuraScript(spell_walden_ice_shards);
void HandleEffectPeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -276,14 +270,12 @@ class spell_walden_ice_shards : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_walden_ice_shards::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_walden_ice_shards::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_walden_conjure_mystery_toxin : public SpellScript
{
PrepareSpellScript(spell_walden_conjure_mystery_toxin);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, 4.58f, 0.0f });
@@ -291,14 +283,12 @@ class spell_walden_conjure_mystery_toxin : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_walden_conjure_mystery_toxin::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_walden_conjure_mystery_toxin::SetDest, EFFECT_0, TARGET_DEST_CASTER);
}
};
class spell_walden_toxic_catalyst : public SpellScript
{
PrepareSpellScript(spell_walden_toxic_catalyst);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if([](WorldObject* obj)->bool
@@ -310,7 +300,7 @@ class spell_walden_toxic_catalyst : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_walden_toxic_catalyst::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_walden_toxic_catalyst::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+1 -3
View File
@@ -54,8 +54,6 @@ enum SKShieldOfBones
class spell_sfk_shield_of_bones : public AuraScript
{
PrepareAuraScript(spell_sfk_shield_of_bones);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHIELD_OF_BONES_TRIGGERED });
@@ -70,7 +68,7 @@ class spell_sfk_shield_of_bones : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_sfk_shield_of_bones::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_sfk_shield_of_bones::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+2 -4
View File
@@ -303,8 +303,6 @@ public:
class spell_ysida_saved_credit : public SpellScript
{
PrepareSpellScript(spell_ysida_saved_credit);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_YSIDA_SAVED });
@@ -329,8 +327,8 @@ class spell_ysida_saved_credit : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ysida_saved_credit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_ysida_saved_credit::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_ysida_saved_credit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_ysida_saved_credit::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+9 -19
View File
@@ -597,8 +597,6 @@ class go_kalecgos_spectral_rift : public GameObjectScript
// 46732 - Tap Check
class spell_kalecgos_tap_check : public SpellScript
{
PrepareSpellScript(spell_kalecgos_tap_check);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_0].CalcValue()) });
@@ -611,7 +609,7 @@ class spell_kalecgos_tap_check : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kalecgos_tap_check::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_kalecgos_tap_check::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -632,8 +630,6 @@ class SpectralBlastSelector : NonTankTargetSelector
// 44869 - Spectral Blast
class spell_kalecgos_spectral_blast : public SpellScript
{
PrepareSpellScript(spell_kalecgos_spectral_blast);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -661,16 +657,14 @@ class spell_kalecgos_spectral_blast : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kalecgos_spectral_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_kalecgos_spectral_blast::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_kalecgos_spectral_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_kalecgos_spectral_blast::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 44811 - Spectral Realm
class spell_kalecgos_spectral_realm_trigger : public SpellScript
{
PrepareSpellScript(spell_kalecgos_spectral_realm_trigger);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -693,15 +687,13 @@ class spell_kalecgos_spectral_realm_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kalecgos_spectral_realm_trigger::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_kalecgos_spectral_realm_trigger::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 46021 - Spectral Realm
class spell_kalecgos_spectral_realm_aura : public AuraScript
{
PrepareAuraScript(spell_kalecgos_spectral_realm_aura);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -722,15 +714,13 @@ class spell_kalecgos_spectral_realm_aura : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_kalecgos_spectral_realm_aura::OnRemove, EFFECT_0, SPELL_AURA_MOD_INVISIBILITY_DETECT, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_kalecgos_spectral_realm_aura::OnRemove, EFFECT_0, SPELL_AURA_MOD_INVISIBILITY_DETECT, AURA_EFFECT_HANDLE_REAL);
}
};
// 45032, 45034 - Curse of Boundless Agony
class spell_kalecgos_curse_of_boundless_agony : public AuraScript
{
PrepareAuraScript(spell_kalecgos_curse_of_boundless_agony);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -775,10 +765,10 @@ class spell_kalecgos_curse_of_boundless_agony : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_kalecgos_curse_of_boundless_agony::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_kalecgos_curse_of_boundless_agony::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_kalecgos_curse_of_boundless_agony::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
AfterEffectRemove += AuraEffectRemoveFn(spell_kalecgos_curse_of_boundless_agony::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_kalecgos_curse_of_boundless_agony::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_kalecgos_curse_of_boundless_agony::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectUpdatePeriodic.Register(&spell_kalecgos_curse_of_boundless_agony::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
AfterEffectRemove.Register(&spell_kalecgos_curse_of_boundless_agony::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+5 -15
View File
@@ -579,8 +579,6 @@ class spell_summon_blood_elves_script : SpellScriptLoader
class spell_summon_blood_elves_script_SpellScript : public SpellScript
{
PrepareSpellScript(spell_summon_blood_elves_script_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(SummonBloodElvesSpells);
@@ -594,7 +592,7 @@ class spell_summon_blood_elves_script : SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_summon_blood_elves_script_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_summon_blood_elves_script_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -611,8 +609,6 @@ class spell_muru_darkness : SpellScriptLoader
class spell_muru_darkness_SpellScript : public SpellScript
{
PrepareSpellScript(spell_muru_darkness_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(SummonDarkFiendSpells);
@@ -626,7 +622,7 @@ class spell_muru_darkness : SpellScriptLoader
void Register() override
{
AfterCast += SpellCastFn(spell_muru_darkness_SpellScript::HandleAfterCast);
AfterCast.Register(&spell_muru_darkness_SpellScript::HandleAfterCast);
}
};
@@ -643,8 +639,6 @@ class spell_dark_fiend_skin : public SpellScriptLoader
class spell_dark_fiend_skin_AuraScript : public AuraScript
{
PrepareAuraScript(spell_dark_fiend_skin_AuraScript);
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::ByEnemySpell))
@@ -662,7 +656,7 @@ class spell_dark_fiend_skin : public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_dark_fiend_skin_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dark_fiend_skin_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -679,8 +673,6 @@ class spell_transform_visual_missile_periodic : public SpellScriptLoader
class spell_transform_visual_missile_periodic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_transform_visual_missile_periodic_AuraScript);
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
GetTarget()->CastSpell(nullptr, RAND(TRANSFORM_VISUAL_MISSILE_1, TRANSFORM_VISUAL_MISSILE_2), true);
@@ -688,7 +680,7 @@ class spell_transform_visual_missile_periodic : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_transform_visual_missile_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_transform_visual_missile_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -705,8 +697,6 @@ class spell_summon_blood_elves_periodic : public SpellScriptLoader
class spell_summon_blood_elves_periodic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_summon_blood_elves_periodic_AuraScript);
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
GetTarget()->CastSpell(nullptr, SPELL_SUMMON_BLOOD_ELVES_SCRIPT, true);
@@ -714,7 +704,7 @@ class spell_summon_blood_elves_periodic : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_summon_blood_elves_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_summon_blood_elves_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp
+1 -3
View File
@@ -200,8 +200,6 @@ struct boss_commander_ulthok : public BossAI
class spell_ulthok_dark_fissure : public AuraScript
{
PrepareAuraScript(spell_ulthok_dark_fissure);
void HandlePeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -215,7 +213,7 @@ class spell_ulthok_dark_fissure : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_ulthok_dark_fissure::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_ulthok_dark_fissure::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp
+3 -7
View File
@@ -463,8 +463,6 @@ private:
class spell_nazjar_waterspout : public SpellScript
{
PrepareSpellScript(spell_nazjar_waterspout);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -473,14 +471,12 @@ class spell_nazjar_waterspout : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_nazjar_waterspout::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_nazjar_waterspout::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_nazjar_waterspout_targeting : public SpellScript
{
PrepareSpellScript(spell_nazjar_waterspout_targeting);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -510,8 +506,8 @@ class spell_nazjar_waterspout_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nazjar_waterspout_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_nazjar_waterspout_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_nazjar_waterspout_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_nazjar_waterspout_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp
+10 -24
View File
@@ -734,8 +734,6 @@ private:
class spell_ozumat_charge_to_window : public SpellScript
{
PrepareSpellScript(spell_ozumat_charge_to_window);
void SetDest(SpellDestination& dest)
{
if (Unit* caster = GetCaster())
@@ -749,14 +747,12 @@ class spell_ozumat_charge_to_window : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_charge_to_window::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
OnDestinationTargetSelect.Register(&spell_ozumat_charge_to_window::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
};
class spell_ozumat_jump_to_ground : public SpellScript
{
PrepareSpellScript(spell_ozumat_jump_to_ground);
void SetDest(SpellDestination& dest)
{
if (Unit* caster = GetCaster())
@@ -791,16 +787,14 @@ class spell_ozumat_jump_to_ground : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_jump_to_ground::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
BeforeCast += SpellCastFn(spell_ozumat_jump_to_ground::DisableHoverEffects);
AfterCast += SpellCastFn(spell_ozumat_jump_to_ground::PrepareNeptulonAttack);
OnDestinationTargetSelect.Register(&spell_ozumat_jump_to_ground::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
BeforeCast.Register(&spell_ozumat_jump_to_ground::DisableHoverEffects);
AfterCast.Register(&spell_ozumat_jump_to_ground::PrepareNeptulonAttack);
}
};
class spell_ozumat_shadow_blast : public SpellScript
{
PrepareSpellScript(spell_ozumat_shadow_blast);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, 5.0f, 0.0f });
@@ -808,14 +802,12 @@ class spell_ozumat_shadow_blast : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_shadow_blast::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_ozumat_shadow_blast::SetDest, EFFECT_0, TARGET_DEST_CASTER);
}
};
class spell_ozumat_shadow_blast_AuraScript : public AuraScript
{
PrepareAuraScript(spell_ozumat_shadow_blast_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHADOW_BLAST_MISSILE });
@@ -836,14 +828,12 @@ class spell_ozumat_shadow_blast_AuraScript : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_ozumat_shadow_blast_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_ozumat_shadow_blast_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_ozumat_shadow_blast_missile : public SpellScript
{
PrepareSpellScript(spell_ozumat_shadow_blast_missile);
void SetDest(SpellDestination& dest)
{
Unit* caster = GetCaster();
@@ -858,15 +848,13 @@ class spell_ozumat_shadow_blast_missile : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_shadow_blast_missile::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_shadow_blast_missile::SetDest, EFFECT_1, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_ozumat_shadow_blast_missile::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_ozumat_shadow_blast_missile::SetDest, EFFECT_1, TARGET_DEST_CASTER);
}
};
class spell_ozumat_blight_of_ozumat : public SpellScript
{
PrepareSpellScript(spell_ozumat_blight_of_ozumat);
void HandleHit(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -875,7 +863,7 @@ class spell_ozumat_blight_of_ozumat : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_ozumat_blight_of_ozumat::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_ozumat_blight_of_ozumat::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -892,8 +880,6 @@ class PurifyHeightCheck
class spell_ozumat_purify : public SpellScript
{
PrepareSpellScript(spell_ozumat_purify);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -904,7 +890,7 @@ class spell_ozumat_purify : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ozumat_purify::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_ozumat_purify::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp
+5 -15
View File
@@ -308,8 +308,6 @@ class InCombatCheck
class spell_tott_trigger_murloc : public SpellScript
{
PrepareSpellScript(spell_tott_trigger_murloc);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TRIGGER_MURLOC_END });
@@ -331,7 +329,7 @@ class spell_tott_trigger_murloc : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_tott_trigger_murloc::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_tott_trigger_murloc::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
@@ -370,8 +368,6 @@ private:
class spell_tott_camera: public SpellScript
{
PrepareSpellScript(spell_tott_camera);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Player* player = GetHitPlayer())
@@ -380,7 +376,7 @@ class spell_tott_camera: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_tott_camera::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_tott_camera::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -391,8 +387,6 @@ enum ShockDefense
class spell_tott_shock_defense_script : public SpellScript
{
PrepareSpellScript(spell_tott_shock_defense_script);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHOCK_DEFENSE_DEST });
@@ -406,14 +400,12 @@ class spell_tott_shock_defense_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_tott_shock_defense_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_tott_shock_defense_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_tott_ulthok_intro_visual_impact: public SpellScript
{
PrepareSpellScript(spell_tott_ulthok_intro_visual_impact);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -422,14 +414,12 @@ class spell_tott_ulthok_intro_visual_impact: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_tott_ulthok_intro_visual_impact::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_tott_ulthok_intro_visual_impact::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_tott_shock_defense : public SpellScript
{
PrepareSpellScript(spell_tott_shock_defense);
void SetDest(SpellDestination& dest)
{
Unit* caster = GetCaster();
@@ -445,7 +435,7 @@ class spell_tott_shock_defense : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_tott_shock_defense::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM);
OnDestinationTargetSelect.Register(&spell_tott_shock_defense::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM);
}
};
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+8 -20
View File
@@ -548,8 +548,6 @@ struct npc_akilzon_amani_kidnapper : public PassiveAI
class spell_akilzon_electrical_storm : public AuraScript
{
PrepareAuraScript(spell_akilzon_electrical_storm);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -581,15 +579,13 @@ class spell_akilzon_electrical_storm : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_akilzon_electrical_storm::AfterApply, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_akilzon_electrical_storm::AfterRemove, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_akilzon_electrical_storm::AfterApply, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_akilzon_electrical_storm::AfterRemove, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_akilzon_electrical_storm_damage : public SpellScript
{
PrepareSpellScript(spell_akilzon_electrical_storm_damage);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -603,15 +599,13 @@ class spell_akilzon_electrical_storm_damage : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY);
}
};
class spell_akilzon_electrical_overloard_graphic_pulse : public SpellScript
{
PrepareSpellScript(spell_akilzon_electrical_overloard_graphic_pulse);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -632,14 +626,12 @@ class spell_akilzon_electrical_overloard_graphic_pulse : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_akilzon_electrical_overloard_graphic_pulse::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_akilzon_electrical_overloard_graphic_pulse::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_akilzon_teleport_self : public SpellScript
{
PrepareSpellScript(spell_akilzon_teleport_self);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, 10.0f, 0.0f });
@@ -647,14 +639,12 @@ class spell_akilzon_teleport_self : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_akilzon_teleport_self::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_akilzon_teleport_self::SetDest, EFFECT_0, TARGET_DEST_CASTER);
}
};
class spell_akilzon_grab_passenger : public SpellScript
{
PrepareSpellScript(spell_akilzon_grab_passenger);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -663,14 +653,12 @@ class spell_akilzon_grab_passenger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_akilzon_grab_passenger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_akilzon_grab_passenger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_akilzon_summon_amani_kidnapper : public SpellScript
{
PrepareSpellScript(spell_akilzon_summon_amani_kidnapper);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, 30.0f, 0.0f });
@@ -678,7 +666,7 @@ class spell_akilzon_summon_amani_kidnapper : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_akilzon_summon_amani_kidnapper::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_akilzon_summon_amani_kidnapper::SetDest, EFFECT_0, TARGET_DEST_CASTER);
}
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp
+12 -28
View File
@@ -483,8 +483,6 @@ class NonVictimTargetSelector
class spell_mandokir_decapitate : public SpellScript
{
PrepareSpellScript(spell_mandokir_decapitate);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -507,15 +505,13 @@ class spell_mandokir_decapitate : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_decapitate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_mandokir_decapitate::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_mandokir_decapitate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_mandokir_decapitate::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_mandokir_bloodletting : public AuraScript
{
PrepareAuraScript(spell_mandokir_bloodletting);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -540,14 +536,12 @@ class spell_mandokir_bloodletting : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mandokir_bloodletting::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_mandokir_bloodletting::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_mandokir_spirit_vengeance_cancel : public SpellScript
{
PrepareSpellScript(spell_mandokir_spirit_vengeance_cancel);
void HandleScript(SpellEffIndex /*effIndex*/)
{
if (Player* target = GetHitPlayer())
@@ -556,15 +550,13 @@ class spell_mandokir_spirit_vengeance_cancel : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
class spell_mandokir_devastating_slam : public SpellScript
{
PrepareSpellScript(spell_mandokir_devastating_slam);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -586,15 +578,13 @@ class spell_mandokir_devastating_slam : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_devastating_slam::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_mandokir_devastating_slam::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_mandokir_devastating_slam::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_mandokir_devastating_slam::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
class spell_mandokir_ohgan_orders : public SpellScript
{
PrepareSpellScript(spell_mandokir_ohgan_orders);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -612,15 +602,13 @@ class spell_mandokir_ohgan_orders : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_ohgan_orders::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_mandokir_ohgan_orders::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_mandokir_ohgan_orders::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_mandokir_ohgan_orders::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_mandokir_ohgan_orders_trigger : public SpellScript
{
PrepareSpellScript(spell_mandokir_ohgan_orders_trigger);
void HandleScript(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -637,14 +625,12 @@ class spell_mandokir_ohgan_orders_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mandokir_ohgan_orders_trigger::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_mandokir_ohgan_orders_trigger::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_mandokir_reanimate_ohgan : public SpellScript
{
PrepareSpellScript(spell_mandokir_reanimate_ohgan);
void HandleScript(SpellEffIndex /*effIndex*/)
{
if (Unit* target = GetHitUnit())
@@ -657,14 +643,12 @@ class spell_mandokir_reanimate_ohgan : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mandokir_reanimate_ohgan::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_mandokir_reanimate_ohgan::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_clear_all : public SpellScript
{
PrepareSpellScript(spell_clear_all);
void HandleScript(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -673,7 +657,7 @@ class spell_clear_all : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_clear_all::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_clear_all::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp
+10 -26
View File
@@ -429,8 +429,6 @@ private:
class spell_venoxis_venomous_effusion : public SpellScript
{
PrepareSpellScript(spell_venoxis_venomous_effusion);
void SetDest(SpellDestination& dest)
{
Unit* caster = GetCaster();
@@ -443,14 +441,12 @@ class spell_venoxis_venomous_effusion : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_venoxis_venomous_effusion::SetDest, EFFECT_1, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_venoxis_venomous_effusion::SetDest, EFFECT_1, TARGET_DEST_CASTER);
}
};
class spell_venoxis_whispers_of_hethiss : public AuraScript
{
PrepareAuraScript(spell_venoxis_whispers_of_hethiss);
void HandleTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -461,14 +457,12 @@ class spell_venoxis_whispers_of_hethiss : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_venoxis_whispers_of_hethiss::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_venoxis_whispers_of_hethiss::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_venoxis_toxic_link_targeting : public SpellScript
{
PrepareSpellScript(spell_venoxis_toxic_link_targeting);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.size() > 2)
@@ -483,15 +477,13 @@ class spell_venoxis_toxic_link_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_venoxis_toxic_link_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_venoxis_toxic_link_targeting::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_venoxis_toxic_link_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_venoxis_toxic_link_targeting::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_venoxis_toxic_link : public AuraScript
{
PrepareAuraScript(spell_venoxis_toxic_link);
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* target = GetTarget())
@@ -500,14 +492,12 @@ class spell_venoxis_toxic_link : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_venoxis_toxic_link::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_venoxis_toxic_link::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_venoxis_toxic_link_ally : public SpellScript
{
PrepareSpellScript(spell_venoxis_toxic_link_ally);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TOXIC_LINK_AURA });
@@ -530,14 +520,12 @@ class spell_venoxis_toxic_link_ally : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_venoxis_toxic_link_ally::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_venoxis_toxic_link_ally::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
class spell_venoxis_pool_of_acrid_tears : public AuraScript
{
PrepareAuraScript(spell_venoxis_pool_of_acrid_tears);
void HandlePeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -551,14 +539,12 @@ class spell_venoxis_pool_of_acrid_tears : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_venoxis_pool_of_acrid_tears::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_venoxis_pool_of_acrid_tears::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_venoxis_blood_venom_forcecast : public SpellScript
{
PrepareSpellScript(spell_venoxis_blood_venom_forcecast);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -576,15 +562,13 @@ class spell_venoxis_blood_venom_forcecast : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_venoxis_blood_venom_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_venoxis_blood_venom_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_venoxis_blood_venom_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_venoxis_blood_venom_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
class spell_venom_withdrawal : public SpellScript
{
PrepareSpellScript(spell_venom_withdrawal);
void HandleKnockback(SpellEffIndex effIndex)
{
// Let's do our own knockback to make sure that we hit our sniffed position
@@ -602,7 +586,7 @@ class spell_venom_withdrawal : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_venom_withdrawal::HandleKnockback, EFFECT_2, SPELL_EFFECT_LEAP_BACK);
OnEffectHitTarget.Register(&spell_venom_withdrawal::HandleKnockback, EFFECT_2, SPELL_EFFECT_LEAP_BACK);
}
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp
+6 -16
View File
@@ -348,8 +348,6 @@ private:
class spell_kilnara_tears_of_blood : public AuraScript
{
PrepareAuraScript(spell_kilnara_tears_of_blood);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WAIL_OF_SORROW });
@@ -366,7 +364,7 @@ class spell_kilnara_tears_of_blood : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_kilnara_tears_of_blood::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_kilnara_tears_of_blood::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -385,8 +383,6 @@ class AttackerVictimCheck
class spell_kilnara_wave_of_agony : public SpellScript
{
PrepareSpellScript(spell_kilnara_wave_of_agony);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -408,15 +404,13 @@ class spell_kilnara_wave_of_agony : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kilnara_wave_of_agony::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kilnara_wave_of_agony::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_kilnara_wave_of_agony::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_kilnara_wave_of_agony::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_kilnara_wave_of_agony_dummy : public AuraScript
{
PrepareAuraScript(spell_kilnara_wave_of_agony_dummy);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Unit* caster = GetCaster())
@@ -431,14 +425,12 @@ class spell_kilnara_wave_of_agony_dummy : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_kilnara_wave_of_agony_dummy::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_kilnara_wave_of_agony_dummy::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_kilnara_primal_awakening : public AuraScript
{
PrepareAuraScript(spell_kilnara_primal_awakening);
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* creature = GetTarget()->ToCreature())
@@ -448,14 +440,12 @@ class spell_kilnara_primal_awakening : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_kilnara_primal_awakening::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_kilnara_primal_awakening::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_kilnara_gaping_wound : public SpellScript
{
PrepareSpellScript(spell_kilnara_gaping_wound);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -471,7 +461,7 @@ class spell_kilnara_gaping_wound : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kilnara_gaping_wound::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_kilnara_gaping_wound::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
+4 -12
View File
@@ -607,8 +607,6 @@ private:
struct spell_jindo_shadow_spike : public SpellScript
{
PrepareSpellScript(spell_jindo_shadow_spike);
void HandleDummyEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -617,14 +615,12 @@ struct spell_jindo_shadow_spike : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_jindo_shadow_spike::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_jindo_shadow_spike::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
struct spell_jindo_call_spirit : public SpellScript
{
PrepareSpellScript(spell_jindo_call_spirit);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_SPIRIT });
@@ -637,14 +633,12 @@ struct spell_jindo_call_spirit : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_jindo_call_spirit::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_jindo_call_spirit::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
struct spell_jindo_spirit_warriors_gaze : public SpellScript
{
PrepareSpellScript(spell_jindo_spirit_warriors_gaze);
void HandleDummyEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -653,14 +647,12 @@ struct spell_jindo_spirit_warriors_gaze : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_jindo_spirit_warriors_gaze::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_jindo_spirit_warriors_gaze::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
struct spell_jindo_body_slam : public SpellScript
{
PrepareSpellScript(spell_jindo_body_slam);
void HandleShieldBreakEffect(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitCreature();
@@ -676,7 +668,7 @@ struct spell_jindo_body_slam : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_jindo_body_slam::HandleShieldBreakEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_jindo_body_slam::HandleShieldBreakEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
+9 -19
View File
@@ -480,8 +480,6 @@ private:
class spell_zanzil_zanzili_fire : public AuraScript
{
PrepareAuraScript(spell_zanzil_zanzili_fire);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Creature* zanzil = GetTarget()->ToCreature())
@@ -491,14 +489,12 @@ class spell_zanzil_zanzili_fire : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_zanzil_zanzili_fire::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_zanzil_zanzili_fire::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_zanzil_zanzils_resurrection_elixir : public AuraScript
{
PrepareAuraScript(spell_zanzil_zanzils_resurrection_elixir);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -523,7 +519,7 @@ class spell_zanzil_zanzils_resurrection_elixir : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_zanzil_zanzils_resurrection_elixir::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_zanzil_zanzils_resurrection_elixir::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -546,8 +542,6 @@ class UnusedGuidTargetSelector
class spell_zanzil_zanzils_resurrection_elixir_red_script : public SpellScript
{
PrepareSpellScript(spell_zanzil_zanzils_resurrection_elixir_red_script);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -595,16 +589,14 @@ class spell_zanzil_zanzils_resurrection_elixir_red_script : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zanzil_zanzils_resurrection_elixir_red_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_zanzil_zanzils_resurrection_elixir_red_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunchTarget += SpellEffectFn(spell_zanzil_zanzils_resurrection_elixir_red_script::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_zanzil_zanzils_resurrection_elixir_red_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_zanzil_zanzils_resurrection_elixir_red_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunchTarget.Register(&spell_zanzil_zanzils_resurrection_elixir_red_script::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_zanzil_zanzils_graveyard_gas : public SpellScript
{
PrepareSpellScript(spell_zanzil_zanzils_graveyard_gas);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -652,16 +644,14 @@ class spell_zanzil_zanzils_graveyard_gas : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zanzil_zanzils_graveyard_gas::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_zanzil_zanzils_graveyard_gas::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunchTarget += SpellEffectFn(spell_zanzil_zanzils_graveyard_gas::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_zanzil_zanzils_graveyard_gas::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_zanzil_zanzils_graveyard_gas::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunchTarget.Register(&spell_zanzil_zanzils_graveyard_gas::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_zanzil_frostburn_formula : public AuraScript
{
PrepareAuraScript(spell_zanzil_frostburn_formula);
bool CheckProc(ProcEventInfo& eventInfo)
{
if (Unit* target = eventInfo.GetProcTarget())
@@ -673,7 +663,7 @@ class spell_zanzil_frostburn_formula : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_zanzil_frostburn_formula::CheckProc);
DoCheckProc.Register(&spell_zanzil_frostburn_formula::CheckProc);
}
};
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp
+7 -15
View File
@@ -226,8 +226,6 @@ private:
class spell_zulgurub_rolling_boulders : public AuraScript
{
PrepareAuraScript(spell_zulgurub_rolling_boulders);
void HandleTick(AuraEffect const* /*aurEff*/)
{
// Serverside spell. We just skip that part and do it directly via script
@@ -239,7 +237,7 @@ class spell_zulgurub_rolling_boulders : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_zulgurub_rolling_boulders::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_zulgurub_rolling_boulders::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -475,8 +473,6 @@ enum SigilShatter
class spell_zulgurub_sigil_shatter : public SpellScript
{
PrepareSpellScript(spell_zulgurub_sigil_shatter);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -519,9 +515,9 @@ class spell_zulgurub_sigil_shatter : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zulgurub_sigil_shatter::FilterSigilOfFlameTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zulgurub_sigil_shatter::FilterSigilOfFrostTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zulgurub_sigil_shatter::FilterSigilOfDeathTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_zulgurub_sigil_shatter::FilterSigilOfFlameTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_zulgurub_sigil_shatter::FilterSigilOfFrostTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_zulgurub_sigil_shatter::FilterSigilOfDeathTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -532,8 +528,6 @@ enum AncientGuardian
class spell_zulgurub_ancient_guardian : public AuraScript
{
PrepareAuraScript(spell_zulgurub_ancient_guardian);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ANCIENT_GUARDIAN_HEAL });
@@ -558,8 +552,8 @@ class spell_zulgurub_ancient_guardian : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_zulgurub_ancient_guardian::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_zulgurub_ancient_guardian::Absorb, EFFECT_1);
DoEffectCalcAmount.Register(&spell_zulgurub_ancient_guardian::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_zulgurub_ancient_guardian::Absorb, EFFECT_1);
}
};
@@ -650,8 +644,6 @@ enum ToadExplode
class spell_zulgurub_toad_explode : public SpellScript
{
PrepareSpellScript(spell_zulgurub_toad_explode);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TOAD_EXPLODE });
@@ -664,7 +656,7 @@ class spell_zulgurub_toad_explode : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_zulgurub_toad_explode::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_zulgurub_toad_explode::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
+1 -3
View File
@@ -44,8 +44,6 @@ class spell_razelikh_teleport_group : public SpellScriptLoader
class spell_razelikh_teleport_group_SpellScript : public SpellScript
{
PrepareSpellScript(spell_razelikh_teleport_group_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_TELEPORT_SINGLE, SPELL_TELEPORT_SINGLE_IN_GROUP });
@@ -69,7 +67,7 @@ class spell_razelikh_teleport_group : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_razelikh_teleport_group_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_razelikh_teleport_group_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
+3 -9
View File
@@ -373,8 +373,6 @@ public:
class spell_a_trip_to_ironforge_quest_complete_SpellScript : public SpellScript
{
PrepareSpellScript(spell_a_trip_to_ironforge_quest_complete_SpellScript);
void HandleForceCast(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -383,7 +381,7 @@ public:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_a_trip_to_ironforge_quest_complete_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_a_trip_to_ironforge_quest_complete_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -405,8 +403,6 @@ public:
class spell_follow_that_gyrocopter_quest_start_SpellScript : public SpellScript
{
PrepareSpellScript(spell_follow_that_gyrocopter_quest_start_SpellScript);
void HandleForceCast(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -415,7 +411,7 @@ public:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_follow_that_gyrocopter_quest_start_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_follow_that_gyrocopter_quest_start_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -437,8 +433,6 @@ public:
class spell_low_health_SpellScript : public SpellScript
{
PrepareSpellScript(spell_low_health_SpellScript);
void HandleDummyEffect(SpellEffIndex /*eff*/)
{
if (Creature* target = GetHitCreature())
@@ -450,7 +444,7 @@ public:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_low_health_SpellScript::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_low_health_SpellScript::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
+6 -14
View File
@@ -1164,8 +1164,6 @@ struct npc_brazie_vehicle_notifier : public ScriptedAI
class spell_brazie_summon_plant : public SpellScript
{
PrepareSpellScript(spell_brazie_summon_plant);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1210,16 +1208,14 @@ class spell_brazie_summon_plant : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_brazie_summon_plant::CheckLocation);
OnEffectHitTarget += SpellEffectFn(spell_brazie_summon_plant::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHit += SpellEffectFn(spell_brazie_summon_plant::PreventEffect, EFFECT_0, SPELL_EFFECT_TRANS_DOOR);
OnCheckCast.Register(&spell_brazie_summon_plant::CheckLocation);
OnEffectHitTarget.Register(&spell_brazie_summon_plant::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHit.Register(&spell_brazie_summon_plant::PreventEffect, EFFECT_0, SPELL_EFFECT_TRANS_DOOR);
}
};
class spell_brazie_highlight : public SpellScript
{
PrepareSpellScript(spell_brazie_highlight);
void SetDest(SpellDestination& dest)
{
dest.Relocate(EmptySpotPositions[0]);
@@ -1227,14 +1223,12 @@ class spell_brazie_highlight : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_brazie_highlight::SetDest, EFFECT_1, TARGET_DEST_NEARBY_ENTRY);
OnDestinationTargetSelect.Register(&spell_brazie_highlight::SetDest, EFFECT_1, TARGET_DEST_NEARBY_ENTRY);
}
};
class spell_brazie_create_random_seed_sack : public SpellScript
{
PrepareSpellScript(spell_brazie_create_random_seed_sack);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CREATE_RANDOM_FREEZYA_SACK });
@@ -1248,14 +1242,12 @@ class spell_brazie_create_random_seed_sack : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_brazie_create_random_seed_sack::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
OnDestinationTargetSelect.Register(&spell_brazie_create_random_seed_sack::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
};
class spell_brazie_spit : public SpellScript
{
PrepareSpellScript(spell_brazie_spit);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1295,7 +1287,7 @@ class spell_brazie_spit : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_ENEMY_104);
OnObjectAreaTargetSelect.Register(&spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_ENEMY_104);
}
};
src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
+1 -3
View File
@@ -99,8 +99,6 @@ public:
class spell_siege_cannon_SpellScript : public SpellScript
{
PrepareSpellScript(spell_siege_cannon_SpellScript);
void SelectRandomTarget(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -113,7 +111,7 @@ public:
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siege_cannon_SpellScript::SelectRandomTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_siege_cannon_SpellScript::SelectRandomTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
src/server/scripts/EasternKingdoms/zone_westfall.cpp
+7 -20
View File
@@ -28,8 +28,6 @@
class spell_westfall_unbound_energy : public SpellScript
{
PrepareSpellScript(spell_westfall_unbound_energy);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -47,7 +45,7 @@ class spell_westfall_unbound_energy : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_westfall_unbound_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_westfall_unbound_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
@@ -112,8 +110,6 @@ private:
class spell_westfall_reaping_blows : public AuraScript
{
PrepareAuraScript(spell_westfall_reaping_blows);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -123,14 +119,12 @@ class spell_westfall_reaping_blows : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_westfall_reaping_blows::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_westfall_reaping_blows::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_westfall_wake_harvest_golem : public SpellScript
{
PrepareSpellScript(spell_westfall_wake_harvest_golem);
SpellCastResult CheckTarget()
{
Unit* target = GetExplTargetUnit();
@@ -155,16 +149,13 @@ class spell_westfall_wake_harvest_golem : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_westfall_wake_harvest_golem::CheckTarget);
OnEffectHitTarget += SpellEffectFn(spell_westfall_wake_harvest_golem::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnCheckCast.Register(&spell_westfall_wake_harvest_golem::CheckTarget);
OnEffectHitTarget.Register(&spell_westfall_wake_harvest_golem::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_westfall_quest_credit_jangolode_event : public SpellScript
{
PrepareSpellScript(spell_westfall_quest_credit_jangolode_event);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->ExitVehicle();
@@ -172,7 +163,7 @@ class spell_westfall_quest_credit_jangolode_event : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_westfall_quest_credit_jangolode_event::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_westfall_quest_credit_jangolode_event::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -489,8 +480,6 @@ private:
class spell_westfall_summon_ragamuffin_looter : public SpellScript
{
PrepareSpellScript(spell_westfall_summon_ragamuffin_looter);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -513,14 +502,12 @@ class spell_westfall_summon_ragamuffin_looter : public SpellScript
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_westfall_summon_ragamuffin_looter::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_westfall_summon_ragamuffin_looter::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_westfall_aggro_hobo : public SpellScript
{
PrepareSpellScript(spell_westfall_aggro_hobo);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (Creature* creature = GetHitCreature())
@@ -530,7 +517,7 @@ class spell_westfall_aggro_hobo : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_westfall_aggro_hobo::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_westfall_aggro_hobo::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+1 -3
View File
@@ -268,8 +268,6 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader
class spell_anetheron_vampiric_aura_AuraScript : public AuraScript
{
PrepareAuraScript(spell_anetheron_vampiric_aura_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_VAMPIRIC_AURA_HEAL });
@@ -288,7 +286,7 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_anetheron_vampiric_aura_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_anetheron_vampiric_aura_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+1 -3
View File
@@ -544,8 +544,6 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader
class spell_archimonde_drain_world_tree_dummy_SpellScript : public SpellScript
{
PrepareSpellScript(spell_archimonde_drain_world_tree_dummy_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRAIN_WORLD_TREE_TRIGGERED });
@@ -559,7 +557,7 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_archimonde_drain_world_tree_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_archimonde_drain_world_tree_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+2 -6
View File
@@ -187,8 +187,6 @@ class spell_mark_of_kazrogal : public SpellScriptLoader
class spell_mark_of_kazrogal_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mark_of_kazrogal_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(MarkTargetFilter());
@@ -196,14 +194,12 @@ class spell_mark_of_kazrogal : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_mark_of_kazrogal_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mark_of_kazrogal_AuraScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_MARK_DAMAGE });
@@ -223,7 +219,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH);
OnEffectPeriodic.Register(&spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH);
}
};
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+1 -3
View File
@@ -141,8 +141,6 @@ class boss_salramm : public CreatureScript
class spell_salramm_steal_flesh : public AuraScript
{
PrepareAuraScript(spell_salramm_steal_flesh);
void HandlePeriodic(AuraEffect const* /*eff*/)
{
GetCaster()->CastSpell(GetCaster(), SPELL_STEAL_FLESH_BUFF, true);
@@ -151,7 +149,7 @@ class spell_salramm_steal_flesh : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_salramm_steal_flesh::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_salramm_steal_flesh::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
+1 -3
View File
@@ -1668,8 +1668,6 @@ struct npc_stratholme_rp_dummy : NullCreatureAI
class spell_stratholme_crusader_strike : public SpellScript
{
PrepareSpellScript(spell_stratholme_crusader_strike);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (Unit* target = GetHitUnit())
@@ -1679,7 +1677,7 @@ class spell_stratholme_crusader_strike : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_stratholme_crusader_strike::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_stratholme_crusader_strike::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp
+39 -105
View File
@@ -1654,8 +1654,6 @@ private:
class spell_madness_of_deathwing_presence_of_the_aspects : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_presence_of_the_aspects);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1676,14 +1674,12 @@ class spell_madness_of_deathwing_presence_of_the_aspects : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_presence_of_the_aspects::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_presence_of_the_aspects::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
}
};
class spell_madness_of_deathwing_carrying_winds_jump : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_carrying_winds_jump);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue());
@@ -1691,14 +1687,12 @@ class spell_madness_of_deathwing_carrying_winds_jump : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_carrying_winds_jump::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_carrying_winds_jump::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_carrying_winds_triggered : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_carrying_winds_triggered);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->RemoveAurasDueToSpell(GetEffectValue());
@@ -1706,14 +1700,12 @@ class spell_madness_of_deathwing_carrying_winds_triggered : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_carrying_winds_triggered::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_carrying_winds_triggered::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_limb_emerge_visual : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_limb_emerge_visual);
void HandleDummyEffect(SpellEffIndex /*effIndex*/)
{
uint32 visualKitId = RAND(SPELL_VISUAL_KIT_LIMB_EMERGE_1, SPELL_VISUAL_KIT_LIMB_EMERGE_2, SPELL_VISUAL_KIT_LIMB_EMERGE_3);
@@ -1722,14 +1714,12 @@ class spell_madness_of_deathwing_limb_emerge_visual : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_limb_emerge_visual::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_limb_emerge_visual::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_madness_of_deathwing_agonizing_pain : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_agonizing_pain);
void HandleDamage(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitUnit();
@@ -1742,14 +1732,12 @@ class spell_madness_of_deathwing_agonizing_pain : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_agonizing_pain::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_agonizing_pain::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_madness_of_deathwing_assault_aspects : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_assault_aspects);
void CountPlayers(std::list<WorldObject*>& targets)
{
std::array<uint8, MAX_DRAGON_ASPECTS> playersOnPlatform = { };
@@ -1792,15 +1780,13 @@ class spell_madness_of_deathwing_assault_aspects : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_assault_aspects::CountPlayers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
AfterCast += SpellCastFn(spell_madness_of_deathwing_assault_aspects::NotifyDeathwing);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_assault_aspects::CountPlayers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
AfterCast.Register(&spell_madness_of_deathwing_assault_aspects::NotifyDeathwing);
}
};
class spell_madness_of_deathwing_face_trigger : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_face_trigger);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue());
@@ -1808,14 +1794,12 @@ class spell_madness_of_deathwing_face_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_face_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_face_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_summon_tail : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_summon_tail);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1844,14 +1828,12 @@ class spell_madness_of_deathwing_summon_tail : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_summon_tail::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_summon_tail::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_madness_of_deathwing_crush : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_crush);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1879,14 +1861,12 @@ class spell_madness_of_deathwing_crush : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_crush::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_crush::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_madness_of_deathwing_hemorrhage : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_hemorrhage);
void SetDest(SpellDestination& dest)
{
if (Creature* caster = GetCaster()->ToCreature())
@@ -1897,14 +1877,12 @@ class spell_madness_of_deathwing_hemorrhage : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_madness_of_deathwing_hemorrhage::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
OnDestinationTargetSelect.Register(&spell_madness_of_deathwing_hemorrhage::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
};
class spell_madness_of_deathwing_hemorrhage_script : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_hemorrhage_script);
void SetTarget(WorldObject*& target)
{
InstanceScript* instance = GetCaster()->GetInstanceScript();
@@ -1924,15 +1902,13 @@ class spell_madness_of_deathwing_hemorrhage_script : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_madness_of_deathwing_hemorrhage_script::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_hemorrhage_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectTargetSelect.Register(&spell_madness_of_deathwing_hemorrhage_script::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_hemorrhage_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_regenerative_blood_periodic : public AuraScript
{
PrepareAuraScript(spell_madness_of_deathwing_regenerative_blood_periodic);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1962,7 +1938,7 @@ class spell_madness_of_deathwing_regenerative_blood_periodic : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_regenerative_blood_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_madness_of_deathwing_regenerative_blood_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
private:
int32 _basePoints = 0;
@@ -1970,8 +1946,6 @@ private:
class spell_madness_of_deathwing_regenerative_blood_script : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_regenerative_blood_script);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->SetPower(POWER_ENERGY, GetEffectValue());
@@ -1979,14 +1953,12 @@ class spell_madness_of_deathwing_regenerative_blood_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_regenerative_blood_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_regenerative_blood_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_elementium_meteor_script: public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_elementium_meteor_script);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Creature* target = GetHitCreature())
@@ -1999,14 +1971,12 @@ class spell_madness_of_deathwing_elementium_meteor_script: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_elementium_meteor_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_elementium_meteor_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_elementium_meteor_visual : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_elementium_meteor_visual);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2032,14 +2002,12 @@ class spell_madness_of_deathwing_elementium_meteor_visual : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_elementium_meteor_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_elementium_meteor_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_madness_of_deathwing_burning_blood : public AuraScript
{
PrepareAuraScript(spell_madness_of_deathwing_burning_blood);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -2057,14 +2025,12 @@ class spell_madness_of_deathwing_burning_blood : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_madness_of_deathwing_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_madness_of_deathwing_spawn_blistering_tentacles : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_spawn_blistering_tentacles);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitUnit();
@@ -2076,14 +2042,12 @@ class spell_madness_of_deathwing_spawn_blistering_tentacles : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_spawn_blistering_tentacles::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_spawn_blistering_tentacles::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_time_zone : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_time_zone);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2109,14 +2073,12 @@ class spell_madness_of_deathwing_time_zone : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_time_zone::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_time_zone::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_madness_of_deathwing_trigger_concentration : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_trigger_concentration);
bool Load() override
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -2162,7 +2124,7 @@ class spell_madness_of_deathwing_trigger_concentration : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_trigger_concentration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_trigger_concentration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
private:
ObjectGuid _aspectGUID;
@@ -2170,8 +2132,6 @@ private:
class spell_madness_of_deathwing_concentration : public AuraScript
{
PrepareAuraScript(spell_madness_of_deathwing_concentration);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* caster = GetCaster())
@@ -2191,15 +2151,13 @@ class spell_madness_of_deathwing_concentration : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_madness_of_deathwing_concentration::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_madness_of_deathwing_concentration::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_madness_of_deathwing_concentration::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_madness_of_deathwing_concentration::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_madness_of_deathwing_trigger_aspect_buffs : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_trigger_aspect_buffs);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2245,14 +2203,12 @@ class spell_madness_of_deathwing_trigger_aspect_buffs : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_trigger_aspect_buffs::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_trigger_aspect_buffs::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_share_health : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_share_health);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHARE_HEALTH_2 });
@@ -2265,14 +2221,12 @@ class spell_madness_of_deathwing_share_health : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_share_health::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_share_health::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_summon_elementium_terror : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_summon_elementium_terror);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
for (uint8 i = 0; i < 2; ++i)
@@ -2281,14 +2235,12 @@ class spell_madness_of_deathwing_summon_elementium_terror : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_summon_elementium_terror::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_summon_elementium_terror::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_summon_impaling_tentacle : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_summon_impaling_tentacle);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitUnit();
@@ -2299,14 +2251,12 @@ class spell_madness_of_deathwing_summon_impaling_tentacle : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_summon_impaling_tentacle::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_summon_impaling_tentacle::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_shrapnel : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_shrapnel);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHRAPNEL });
@@ -2348,9 +2298,9 @@ class spell_madness_of_deathwing_shrapnel : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_shrapnel::FilterFragments, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_shrapnel::FilterPlayers, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
AfterCast += SpellCastFn(spell_madness_of_deathwing_shrapnel::HandleShrapnels);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_shrapnel::FilterFragments, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_shrapnel::FilterPlayers, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
AfterCast.Register(&spell_madness_of_deathwing_shrapnel::HandleShrapnels);
}
private:
GuidVector _targetGUIDs;
@@ -2359,8 +2309,6 @@ private:
class spell_madness_of_deathwing_fire_dragon_soul: public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_fire_dragon_soul);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Creature* deathwing = GetHitCreature())
@@ -2370,14 +2318,12 @@ class spell_madness_of_deathwing_fire_dragon_soul: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_fire_dragon_soul::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_fire_dragon_soul::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_fire_dragon_soul_aspects : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_fire_dragon_soul_aspects);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2431,14 +2377,12 @@ class spell_madness_of_deathwing_fire_dragon_soul_aspects : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_fire_dragon_soul_aspects::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_fire_dragon_soul_aspects::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_trigger_aspect_yell : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_trigger_aspect_yell);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -2459,15 +2403,13 @@ class spell_madness_of_deathwing_trigger_aspect_yell : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_trigger_aspect_yell::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_trigger_aspect_yell::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_trigger_aspect_yell::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_trigger_aspect_yell::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_madness_of_deathwing_corrupted_blood_stacker : public AuraScript
{
PrepareAuraScript(spell_madness_of_deathwing_corrupted_blood_stacker);
void HandlePeriodic(AuraEffect const* aurEff)
{
Unit* target = GetTarget();
@@ -2494,7 +2436,7 @@ class spell_madness_of_deathwing_corrupted_blood_stacker : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_corrupted_blood_stacker::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_madness_of_deathwing_corrupted_blood_stacker::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
private:
uint8 _hemorrHageSteps = 0;
@@ -2502,8 +2444,6 @@ private:
class spell_madness_of_deathwing_corrupted_blood: public AuraScript
{
PrepareAuraScript(spell_madness_of_deathwing_corrupted_blood);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (AuraEffect* bonusEffect = GetEffect(EFFECT_1))
@@ -2516,14 +2456,12 @@ class spell_madness_of_deathwing_corrupted_blood: public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_corrupted_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_madness_of_deathwing_corrupted_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_madness_of_deathwing_spellweave : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_spellweave);
void FilterFragments(std::list<WorldObject*>& targets)
{
targets.remove_if([this](WorldObject const* target)->bool
@@ -2534,14 +2472,12 @@ class spell_madness_of_deathwing_spellweave : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_spellweave::FilterFragments, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_spellweave::FilterFragments, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
class spell_madness_of_deathwing_elementium_blast : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_elementium_blast);
void HandleDamage(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -2561,14 +2497,12 @@ class spell_madness_of_deathwing_elementium_blast : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_elementium_blast::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_madness_of_deathwing_elementium_blast::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_madness_of_deathwing_cataclysm : public SpellScript
{
PrepareSpellScript(spell_madness_of_deathwing_cataclysm);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CATACLYSM_VISUAL });
@@ -2581,7 +2515,7 @@ class spell_madness_of_deathwing_cataclysm : public SpellScript
void Register() override
{
AfterCast += SpellCastFn(spell_madness_of_deathwing_cataclysm::HandleVisual);
AfterCast.Register(&spell_madness_of_deathwing_cataclysm::HandleVisual);
}
};
src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp
+3 -9
View File
@@ -468,8 +468,6 @@ private:
// 101590 - Rewind Time
class spell_murozond_rewind_time_forcecast : public SpellScript
{
PrepareSpellScript(spell_murozond_rewind_time_forcecast);
void HandleSummon(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -480,15 +478,13 @@ class spell_murozond_rewind_time_forcecast : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_murozond_rewind_time_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_murozond_rewind_time_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
// 108026 - (Serverside/Non-DB2) Rewind Time
class spell_murozond_rewind_time : public SpellScript
{
PrepareSpellScript(spell_murozond_rewind_time);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Creature* target = GetHitCreature();
@@ -501,15 +497,13 @@ class spell_murozond_rewind_time : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_murozond_rewind_time::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_murozond_rewind_time::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 102571 - Clone Master Health
class spell_murozond_clone_master_health : public SpellScript
{
PrepareSpellScript(spell_murozond_clone_master_health);
void HandleDummyEffect(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -526,7 +520,7 @@ class spell_murozond_clone_master_health : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_murozond_clone_master_health::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_murozond_clone_master_health::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
+6 -14
View File
@@ -501,8 +501,6 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader
class spell_alysrazor_cosmetic_egg_xplosion_SpellScript : public SpellScript
{
PrepareSpellScript(spell_alysrazor_cosmetic_egg_xplosion_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sCreatureDisplayInfoStore.LookupEntry(MODEL_INVISIBLE_STALKER))
@@ -520,7 +518,7 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alysrazor_cosmetic_egg_xplosion_SpellScript::HandleExplosion, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_alysrazor_cosmetic_egg_xplosion_SpellScript::HandleExplosion, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -537,8 +535,6 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader
class spell_alysrazor_turn_monstrosity_SpellScript : public SpellScript
{
PrepareSpellScript(spell_alysrazor_turn_monstrosity_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_GENERIC_DUMMY_CAST, SPELL_KNOCKBACK_RIGHT, SPELL_KNOCKBACK_LEFT, SPELL_KNOCKBACK_FORWARD, SPELL_KNOCKBACK_BACK });
@@ -598,8 +594,8 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::KnockBarrage, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::TurnBird, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_alysrazor_turn_monstrosity_SpellScript::KnockBarrage, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_alysrazor_turn_monstrosity_SpellScript::TurnBird, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -616,8 +612,6 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader
class spell_alysrazor_aggro_closest_SpellScript : public SpellScript
{
PrepareSpellScript(spell_alysrazor_aggro_closest_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -638,8 +632,8 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alysrazor_aggro_closest_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast += SpellCastFn(spell_alysrazor_aggro_closest_SpellScript::UpdateThreat);
OnEffectHitTarget.Register(&spell_alysrazor_aggro_closest_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast.Register(&spell_alysrazor_aggro_closest_SpellScript::UpdateThreat);
}
};
@@ -656,8 +650,6 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader
class spell_alysrazor_fieroblast_SpellScript : public SpellScript
{
PrepareSpellScript(spell_alysrazor_fieroblast_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FIRE_IT_UP });
@@ -670,7 +662,7 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader
void Register() override
{
AfterCast += SpellCastFn(spell_alysrazor_fieroblast_SpellScript::FireItUp);
AfterCast.Register(&spell_alysrazor_fieroblast_SpellScript::FireItUp);
}
};
src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
+13 -33
View File
@@ -407,8 +407,6 @@ class spell_countdown_p1 : public SpellScriptLoader
class spell_countdown_p1_SpellScript : public SpellScript
{
PrepareSpellScript(spell_countdown_p1_SpellScript);
bool Load() override
{
target1 = nullptr;
@@ -447,9 +445,9 @@ class spell_countdown_p1 : public SpellScriptLoader
void Register() override
{
AfterCast += SpellCastFn(spell_countdown_p1_SpellScript::CastSpellLink);
OnEffectHitTarget += SpellEffectFn(spell_countdown_p1_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_countdown_p1_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
AfterCast.Register(&spell_countdown_p1_SpellScript::CastSpellLink);
OnEffectHitTarget.Register(&spell_countdown_p1_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_countdown_p1_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
WorldObject* target1;
@@ -469,8 +467,6 @@ class spell_countdown_p2 : public SpellScriptLoader
class spell_countdown_p2_AuraScript : public AuraScript
{
PrepareAuraScript(spell_countdown_p2_AuraScript);
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired))
@@ -480,7 +476,7 @@ class spell_countdown_p2 : public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_countdown_p2_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_countdown_p2_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -497,8 +493,6 @@ class spell_countdown_p3 : public SpellScriptLoader
class spell_countdown_p3_SpellScript : public SpellScript
{
PrepareSpellScript(spell_countdown_p3_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -524,7 +518,7 @@ class spell_countdown_p3 : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_countdown_p3_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_countdown_p3_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
@@ -541,8 +535,6 @@ class spell_decimating_strike : public SpellScriptLoader
class spell_decimating_strike_SpellScript : public SpellScript
{
PrepareSpellScript(spell_decimating_strike_SpellScript);
bool Load() override
{
if (GetCaster()->GetTypeId() != TYPEID_UNIT)
@@ -571,7 +563,7 @@ class spell_decimating_strike : public SpellScriptLoader
void Register() override
{
OnHit += SpellHitFn(spell_decimating_strike_SpellScript::ChangeDamage);
OnHit.Register(&spell_decimating_strike_SpellScript::ChangeDamage);
}
};
@@ -588,8 +580,6 @@ class spell_shards_of_torment : public SpellScriptLoader
class spell_shards_of_torment_SpellScript : public SpellScript
{
PrepareSpellScript(spell_shards_of_torment_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -621,8 +611,8 @@ class spell_shards_of_torment : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_shards_of_torment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_shards_of_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_shards_of_torment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_shards_of_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -653,8 +643,6 @@ class spell_baleroc_torment : public SpellScriptLoader
class spell_baleroc_torment_SpellScript : public SpellScript
{
PrepareSpellScript(spell_baleroc_torment_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -692,7 +680,7 @@ class spell_baleroc_torment : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_baleroc_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_baleroc_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -709,8 +697,6 @@ class spell_baleroc_tormented : public SpellScriptLoader
class spell_baleroc_tormented_SpellScript : public SpellScript
{
PrepareSpellScript(spell_baleroc_tormented_SpellScript);
void ChangeDamage()
{
//SetHitDamage(GetHitDamage()*GetHitUnit()->GetAuraCount(m_scriptSpellId));
@@ -731,15 +717,13 @@ class spell_baleroc_tormented : public SpellScriptLoader
void Register() override
{
OnHit += SpellHitFn(spell_baleroc_tormented_SpellScript::ChangeDamage);
OnHit.Register(&spell_baleroc_tormented_SpellScript::ChangeDamage);
}
};
class spell_baleroc_tormented_AuraScript : public AuraScript
{
PrepareAuraScript(spell_baleroc_tormented_AuraScript);
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::ByDeath))
@@ -753,7 +737,7 @@ class spell_baleroc_tormented : public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_baleroc_tormented_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_baleroc_tormented_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -775,8 +759,6 @@ class spell_baleroc_tormented_debuff : public SpellScriptLoader
class spell_baleroc_tormented_debuff_AuraScript : public AuraScript
{
PrepareAuraScript(spell_baleroc_tormented_debuff_AuraScript);
void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (InstanceScript* instance = GetTarget()->GetInstanceScript())
@@ -786,7 +768,7 @@ class spell_baleroc_tormented_debuff : public SpellScriptLoader
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_baleroc_tormented_debuff_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_baleroc_tormented_debuff_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -803,8 +785,6 @@ class spell_baleroc_tormented_heroic : public SpellScriptLoader
class spell_baleroc_tormented_heroic_SpellScript : public SpellScript
{
PrepareSpellScript(spell_baleroc_tormented_heroic_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -819,7 +799,7 @@ class spell_baleroc_tormented_heroic : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_baleroc_tormented_heroic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_baleroc_tormented_heroic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp
+6 -14
View File
@@ -440,8 +440,6 @@ private:
class spell_ammunae_consume_life_energy : public SpellScript
{
PrepareSpellScript(spell_ammunae_consume_life_energy);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -502,15 +500,13 @@ class spell_ammunae_consume_life_energy : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ammunae_consume_life_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_ammunae_consume_life_energy::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_ammunae_consume_life_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_ammunae_consume_life_energy::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_ammunae_summon_bloodpetal_blossom : public SpellScript
{
PrepareSpellScript(spell_ammunae_summon_bloodpetal_blossom);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -527,15 +523,13 @@ class spell_ammunae_summon_bloodpetal_blossom : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ammunae_summon_bloodpetal_blossom::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnEffectHitTarget += SpellEffectFn(spell_ammunae_summon_bloodpetal_blossom::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnObjectAreaTargetSelect.Register(&spell_ammunae_summon_bloodpetal_blossom::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnEffectHitTarget.Register(&spell_ammunae_summon_bloodpetal_blossom::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
class spell_ammunae_rampant_growth : public SpellScript
{
PrepareSpellScript(spell_ammunae_rampant_growth);
void HandleDespawn(SpellEffIndex /*effIndex*/)
{
if (Creature* target = GetHitCreature())
@@ -544,14 +538,12 @@ class spell_ammunae_rampant_growth : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_ammunae_rampant_growth::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_ammunae_rampant_growth::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
class spell_ammunae_fixate : public SpellScript
{
PrepareSpellScript(spell_ammunae_fixate);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -560,7 +552,7 @@ class spell_ammunae_fixate : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_ammunae_fixate::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_ammunae_fixate::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
+8 -18
View File
@@ -520,8 +520,6 @@ class PlayerCheck
// 77437 - Destruction Protocol
class spell_anraphet_destruction_protocol : public SpellScript
{
PrepareSpellScript(spell_anraphet_destruction_protocol);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -547,16 +545,14 @@ class spell_anraphet_destruction_protocol : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anraphet_destruction_protocol::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_anraphet_destruction_protocol::HandlePlayerDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_anraphet_destruction_protocol::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_anraphet_destruction_protocol::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_anraphet_destruction_protocol::HandlePlayerDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_anraphet_destruction_protocol::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
class spell_anraphet_alpha_beams : public SpellScript
{
PrepareSpellScript(spell_anraphet_alpha_beams);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -567,14 +563,12 @@ class spell_anraphet_alpha_beams : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anraphet_alpha_beams::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_anraphet_alpha_beams::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_anraphet_omega_stance : public AuraScript
{
PrepareAuraScript(spell_anraphet_omega_stance);
void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->CastSpell(GetTarget(), SPELL_OMEGA_STANCE_SUMMON, true);
@@ -588,16 +582,14 @@ class spell_anraphet_omega_stance : public AuraScript
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_anraphet_omega_stance::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_anraphet_omega_stance::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_anraphet_omega_stance::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove.Register(&spell_anraphet_omega_stance::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
// 77106 - Omega Stance (Summon)
class spell_anraphet_omega_stance_summon : public SpellScript
{
PrepareSpellScript(spell_anraphet_omega_stance_summon);
void SetDestPosition(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -613,15 +605,13 @@ class spell_anraphet_omega_stance_summon : public SpellScript
void Register()
{
OnEffectLaunch += SpellEffectFn(spell_anraphet_omega_stance_summon::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON);
OnEffectLaunch.Register(&spell_anraphet_omega_stance_summon::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON);
}
};
// 77127 Omega Stance Spider Effect
class spell_anraphet_omega_stance_spider_effect : public SpellScript
{
PrepareSpellScript(spell_anraphet_omega_stance_spider_effect);
void SetDestPosition(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -638,7 +628,7 @@ class spell_anraphet_omega_stance_spider_effect : public SpellScript
void Register()
{
OnEffectLaunch += SpellEffectFn(spell_anraphet_omega_stance_spider_effect::SetDestPosition, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectLaunch.Register(&spell_anraphet_omega_stance_spider_effect::SetDestPosition, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+5 -14
View File
@@ -301,8 +301,6 @@ private:
class spell_earthrager_ptah_flame_bolt : public SpellScript
{
PrepareSpellScript(spell_earthrager_ptah_flame_bolt);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -316,14 +314,12 @@ class spell_earthrager_ptah_flame_bolt : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_earthrager_ptah_flame_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_earthrager_ptah_flame_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_earthrager_ptah_sandstorm : public SpellScript
{
PrepareSpellScript(spell_earthrager_ptah_sandstorm);
void PlaySoundID(SpellEffIndex /*effIndex*/)
{
if (Player* player = GetHitUnit()->ToPlayer())
@@ -332,14 +328,12 @@ class spell_earthrager_ptah_sandstorm : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_earthrager_ptah_sandstorm::PlaySoundID, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_earthrager_ptah_sandstorm::PlaySoundID, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_earthrager_ptah_explosion : public AuraScript
{
PrepareAuraScript(spell_earthrager_ptah_explosion);
void SetFlags(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -349,7 +343,6 @@ class spell_earthrager_ptah_explosion : public AuraScript
void RemoveFlags(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
target->RemoveFlag(UNIT_FIELD_FLAGS, uint32(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_UNK_29 | UNIT_FLAG_UNK_31));
target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
@@ -357,15 +350,13 @@ class spell_earthrager_ptah_explosion : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_earthrager_ptah_explosion::SetFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_earthrager_ptah_explosion::RemoveFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_earthrager_ptah_explosion::SetFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_earthrager_ptah_explosion::RemoveFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_earthrager_ptah_consume : public SpellScript
{
PrepareSpellScript(spell_earthrager_ptah_consume);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -393,7 +384,7 @@ class spell_earthrager_ptah_consume : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_earthrager_ptah_consume::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_earthrager_ptah_consume::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp
+9 -27
View File
@@ -482,8 +482,6 @@ public:
class spell_isiset_astral_rain_controller_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_astral_rain_controller_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({
@@ -510,7 +508,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_isiset_astral_rain_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_isiset_astral_rain_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -528,8 +526,6 @@ public:
class spell_isiset_mana_shield_controller_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_mana_shield_controller_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({
@@ -556,7 +552,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_isiset_mana_shield_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_isiset_mana_shield_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -574,8 +570,6 @@ public:
class spell_isiset_astral_familiar_controller_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_astral_familiar_controller_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({
@@ -602,7 +596,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_isiset_astral_familiar_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_isiset_astral_familiar_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -620,8 +614,6 @@ public:
class spell_isiset_veil_of_sky_AuraScript : public AuraScript
{
PrepareAuraScript(spell_isiset_veil_of_sky_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_VEIL_OF_SKY_DAMAGE });
@@ -644,7 +636,7 @@ public:
void Register() override
{
AfterEffectManaShield += AuraEffectManaShieldFn(spell_isiset_veil_of_sky_AuraScript::Trigger, EFFECT_0);
AfterEffectManaShield.Register(&spell_isiset_veil_of_sky_AuraScript::Trigger, EFFECT_0);
}
private:
@@ -666,8 +658,6 @@ public:
class spell_isiset_supernova_filter_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_supernova_filter_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
Unit* caster = GetCaster();
@@ -676,7 +666,7 @@ public:
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_isiset_supernova_filter_SpellScript::FilterTargets, m_scriptSpellId == SPELL_SUPERNOVA_EFFECT ? EFFECT_1 : EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_isiset_supernova_filter_SpellScript::FilterTargets, m_scriptSpellId == SPELL_SUPERNOVA_EFFECT ? EFFECT_1 : EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -694,8 +684,6 @@ public:
class spell_isiset_mirror_image_starry_sky_spawner_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_mirror_image_starry_sky_spawner_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_STARRY_SKY_N, SPELL_MIRROR_IMAGE_STARRY_SKY_E, SPELL_MIRROR_IMAGE_STARRY_SKY_W });
@@ -717,7 +705,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_isiset_mirror_image_starry_sky_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_isiset_mirror_image_starry_sky_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -735,8 +723,6 @@ public:
class spell_isiset_mirror_image_spawner_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_mirror_image_spawner_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_N, SPELL_MIRROR_IMAGE_E, SPELL_MIRROR_IMAGE_W });
@@ -758,7 +744,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_isiset_mirror_image_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_isiset_mirror_image_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -777,8 +763,6 @@ public:
class spell_isiset_image_explosion_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_image_explosion_SpellScript);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
InstanceScript* const instance = GetCaster()->GetInstanceScript();
@@ -804,7 +788,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_isiset_image_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectLaunch.Register(&spell_isiset_image_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -822,8 +806,6 @@ public:
class spell_isiset_call_of_sky_SpellScript : public SpellScript
{
PrepareSpellScript(spell_isiset_call_of_sky_SpellScript);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -833,7 +815,7 @@ public:
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_isiset_call_of_sky_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectLaunch.Register(&spell_isiset_call_of_sky_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
+3 -9
View File
@@ -382,8 +382,6 @@ private:
class spell_rajh_summon_meteor : public SpellScript
{
PrepareSpellScript(spell_rajh_summon_meteor);
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, 1);
@@ -391,14 +389,12 @@ class spell_rajh_summon_meteor : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rajh_summon_meteor::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_rajh_summon_meteor::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_rajh_summon_sun_orb : public SpellScript
{
PrepareSpellScript(spell_rajh_summon_sun_orb);
void SetDest(SpellDestination& dest)
{
dest.RelocateOffset({ 0.0f, 0.0f, 15.0f, 0.0f });
@@ -406,14 +402,12 @@ class spell_rajh_summon_sun_orb : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_rajh_summon_sun_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT_RIGHT);
OnDestinationTargetSelect.Register(&spell_rajh_summon_sun_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT_RIGHT);
}
};
class spell_rajh_summon_sun_orb_power_cost : public AuraScript
{
PrepareAuraScript(spell_rajh_summon_sun_orb_power_cost);
void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -422,7 +416,7 @@ class spell_rajh_summon_sun_orb_power_cost : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_rajh_summon_sun_orb_power_cost::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_rajh_summon_sun_orb_power_cost::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp
+1 -3
View File
@@ -499,8 +499,6 @@ public:
class spell_setesh_chaos_blast_SpellScript : public SpellScript
{
PrepareSpellScript(spell_setesh_chaos_blast_SpellScript);
void FilterTargets(std::list<WorldObject*>& unitList)
{
if (unitList.empty())
@@ -513,7 +511,7 @@ public:
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_setesh_chaos_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_setesh_chaos_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
+6 -16
View File
@@ -336,8 +336,6 @@ struct go_anhuur_beacon_of_light : public GameObjectAI
// 75592 - Divine Reckoning
class spell_anhuur_divine_reckoning : public AuraScript
{
PrepareAuraScript(spell_anhuur_divine_reckoning);
void OnPeriodic(AuraEffect const* aurEff)
{
if (Unit* caster = GetCaster())
@@ -353,7 +351,7 @@ class spell_anhuur_divine_reckoning : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_anhuur_divine_reckoning::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_anhuur_divine_reckoning::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -361,8 +359,6 @@ class spell_anhuur_divine_reckoning : public AuraScript
// 76573 - Shield of Light (right)
class spell_anhuur_shield_of_light : public SpellScript
{
PrepareSpellScript(spell_anhuur_shield_of_light);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -377,15 +373,13 @@ class spell_anhuur_shield_of_light : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_shield_of_light::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_anhuur_shield_of_light::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
// 75322 - Reverberating Hymn
class spell_anhuur_reverberating_hymn : public AuraScript
{
PrepareAuraScript(spell_anhuur_reverberating_hymn);
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired))
@@ -396,7 +390,7 @@ class spell_anhuur_reverberating_hymn : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_anhuur_reverberating_hymn::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_anhuur_reverberating_hymn::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -404,8 +398,6 @@ class spell_anhuur_reverberating_hymn : public AuraScript
// 76608 - Disable Beacon Beams R
class spell_anhuur_disable_beacon_beams : public SpellScript
{
PrepareSpellScript(spell_anhuur_disable_beacon_beams);
void HandleScript(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->InterruptNonMeleeSpells(true, GetEffectValue());
@@ -420,15 +412,13 @@ class spell_anhuur_disable_beacon_beams : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_anhuur_disable_beacon_beams::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHit += SpellEffectFn(spell_anhuur_disable_beacon_beams::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_anhuur_disable_beacon_beams::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHit.Register(&spell_anhuur_disable_beacon_beams::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_anhuur_burning_light_forcecast : public SpellScript
{
PrepareSpellScript(spell_anhuur_burning_light_forcecast);
void FilterTargets(std::list<WorldObject*>& targets)
{
Unit* caster = GetCaster();
@@ -446,7 +436,7 @@ class spell_anhuur_burning_light_forcecast : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_burning_light_forcecast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_anhuur_burning_light_forcecast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp
+2 -4
View File
@@ -96,8 +96,6 @@ struct go_hoo_the_makers_lift_controller : public GameObjectAI
class spell_hoo_flame_ring_visual : public SpellScript
{
PrepareSpellScript(spell_hoo_flame_ring_visual);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -123,8 +121,8 @@ class spell_hoo_flame_ring_visual : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hoo_flame_ring_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnEffectHitTarget += SpellEffectFn(spell_hoo_flame_ring_visual::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_hoo_flame_ring_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnEffectHitTarget.Register(&spell_hoo_flame_ring_visual::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp
+8 -24
View File
@@ -350,8 +350,6 @@ struct npc_husam_shockwave_visual : public NullCreatureAI
class spell_husam_hammer_fist : public AuraScript
{
PrepareAuraScript(spell_husam_hammer_fist);
void HandleTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -362,14 +360,12 @@ class spell_husam_hammer_fist : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_husam_hammer_fist::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_husam_hammer_fist::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_husam_shockwave : public SpellScript
{
PrepareSpellScript(spell_husam_shockwave);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHOCKWAVE_VISUAL });
@@ -382,14 +378,12 @@ class spell_husam_shockwave : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_husam_shockwave::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_husam_shockwave::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_husam_shockwave_summon_search : public SpellScript
{
PrepareSpellScript(spell_husam_shockwave_summon_search);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHOCKWAVE_SUMMON_EFFECT });
@@ -403,14 +397,12 @@ class spell_husam_shockwave_summon_search : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_husam_shockwave_summon_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_husam_shockwave_summon_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_husam_mystic_trap : public SpellScript
{
PrepareSpellScript(spell_husam_mystic_trap);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.size() < 3)
@@ -421,14 +413,12 @@ class spell_husam_mystic_trap : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_husam_mystic_trap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_husam_mystic_trap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_husam_detonate_traps : public SpellScript
{
PrepareSpellScript(spell_husam_detonate_traps);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Creature* target = GetHitCreature())
@@ -438,14 +428,12 @@ class spell_husam_detonate_traps : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_husam_detonate_traps::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_husam_detonate_traps::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_husam_bad_intentions : public SpellScript
{
PrepareSpellScript(spell_husam_bad_intentions);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -458,14 +446,12 @@ class spell_husam_bad_intentions : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_husam_bad_intentions::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_husam_bad_intentions::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_husam_hurl : public SpellScript
{
PrepareSpellScript(spell_husam_hurl);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Vehicle* vehicle = GetCaster()->GetVehicleKit())
@@ -482,14 +468,12 @@ class spell_husam_hurl : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_husam_hurl::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_husam_hurl::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_husam_land_mine_player_search_effect : public SpellScript
{
PrepareSpellScript(spell_husam_land_mine_player_search_effect);
void HandleDummyEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -500,7 +484,7 @@ class spell_husam_land_mine_player_search_effect : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_husam_land_mine_player_search_effect::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_husam_land_mine_player_search_effect::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp
+4 -12
View File
@@ -680,8 +680,6 @@ public:
class spell_barim_plague_of_ages_first_SpellScript : public SpellScript
{
PrepareSpellScript(spell_barim_plague_of_ages_first_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -692,7 +690,7 @@ public:
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_barim_plague_of_ages_first_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_barim_plague_of_ages_first_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
}
};
@@ -709,8 +707,6 @@ public:
class spell_barim_plague_of_ages_second_SpellScript : public SpellScript
{
PrepareSpellScript(spell_barim_plague_of_ages_second_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -721,7 +717,7 @@ public:
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_barim_plague_of_ages_second_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_barim_plague_of_ages_second_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
}
};
@@ -738,8 +734,6 @@ public:
class spell_barim_repentance_script_SpellScript : public SpellScript
{
PrepareSpellScript(spell_barim_repentance_script_SpellScript);
void EffectScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* playerTarget = GetHitPlayer())
@@ -748,7 +742,7 @@ public:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_barim_repentance_script_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_barim_repentance_script_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -765,8 +759,6 @@ public:
class spell_barim_repentance_pull_SpellScript : public SpellScript
{
PrepareSpellScript(spell_barim_repentance_pull_SpellScript);
void HandPullEffect(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -791,7 +783,7 @@ public:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_barim_repentance_pull_SpellScript::HandPullEffect, EFFECT_0, SPELL_EFFECT_PULL_TOWARDS);
OnEffectHitTarget.Register(&spell_barim_repentance_pull_SpellScript::HandPullEffect, EFFECT_0, SPELL_EFFECT_PULL_TOWARDS);
}
};
src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
+4 -10
View File
@@ -531,8 +531,6 @@ class spell_lockmaw_scent_of_blood : public SpellScriptLoader
class spell_lockmaw_scent_of_blood_SpellScript : public SpellScript
{
PrepareSpellScript(spell_lockmaw_scent_of_blood_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -543,7 +541,7 @@ class spell_lockmaw_scent_of_blood : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_lockmaw_scent_of_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_lockmaw_scent_of_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -560,8 +558,6 @@ class spell_lockmaw_paralytic_blow_dart : public SpellScriptLoader
class spell_lockmaw_paralytic_blow_dart_SpellScript : public SpellScript
{
PrepareSpellScript(spell_lockmaw_paralytic_blow_dart_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -572,7 +568,7 @@ class spell_lockmaw_paralytic_blow_dart : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_lockmaw_paralytic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_lockmaw_paralytic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -589,8 +585,6 @@ class spell_lockmaw_random_aggro_taunt : public SpellScriptLoader
class spell_lockmaw_random_aggro_taunt_SpellScript : public SpellScript
{
PrepareSpellScript(spell_lockmaw_random_aggro_taunt_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -606,8 +600,8 @@ class spell_lockmaw_random_aggro_taunt : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_lockmaw_random_aggro_taunt_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_lockmaw_random_aggro_taunt_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_lockmaw_random_aggro_taunt_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_lockmaw_random_aggro_taunt_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
+12 -28
View File
@@ -531,8 +531,6 @@ class spell_siamat_thunder_crash : public SpellScriptLoader
class spell_siamat_thunder_crash_AuraScript : public AuraScript
{
PrepareAuraScript(spell_siamat_thunder_crash_AuraScript);
void HandleTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -543,7 +541,7 @@ class spell_siamat_thunder_crash : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_thunder_crash_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_siamat_thunder_crash_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -560,8 +558,6 @@ class spell_siamat_wailing_winds : public SpellScriptLoader
class spell_siamat_wailing_winds_AuraScript : public AuraScript
{
PrepareAuraScript(spell_siamat_wailing_winds_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WAILING_WINDS_DAMAGE });
@@ -575,7 +571,7 @@ class spell_siamat_wailing_winds : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_wailing_winds_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_siamat_wailing_winds_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -592,8 +588,6 @@ public:
class spell_siamat_wailing_winds_player_AuraScript : public AuraScript
{
PrepareAuraScript(spell_siamat_wailing_winds_player_AuraScript);
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -605,7 +599,7 @@ public:
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_wailing_winds_player_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_siamat_wailing_winds_player_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -622,9 +616,7 @@ public:
class spell_siamat_wailing_winds_knockback_SpellScript : public SpellScript
{
PrepareSpellScript(spell_siamat_wailing_winds_knockback_SpellScript);
void EffectScriptEffect(SpellEffIndex /*effIndex*/)
void EffectScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
if (Unit* victim = GetHitUnit())
@@ -641,7 +633,7 @@ public:
void Register()
{
OnEffectHitTarget += SpellEffectFn(spell_siamat_wailing_winds_knockback_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_siamat_wailing_winds_knockback_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -658,9 +650,7 @@ public:
class spell_siamat_cloud_burst_SpellScript : public SpellScript
{
PrepareSpellScript(spell_siamat_cloud_burst_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
return;
@@ -670,7 +660,7 @@ public:
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siamat_cloud_burst_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_siamat_cloud_burst_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -687,9 +677,7 @@ public:
class spell_siamat_gathered_storms_SpellScript : public SpellScript
{
PrepareSpellScript(spell_siamat_gathered_storms_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
return;
@@ -699,7 +687,7 @@ public:
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siamat_gathered_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_siamat_gathered_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -716,8 +704,6 @@ class spell_siamat_absorb_storms : public SpellScriptLoader
class spell_siamat_absorb_storms_AuraScript : public AuraScript
{
PrepareAuraScript(spell_siamat_absorb_storms_AuraScript);
void OnPeriodic(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -727,14 +713,12 @@ class spell_siamat_absorb_storms : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_absorb_storms_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_siamat_absorb_storms_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_siamat_absorb_storms_SpellScript : public SpellScript
{
PrepareSpellScript(spell_siamat_absorb_storms_SpellScript);
void HandleHit(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -756,8 +740,8 @@ class spell_siamat_absorb_storms : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_siamat_absorb_storms_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siamat_absorb_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_siamat_absorb_storms_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnObjectAreaTargetSelect.Register(&spell_siamat_absorb_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+2 -4
View File
@@ -249,8 +249,6 @@ class spell_egg_explosion : public SpellScriptLoader
class spell_egg_explosion_SpellScript : public SpellScript
{
PrepareSpellScript(spell_egg_explosion_SpellScript);
void HandleAfterCast()
{
if (Creature* buru = GetCaster()->FindNearestCreature(NPC_BURU, 5.f))
@@ -265,8 +263,8 @@ class spell_egg_explosion : public SpellScriptLoader
void Register() override
{
AfterCast += SpellCastFn(spell_egg_explosion_SpellScript::HandleAfterCast);
OnEffectHitTarget += SpellEffectFn(spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast.Register(&spell_egg_explosion_SpellScript::HandleAfterCast);
OnEffectHitTarget.Register(&spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+2 -6
View File
@@ -229,8 +229,6 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader
class spell_skeram_arcane_explosion_SpellScript : public SpellScript
{
PrepareSpellScript(spell_skeram_arcane_explosion_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(PlayerOrPetCheck());
@@ -238,7 +236,7 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -256,8 +254,6 @@ public:
class spell_skeram_true_fulfillment_SpellScript : public SpellScript
{
PrepareSpellScript(spell_skeram_true_fulfillment_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_TRUE_FULFILLMENT_2, SPELL_GENERIC_DISMOUNT });
@@ -271,7 +267,7 @@ public:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_skeram_true_fulfillment_SpellScript::HandleEffect, EFFECT_0, SPELL_AURA_MOD_CHARM);
OnEffectHitTarget.Register(&spell_skeram_true_fulfillment_SpellScript::HandleEffect, EFFECT_0, SPELL_AURA_MOD_CHARM);
}
};
src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
+18 -52
View File
@@ -754,8 +754,6 @@ private:
class spell_alakir_lightning_strike_script : public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_strike_script);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -784,14 +782,12 @@ class spell_alakir_lightning_strike_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_strike_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_alakir_lightning_strike_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_alakir_lightning_strike_periodic : public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_strike_periodic);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -821,14 +817,12 @@ class spell_alakir_lightning_strike_periodic : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_strike_periodic::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_alakir_lightning_strike_periodic::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_alakir_lightning_strike_damage : public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_strike_damage);
void HandleDamageReuction(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -840,14 +834,12 @@ class spell_alakir_lightning_strike_damage : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_strike_damage::HandleDamageReuction, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_alakir_lightning_strike_damage::HandleDamageReuction, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_alakir_electrocute : public AuraScript
{
PrepareAuraScript(spell_alakir_electrocute);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
Unit* caster = GetCaster();
@@ -872,7 +864,7 @@ class spell_alakir_electrocute : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_electrocute::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_alakir_electrocute::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
@@ -904,8 +896,6 @@ class SquallLineGapTargetSelector
class spell_alakir_squall_line_pre_aura : public SpellScript
{
PrepareSpellScript(spell_alakir_squall_line_pre_aura);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -917,14 +907,12 @@ class spell_alakir_squall_line_pre_aura : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_squall_line_pre_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_alakir_squall_line_pre_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_alakir_squall_line_script : public SpellScript
{
PrepareSpellScript(spell_alakir_squall_line_script);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -941,14 +929,12 @@ class spell_alakir_squall_line_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alakir_squall_line_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_alakir_squall_line_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_alakir_relentless_storm_initial_vehicle_ride_trigger : public SpellScript
{
PrepareSpellScript(spell_alakir_relentless_storm_initial_vehicle_ride_trigger);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_RELENTLESS_STORM_INITIAL_VEHICLE_RIDE });
@@ -963,14 +949,12 @@ class spell_alakir_relentless_storm_initial_vehicle_ride_trigger : public SpellS
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alakir_relentless_storm_initial_vehicle_ride_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_alakir_relentless_storm_initial_vehicle_ride_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_alakir_relentless_storm_initial_vehicle_ride : public SpellScript
{
PrepareSpellScript(spell_alakir_relentless_storm_initial_vehicle_ride);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -981,14 +965,12 @@ class spell_alakir_relentless_storm_initial_vehicle_ride : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_alakir_relentless_storm_initial_vehicle_ride::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_alakir_relentless_storm_initial_vehicle_ride::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
class spell_alakir_wind_burst : public AuraScript
{
PrepareAuraScript(spell_alakir_wind_burst);
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
GetTarget()->SetCanFly(true, true);
@@ -996,14 +978,12 @@ class spell_alakir_wind_burst : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_wind_burst::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_alakir_wind_burst::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_alakir_lightning_clouds_periodic : public AuraScript
{
PrepareAuraScript(spell_alakir_lightning_clouds_periodic);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_LIGHTNING_CLOUDS_VISUAL_DEST });
@@ -1020,7 +1000,7 @@ class spell_alakir_lightning_clouds_periodic : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_lightning_clouds_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_alakir_lightning_clouds_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -1039,8 +1019,6 @@ class LightningCloudsAltitudeTargetSelector
class spell_alakir_lightning_clouds_damage : public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_clouds_damage);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1051,14 +1029,12 @@ class spell_alakir_lightning_clouds_damage : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_lightning_clouds_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_alakir_lightning_clouds_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_alakir_lightning_clouds_targeting : public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_clouds_targeting);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_LIGHTNING_CLOUDS_SUMMON });
@@ -1078,14 +1054,12 @@ class spell_alakir_lightning_clouds_targeting : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_clouds_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_alakir_lightning_clouds_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_alakir_lightning_clouds_dummy : public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_clouds_dummy);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1096,7 +1070,7 @@ class spell_alakir_lightning_clouds_dummy : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_lightning_clouds_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_alakir_lightning_clouds_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
@@ -1115,8 +1089,6 @@ class LightningRodTargetSelector
class spell_alakir_lightning_rod_damage : public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_rod_damage);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1127,14 +1099,12 @@ class spell_alakir_lightning_rod_damage : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_lightning_rod_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_alakir_lightning_rod_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
class spell_alakir_relentless_storm : public SpellScript
{
PrepareSpellScript(spell_alakir_relentless_storm);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -1145,7 +1115,7 @@ class spell_alakir_relentless_storm : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_alakir_relentless_storm::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_alakir_relentless_storm::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
@@ -1164,8 +1134,6 @@ class RelentlessStormTargetSelector
class spell_alakir_storm_distance_check: public SpellScript
{
PrepareSpellScript(spell_alakir_storm_distance_check);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_RELENTLESS_STORM_RIDE });
@@ -1186,15 +1154,13 @@ class spell_alakir_storm_distance_check: public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_storm_distance_check::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_alakir_storm_distance_check::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_alakir_storm_distance_check::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_alakir_storm_distance_check::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_alakir_lightning_script: public SpellScript
{
PrepareSpellScript(spell_alakir_lightning_script);
void HandleScriptEffect(SpellEffIndex effIndex)
{
if (Unit* caster = GetCaster())
@@ -1206,7 +1172,7 @@ class spell_alakir_lightning_script: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_alakir_lightning_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp
+12 -33
View File
@@ -1074,8 +1074,6 @@ private:
class spell_conclave_of_wind_winds_pre_effect_warning : public AuraScript
{
PrepareAuraScript(spell_conclave_of_wind_winds_pre_effect_warning);
void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired))
@@ -1087,14 +1085,12 @@ class spell_conclave_of_wind_winds_pre_effect_warning : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_conclave_of_wind_winds_pre_effect_warning::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_conclave_of_wind_winds_pre_effect_warning::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_conclave_of_wind_teleport_to_center : public SpellScript
{
PrepareSpellScript(spell_conclave_of_wind_teleport_to_center);
void SetDest(SpellDestination& dest)
{
if (Creature* creature = GetCaster()->ToCreature())
@@ -1103,14 +1099,12 @@ class spell_conclave_of_wind_teleport_to_center : public SpellScript
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_conclave_of_wind_teleport_to_center::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
OnDestinationTargetSelect.Register(&spell_conclave_of_wind_teleport_to_center::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
};
class spell_conclave_of_wind_winds : public AuraScript
{
PrepareAuraScript(spell_conclave_of_wind_winds);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1148,14 +1142,12 @@ class spell_conclave_of_wind_winds : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_conclave_of_wind_winds::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_conclave_of_wind_winds::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_conclave_of_wind_wind_blast : public SpellScript
{
PrepareSpellScript(spell_conclave_of_wind_wind_blast);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -1166,14 +1158,12 @@ class spell_conclave_of_wind_wind_blast : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_conclave_of_wind_wind_blast::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_conclave_of_wind_wind_blast::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
class spell_conclave_of_wind_wind_blast_AuraScript : public AuraScript
{
PrepareAuraScript(spell_conclave_of_wind_wind_blast_AuraScript);
void HandleTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
@@ -1183,14 +1173,12 @@ class spell_conclave_of_wind_wind_blast_AuraScript : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_conclave_of_wind_wind_blast_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_conclave_of_wind_wind_blast_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
class spell_conclave_of_wind_wind_blast_triggered : public SpellScript
{
PrepareSpellScript(spell_conclave_of_wind_wind_blast_triggered);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -1201,14 +1189,12 @@ class spell_conclave_of_wind_wind_blast_triggered : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_conclave_of_wind_wind_blast_triggered::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_conclave_of_wind_wind_blast_triggered::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
class spell_conclave_of_wind_hurricane : public SpellScript
{
PrepareSpellScript(spell_conclave_of_wind_hurricane);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HURRICANE_RIDE_VEHICLE });
@@ -1221,14 +1207,12 @@ class spell_conclave_of_wind_hurricane : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_conclave_of_wind_hurricane::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_conclave_of_wind_hurricane::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_conclave_of_wind_hurricane_ride_vehicle : public SpellScript
{
PrepareSpellScript(spell_conclave_of_wind_hurricane_ride_vehicle);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -1239,15 +1223,12 @@ class spell_conclave_of_wind_hurricane_ride_vehicle : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_conclave_of_wind_hurricane_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_conclave_of_wind_hurricane_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
class spell_conclave_of_wind_toxic_spores : public SpellScript
{
PrepareSpellScript(spell_conclave_of_wind_toxic_spores);
// Handle the cast as non-triggered to inform the client and its addons properly
{ // Handle the cast as non-triggered to inform the client and its addons properly
void HandleCast(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -1256,14 +1237,12 @@ class spell_conclave_of_wind_toxic_spores : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_conclave_of_wind_toxic_spores::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_conclave_of_wind_toxic_spores::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
class spell_conclave_of_wind_sleet_storm : public SpellScript
{
PrepareSpellScript(spell_conclave_of_wind_sleet_storm);
bool Load() override
{
_targetCount = 0;
@@ -1285,8 +1264,8 @@ class spell_conclave_of_wind_sleet_storm : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_conclave_of_wind_sleet_storm::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnHit += SpellHitFn(spell_conclave_of_wind_sleet_storm::SplitDamage);
OnObjectAreaTargetSelect.Register(&spell_conclave_of_wind_sleet_storm::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnHit.Register(&spell_conclave_of_wind_sleet_storm::SplitDamage);
}
private:
src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp
+2 -6
View File
@@ -178,8 +178,6 @@ class spell_totfw_jet_stream : public SpellScriptLoader
class spell_totfw_jet_stream_SpellScript : public SpellScript
{
PrepareSpellScript(spell_totfw_jet_stream_SpellScript);
void HandleForcecast(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -188,7 +186,7 @@ class spell_totfw_jet_stream : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_totfw_jet_stream_SpellScript::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_totfw_jet_stream_SpellScript::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -205,8 +203,6 @@ class spell_totfw_catch_fall_summon : public SpellScriptLoader
class spell_totfw_catch_fall_summon_SpellScript : public SpellScript
{
PrepareSpellScript(spell_totfw_catch_fall_summon_SpellScript);
void SetDestPosition(SpellEffIndex /*effIndex*/)
{
float x = GetExplTargetDest()->GetPositionX();
@@ -219,7 +215,7 @@ class spell_totfw_catch_fall_summon : public SpellScriptLoader
void Register()
{
OnEffectLaunch += SpellEffectFn(spell_totfw_catch_fall_summon_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON);
OnEffectLaunch.Register(&spell_totfw_catch_fall_summon_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON);
}
};
src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp
+6 -16
View File
@@ -227,8 +227,6 @@ private:
// 88276 - Call The Wind
class spell_altairus_call_the_wind : public SpellScript
{
PrepareSpellScript(spell_altairus_call_the_wind);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_CALL_THE_WIND_AURA });
@@ -256,16 +254,14 @@ class spell_altairus_call_the_wind : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_altairus_call_the_wind::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_altairus_call_the_wind::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_altairus_call_the_wind::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_altairus_call_the_wind::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 88282 - Upwind of Altairus
class spell_altairus_upwind_of_altairus : public SpellScript
{
PrepareSpellScript(spell_altairus_upwind_of_altairus);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -296,15 +292,13 @@ class spell_altairus_upwind_of_altairus : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_altairus_upwind_of_altairus::HandleUpwind, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_altairus_upwind_of_altairus::HandleUpwind, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
// 88772 - Call the Wind
class spell_altairus_call_the_wind_channel : public SpellScript
{
PrepareSpellScript(spell_altairus_call_the_wind_channel);
void SetTarget(WorldObject*& target)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -315,15 +309,13 @@ class spell_altairus_call_the_wind_channel : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_altairus_call_the_wind_channel::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_altairus_call_the_wind_channel::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
// 88322 - Chilling Breath
class spell_altairus_chilling_breath : public SpellScript
{
PrepareSpellScript(spell_altairus_chilling_breath);
void HandleScript(SpellEffIndex /*effIndex*/)
{
GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()));
@@ -331,13 +323,11 @@ class spell_altairus_chilling_breath : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_altairus_chilling_breath::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_altairus_chilling_breath::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_altairus_safe_area : public AuraScript
{
PrepareAuraScript(spell_altairus_safe_area);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_LIGHTNING_BLAST });
@@ -362,7 +352,7 @@ class spell_altairus_safe_area : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_altairus_safe_area::HandleLightningBlast, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_altairus_safe_area::HandleLightningBlast, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
+12 -28
View File
@@ -559,8 +559,6 @@ private:
// 86632 - SOTS Targeting
class spell_asaad_sots_targeting : public SpellScript
{
PrepareSpellScript(spell_asaad_sots_targeting);
void SelectRandom(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, 1);
@@ -574,16 +572,14 @@ class spell_asaad_sots_targeting : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_sots_targeting::SelectRandom, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_asaad_sots_targeting::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_asaad_sots_targeting::SelectRandom, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_asaad_sots_targeting::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 86926 - SOTS Trigger (makes Asaad channel Unstable Grounding Field)
class spell_asaad_sots_trigger : public SpellScript
{
PrepareSpellScript(spell_asaad_sots_trigger);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_UNSTABLE_GROUNDING_FIELD });
@@ -596,7 +592,7 @@ class spell_asaad_sots_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_asaad_sots_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_asaad_sots_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -606,8 +602,6 @@ class spell_asaad_sots_trigger : public SpellScript
// 86925 - Storm Rune Beam C
class spell_asaad_storm_rune_beam : public SpellScript
{
PrepareSpellScript(spell_asaad_storm_rune_beam);
void SetTarget(WorldObject*& target)
{
InstanceScript* instance = GetCaster()->GetInstanceScript();
@@ -637,15 +631,13 @@ class spell_asaad_storm_rune_beam : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_storm_rune_beam::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_asaad_storm_rune_beam::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
// 87517 - Grounding Field Visual Beams
class spell_asaad_grounding_field_visual_beams : public SpellScript
{
PrepareSpellScript(spell_asaad_grounding_field_visual_beams);
void SetTargetA(WorldObject*& target)
{
target = GetStormTarget(POINT_STORM_A);
@@ -663,9 +655,9 @@ class spell_asaad_grounding_field_visual_beams : public SpellScript
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_grounding_field_visual_beams::SetTargetA, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_grounding_field_visual_beams::SetTargetB, EFFECT_1, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_grounding_field_visual_beams::SetTargetC, EFFECT_2, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_asaad_grounding_field_visual_beams::SetTargetA, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_asaad_grounding_field_visual_beams::SetTargetB, EFFECT_1, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_asaad_grounding_field_visual_beams::SetTargetC, EFFECT_2, TARGET_UNIT_NEARBY_ENTRY);
}
private:
Creature * GetStormTarget(uint32 point)
@@ -681,8 +673,6 @@ private:
// 87553/93994 - Supremacy of the Storm (massive aoe damage)
class spell_asaad_supremacy_of_the_storm : public SpellScript
{
PrepareSpellScript(spell_asaad_supremacy_of_the_storm);
void FilterTargets(std::list<WorldObject*>& targets)
{
InstanceScript* instance = GetCaster()->GetInstanceScript();
@@ -709,7 +699,7 @@ class spell_asaad_supremacy_of_the_storm : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_supremacy_of_the_storm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_asaad_supremacy_of_the_storm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
@@ -731,8 +721,6 @@ class AboveGroundCheck
class spell_asaad_supremacy_of_the_storm_visual : public SpellScript
{
PrepareSpellScript(spell_asaad_supremacy_of_the_storm_visual);
void FilterTargets(std::list<WorldObject*>& targets)
{
InstanceScript* instance = GetCaster()->GetInstanceScript();
@@ -763,14 +751,12 @@ class spell_asaad_supremacy_of_the_storm_visual : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_supremacy_of_the_storm_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_asaad_supremacy_of_the_storm_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_asaad_static_cling : public SpellScript
{
PrepareSpellScript(spell_asaad_static_cling);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(AboveGroundCheck());
@@ -778,15 +764,13 @@ class spell_asaad_static_cling : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_static_cling::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_static_cling::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_asaad_static_cling::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_asaad_static_cling::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
class spell_asaad_summon_skyfall_star : public SpellScript
{
PrepareSpellScript(spell_asaad_summon_skyfall_star);
void SetDest(SpellDestination& dest)
{
Creature* caster = GetCaster()->ToCreature();
@@ -805,7 +789,7 @@ class spell_asaad_summon_skyfall_star : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_asaad_summon_skyfall_star::SetDest, EFFECT_0, TARGET_DEST_DEST_RADIUS);
OnDestinationTargetSelect.Register(&spell_asaad_summon_skyfall_star::SetDest, EFFECT_0, TARGET_DEST_DEST_RADIUS);
}
};
src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
+2 -6
View File
@@ -231,8 +231,6 @@ private:
class spell_ertan_storms_edge : public SpellScript
{
PrepareSpellScript(spell_ertan_storms_edge);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -260,14 +258,12 @@ class spell_ertan_storms_edge : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_ertan_storms_edge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_ertan_storms_edge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_ertan_storms_edge_script : public SpellScript
{
PrepareSpellScript(spell_ertan_storms_edge_script);
void HandleScript(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -276,7 +272,7 @@ class spell_ertan_storms_edge_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_ertan_storms_edge_script::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_ertan_storms_edge_script::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
+16 -40
View File
@@ -477,8 +477,6 @@ struct npc_vp_catch_fall : public NullCreatureAI
// 85294 - Lurk Search
class spell_vp_lurk_search_periodic : public AuraScript
{
PrepareAuraScript(spell_vp_lurk_search_periodic);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -506,14 +504,12 @@ class spell_vp_lurk_search_periodic : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_vp_lurk_search_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_vp_lurk_search_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_vp_lurk_search : public SpellScript
{
PrepareSpellScript(spell_vp_lurk_search);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -582,16 +578,14 @@ class spell_vp_lurk_search : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_vp_lurk_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_vp_lurk_search::HandleLightningBolt, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_vp_lurk_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_vp_lurk_search::HandleLightningBolt, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 85267 - Feign Death
class spell_vp_feign_death : public SpellScript
{
PrepareSpellScript(spell_vp_feign_death);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_LURK });
@@ -604,14 +598,12 @@ class spell_vp_feign_death : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_vp_feign_death::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_vp_feign_death::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_vp_feign_death_AuraScript : public AuraScript
{
PrepareAuraScript(spell_vp_feign_death_AuraScript);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
@@ -624,16 +616,14 @@ class spell_vp_feign_death_AuraScript : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectRemoveFn(spell_vp_feign_death_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_vp_feign_death_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_vp_feign_death_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_vp_feign_death_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
}
};
// 85281 - Lurk Ressurect
class spell_vp_lurk_ressurect : public AuraScript
{
PrepareAuraScript(spell_vp_lurk_ressurect);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_LURK });
@@ -648,15 +638,13 @@ class spell_vp_lurk_ressurect : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_vp_lurk_ressurect::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_vp_lurk_ressurect::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// 85084 - Howling Gale
class spell_vp_howling_gale : public AuraScript
{
PrepareAuraScript(spell_vp_howling_gale);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -678,15 +666,13 @@ class spell_vp_howling_gale : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_vp_howling_gale::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_vp_howling_gale::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
// 85159, 85085 - Howling Gale
class spell_vp_howling_gale_knockback : public AuraScript
{
PrepareAuraScript(spell_vp_howling_gale_knockback);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->ModifyAuraState(AURA_STATE_UNKNOWN22, true);
@@ -699,16 +685,14 @@ class spell_vp_howling_gale_knockback : public AuraScript
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_vp_howling_gale_knockback::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_vp_howling_gale_knockback::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_vp_howling_gale_knockback::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_vp_howling_gale_knockback::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// 84978, 84989, 85395, 85396, 85017 - Slipstream
class spell_slipstream : public SpellScript
{
PrepareSpellScript(spell_slipstream);
void SetTarget(WorldObject*& target)
{
InstanceScript* instance = GetCaster()->GetInstanceScript();
@@ -749,15 +733,13 @@ class spell_slipstream : public SpellScript
}
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_slipstream::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
OnObjectTargetSelect.Register(&spell_slipstream::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
// 87726 - Grounding Field
class spell_grounding_field : public SpellScript
{
PrepareSpellScript(spell_grounding_field);
void GetNearbyGroundFields()
{
std::list<Creature*> groundingFields;
@@ -789,8 +771,8 @@ class spell_grounding_field : public SpellScript
void Register() override
{
BeforeCast += SpellCastFn(spell_grounding_field::GetNearbyGroundFields);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_grounding_field::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
BeforeCast.Register(&spell_grounding_field::GetNearbyGroundFields);
OnObjectAreaTargetSelect.Register(&spell_grounding_field::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
private:
bool prevent = false;
@@ -800,8 +782,6 @@ private:
// 87850 - Skyfall
class spell_skyfall : public SpellScript
{
PrepareSpellScript(spell_skyfall);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -814,15 +794,13 @@ class spell_skyfall : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_skyfall::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_skyfall::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 88201 - Healing Well
class spell_vp_healing_well : public SpellScript
{
PrepareSpellScript(spell_vp_healing_well);
void SetDest(SpellDestination& dest)
{
float offset = GetCaster()->GetFloorZ() - GetCaster()->GetPositionZ();
@@ -831,7 +809,7 @@ class spell_vp_healing_well : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_vp_healing_well::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_vp_healing_well::SetDest, EFFECT_0, TARGET_DEST_CASTER);
}
};
@@ -841,8 +819,6 @@ Position const AsaadTeleportPos = { -1193.67f, 472.835f, 634.8653f, 0.0f };
class spell_vp_catch_fall : public SpellScript
{
PrepareSpellScript(spell_vp_catch_fall);
void SetDest(SpellDestination& dest)
{
float z = GetCaster()->GetPositionZ();
@@ -858,7 +834,7 @@ class spell_vp_catch_fall : public SpellScript
void Register()
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_vp_catch_fall::SetDest, EFFECT_0, TARGET_DEST_CASTER);
OnDestinationTargetSelect.Register(&spell_vp_catch_fall::SetDest, EFFECT_0, TARGET_DEST_CASTER);
}
};
src/server/scripts/Kalimdor/zone_ashenvale.cpp
+1 -3
View File
@@ -367,8 +367,6 @@ class spell_destroy_karangs_banner : public SpellScriptLoader
class spell_destroy_karangs_banner_SpellScript : public SpellScript
{
PrepareSpellScript(spell_destroy_karangs_banner_SpellScript);
void HandleAfterCast()
{
if (GameObject* banner = GetCaster()->FindNearestGameObject(GO_BANNER, GetSpellInfo()->GetMaxRange(true)))
@@ -377,7 +375,7 @@ class spell_destroy_karangs_banner : public SpellScriptLoader
void Register() override
{
AfterCast += SpellCastFn(spell_destroy_karangs_banner_SpellScript::HandleAfterCast);
AfterCast.Register(&spell_destroy_karangs_banner_SpellScript::HandleAfterCast);
}
};
Loaded 100 of 252 files, more files were not shown because too many files have changed in this diff. Show more