diff options
| author | Mikhail Redko <ovitnez@gmail.com> | 2017-05-04 18:46:10 +0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-05-04 12:46:10 -0300 |
| commit | 8a5b998f487bd1a391cc9d2d350c4a686b4e61b0 (patch) | |
| tree | 72a37f597801978b3dbb3ac3fb2f2b6046d162fd /src | |
| parent | 5ff8601d36a14e95f9c227db1b85253ff36e551e (diff) | |
Core/Spells: Move Big Blizzard Bear implementation to spell script (#19544)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 18 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 1 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 5 |
3 files changed, 6 insertions, 18 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index b889855bf99..c8eae841a45 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3809,24 +3809,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) return; } - case 58983: // Big Blizzard Bear - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill - if (uint16 skillval = unitTarget->ToPlayer()->GetSkillValue(SKILL_RIDING)) - { - if (skillval >= 150) - unitTarget->CastSpell(unitTarget, 58999, true); - else - unitTarget->CastSpell(unitTarget, 58997, true); - } - return; - } case 59317: // Teleporting { diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 1c631b2b511..4c580d25669 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3121,6 +3121,7 @@ void SpellMgr::LoadSpellInfoCorrections() 47977, // Magic Broom 48025, // Headless Horseman's Mount 54729, // Winged Steed of the Ebon Blade + 58983, // Big Blizzard Bear 71342, // Big Love Rocket 72286, // Invincible 74856, // Blazing Hippogryph diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index cac920650d7..6c94a2e53ee 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1922,6 +1922,10 @@ enum Mounts SPELL_WINGED_STEED_150 = 54726, SPELL_WINGED_STEED_280 = 54727, + // Big Blizzard Bear + SPELL_BIG_BLIZZARD_BEAR_60 = 58997, + SPELL_BIG_BLIZZARD_BEAR_100 = 58999, + // Big Love Rocket SPELL_BIG_LOVE_ROCKET_0 = 71343, SPELL_BIG_LOVE_ROCKET_60 = 71344, @@ -4291,6 +4295,7 @@ void AddSC_generic_spell_scripts() new spell_gen_mount("spell_magic_broom", 0, SPELL_MAGIC_BROOM_60, SPELL_MAGIC_BROOM_100, SPELL_MAGIC_BROOM_150, SPELL_MAGIC_BROOM_280); new spell_gen_mount("spell_headless_horseman_mount", 0, SPELL_HEADLESS_HORSEMAN_MOUNT_60, SPELL_HEADLESS_HORSEMAN_MOUNT_100, SPELL_HEADLESS_HORSEMAN_MOUNT_150, SPELL_HEADLESS_HORSEMAN_MOUNT_280); new spell_gen_mount("spell_winged_steed_of_the_ebon_blade", 0, 0, 0, SPELL_WINGED_STEED_150, SPELL_WINGED_STEED_280); + new spell_gen_mount("spell_big_blizzard_bear", 0, SPELL_BIG_BLIZZARD_BEAR_60, SPELL_BIG_BLIZZARD_BEAR_100); new spell_gen_mount("spell_big_love_rocket", SPELL_BIG_LOVE_ROCKET_0, SPELL_BIG_LOVE_ROCKET_60, SPELL_BIG_LOVE_ROCKET_100, SPELL_BIG_LOVE_ROCKET_150, SPELL_BIG_LOVE_ROCKET_310); new spell_gen_mount("spell_invincible", 0, SPELL_INVINCIBLE_60, SPELL_INVINCIBLE_100, SPELL_INVINCIBLE_150, SPELL_INVINCIBLE_310); new spell_gen_mount("spell_blazing_hippogryph", 0, 0, 0, SPELL_BLAZING_HIPPOGRYPH_150, SPELL_BLAZING_HIPPOGRYPH_280); |