refactor(Script/Spells): convert winter_veil into new system (#9606)

This commit is contained in:
Kitzunu
2021-12-13 08:39:27 +01:00
committed by GitHub
parent 0a0013aaef
commit fa1f9085bb
+21 -76
View File
@@ -34,14 +34,9 @@ enum Mistletoe
}; };
// 26218 - Mistletoe // 26218 - Mistletoe
class spell_winter_veil_mistletoe : public SpellScriptLoader class spell_winter_veil_mistletoe : public SpellScript
{ {
public: PrepareSpellScript(spell_winter_veil_mistletoe);
spell_winter_veil_mistletoe() : SpellScriptLoader("spell_winter_veil_mistletoe") { }
class spell_winter_veil_mistletoe_SpellScript : public SpellScript
{
PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override bool Validate(SpellInfo const* /*spell*/) override
{ {
@@ -64,13 +59,7 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_mistletoe_SpellScript();
} }
}; };
@@ -83,14 +72,9 @@ enum winterWondervoltTrap
}; };
// 26275 - PX-238 Winter Wondervolt TRAP // 26275 - PX-238 Winter Wondervolt TRAP
class spell_winter_wondervolt_trap : public SpellScriptLoader class spell_winter_wondervolt_trap : public SpellScript
{ {
public: PrepareSpellScript(spell_winter_wondervolt_trap);
spell_winter_wondervolt_trap() : SpellScriptLoader("spell_winter_wondervolt_trap") {}
class spell_winter_wondervolt_trap_SpellScript : public SpellScript
{
PrepareSpellScript(spell_winter_wondervolt_trap_SpellScript);
void HandleScriptEffect(SpellEffIndex /*effIndex*/) void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{ {
@@ -118,13 +102,7 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_winter_wondervolt_trap_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_winter_wondervolt_trap::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_winter_wondervolt_trap_SpellScript();
} }
}; };
@@ -145,14 +123,9 @@ enum crashinTrashin
}; };
// 49297 - Racer Rocket Slam // 49297 - Racer Rocket Slam
class spell_winter_veil_racer_rocket_slam : public SpellScriptLoader class spell_winter_veil_racer_rocket_slam : public SpellScript
{ {
public: PrepareSpellScript(spell_winter_veil_racer_rocket_slam);
spell_winter_veil_racer_rocket_slam() : SpellScriptLoader("spell_winter_veil_racer_rocket_slam") {}
class spell_winter_veil_racer_rocket_slam_SpellScript : public SpellScript
{
PrepareSpellScript(spell_winter_veil_racer_rocket_slam_SpellScript);
void HandleTriggerSpell(SpellEffIndex /*effIndex*/) void HandleTriggerSpell(SpellEffIndex /*effIndex*/)
{ {
@@ -201,25 +174,14 @@ public:
void Register() override void Register() override
{ {
OnEffectLaunch += SpellEffectFn(spell_winter_veil_racer_rocket_slam_SpellScript::HandleTriggerSpell, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); OnEffectLaunch += SpellEffectFn(spell_winter_veil_racer_rocket_slam::HandleTriggerSpell, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_racer_rocket_slam_SpellScript();
} }
}; };
// 49325 - Racer Slam, resolve // 49325 - Racer Slam, resolve
class spell_winter_veil_racer_slam_hit : public SpellScriptLoader class spell_winter_veil_racer_slam_hit : public SpellScript
{ {
public: PrepareSpellScript(spell_winter_veil_racer_slam_hit);
spell_winter_veil_racer_slam_hit() : SpellScriptLoader("spell_winter_veil_racer_slam_hit") {}
class spell_winter_veil_racer_slam_hit_SpellScript : public SpellScript
{
PrepareSpellScript(spell_winter_veil_racer_slam_hit_SpellScript);
void HandleScriptEffect(SpellEffIndex /*effIndex*/) void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{ {
@@ -242,13 +204,7 @@ public:
void Register() override void Register() override
{ {
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_racer_slam_hit_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_winter_veil_racer_slam_hit::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_racer_slam_hit_SpellScript();
} }
}; };
@@ -263,14 +219,9 @@ enum airRifle
/* 65576 - Pelted! /* 65576 - Pelted!
67533 - Shoot Air Rifle */ 67533 - Shoot Air Rifle */
class spell_winter_veil_shoot_air_rifle : public SpellScriptLoader class spell_winter_veil_shoot_air_rifle : public SpellScript
{ {
public: PrepareSpellScript(spell_winter_veil_shoot_air_rifle);
spell_winter_veil_shoot_air_rifle() : SpellScriptLoader("spell_winter_veil_shoot_air_rifle") {}
class spell_winter_veil_shoot_air_rifle_SpellScript : public SpellScript
{
PrepareSpellScript(spell_winter_veil_shoot_air_rifle_SpellScript);
void HandleScriptEffect(SpellEffIndex /*effIndex*/) void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{ {
@@ -299,24 +250,18 @@ public:
void Register() override void Register() override
{ {
if (m_scriptSpellId == SPELL_AIR_RIFLE_HIT_TRIGGER) if (m_scriptSpellId == SPELL_AIR_RIFLE_HIT_TRIGGER)
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_shoot_air_rifle_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_winter_veil_shoot_air_rifle::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
else else
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_shoot_air_rifle_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_winter_veil_shoot_air_rifle::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_winter_veil_shoot_air_rifle_SpellScript();
} }
}; };
void AddSC_event_winter_veil_scripts() void AddSC_event_winter_veil_scripts()
{ {
// Spells // Spells
new spell_winter_veil_mistletoe(); RegisterSpellScript(spell_winter_veil_mistletoe);
new spell_winter_wondervolt_trap(); RegisterSpellScript(spell_winter_wondervolt_trap);
new spell_winter_veil_racer_rocket_slam(); RegisterSpellScript(spell_winter_veil_racer_rocket_slam);
new spell_winter_veil_racer_slam_hit(); RegisterSpellScript(spell_winter_veil_racer_slam_hit);
new spell_winter_veil_shoot_air_rifle(); RegisterSpellScript(spell_winter_veil_shoot_air_rifle);
} }