diff options
| -rw-r--r-- | sql/FULL/world_spell_full.sql | 2 | ||||
| -rw-r--r-- | sql/updates/4409_world_spell_proc_event.sql | 21 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 3 |
3 files changed, 25 insertions, 1 deletions
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index 9d6ee9c6f82..2a9115090e7 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -1449,7 +1449,7 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell ( 18096, 0x00, 5, 0x00000100, 0x00800000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Pyroclasm ( 18073, 0x00, 5, 0x00000100, 0x00800000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Pyroclasm ( 63280, 0x00, 11, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Glyph of Totem of Wrath -( 63310, 0x00, 5, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Glyph of Shadowflame +( 63310, 0x00, 5, 0x00000000, 0x00010000, 0x00000000, 0x00010000, 0x00000000, 0, 0, 0), -- Glyph of Shadowflame ( 63320, 0x00, 5, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Glyph of Life Tap ( 63335, 0x00, 15, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Glyph of Howling Blast ( 63730, 0x00, 6, 0x00000800, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Serendipity diff --git a/sql/updates/4409_world_spell_proc_event.sql b/sql/updates/4409_world_spell_proc_event.sql new file mode 100644 index 00000000000..76184c6b0c0 --- /dev/null +++ b/sql/updates/4409_world_spell_proc_event.sql @@ -0,0 +1,21 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (31876, 31877, 31878, 34258, 34262, 37195, 40470, 48835, 53380, 53381, 53382, 53486, 53488, 53671, 53673, 54151, 54154, 54155, 63310); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +( 31876, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 1) +( 31877, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 2) +( 31878, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 3) +( 34258, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Justice +( 34262, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Mercy +( 37195, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgement Group Heal +( 40470, 0x00, 10, 0xC0800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Paladin Tier 6 Trinket +( 48835, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Justice +( 53380, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 1) +( 53381, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 2) +( 53382, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 3) +( 53486, 0x00, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- The Art of War (Rank 1) +( 53488, 0x00, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- The Art of War (Rank 2) +( 53671, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Pure (Rank 1) +( 53673, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Pure (Rank 2) +( 54151, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Pure (Rank 3) +( 54154, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Pure (Rank 4) +( 63310, 0x00, 5, 0x00000000, 0x00010000, 0x00000000, 0x00010000, 0x00000000, 0, 0, 0), -- Glyph of Shadowflame +( 54155, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0); -- Judgements of the Pure (Rank 5) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e3c7eae83d9..a6314fa16b8 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10213,6 +10213,9 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT } } } + // This is not a typo - Impurity has SPELLFAMILY_DRUID + if (AuraEffect const * aurEff = GetDummyAura(SPELLFAMILY_DRUID, 1986, 0)) + APbonus *= (100.0f + aurEff->GetAmount()) / 100.0f; DoneFlatBenefit += int32(APbonus/14.0f * GetAPMultiplier(attType,normalized)); } |