From f8a5ca9f6c8ccd31bfc4a2981de56f8600563f4c Mon Sep 17 00:00:00 2001 From: Keader Date: Sat, 28 May 2016 18:54:31 -0300 Subject: [PATCH] DB/Misc: delete duplicate file --- .../world/3.3.5/9999_99_99_99_world.sql | 20 ------------------- .../boss_northrend_beasts.cpp | 16 +++++++-------- 2 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 sql/updates/world/3.3.5/9999_99_99_99_world.sql diff --git a/sql/updates/world/3.3.5/9999_99_99_99_world.sql b/sql/updates/world/3.3.5/9999_99_99_99_world.sql deleted file mode 100644 index 5eb742f0dcc..00000000000 --- a/sql/updates/world/3.3.5/9999_99_99_99_world.sql +++ /dev/null @@ -1,20 +0,0 @@ -DELETE FROM `spell_script_names` where `ScriptName` IN ('spell_jormungars_burning_spray','spell_jormungars_paralytic_spray','spell_jormungars_paralytic_toxin','spell_jormungars_paralysis'); -INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES -(66902,'spell_jormungars_burning_spray'), -- Burning Spray 10m normal -(67627,'spell_jormungars_burning_spray'), -- Burning Spray 25m normal -(67628,'spell_jormungars_burning_spray'), -- Burning Spray 10m heroic -(67629,'spell_jormungars_burning_spray'), -- Burning Spray 25m heroic -(66901,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 10m normal -(67615,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 25m normal -(67616,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 10m heroic -(67617,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 25m heroic -(66823,'spell_jormungars_paralytic_toxin'), -- Paralytic Toxin 10m normal -(67618,'spell_jormungars_paralytic_toxin'), -- Paralytic Toxin 25m normal -(67619,'spell_jormungars_paralytic_toxin'), -- Paralytic Toxin 10m heroic -(67620,'spell_jormungars_paralytic_toxin'), -- Paralytic Toxin 25m heroic -(66830,'spell_jormungars_paralysis'); -- Paralysis - --- Acidmaw missing text -DELETE FROM `creature_text` where entry = 35144 AND groupid = 1; -INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES -(35144, 1, 0, 'You have been infected with a Paralytic Toxin!', 42, 0, 0, 0, 0, 0, 'Acidmaw - Special Attack'); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index d924533a873..abca9a42d45 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -1146,7 +1146,7 @@ public: { PrepareAuraScript(spell_jormungars_paralytic_toxin_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PARALYSIS)) return false; @@ -1190,7 +1190,7 @@ public: } } - void Register() + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_jormungars_paralytic_toxin_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_jormungars_paralytic_toxin_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); @@ -1199,7 +1199,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const override { return new spell_jormungars_paralytic_toxin_AuraScript(); } @@ -1217,7 +1217,7 @@ public: public: spell_jormungars_snakes_spray_SpellScript(uint32 spellId) : SpellScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -1230,7 +1230,7 @@ public: GetCaster()->CastSpell(target, _spellId, true); } - void Register() + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_jormungars_snakes_spray_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } @@ -1239,7 +1239,7 @@ public: uint32 _spellId; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const override { return new spell_jormungars_snakes_spray_SpellScript(_spellId); } @@ -1267,13 +1267,13 @@ public: Remove(); } - void Register() + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_jormungars_paralysis_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const override { return new spell_jormungars_paralysis_AuraScript(); }