diff options
| -rw-r--r-- | sql/updates/3899_world_spell_proc_event.sql | 4 | ||||
| -rw-r--r-- | sql/world_spell_full.sql | 6 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sql/updates/3899_world_spell_proc_event.sql b/sql/updates/3899_world_spell_proc_event.sql new file mode 100644 index 00000000000..968c82ec29b --- /dev/null +++ b/sql/updates/3899_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (18096, 18073); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(18096, 0x00, 5, 0x00000060, 0x00800080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Pyroclasm (Rank 1) +(18073, 0x00, 5, 0x00000060, 0x00800080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Pyroclasm (Rank 2)
\ No newline at end of file diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql index fb2c9a8b04a..1b29283c6af 100644 --- a/sql/world_spell_full.sql +++ b/sql/world_spell_full.sql @@ -782,10 +782,10 @@ 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, 0x00000080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Pyroclasm (Rank 2) +(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, 0x00000080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Pyroclasm (Rank 1) +(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 @@ -1585,7 +1585,7 @@ UPDATE creature_template SET VehicleId = 312 WHERE entry IN (31857,31858,31861,3 update creature_template set spell5=51890 where entry = 28511; -- Eye of Acherus flight DELETE FROM `spell_script_target` WHERE entry IN -(51859); +(51859, 48743); INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES (51859, 1, 28525), -- siphon of archerus (51859, 1, 28542), diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 39a14825573..016abedf888 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7060,7 +7060,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig if(!pVictim || !pVictim->isAlive() || pVictim == this || procSpell == NULL) return false; // Calculate spell tick count for spells - uint32 tick = 1; // Default tick = 1 + uint32 tick; // Hellfire have 15 tick if (procSpell->SpellFamilyFlags[0]&0x40) @@ -7069,7 +7069,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig else if (procSpell->SpellFamilyFlags[0]&0x20) tick = 4; else - return false; + tick = 1; // Calculate chance = baseChance / tick float chance = 0; |