From 3e407c7d1c79cc94bf932880ee0eb68058d139fd Mon Sep 17 00:00:00 2001 From: Edder Date: Sun, 25 Apr 2021 11:36:54 +0200 Subject: Core/Quest: Threat From Above (#26468) * [Quest] Threat From Above #26355 * [Quest] Threat From Above TrinityCore#26355 * Core/Quest: Threat From Above #26468 - modified sql according to guidelines; added override keyword * Rename 2021_04_24_00_world.sql to 2021_04_25_00_world.sql Co-authored-by: Edder Co-authored-by: Giacomo Pozzoni --- src/server/scripts/Northrend/zone_storm_peaks.cpp | 33 ----------------------- src/server/scripts/Spells/spell_generic.cpp | 27 +++++++++++++++++++ 2 files changed, 27 insertions(+), 33 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index ee7281dabf9..63012a4a65c 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -1067,38 +1067,6 @@ class spell_close_rift : public SpellScriptLoader } }; -// 60603 - Eject Passenger 1 -class spell_eject_passenger_wild_wyrm : public SpellScriptLoader -{ - public: - spell_eject_passenger_wild_wyrm() : SpellScriptLoader("spell_eject_passenger_wild_wyrm") { } - - class spell_eject_passenger_wild_wyrm_SpellScript : public SpellScript - { - PrepareSpellScript(spell_eject_passenger_wild_wyrm_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override - { - return ValidateSpellInfo({ SPELL_FIGHT_WYRM }); - } - - void HandleScript(SpellEffIndex /*effIndex*/) - { - GetHitUnit()->RemoveAurasDueToSpell(SPELL_FIGHT_WYRM); - } - - void Register() override - { - OnEffectHitTarget += SpellEffectFn(spell_eject_passenger_wild_wyrm_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - } - }; - - SpellScript* GetSpellScript() const override - { - return new spell_eject_passenger_wild_wyrm_SpellScript(); - } -}; - // 56689 - Grip class spell_grip : public SpellScriptLoader { @@ -1480,7 +1448,6 @@ void AddSC_storm_peaks() new spell_jokkum_scriptcast(); new spell_veranus_summon(); new spell_close_rift(); - new spell_eject_passenger_wild_wyrm(); new spell_grip(); new spell_grab_on(); new spell_loosen_grip<5>("spell_thrust_spear"); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 3d4a012cf2b..af37d81e776 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3735,6 +3735,31 @@ class spell_gen_eject_passenger : public SpellScript } }; +class spell_gen_eject_passenger_with_seatId : public SpellScript +{ + PrepareSpellScript(spell_gen_eject_passenger_with_seatId); + +public: + spell_gen_eject_passenger_with_seatId(uint8 seatId) : SpellScript(), _seatId(seatId) { } + +private: + uint8 _seatId; + + void EjectPassenger(SpellEffIndex /*effIndex*/) + { + if (Vehicle* vehicle = GetHitUnit()->GetVehicleKit()) + { + if (Unit* passenger = vehicle->GetPassenger(_seatId)) + passenger->ExitVehicle(); + } + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_gen_eject_passenger_with_seatId::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + enum GMFreeze { SPELL_GM_FREEZE = 9454 @@ -4545,6 +4570,8 @@ void AddSC_generic_spell_scripts() RegisterSpellScript(spell_gen_whisper_gulch_yogg_saron_whisper); RegisterSpellScript(spell_gen_eject_all_passengers); RegisterSpellScript(spell_gen_eject_passenger); + RegisterSpellScriptWithArgs(spell_gen_eject_passenger_with_seatId, "spell_gen_eject_passenger_1", 0); + RegisterSpellScriptWithArgs(spell_gen_eject_passenger_with_seatId, "spell_gen_eject_passenger_3", 2); RegisterSpellScript(spell_gen_gm_freeze); RegisterSpellScript(spell_gen_stand); RegisterSpellScript(spell_gen_mixology_bonus); -- cgit v1.2.3