diff options
| author | QAston <none@none> | 2009-07-23 01:01:12 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-07-23 01:01:12 +0200 |
| commit | a522e3bff4e421fcac980b67bbdefb3d1a2084f3 (patch) | |
| tree | 15a22dcda3456dec25c7d70e18dc1e3c0b9383d3 | |
| parent | 9eaf1e6de38f02e7e43664115ed53bb09a969883 (diff) | |
*Add spell_linked_spell entry for Lichborne.
*Add defines for SHADOW_DANCE and UNDEAD shapeshifts to prevent error display - cherrypicked from Astellar's shape patches.
--HG--
branch : trunk
| -rw-r--r-- | sql/FULL/world_spell_full.sql | 1 | ||||
| -rw-r--r-- | sql/updates/4539_world_spell_linked_spell.sql | 3 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 2 | ||||
| -rw-r--r-- | src/game/Unit.h | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index 3d5e1198fc2..006373cddf1 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -69,6 +69,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm (48395, 50171, 2, 'Improved Moonkin Form'), (48396, 50172, 2, 'Improved Moonkin Form'), ( 20594, 65116, 0, 'Stoneform'), +( 49039, 50397, 2, 'Lichborne - shapeshift'), -- Creature ( 36574, 36650, 0, 'Apply Phase Slip Vulnerability'), diff --git a/sql/updates/4539_world_spell_linked_spell.sql b/sql/updates/4539_world_spell_linked_spell.sql new file mode 100644 index 00000000000..1be5970f4ab --- /dev/null +++ b/sql/updates/4539_world_spell_linked_spell.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (49039); +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +( 49039, 50397, 2, 'Lichborne - shapeshift'); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 59bbffdf261..085ef00d191 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3278,6 +3278,8 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun case FORM_AMBIENT: case FORM_SHADOW: case FORM_STEALTH: + case FORM_UNDEAD: + case FORM_SHADOW_DANCE: break; case FORM_TREE: modelid = 864; diff --git a/src/game/Unit.h b/src/game/Unit.h index 7e455dfadea..9be220e03b1 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -197,6 +197,7 @@ enum ShapeshiftForm FORM_AMBIENT = 0x06, FORM_GHOUL = 0x07, FORM_DIREBEAR = 0x08, + FORM_SHADOW_DANCE = 0x0D, FORM_CREATUREBEAR = 0x0E, FORM_CREATURECAT = 0x0F, FORM_GHOSTWOLF = 0x10, @@ -206,6 +207,7 @@ enum ShapeshiftForm FORM_TEST = 0x14, FORM_ZOMBIE = 0x15, FORM_METAMORPHOSIS = 0x16, + FORM_UNDEAD = 0x19, FORM_FLIGHT_EPIC = 0x1B, FORM_SHADOW = 0x1C, FORM_FLIGHT = 0x1D, |