diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-13 07:03:57 -0700 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-13 07:03:57 -0700 |
| commit | b9434b63770dc843d68a76bf3f8df64cb68f10f5 (patch) | |
| tree | 3bd7f41d3be303d48382dceff258fc60300299bd | |
| parent | b34d6f5784ef72df4d38df380053059ff0b35ffe (diff) | |
| parent | 9b76acbd3a0745f8eef6af77d80320cb74103a20 (diff) | |
Merge pull request #7753 from Faq/ScrollOfRecall
Core/Spells: Scroll of Recall
| -rw-r--r-- | sql/updates/world/2012_09_13_01_world_spell_target_position.sql | 15 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/sql/updates/world/2012_09_13_01_world_spell_target_position.sql b/sql/updates/world/2012_09_13_01_world_spell_target_position.sql new file mode 100644 index 00000000000..0879dbbbda0 --- /dev/null +++ b/sql/updates/world/2012_09_13_01_world_spell_target_position.sql @@ -0,0 +1,15 @@ +DELETE FROM `spell_target_position` WHERE `id` IN (60323,60324,60325,60326,60327,60328,60329,60330,60331,60332,60333,60334,60335); +INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES +(60323,0,-5506.339,-704.348,392.686,0.595), -- Steelgrills Depot +(60324,0,-9470.760,3.909,49.794,4.802), -- Lions Pride Inn, Goldshire +(60325,1,-3721.306,-4411.906,25.247,0.831), -- Theramore isle, Dustwallow Marsh +(60326,0,286.314,-2184.086,122.612,2.271), -- Aerie Peak, The Hinterlands +(60327,1,6395.708,433.256,33.260,0.566), -- Auberdine, Darkshore +(60328,0,-14412.923,692.017,22.248,1.231), -- Boote Bay +(60329,1,-7135.717,-3787.769,8.799,5.992), -- Tanaris, Gadgetzan +(60330,0,-10336.138,-2934.057,116.723,4.523), -- Swamp of Sorrows, Z coord is intended +(60331,0,-10446.900,-3261.909,20.179,5.875), -- Stonard, Swamp of Sorrows +(60332,0,-103.988,-902.795,55.534,5.924), -- Tarren Mill, Hillsbrad Foothils +(60333,0,1804.836,196.322,70.399,1.572), -- Undercity +(60334,1,-1060.266,23.137,141.455,5.967), -- Thunder Bluff +(60335,1,-506.224,-2590.084,113.150,2.445); -- Barrens, The Crossroads diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 75cf7e82b25..dcbd1888b03 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1153,6 +1153,14 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) if (unitTarget->getLevel() > uiMaxSafeLevel) { unitTarget->AddAura(60444, unitTarget); //Apply Lost! Aura + + // ALLIANCE from 60323 to 60330 - HORDE from 60328 to 60335 + uint32 spellId = 60323; + if (m_caster->ToPlayer()->GetTeam() == HORDE) + spellId += 5; + + spellId += urand(0, 7); + m_caster->CastSpell(m_caster, spellId, true); return; } break; |