diff options
| -rw-r--r-- | sql/FULL/world_spell_full.sql | 4 | ||||
| -rw-r--r-- | sql/updates/4225_world.sql | 9 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 24 |
3 files changed, 37 insertions, 0 deletions
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index 04710b32080..7ecf8d15554 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -74,6 +74,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm ( -52610, -62071, 0, 'Savage Roar'), (51209, 55095, 1, 'Hungering cold - frost fever'), (50334, 58923, 2, 'Berserk - modify target number aura'), +( -5229, -51185, 0, 'King of the Jungle - remove with enrage'), -- Creature ( 36574, 36650, 0, 'Apply Phase Slip Vulnerability'), @@ -1141,6 +1142,9 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell ( 48483, 0x00, 7, 0x00008800, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Infected Wounds (Rank 1) ( 48484, 0x00, 7, 0x00008800, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Infected Wounds (Rank 2) ( 48485, 0x00, 7, 0x00008800, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Infected Wounds (Rank 3) +( 48492, 0x00, 7, 0x00080000, 0x00000000, 0x00000800, 0x00000400, 0x00000000, 0, 0, 0), -- King of the Jungle (Rank1) +( 48494, 0x00, 7, 0x00080000, 0x00000000, 0x00000800, 0x00000400, 0x00000000, 0, 0, 0), -- King of the Jungle (Rank2) +( 48495, 0x00, 7, 0x00080000, 0x00000000, 0x00000800, 0x00000400, 0x00000000, 0, 0, 0), -- King of the Jungle (Rank3) ( 48496, 0x00, 7, 0x00000060, 0x02000002, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Living Seed (Rank 1) ( 48499, 0x00, 7, 0x00000060, 0x02000002, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Living Seed (Rank 2) ( 48500, 0x00, 7, 0x00000060, 0x02000002, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Living Seed (Rank 3) diff --git a/sql/updates/4225_world.sql b/sql/updates/4225_world.sql new file mode 100644 index 00000000000..39aa777c6a9 --- /dev/null +++ b/sql/updates/4225_world.sql @@ -0,0 +1,9 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (48492, 48494, 48495); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +( 48492, 0x00, 7, 0x00080000, 0x00000000, 0x00000800, 0x00000400, 0x00000000, 0, 0, 0), -- King of the Jungle (Rank1) +( 48494, 0x00, 7, 0x00080000, 0x00000000, 0x00000800, 0x00000400, 0x00000000, 0, 0, 0), -- King of the Jungle (Rank2) +( 48495, 0x00, 7, 0x00080000, 0x00000000, 0x00000800, 0x00000400, 0x00000000, 0, 0, 0); -- King of the Jungle (Rank3) + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-5229); +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +( -5229, -51185, 0, 'King of the Jungle - remove with enrage'); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 96a0a952339..6a2be9f4c65 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6000,6 +6000,30 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger basepoints0 = triggerAmount * damage / 100; break; } + // King of the Jungle + else if (dummySpell->SpellIconID == 2850) + { + // Effect 0 - mod damage while having Enrage + if (effIndex==0) + { + if (!(procSpell->SpellFamilyFlags[0] & 0x00080000)) + return false; + triggered_spell_id = 51185; + basepoints0 = triggerAmount; + target = this; + break; + } + // Effect 1 - Tiger's Fury restore energy + else if (effIndex==1) + { + if (!(procSpell->SpellFamilyFlags[2] & 0x00000800)) + return false; + triggered_spell_id = 51178; + basepoints0 = triggerAmount; + target = this; + break; + } + } break; } case SPELLFAMILY_ROGUE: |