From 486be4b76658fc00e98a1d10beba2f0d927dbc69 Mon Sep 17 00:00:00 2001 From: Ariel- Date: Tue, 28 Feb 2017 19:47:01 +0100 Subject: [PATCH 1/4] implement Moss Covered Feet implement Moss Covered Feet --- .../rev_1488307580281293100.sql | 8 ++++ src/scripts/Spells/spell_generic.cpp | 42 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1488307580281293100.sql diff --git a/data/sql/updates/pending_db_world/rev_1488307580281293100.sql b/data/sql/updates/pending_db_world/rev_1488307580281293100.sql new file mode 100644 index 000000000..22835a3b0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1488307580281293100.sql @@ -0,0 +1,8 @@ +INSERT INTO version_db_world (`sql_rev`) VALUES ('1488307580281293100'); +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_moss_covered_feet'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(6870, 'spell_gen_moss_covered_feet'), +(31399, 'spell_gen_moss_covered_feet'); + + + diff --git a/src/scripts/Spells/spell_generic.cpp b/src/scripts/Spells/spell_generic.cpp index 44d822556..ff27b7750 100644 --- a/src/scripts/Spells/spell_generic.cpp +++ b/src/scripts/Spells/spell_generic.cpp @@ -1709,6 +1709,47 @@ class spell_gen_create_lance : public SpellScriptLoader } }; +enum MossCoveredFeet +{ + SPELL_FALL_DOWN = 6869 +}; + +// 6870 Moss Covered Feet +// 31399 Moss Covered Feet +class spell_gen_moss_covered_feet : public SpellScriptLoader +{ +public: + spell_gen_moss_covered_feet() : SpellScriptLoader("spell_gen_moss_covered_feet") { } + + class spell_gen_moss_covered_feet_AuraScript : public AuraScript + { + PrepareAuraScript(spell_gen_moss_covered_feet_AuraScript); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + if (!sSpellMgr->GetSpellInfo(SPELL_FALL_DOWN)) + return false; + return true; + } + + void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + { + PreventDefaultAction(); + eventInfo.GetActionTarget()->CastSpell((Unit*)nullptr, SPELL_FALL_DOWN, true, nullptr, aurEff); + } + + void Register() override + { + OnEffectProc += AuraEffectProcFn(spell_gen_moss_covered_feet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + } + }; + + AuraScript* GetAuraScript() const override + { + return new spell_gen_moss_covered_feet_AuraScript(); + } +}; + enum Netherbloom { SPELL_NETHERBLOOM_POLLEN_1 = 28703 @@ -4910,6 +4951,7 @@ void AddSC_generic_spell_scripts() new spell_gen_break_shield("spell_gen_break_shield"); new spell_gen_break_shield("spell_gen_tournament_counterattack"); new spell_gen_mounted_charge(); + new spell_gen_moss_covered_feet(); new spell_gen_defend(); new spell_gen_tournament_duel(); new spell_gen_summon_tournament_mount(); From a845a3c1d495265e65881c4dcde708ef7ac6e051 Mon Sep 17 00:00:00 2001 From: starrheld Date: Tue, 28 Feb 2017 19:53:18 +0100 Subject: [PATCH 2/4] Update spell_generic.cpp --- src/scripts/Spells/spell_generic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/Spells/spell_generic.cpp b/src/scripts/Spells/spell_generic.cpp index ff27b7750..eb848d453 100644 --- a/src/scripts/Spells/spell_generic.cpp +++ b/src/scripts/Spells/spell_generic.cpp @@ -4951,7 +4951,7 @@ void AddSC_generic_spell_scripts() new spell_gen_break_shield("spell_gen_break_shield"); new spell_gen_break_shield("spell_gen_tournament_counterattack"); new spell_gen_mounted_charge(); - new spell_gen_moss_covered_feet(); + new spell_gen_moss_covered_feet(); new spell_gen_defend(); new spell_gen_tournament_duel(); new spell_gen_summon_tournament_mount(); From 2e497c0f8569395ba69d94750384c4e899ecb84d Mon Sep 17 00:00:00 2001 From: starrheld Date: Fri, 3 Mar 2017 12:02:21 +0100 Subject: [PATCH 3/4] Update spell_generic.cpp --- src/scripts/Spells/spell_generic.cpp | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/scripts/Spells/spell_generic.cpp b/src/scripts/Spells/spell_generic.cpp index eb848d453..e63a8805b 100644 --- a/src/scripts/Spells/spell_generic.cpp +++ b/src/scripts/Spells/spell_generic.cpp @@ -1711,43 +1711,43 @@ class spell_gen_create_lance : public SpellScriptLoader enum MossCoveredFeet { - SPELL_FALL_DOWN = 6869 + SPELL_FALL_DOWN = 6869 }; // 6870 Moss Covered Feet // 31399 Moss Covered Feet class spell_gen_moss_covered_feet : public SpellScriptLoader { -public: - spell_gen_moss_covered_feet() : SpellScriptLoader("spell_gen_moss_covered_feet") { } + public: + spell_gen_moss_covered_feet() : SpellScriptLoader("spell_gen_moss_covered_feet") { } - class spell_gen_moss_covered_feet_AuraScript : public AuraScript - { - PrepareAuraScript(spell_gen_moss_covered_feet_AuraScript); + class spell_gen_moss_covered_feet_AuraScript : public AuraScript + { + PrepareAuraScript(spell_gen_moss_covered_feet_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override - { - if (!sSpellMgr->GetSpellInfo(SPELL_FALL_DOWN)) - return false; - return true; - } + bool Validate(SpellInfo const* /*spellInfo*/) override + { + if (!sSpellMgr->GetSpellInfo(SPELL_FALL_DOWN)) + return false; + return true; + } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) - { - PreventDefaultAction(); - eventInfo.GetActionTarget()->CastSpell((Unit*)nullptr, SPELL_FALL_DOWN, true, nullptr, aurEff); - } + void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + { + PreventDefaultAction(); + eventInfo.GetActionTarget()->CastSpell((Unit*)nullptr, SPELL_FALL_DOWN, true, nullptr, aurEff); + } - void Register() override - { - OnEffectProc += AuraEffectProcFn(spell_gen_moss_covered_feet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); - } - }; + void Register() override + { + OnEffectProc += AuraEffectProcFn(spell_gen_moss_covered_feet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + } + }; - AuraScript* GetAuraScript() const override - { - return new spell_gen_moss_covered_feet_AuraScript(); - } + AuraScript* GetAuraScript() const override + { + return new spell_gen_moss_covered_feet_AuraScript(); + } }; enum Netherbloom From a8e09d7c31d83ae59cdc6cd9cd69180115b1c110 Mon Sep 17 00:00:00 2001 From: starrheld Date: Fri, 3 Mar 2017 12:05:45 +0100 Subject: [PATCH 4/4] [NPC] Lagoon Eel Currently swimming above water surface. --- .../sql/updates/pending_db_world/rev_1488539095792222900.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1488539095792222900.sql diff --git a/data/sql/updates/pending_db_world/rev_1488539095792222900.sql b/data/sql/updates/pending_db_world/rev_1488539095792222900.sql new file mode 100644 index 000000000..44c87b918 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1488539095792222900.sql @@ -0,0 +1,5 @@ +INSERT INTO version_db_world (`sql_rev`) VALUES ('1488539095792222900'); +DELETE FROM `creature` WHERE `GUID` IN(72106); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES (72106, 20290, 530, 1, 1, 0, 0, -284.632, 6580.16, 15.1109, 4.78078, 300, 5, 0, 5158, 0, 1, 0, 0, 0); + +