sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Scripts/BlackTemple): Spell Scripts use registry macros (#19122)

Browse Source
This commit is contained in:
Jelle Meeus
2024-06-22 10:20:06 +02:00
committed by GitHub
parent f65283c35a
commit 9f348fc96d
7 changed files with 828 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1719035147610263349.sql
+26
View File
@@ -0,0 +1,26 @@
--
UPDATE `spell_script_names` SET `ScriptName`='spell_mother_shahraz_random_periodic_aura' WHERE `spell_id`=40867;
UPDATE `spell_script_names` SET `ScriptName`='spell_mother_shahraz_beam_periodic_aura' WHERE `spell_id` IN (40862,40863,40865,40866);
UPDATE `spell_script_names` SET `ScriptName`='spell_mother_shahraz_saber_lash_aura' WHERE `spell_id`=40816;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidari_council_balance_of_power_aura' WHERE `spell_id`=41341;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidari_council_reflective_shield_aura' WHERE `spell_id`=41475;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidari_council_deadly_strike_aura' WHERE `spell_id`=41480;
UPDATE `spell_script_names` SET `ScriptName`='spell_reliquary_of_souls_aura_of_suffering_aura' WHERE `spell_id`=41292;
UPDATE `spell_script_names` SET `ScriptName`='spell_reliquary_of_souls_aura_of_desire_aura' WHERE `spell_id`=41350;
UPDATE `spell_script_names` SET `ScriptName`='spell_reliquary_of_souls_aura_of_anger_aura' WHERE `spell_id`=41337;
UPDATE `spell_script_names` SET `ScriptName`='spell_reliquary_of_souls_spite_aura' WHERE `spell_id`=41376;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_template_harpooners_mark_aura' WHERE `spell_id`=40084;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_curse_of_the_bleakheart_aura' WHERE `spell_id`=41170;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_skeleton_shot_aura' WHERE `spell_id`=41171;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_wyvern_sting_aura' WHERE `spell_id`=41186;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_charge_rage_aura' WHERE `spell_id`=39575;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_shadow_inferno_aura' WHERE `spell_id`=39645;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_spell_absorption_aura' WHERE `spell_id`=41034;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_consuming_strikes_aura' WHERE `spell_id`=41248;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_curse_of_vitality_aura' WHERE `spell_id`=41351;
UPDATE `spell_script_names` SET `ScriptName`='spell_black_temple_dementia_aura' WHERE `spell_id`=41404;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidan_parasitic_shadowfiend_aura' WHERE `spell_id`=41917;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidan_tear_of_azzinoth_summon_channel_aura' WHERE `spell_id`=39857;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidan_demon_transform1_aura' WHERE `spell_id`=40511;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidan_demon_transform2_aura' WHERE `spell_id`=40398;
UPDATE `spell_script_names` SET `ScriptName`='spell_illidan_cage_trap_stun_aura' WHERE `spell_id`=40760;
src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+8 -30
View File
@@ -198,14 +198,9 @@ public:
}; };
}; };
class spell_gurtogg_bloodboil : public SpellScriptLoader class spell_gurtogg_bloodboil : public SpellScript
{ {
public: PrepareSpellScript(spell_gurtogg_bloodboil);
spell_gurtogg_bloodboil() : SpellScriptLoader("spell_gurtogg_bloodboil") { }
class spell_gurtogg_bloodboil_SpellScript : public SpellScript
{
PrepareSpellScript(spell_gurtogg_bloodboil_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets) void FilterTargets(std::list<WorldObject*>& targets)
{ {
@@ -223,24 +218,13 @@ public:
void Register() override void Register() override
{ {
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gurtogg_bloodboil_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gurtogg_bloodboil::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_gurtogg_bloodboil_SpellScript();
} }
}; };
class spell_gurtogg_eject : public SpellScriptLoader class spell_gurtogg_eject : public SpellScript
{ {
public: PrepareSpellScript(spell_gurtogg_eject);
spell_gurtogg_eject() : SpellScriptLoader("spell_gurtogg_eject") { }
class spell_gurtogg_eject_SpellScript : public SpellScript
{
PrepareSpellScript(spell_gurtogg_eject_SpellScript);
void HandleScriptEffect(SpellEffIndex effIndex) void HandleScriptEffect(SpellEffIndex effIndex)
{ {
@@ -251,20 +235,14 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_gurtogg_eject_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_gurtogg_eject::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_gurtogg_eject_SpellScript();
} }
}; };
void AddSC_boss_gurtogg_bloodboil() void AddSC_boss_gurtogg_bloodboil()
{ {
new boss_gurtogg_bloodboil(); new boss_gurtogg_bloodboil();
new spell_gurtogg_bloodboil(); RegisterSpellScript(spell_gurtogg_bloodboil);
new spell_gurtogg_eject(); RegisterSpellScript(spell_gurtogg_eject);
} }
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+99 -181
View File
@@ -1023,14 +1023,14 @@ public:
} }
}; };
class spell_illidan_draw_soul : public SpellScriptLoader class spell_illidan_draw_soul : public SpellScript
{ {
public: PrepareSpellScript(spell_illidan_draw_soul);
spell_illidan_draw_soul() : SpellScriptLoader("spell_illidan_draw_soul") { }
class spell_illidan_draw_soul_SpellScript : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareSpellScript(spell_illidan_draw_soul_SpellScript); return ValidateSpellInfo({ SPELL_DRAW_SOUL_HEAL });
}
void HandleScriptEffect(SpellEffIndex effIndex) void HandleScriptEffect(SpellEffIndex effIndex)
{ {
@@ -1041,24 +1041,18 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidan_draw_soul_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_illidan_draw_soul::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidan_draw_soul_SpellScript();
} }
}; };
class spell_illidan_parasitic_shadowfiend : public SpellScriptLoader class spell_illidan_parasitic_shadowfiend_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidan_parasitic_shadowfiend_aura);
spell_illidan_parasitic_shadowfiend() : SpellScriptLoader("spell_illidan_parasitic_shadowfiend") { }
class spell_illidan_parasitic_shadowfiend_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_illidan_parasitic_shadowfiend_AuraScript) return ValidateSpellInfo({ SPELL_SUMMON_PARASITIC_SHADOWFIENDS });
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
@@ -1068,45 +1062,13 @@ public:
void Register() override void Register() override
{ {
AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidan_parasitic_shadowfiend_AuraScript();
} }
}; };
class spell_illidan_parasitic_shadowfiend_trigger : public SpellScriptLoader class spell_illidan_parasitic_shadowfiend_trigger : public SpellScript
{ {
public: PrepareSpellScript(spell_illidan_parasitic_shadowfiend_trigger);
spell_illidan_parasitic_shadowfiend_trigger() : SpellScriptLoader("spell_illidan_parasitic_shadowfiend_trigger") { }
class spell_illidan_parasitic_shadowfiend_trigger_AuraScript : public AuraScript
{
PrepareAuraScript(spell_illidan_parasitic_shadowfiend_trigger_AuraScript)
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (!GetTarget()->HasAura(SPELL_SHADOW_PRISON) && GetTarget()->GetInstanceScript() && GetTarget()->GetInstanceScript()->IsEncounterInProgress())
GetTarget()->CastSpell(GetTarget(), SPELL_SUMMON_PARASITIC_SHADOWFIENDS, true);
}
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_trigger_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidan_parasitic_shadowfiend_trigger_AuraScript();
}
class spell_illidan_parasitic_shadowfiend_trigger_SpellScript : public SpellScript
{
PrepareSpellScript(spell_illidan_parasitic_shadowfiend_trigger_SpellScript);
void HandleScriptEffect(SpellEffIndex effIndex) void HandleScriptEffect(SpellEffIndex effIndex)
{ {
@@ -1117,24 +1079,39 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidan_parasitic_shadowfiend_trigger_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_illidan_parasitic_shadowfiend_trigger::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidan_parasitic_shadowfiend_trigger_SpellScript();
} }
}; };
class spell_illidan_glaive_throw : public SpellScriptLoader class spell_illidan_parasitic_shadowfiend_trigger_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidan_parasitic_shadowfiend_trigger_aura);
spell_illidan_glaive_throw() : SpellScriptLoader("spell_illidan_glaive_throw") { }
class spell_illidan_glaive_throw_SpellScript : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareSpellScript(spell_illidan_glaive_throw_SpellScript); return ValidateSpellInfo({ SPELL_SUMMON_PARASITIC_SHADOWFIENDS });
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (!GetTarget()->HasAura(SPELL_SHADOW_PRISON) && GetTarget()->GetInstanceScript() && GetTarget()->GetInstanceScript()->IsEncounterInProgress())
GetTarget()->CastSpell(GetTarget(), SPELL_SUMMON_PARASITIC_SHADOWFIENDS, true);
}
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_trigger_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_illidan_glaive_throw : public SpellScript
{
PrepareSpellScript(spell_illidan_glaive_throw);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SUMMON_GLAIVE });
}
void HandleDummy(SpellEffIndex effIndex) void HandleDummy(SpellEffIndex effIndex)
{ {
@@ -1145,24 +1122,18 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidan_glaive_throw_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_illidan_glaive_throw::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidan_glaive_throw_SpellScript();
} }
}; };
class spell_illidan_tear_of_azzinoth_summon_channel : public SpellScriptLoader class spell_illidan_tear_of_azzinoth_summon_channel_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidan_tear_of_azzinoth_summon_channel_aura);
spell_illidan_tear_of_azzinoth_summon_channel() : SpellScriptLoader("spell_illidan_tear_of_azzinoth_summon_channel") { }
class spell_illidan_tear_of_azzinoth_summon_channel_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_illidan_tear_of_azzinoth_summon_channel_AuraScript); return ValidateSpellInfo({ SPELL_UNCAGED_WRATH, SPELL_CHARGE });
}
void OnPeriodic(AuraEffect const* /*aurEff*/) void OnPeriodic(AuraEffect const* /*aurEff*/)
{ {
@@ -1189,24 +1160,13 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_tear_of_azzinoth_summon_channel_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_tear_of_azzinoth_summon_channel_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidan_tear_of_azzinoth_summon_channel_AuraScript();
} }
}; };
class spell_illidan_shadow_prison : public SpellScriptLoader class spell_illidan_shadow_prison : public SpellScript
{ {
public: PrepareSpellScript(spell_illidan_shadow_prison);
spell_illidan_shadow_prison() : SpellScriptLoader("spell_illidan_shadow_prison") { }
class spell_illidan_shadow_prison_SpellScript : public SpellScript
{
PrepareSpellScript(spell_illidan_shadow_prison_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets) void FilterTargets(std::list<WorldObject*>& targets)
{ {
@@ -1215,24 +1175,18 @@ public:
void Register() override void Register() override
{ {
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_illidan_shadow_prison_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_illidan_shadow_prison::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidan_shadow_prison_SpellScript();
} }
}; };
class spell_illidan_demon_transform1 : public SpellScriptLoader class spell_illidan_demon_transform1_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidan_demon_transform1_aura);
spell_illidan_demon_transform1() : SpellScriptLoader("spell_illidan_demon_transform1") { }
class spell_illidan_demon_transform1_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_illidan_demon_transform1_AuraScript); return ValidateSpellInfo({ SPELL_DEMON_TRANSFORM_2 });
}
bool Load() override bool Load() override
{ {
@@ -1249,24 +1203,18 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_demon_transform1_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_demon_transform1_aura::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidan_demon_transform1_AuraScript();
} }
}; };
class spell_illidan_demon_transform2 : public SpellScriptLoader class spell_illidan_demon_transform2_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidan_demon_transform2_aura);
spell_illidan_demon_transform2() : SpellScriptLoader("spell_illidan_demon_transform2") { }
class spell_illidan_demon_transform2_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_illidan_demon_transform2_AuraScript); return ValidateSpellInfo({ SPELL_DEMON_FORM, SPELL_DEMON_TRANSFORM_3 });
}
bool Load() override bool Load() override
{ {
@@ -1298,24 +1246,18 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_demon_transform2_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_demon_transform2_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidan_demon_transform2_AuraScript();
} }
}; };
class spell_illidan_flame_burst : public SpellScriptLoader class spell_illidan_flame_burst : public SpellScript
{ {
public: PrepareSpellScript(spell_illidan_flame_burst);
spell_illidan_flame_burst() : SpellScriptLoader("spell_illidan_flame_burst") { }
class spell_illidan_flame_burst_SpellScript : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareSpellScript(spell_illidan_flame_burst_SpellScript); return ValidateSpellInfo({ SPELL_FLAME_BURST_EFFECT });
}
void HandleScriptEffect(SpellEffIndex effIndex) void HandleScriptEffect(SpellEffIndex effIndex)
{ {
@@ -1326,24 +1268,18 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidan_flame_burst_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_illidan_flame_burst::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidan_flame_burst_SpellScript();
} }
}; };
class spell_illidan_found_target : public SpellScriptLoader class spell_illidan_found_target : public SpellScript
{ {
public: PrepareSpellScript(spell_illidan_found_target);
spell_illidan_found_target() : SpellScriptLoader("spell_illidan_found_target") { }
class spell_illidan_found_target_SpellScript : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareSpellScript(spell_illidan_found_target_SpellScript); return ValidateSpellInfo({ SPELL_CONSUME_SOUL, SPELL_FIND_TARGET });
}
void HandleDummy(SpellEffIndex effIndex) void HandleDummy(SpellEffIndex effIndex)
{ {
@@ -1358,24 +1294,18 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidan_found_target_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_illidan_found_target::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidan_found_target_SpellScript();
} }
}; };
class spell_illidan_cage_trap : public SpellScriptLoader class spell_illidan_cage_trap : public SpellScript
{ {
public: PrepareSpellScript(spell_illidan_cage_trap);
spell_illidan_cage_trap() : SpellScriptLoader("spell_illidan_cage_trap") { }
class spell_illidan_cage_trap_SpellScript : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareSpellScript(spell_illidan_cage_trap_SpellScript); return ValidateSpellInfo({ SPELL_CAGE_TRAP });
}
bool Load() override bool Load() override
{ {
@@ -1398,24 +1328,18 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidan_cage_trap_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_illidan_cage_trap::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidan_cage_trap_SpellScript();
} }
}; };
class spell_illidan_cage_trap_stun : public SpellScriptLoader class spell_illidan_cage_trap_stun_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidan_cage_trap_stun_aura);
spell_illidan_cage_trap_stun() : SpellScriptLoader("spell_illidan_cage_trap_stun") { }
class spell_illidan_cage_trap_stun_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_illidan_cage_trap_stun_AuraScript); return ValidateSpellInfo({ SPELL_CAGED_DEBUFF, SPELL_CAGED_SUMMON1, SPELL_CAGED_SUMMON1+1, SPELL_CAGED_SUMMON1+2, SPELL_CAGED_SUMMON1+3, SPELL_CAGED_SUMMON1+4, SPELL_CAGED_SUMMON1+5, SPELL_CAGED_SUMMON1+6, SPELL_CAGED_SUMMON8 });
}
void OnPeriodic(AuraEffect const* /*aurEff*/) void OnPeriodic(AuraEffect const* /*aurEff*/)
{ {
@@ -1429,13 +1353,7 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_cage_trap_stun_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_cage_trap_stun_aura::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidan_cage_trap_stun_AuraScript();
} }
}; };
@@ -1443,17 +1361,17 @@ void AddSC_boss_illidan()
{ {
new boss_illidan_stormrage(); new boss_illidan_stormrage();
new npc_akama_illidan(); new npc_akama_illidan();
new spell_illidan_draw_soul(); RegisterSpellScript(spell_illidan_draw_soul);
new spell_illidan_parasitic_shadowfiend(); RegisterSpellScript(spell_illidan_parasitic_shadowfiend_aura);
new spell_illidan_parasitic_shadowfiend_trigger(); RegisterSpellAndAuraScriptPair(spell_illidan_parasitic_shadowfiend_trigger, spell_illidan_parasitic_shadowfiend_trigger_aura);
new spell_illidan_glaive_throw(); RegisterSpellScript(spell_illidan_glaive_throw);
new spell_illidan_tear_of_azzinoth_summon_channel(); RegisterSpellScript(spell_illidan_tear_of_azzinoth_summon_channel_aura);
new spell_illidan_shadow_prison(); RegisterSpellScript(spell_illidan_shadow_prison);
new spell_illidan_demon_transform1(); RegisterSpellScript(spell_illidan_demon_transform1_aura);
new spell_illidan_demon_transform2(); RegisterSpellScript(spell_illidan_demon_transform2_aura);
new spell_illidan_flame_burst(); RegisterSpellScript(spell_illidan_flame_burst);
new spell_illidan_found_target(); RegisterSpellScript(spell_illidan_found_target);
new spell_illidan_cage_trap(); RegisterSpellScript(spell_illidan_cage_trap);
new spell_illidan_cage_trap_stun(); RegisterSpellScript(spell_illidan_cage_trap_stun_aura);
} }
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+36 -87
View File
@@ -171,14 +171,14 @@ public:
}; };
}; };
class spell_mother_shahraz_random_periodic : public SpellScriptLoader class spell_mother_shahraz_random_periodic_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_mother_shahraz_random_periodic_aura);
spell_mother_shahraz_random_periodic() : SpellScriptLoader("spell_mother_shahraz_random_periodic") { }
class spell_mother_shahraz_random_periodic_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_mother_shahraz_random_periodic_AuraScript); return ValidateSpellInfo({ SPELL_SINFUL_PERIODIC, SPELL_SINISTER_PERIODIC, SPELL_VILE_PERIODIC, SPELL_WICKED_PERIODIC });
}
void Update(AuraEffect const* effect) void Update(AuraEffect const* effect)
{ {
@@ -189,24 +189,13 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_random_periodic_AuraScript::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_random_periodic_aura::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_mother_shahraz_random_periodic_AuraScript();
} }
}; };
class spell_mother_shahraz_beam_periodic : public SpellScriptLoader class spell_mother_shahraz_beam_periodic_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_mother_shahraz_beam_periodic_aura);
spell_mother_shahraz_beam_periodic() : SpellScriptLoader("spell_mother_shahraz_beam_periodic") { }
class spell_mother_shahraz_beam_periodic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mother_shahraz_beam_periodic_AuraScript);
void Update(AuraEffect const* effect) void Update(AuraEffect const* effect)
{ {
@@ -217,24 +206,13 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_beam_periodic_AuraScript::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_beam_periodic_aura::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_mother_shahraz_beam_periodic_AuraScript();
} }
}; };
class spell_mother_shahraz_saber_lash : public SpellScriptLoader class spell_mother_shahraz_saber_lash_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_mother_shahraz_saber_lash_aura);
spell_mother_shahraz_saber_lash() : SpellScriptLoader("spell_mother_shahraz_saber_lash") { }
class spell_mother_shahraz_saber_lash_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mother_shahraz_saber_lash_AuraScript);
bool CheckProc(ProcEventInfo& /*eventInfo*/) bool CheckProc(ProcEventInfo& /*eventInfo*/)
{ {
@@ -250,25 +228,19 @@ public:
void Register() override void Register() override
{ {
DoCheckProc += AuraCheckProcFn(spell_mother_shahraz_saber_lash_AuraScript::CheckProc); DoCheckProc += AuraCheckProcFn(spell_mother_shahraz_saber_lash_aura::CheckProc);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_saber_lash_AuraScript::Update, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_saber_lash_aura::Update, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_mother_shahraz_saber_lash_AuraScript();
} }
}; };
class spell_mother_shahraz_fatal_attraction : public SpellScriptLoader class spell_mother_shahraz_fatal_attraction : public SpellScript
{ {
public: PrepareSpellScript(spell_mother_shahraz_fatal_attraction);
spell_mother_shahraz_fatal_attraction() : SpellScriptLoader("spell_mother_shahraz_fatal_attraction") { }
class spell_mother_shahraz_fatal_attraction_SpellScript : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareSpellScript(spell_mother_shahraz_fatal_attraction_SpellScript); return ValidateSpellInfo({ SPELL_FATAL_ATTRACTION_AURA });
}
void FilterTargets(std::list<WorldObject*>& targets) void FilterTargets(std::list<WorldObject*>& targets)
{ {
@@ -297,26 +269,20 @@ public:
void Register() override void Register() override
{ {
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mother_shahraz_fatal_attraction_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mother_shahraz_fatal_attraction::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_mother_shahraz_fatal_attraction_SpellScript::SetDest, EFFECT_1, TARGET_DEST_CASTER_RANDOM); OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_mother_shahraz_fatal_attraction::SetDest, EFFECT_1, TARGET_DEST_CASTER_RANDOM);
OnEffectHitTarget += SpellEffectFn(spell_mother_shahraz_fatal_attraction_SpellScript::HandleTeleportUnits, EFFECT_1, SPELL_EFFECT_TELEPORT_UNITS); OnEffectHitTarget += SpellEffectFn(spell_mother_shahraz_fatal_attraction::HandleTeleportUnits, EFFECT_1, SPELL_EFFECT_TELEPORT_UNITS);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_mother_shahraz_fatal_attraction_SpellScript();
} }
}; };
class spell_mother_shahraz_fatal_attraction_dummy : public SpellScriptLoader class spell_mother_shahraz_fatal_attraction_dummy : public SpellScript
{ {
public: PrepareSpellScript(spell_mother_shahraz_fatal_attraction_dummy);
spell_mother_shahraz_fatal_attraction_dummy() : SpellScriptLoader("spell_mother_shahraz_fatal_attraction_dummy") { }
class spell_mother_shahraz_fatal_attraction_dummy_SpellScript : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareSpellScript(spell_mother_shahraz_fatal_attraction_dummy_SpellScript); return ValidateSpellInfo({ SPELL_FATAL_ATTRACTION_DAMAGE });
}
void HandleDummy(SpellEffIndex /*effIndex*/) void HandleDummy(SpellEffIndex /*effIndex*/)
{ {
@@ -330,24 +296,13 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_mother_shahraz_fatal_attraction_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_mother_shahraz_fatal_attraction_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_mother_shahraz_fatal_attraction_dummy_SpellScript();
} }
}; };
class spell_mother_shahraz_fatal_attraction_aura : public SpellScriptLoader class spell_mother_shahraz_fatal_attraction_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_mother_shahraz_fatal_attraction_aura);
spell_mother_shahraz_fatal_attraction_aura() : SpellScriptLoader("spell_mother_shahraz_fatal_attraction_aura") { }
class spell_mother_shahraz_fatal_attraction_aura_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mother_shahraz_fatal_attraction_aura_AuraScript);
void Update(AuraEffect const* effect) void Update(AuraEffect const* effect)
{ {
@@ -360,24 +315,18 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_fatal_attraction_aura_AuraScript::Update, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_fatal_attraction_aura::Update, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_mother_shahraz_fatal_attraction_aura_AuraScript();
} }
}; };
void AddSC_boss_mother_shahraz() void AddSC_boss_mother_shahraz()
{ {
new boss_mother_shahraz(); new boss_mother_shahraz();
new spell_mother_shahraz_random_periodic(); RegisterSpellScript(spell_mother_shahraz_random_periodic_aura);
new spell_mother_shahraz_beam_periodic(); RegisterSpellScript(spell_mother_shahraz_beam_periodic_aura);
new spell_mother_shahraz_saber_lash(); RegisterSpellScript(spell_mother_shahraz_saber_lash_aura);
new spell_mother_shahraz_fatal_attraction(); RegisterSpellScript(spell_mother_shahraz_fatal_attraction);
new spell_mother_shahraz_fatal_attraction_dummy(); RegisterSpellScript(spell_mother_shahraz_fatal_attraction_dummy);
new spell_mother_shahraz_fatal_attraction_aura(); RegisterSpellScript(spell_mother_shahraz_fatal_attraction_aura);
} }
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+40 -85
View File
@@ -582,14 +582,14 @@ public:
}; };
}; };
class spell_reliquary_of_souls_aura_of_suffering : public SpellScriptLoader class spell_reliquary_of_souls_aura_of_suffering_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_reliquary_of_souls_aura_of_suffering_aura);
spell_reliquary_of_souls_aura_of_suffering() : SpellScriptLoader("spell_reliquary_of_souls_aura_of_suffering") { }
class spell_reliquary_of_souls_aura_of_suffering_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_reliquary_of_souls_aura_of_suffering_AuraScript) return ValidateSpellInfo({ SPELL_AURA_OF_SUFFERING_TRIGGER });
}
void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
@@ -603,25 +603,14 @@ public:
void Register() override void Register() override
{ {
OnEffectApply += AuraEffectApplyFn(spell_reliquary_of_souls_aura_of_suffering_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_reliquary_of_souls_aura_of_suffering_aura::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_aura_of_suffering_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_aura_of_suffering_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_reliquary_of_souls_aura_of_suffering_AuraScript();
} }
}; };
class spell_reliquary_of_souls_fixate : public SpellScriptLoader class spell_reliquary_of_souls_fixate : public SpellScript
{ {
public: PrepareSpellScript(spell_reliquary_of_souls_fixate);
spell_reliquary_of_souls_fixate() : SpellScriptLoader("spell_reliquary_of_souls_fixate") { }
class spell_reliquary_of_souls_fixate_SpellScript : public SpellScript
{
PrepareSpellScript(spell_reliquary_of_souls_fixate_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets) void FilterTargets(std::list<WorldObject*>& targets)
{ {
@@ -636,18 +625,13 @@ public:
void Register() override void Register() override
{ {
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_reliquary_of_souls_fixate_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_reliquary_of_souls_fixate::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
} }
}; };
SpellScript* GetSpellScript() const override class spell_reliquary_of_souls_fixate_aura : public AuraScript
{ {
return new spell_reliquary_of_souls_fixate_SpellScript(); PrepareAuraScript(spell_reliquary_of_souls_fixate_aura);
}
class spell_reliquary_of_souls_fixate_AuraScript : public AuraScript
{
PrepareAuraScript(spell_reliquary_of_souls_fixate_AuraScript)
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
@@ -657,24 +641,18 @@ public:
void Register() override void Register() override
{ {
OnEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_fixate_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_fixate_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_reliquary_of_souls_fixate_AuraScript();
} }
}; };
class spell_reliquary_of_souls_aura_of_desire : public SpellScriptLoader class spell_reliquary_of_souls_aura_of_desire_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_reliquary_of_souls_aura_of_desire_aura);
spell_reliquary_of_souls_aura_of_desire() : SpellScriptLoader("spell_reliquary_of_souls_aura_of_desire") { }
class spell_reliquary_of_souls_aura_of_desire_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_reliquary_of_souls_aura_of_desire_AuraScript); return ValidateSpellInfo({ SPELL_AURA_OF_DESIRE_DAMAGE });
}
bool CheckProc(ProcEventInfo& eventInfo) bool CheckProc(ProcEventInfo& eventInfo)
{ {
@@ -702,27 +680,16 @@ public:
void Register() override void Register() override
{ {
DoCheckProc += AuraCheckProcFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::CheckProc); DoCheckProc += AuraCheckProcFn(spell_reliquary_of_souls_aura_of_desire_aura::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); OnEffectProc += AuraEffectProcFn(spell_reliquary_of_souls_aura_of_desire_aura::HandleProc, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_ENERGY_PERCENT); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_reliquary_of_souls_aura_of_desire_aura::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_ENERGY_PERCENT);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::Update, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_reliquary_of_souls_aura_of_desire_aura::Update, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_reliquary_of_souls_aura_of_desire_AuraScript();
} }
}; };
class spell_reliquary_of_souls_aura_of_anger : public SpellScriptLoader class spell_reliquary_of_souls_aura_of_anger_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_reliquary_of_souls_aura_of_anger_aura);
spell_reliquary_of_souls_aura_of_anger() : SpellScriptLoader("spell_reliquary_of_souls_aura_of_anger") { }
class spell_reliquary_of_souls_aura_of_anger_AuraScript : public AuraScript
{
PrepareAuraScript(spell_reliquary_of_souls_aura_of_anger_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
@@ -740,26 +707,20 @@ public:
void Register() override void Register() override
{ {
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_reliquary_of_souls_aura_of_anger_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_reliquary_of_souls_aura_of_anger_aura::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_reliquary_of_souls_aura_of_anger_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_reliquary_of_souls_aura_of_anger_aura::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_reliquary_of_souls_aura_of_anger_AuraScript::Update, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); OnEffectPeriodic += AuraEffectPeriodicFn(spell_reliquary_of_souls_aura_of_anger_aura::Update, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_reliquary_of_souls_aura_of_anger_AuraScript();
} }
}; };
class spell_reliquary_of_souls_spite : public SpellScriptLoader class spell_reliquary_of_souls_spite_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_reliquary_of_souls_spite_aura);
spell_reliquary_of_souls_spite() : SpellScriptLoader("spell_reliquary_of_souls_spite") { }
class spell_reliquary_of_souls_spite_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_reliquary_of_souls_spite_AuraScript) return ValidateSpellInfo({ SPELL_SPITE_DAMAGE });
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
@@ -769,13 +730,7 @@ public:
void Register() override void Register() override
{ {
AfterEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_spite_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DAMAGE_IMMUNITY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_spite_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_DAMAGE_IMMUNITY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_reliquary_of_souls_spite_AuraScript();
} }
}; };
@@ -785,10 +740,10 @@ void AddSC_boss_reliquary_of_souls()
new boss_essence_of_suffering(); new boss_essence_of_suffering();
new boss_essence_of_desire(); new boss_essence_of_desire();
new boss_essence_of_anger(); new boss_essence_of_anger();
new spell_reliquary_of_souls_aura_of_suffering(); RegisterSpellScript(spell_reliquary_of_souls_aura_of_suffering_aura);
new spell_reliquary_of_souls_fixate(); RegisterSpellAndAuraScriptPair(spell_reliquary_of_souls_fixate, spell_reliquary_of_souls_fixate_aura);
new spell_reliquary_of_souls_aura_of_desire(); RegisterSpellScript(spell_reliquary_of_souls_aura_of_desire_aura);
new spell_reliquary_of_souls_aura_of_anger(); RegisterSpellScript(spell_reliquary_of_souls_aura_of_anger_aura);
new spell_reliquary_of_souls_spite(); RegisterSpellScript(spell_reliquary_of_souls_spite_aura);
} }
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+25 -75
View File
@@ -556,14 +556,9 @@ public:
}; };
}; };
class spell_illidari_council_balance_of_power : public SpellScriptLoader class spell_illidari_council_balance_of_power_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidari_council_balance_of_power_aura);
spell_illidari_council_balance_of_power() : SpellScriptLoader("spell_illidari_council_balance_of_power") { }
class spell_illidari_council_balance_of_power_AuraScript : public AuraScript
{
PrepareAuraScript(spell_illidari_council_balance_of_power_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
@@ -573,24 +568,13 @@ public:
void Register() override void Register() override
{ {
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_illidari_council_balance_of_power_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_illidari_council_balance_of_power_aura::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidari_council_balance_of_power_AuraScript();
} }
}; };
class spell_illidari_council_empyreal_balance : public SpellScriptLoader class spell_illidari_council_empyreal_balance : public SpellScript
{ {
public: PrepareSpellScript(spell_illidari_council_empyreal_balance);
spell_illidari_council_empyreal_balance() : SpellScriptLoader("spell_illidari_council_empyreal_balance") { }
class spell_illidari_council_empyreal_balance_SpellScript : public SpellScript
{
PrepareSpellScript(spell_illidari_council_empyreal_balance_SpellScript);
bool Load() override bool Load() override
{ {
@@ -631,30 +615,24 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidari_council_empyreal_balance_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_illidari_council_empyreal_balance::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast += SpellCastFn(spell_illidari_council_empyreal_balance_SpellScript::HandleAfterCast); AfterCast += SpellCastFn(spell_illidari_council_empyreal_balance::HandleAfterCast);
} }
private: private:
float _sharedHealth; float _sharedHealth;
float _sharedHealthMax; float _sharedHealthMax;
uint8 _targetCount; uint8 _targetCount;
};
SpellScript* GetSpellScript() const override
{
return new spell_illidari_council_empyreal_balance_SpellScript();
}
}; };
class spell_illidari_council_reflective_shield : public SpellScriptLoader class spell_illidari_council_reflective_shield_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidari_council_reflective_shield_aura);
spell_illidari_council_reflective_shield() : SpellScriptLoader("spell_illidari_council_reflective_shield") { }
class spell_illidari_council_reflective_shield_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_illidari_council_reflective_shield_AuraScript); return ValidateSpellInfo({ SPELL_REFLECTIVE_SHIELD_T });
}
void ReflectDamage(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) void ReflectDamage(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount)
{ {
@@ -668,24 +646,13 @@ public:
void Register() override void Register() override
{ {
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_illidari_council_reflective_shield_AuraScript::ReflectDamage, EFFECT_0); AfterEffectAbsorb += AuraEffectAbsorbFn(spell_illidari_council_reflective_shield_aura::ReflectDamage, EFFECT_0);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidari_council_reflective_shield_AuraScript();
} }
}; };
class spell_illidari_council_judgement : public SpellScriptLoader class spell_illidari_council_judgement : public SpellScript
{ {
public: PrepareSpellScript(spell_illidari_council_judgement);
spell_illidari_council_judgement() : SpellScriptLoader("spell_illidari_council_judgement") { }
class spell_illidari_council_judgement_SpellScript : public SpellScript
{
PrepareSpellScript(spell_illidari_council_judgement_SpellScript);
void HandleScriptEffect(SpellEffIndex /*effIndex*/) void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{ {
@@ -703,24 +670,13 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_illidari_council_judgement_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_illidari_council_judgement::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_illidari_council_judgement_SpellScript();
} }
}; };
class spell_illidari_council_deadly_strike : public SpellScriptLoader class spell_illidari_council_deadly_strike_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_illidari_council_deadly_strike_aura);
spell_illidari_council_deadly_strike() : SpellScriptLoader("spell_illidari_council_deadly_strike") { }
class spell_illidari_council_deadly_strike_AuraScript : public AuraScript
{
PrepareAuraScript(spell_illidari_council_deadly_strike_AuraScript);
void Update(AuraEffect const* effect) void Update(AuraEffect const* effect)
{ {
@@ -734,13 +690,7 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidari_council_deadly_strike_AuraScript::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidari_council_deadly_strike_aura::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_illidari_council_deadly_strike_AuraScript();
} }
}; };
@@ -751,10 +701,10 @@ void AddSC_boss_illidari_council()
new boss_lady_malande(); new boss_lady_malande();
new boss_veras_darkshadow(); new boss_veras_darkshadow();
new boss_high_nethermancer_zerevor(); new boss_high_nethermancer_zerevor();
new spell_illidari_council_balance_of_power(); RegisterSpellScript(spell_illidari_council_balance_of_power_aura);
new spell_illidari_council_empyreal_balance(); RegisterSpellScript(spell_illidari_council_empyreal_balance);
new spell_illidari_council_reflective_shield(); RegisterSpellScript(spell_illidari_council_reflective_shield_aura);
new spell_illidari_council_judgement(); RegisterSpellScript(spell_illidari_council_judgement);
new spell_illidari_council_deadly_strike(); RegisterSpellScript(spell_illidari_council_deadly_strike_aura);
} }
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+65 -177
View File
@@ -188,14 +188,9 @@ public:
} }
}; };
class spell_black_template_harpooners_mark : public SpellScriptLoader class spell_black_template_harpooners_mark_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_template_harpooners_mark_aura);
spell_black_template_harpooners_mark() : SpellScriptLoader("spell_black_template_harpooners_mark") { }
class spell_black_template_harpooners_mark_AuraScript : public AuraScript
{
PrepareAuraScript(spell_black_template_harpooners_mark_AuraScript)
bool Load() override bool Load() override
{ {
@@ -227,28 +222,17 @@ public:
void Register() override void Register() override
{ {
OnEffectApply += AuraEffectApplyFn(spell_black_template_harpooners_mark_AuraScript::HandleEffectApply, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_black_template_harpooners_mark_aura::HandleEffectApply, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_black_template_harpooners_mark_AuraScript::HandleEffectRemove, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_black_template_harpooners_mark_aura::HandleEffectRemove, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
} }
private: private:
GuidSet _turtleSet; GuidSet _turtleSet;
};
AuraScript* GetAuraScript() const override
{
return new spell_black_template_harpooners_mark_AuraScript();
}
}; };
class spell_black_template_free_friend : public SpellScriptLoader class spell_black_template_free_friend : public SpellScript
{ {
public: PrepareSpellScript(spell_black_template_free_friend);
spell_black_template_free_friend() : SpellScriptLoader("spell_black_template_free_friend") { }
class spell_black_template_free_friend_SpellScript : public SpellScript
{
PrepareSpellScript(spell_black_template_free_friend_SpellScript);
void HandleScriptEffect(SpellEffIndex effIndex) void HandleScriptEffect(SpellEffIndex effIndex)
{ {
@@ -259,24 +243,18 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_black_template_free_friend_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_black_template_free_friend::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_black_template_free_friend_SpellScript();
} }
}; };
class spell_black_temple_curse_of_the_bleakheart : public SpellScriptLoader class spell_black_temple_curse_of_the_bleakheart_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_curse_of_the_bleakheart_aura);
spell_black_temple_curse_of_the_bleakheart() : SpellScriptLoader("spell_black_temple_curse_of_the_bleakheart") { }
class spell_black_temple_curse_of_the_bleakheart_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_black_temple_curse_of_the_bleakheart_AuraScript); return ValidateSpellInfo({ SPELL_CHEST_PAINS });
}
void CalcPeriodic(AuraEffect const* /*effect*/, bool& isPeriodic, int32& amplitude) void CalcPeriodic(AuraEffect const* /*effect*/, bool& isPeriodic, int32& amplitude)
{ {
@@ -293,25 +271,14 @@ public:
void Register() override void Register() override
{ {
DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_black_temple_curse_of_the_bleakheart_AuraScript::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_black_temple_curse_of_the_bleakheart_aura::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_curse_of_the_bleakheart_AuraScript::Update, EFFECT_0, SPELL_AURA_DUMMY); OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_curse_of_the_bleakheart_aura::Update, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_curse_of_the_bleakheart_AuraScript();
} }
}; };
class spell_black_temple_skeleton_shot : public SpellScriptLoader class spell_black_temple_skeleton_shot_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_skeleton_shot_aura);
spell_black_temple_skeleton_shot() : SpellScriptLoader("spell_black_temple_skeleton_shot") { }
class spell_black_temple_skeleton_shot_AuraScript : public AuraScript
{
PrepareAuraScript(spell_black_temple_skeleton_shot_AuraScript)
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
@@ -321,24 +288,18 @@ public:
void Register() override void Register() override
{ {
AfterEffectRemove += AuraEffectRemoveFn(spell_black_temple_skeleton_shot_AuraScript::HandleEffectRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_black_temple_skeleton_shot_aura::HandleEffectRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_skeleton_shot_AuraScript();
} }
}; };
class spell_black_temple_wyvern_sting : public SpellScriptLoader class spell_black_temple_wyvern_sting_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_wyvern_sting_aura);
spell_black_temple_wyvern_sting() : SpellScriptLoader("spell_black_temple_wyvern_sting") { }
class spell_black_temple_wyvern_sting_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_black_temple_wyvern_sting_AuraScript) return ValidateSpellInfo({ SPELL_WYVERN_STING });
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
@@ -348,24 +309,13 @@ public:
void Register() override void Register() override
{ {
AfterEffectRemove += AuraEffectRemoveFn(spell_black_temple_wyvern_sting_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_black_temple_wyvern_sting_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_wyvern_sting_AuraScript();
} }
}; };
class spell_black_temple_charge_rage : public SpellScriptLoader class spell_black_temple_charge_rage_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_charge_rage_aura);
spell_black_temple_charge_rage() : SpellScriptLoader("spell_black_temple_charge_rage") { }
class spell_black_temple_charge_rage_AuraScript : public AuraScript
{
PrepareAuraScript(spell_black_temple_charge_rage_AuraScript);
void Update(AuraEffect const* effect) void Update(AuraEffect const* effect)
{ {
@@ -376,24 +326,18 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_charge_rage_AuraScript::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_charge_rage_aura::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_charge_rage_AuraScript();
} }
}; };
class spell_black_temple_shadow_inferno : public SpellScriptLoader class spell_black_temple_shadow_inferno_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_shadow_inferno_aura);
spell_black_temple_shadow_inferno() : SpellScriptLoader("spell_black_temple_shadow_inferno") { }
class spell_black_temple_shadow_inferno_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_black_temple_shadow_inferno_AuraScript); return ValidateSpellInfo({ SPELL_SHADOW_INFERNO_DAMAGE });
}
void Update(AuraEffect const* effect) void Update(AuraEffect const* effect)
{ {
@@ -404,24 +348,13 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_shadow_inferno_AuraScript::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_shadow_inferno_aura::Update, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_shadow_inferno_AuraScript();
} }
}; };
class spell_black_temple_spell_absorption : public SpellScriptLoader class spell_black_temple_spell_absorption_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_spell_absorption_aura);
spell_black_temple_spell_absorption() : SpellScriptLoader("spell_black_temple_spell_absorption") { }
class spell_black_temple_spell_absorption_AuraScript : public AuraScript
{
PrepareAuraScript(spell_black_temple_spell_absorption_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
@@ -447,26 +380,15 @@ public:
void Register() override void Register() override
{ {
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_black_temple_spell_absorption_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_SCHOOL_ABSORB); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_black_temple_spell_absorption_aura::CalculateAmount, EFFECT_2, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_black_temple_spell_absorption_AuraScript::Absorb, EFFECT_2); OnEffectAbsorb += AuraEffectAbsorbFn(spell_black_temple_spell_absorption_aura::Absorb, EFFECT_2);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_spell_absorption_AuraScript::Update, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE); OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_spell_absorption_aura::Update, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_spell_absorption_AuraScript();
} }
}; };
class spell_black_temple_bloodbolt : public SpellScriptLoader class spell_black_temple_bloodbolt : public SpellScript
{ {
public: PrepareSpellScript(spell_black_temple_bloodbolt);
spell_black_temple_bloodbolt() : SpellScriptLoader("spell_black_temple_bloodbolt") { }
class spell_black_temple_bloodbolt_SpellScript : public SpellScript
{
PrepareSpellScript(spell_black_temple_bloodbolt_SpellScript);
void HandleScriptEffect(SpellEffIndex effIndex) void HandleScriptEffect(SpellEffIndex effIndex)
{ {
@@ -477,24 +399,13 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_black_temple_bloodbolt_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_black_temple_bloodbolt::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_black_temple_bloodbolt_SpellScript();
} }
}; };
class spell_black_temple_consuming_strikes : public SpellScriptLoader class spell_black_temple_consuming_strikes_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_consuming_strikes_aura);
spell_black_temple_consuming_strikes() : SpellScriptLoader("spell_black_temple_consuming_strikes") { }
class spell_black_temple_consuming_strikes_AuraScript : public AuraScript
{
PrepareAuraScript(spell_black_temple_consuming_strikes_AuraScript);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo)
{ {
@@ -504,24 +415,13 @@ public:
void Register() override void Register() override
{ {
OnEffectProc += AuraEffectProcFn(spell_black_temple_consuming_strikes_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); OnEffectProc += AuraEffectProcFn(spell_black_temple_consuming_strikes_aura::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_consuming_strikes_AuraScript();
} }
}; };
class spell_black_temple_curse_of_vitality : public SpellScriptLoader class spell_black_temple_curse_of_vitality_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_curse_of_vitality_aura);
spell_black_temple_curse_of_vitality() : SpellScriptLoader("spell_black_temple_curse_of_vitality") { }
class spell_black_temple_curse_of_vitality_AuraScript : public AuraScript
{
PrepareAuraScript(spell_black_temple_curse_of_vitality_AuraScript);
void OnPeriodic(AuraEffect const* /*aurEff*/) void OnPeriodic(AuraEffect const* /*aurEff*/)
{ {
@@ -531,24 +431,18 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_curse_of_vitality_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_curse_of_vitality_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_curse_of_vitality_AuraScript();
} }
}; };
class spell_black_temple_dementia : public SpellScriptLoader class spell_black_temple_dementia_aura : public AuraScript
{ {
public: PrepareAuraScript(spell_black_temple_dementia_aura);
spell_black_temple_dementia() : SpellScriptLoader("spell_black_temple_dementia") { }
class spell_black_temple_dementia_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_black_temple_dementia_AuraScript); return ValidateSpellInfo({ SPELL_DEMENTIA1, SPELL_DEMENTIA2 });
}
void OnPeriodic(AuraEffect const* /*aurEff*/) void OnPeriodic(AuraEffect const* /*aurEff*/)
{ {
@@ -560,30 +454,24 @@ public:
void Register() override void Register() override
{ {
OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_dementia_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); OnEffectPeriodic += AuraEffectPeriodicFn(spell_black_temple_dementia_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_black_temple_dementia_AuraScript();
} }
}; };
void AddSC_instance_black_temple() void AddSC_instance_black_temple()
{ {
new instance_black_temple(); new instance_black_temple();
new spell_black_template_harpooners_mark(); RegisterSpellScript(spell_black_template_harpooners_mark_aura);
new spell_black_template_free_friend(); RegisterSpellScript(spell_black_template_free_friend);
new spell_black_temple_curse_of_the_bleakheart(); RegisterSpellScript(spell_black_temple_curse_of_the_bleakheart_aura);
new spell_black_temple_skeleton_shot(); RegisterSpellScript(spell_black_temple_skeleton_shot_aura);
new spell_black_temple_wyvern_sting(); RegisterSpellScript(spell_black_temple_wyvern_sting_aura);
new spell_black_temple_charge_rage(); RegisterSpellScript(spell_black_temple_charge_rage_aura);
new spell_black_temple_shadow_inferno(); RegisterSpellScript(spell_black_temple_shadow_inferno_aura);
new spell_black_temple_spell_absorption(); RegisterSpellScript(spell_black_temple_spell_absorption_aura);
new spell_black_temple_bloodbolt(); RegisterSpellScript(spell_black_temple_bloodbolt);
new spell_black_temple_consuming_strikes(); RegisterSpellScript(spell_black_temple_consuming_strikes_aura);
new spell_black_temple_curse_of_vitality(); RegisterSpellScript(spell_black_temple_curse_of_vitality_aura);
new spell_black_temple_dementia(); RegisterSpellScript(spell_black_temple_dementia_aura);
} }