josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add spell_proc_event entries for some spells.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-07-03 02:14:33 +02:00
parent 9a6fa5cf3c
commit 9d3c9af594
3 changed files with 100 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/FULL/world_spell_full.sql
+48 -4
View File
@@ -689,10 +689,8 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
( 17801, 0x00, 5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Improved Shadow Bolt (Rank 3)
( 17802, 0x00, 5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Improved Shadow Bolt (Rank 4)
( 17803, 0x00, 5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Improved Shadow Bolt (Rank 5)
( 18073, 0x00, 5, 0x00000060, 0x00800080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Pyroclasm (Rank 2)
( 18094, 0x00, 5, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Nightfall (Rank 1)
( 18095, 0x00, 5, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Nightfall (Rank 2)
( 18096, 0x00, 5, 0x00000060, 0x00800080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Pyroclasm (Rank 1)
( 18119, 0x00, 5, 0x000003E5, 0x000010C0, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Aftermath (Rank 1)
( 18120, 0x00, 5, 0x000003E5, 0x000010C0, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Aftermath (Rank 2)
( 18820, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Insight
@@ -1390,7 +1388,6 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
( 59725, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0, 0, 0), -- Spell Reflection
( 60061, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Flow of Time
( 60063, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Now is the Time!
( 60066, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Rage of the Unraveller
( 60132, 0x00, 15, 0x00000000, 0x08020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Oblit/Scourge Strike Runic Power Up
( 60170, 0x00, 5, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Corruption Triggers Crit
( 60172, 0x00, 5, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Life Tap Bonus Spirit
@@ -1438,7 +1435,54 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
( 63158, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Decimation
( 63156, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Decimation
( 64343, 0x00, 3, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Impact
( 64976, 0x00, 4, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Juggernaut
( 64976, 0x00, 4, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Juggernaut
( 64914, 0x00, 8, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Rogue T8 2P Bonus
( 64928, 0x00, 11, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Item - Shaman T8 Elemental 4P Bonus
( 64938, 0x00, 4, 0x00200040, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Item - Warrior T8 Melee 2P Bonus
( 64952, 0x00, 7, 0x00000000, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Druid T8 Feral Relic
( 64964, 0x00, 15, 0x00000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Death Knight T8 Tank Relic
( 65002, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Bonus Mana Regen
( 65005, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Alacrity of the Elements
( 64999, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0), -- Meteoric Inspiration
( 65007, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0), -- Eye of the Broodmother
( 65013, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Pyrite Infusion
( 65020, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Mjolnir Runestone
( 65025, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Dark Matter
( 46949, 0x00, 4, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Safeguard
( 46945, 0x00, 4, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Safeguard
( 64415, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Val'anyr Hammer of Ancient Kings - Equip Effect
( 60066, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Rage of the Unraveller
( 62115, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Strength of the Titans
( 62114, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Flow of Knowledge
( 62600, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Savage Defense
( 63245, 0x00, 5, 0x00000100, 0x00800000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Pyroclasm
( 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
( 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
( 63733, 0x00, 6, 0x00000800, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Serendipity
( 63737, 0x00, 6, 0x00000800, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Serendipity
( 64127, 0x00, 6, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Body and Soul
( 64129, 0x00, 6, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Body and Soul
( 64568, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 3), -- Blood Reserve
( 64571, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 30), -- Blood Draining
( 64440, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0, 0, 20), -- Blade Warding
( 64714, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Flame of the Heavens
( 64738, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Show of Faith
( 64742, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Pandora's Plea
( 64752, 0x00, 7, 0x00800000, 0x10000100, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Druid T8 Feral 2P Bonus
( 64786, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 15), -- Comet's Trail
( 64792, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Blood of the Old God
( 64824, 0x00, 7, 0x00200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Druid T8 Balance 4P Bonus
( 64860, 0x00, 9, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Hunter T8 4P Bonus
( 64867, 0x00, 3, 0x20000021, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Mage T8 2P Bonus
( 64882, 0x00, 10, 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Paladin T8 Protection 4P Bonus
( 64890, 0x00, 10, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Item - Paladin T8 Holy 2P Bonus
( 64908, 0x00, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Priest T8 Shadow 4P Bonus
( 64912, 0x00, 6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Item - Priest T8 Healer 4P Bonus
-- --------
-- ENCHANT PROC
sql/updates/4360_world_spell_proc_event.sql
+51
View File
@@ -0,0 +1,51 @@
DELETE FROM `spell_proc_event` WHERE `entry` IN (65013, 46949, 46945, 64415, 60066, 62115, 62114, 62600, 63245, 18096, 18073, 63280
, 63310, 63320, 63335, 63730, 63733, 63737, 63737, 64127, 64129, 64568, 64571, 64440, 64714, 64738, 64742, 64752, 64786, 64792
, 64824, 64860, 64867, 64882, 64890, 64908, 64912, 64914, 64928, 64938, 64952, 64964, 65002, 65005, 64999, 65007, 65013, 65020, 65025);
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
( 64914, 0x00, 8, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Rogue T8 2P Bonus
( 64928, 0x00, 11, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Item - Shaman T8 Elemental 4P Bonus
( 64938, 0x00, 4, 0x00200040, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Item - Warrior T8 Melee 2P Bonus
( 64952, 0x00, 7, 0x00000000, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Druid T8 Feral Relic
( 64964, 0x00, 15, 0x00000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Death Knight T8 Tank Relic
( 65002, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Bonus Mana Regen
( 65005, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Alacrity of the Elements
( 64999, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0), -- Meteoric Inspiration
( 65007, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0), -- Eye of the Broodmother
( 65013, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Pyrite Infusion
( 65020, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Mjolnir Runestone
( 65025, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Dark Matter
( 46949, 0x00, 4, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Safeguard
( 46945, 0x00, 4, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Safeguard
( 64415, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Val'anyr Hammer of Ancient Kings - Equip Effect
( 60066, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Rage of the Unraveller
( 62115, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Strength of the Titans
( 62114, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Flow of Knowledge
( 62600, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Savage Defense
( 63245, 0x00, 5, 0x00000100, 0x00800000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Pyroclasm
( 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
( 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
( 63733, 0x00, 6, 0x00000800, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Serendipity
( 63737, 0x00, 6, 0x00000800, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Serendipity
( 64127, 0x00, 6, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Body and Soul
( 64129, 0x00, 6, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Body and Soul
( 64568, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 3), -- Blood Reserve
( 64571, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 30), -- Blood Draining
( 64440, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0, 0, 20), -- Blade Warding
( 64714, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Flame of the Heavens
( 64738, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Show of Faith
( 64742, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Pandora's Plea
( 64752, 0x00, 7, 0x00800000, 0x10000100, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Druid T8 Feral 2P Bonus
( 64786, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 15), -- Comet's Trail
( 64792, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Blood of the Old God
( 64824, 0x00, 7, 0x00200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Druid T8 Balance 4P Bonus
( 64860, 0x00, 9, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Hunter T8 4P Bonus
( 64867, 0x00, 3, 0x20000021, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Mage T8 2P Bonus
( 64882, 0x00, 10, 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Paladin T8 Protection 4P Bonus
( 64890, 0x00, 10, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Item - Paladin T8 Holy 2P Bonus
( 64908, 0x00, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Priest T8 Shadow 4P Bonus
( 64912, 0x00, 6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Item - Priest T8 Healer 4P Bonus
src/game/Unit.cpp
+1 -31
View File
@@ -7285,38 +7285,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
break;
case SPELLFAMILY_WARLOCK:
{
// Pyroclasm
if (auraSpellInfo->SpellIconID == 1137)
{
if(!pVictim || !pVictim->isAlive() || pVictim == this || procSpell == NULL)
return false;
// Calculate spell tick count for spells
uint32 tick;
// Hellfire have 15 tick
if (procSpell->SpellFamilyFlags[0]&0x40)
tick = 15;
// Rain of Fire have 4 tick
else if (procSpell->SpellFamilyFlags[0]&0x20)
tick = 4;
else
tick = 1;
// Calculate chance = baseChance / tick
float chance = 0;
switch (auraSpellInfo->Id)
{
case 18096: chance = 13.0f / tick; break;
case 18073: chance = 26.0f / tick; break;
}
// Roll chance
if (!roll_chance_f(chance))
return false;
trigger_spell_id = 18093;
}
// Improved Drain Soul
else if (auraSpellInfo->SpellFamilyFlags[0] & 0x4000)
if (auraSpellInfo->SpellFamilyFlags[0] & 0x4000)
{
Unit::AuraEffectList const& mAddFlatModifier = GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraEffectList::const_iterator i = mAddFlatModifier.begin(); i != mAddFlatModifier.end(); ++i)