From 109302999d63c85fe14842d1222f0ce30addbe92 Mon Sep 17 00:00:00 2001 From: QAston Date: Mon, 15 Jun 2009 17:56:10 +0200 Subject: [PATCH] *Fix improved stormstrike - by CRAZyBUg --HG-- branch : trunk --- sql/updates/4023_world_spell_proc_event.sql | 4 ++++ sql/world_spell_full.sql | 2 ++ src/game/SpellMgr.cpp | 1 + src/game/SpellMgr.h | 2 ++ src/game/Unit.cpp | 5 +++++ 5 files changed, 14 insertions(+) create mode 100644 sql/updates/4023_world_spell_proc_event.sql diff --git a/sql/updates/4023_world_spell_proc_event.sql b/sql/updates/4023_world_spell_proc_event.sql new file mode 100644 index 0000000000..caa53b3c11 --- /dev/null +++ b/sql/updates/4023_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (51521, 51522); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +( 51521, 0x00, 11, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Improved Stormspike +( 51522, 0x00, 11, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Improved Stormspike \ No newline at end of file diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql index 4580801b45..87fd476365 100644 --- a/sql/world_spell_full.sql +++ b/sql/world_spell_full.sql @@ -1215,6 +1215,8 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell ( 51474, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Astral Shift (Rank 1) ( 51478, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Astral Shift (Rank 2) ( 51479, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Astral Shift (Rank 3) +( 51521, 0x00, 11, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Improved Stormstrike +( 51522, 0x00, 11, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Improved Stormstrike ( 51528, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2.5, 0, 0), -- Maelstrom Weapon (Rank 1) ( 51529, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0), -- Maelstrom Weapon (Rank 2) ( 51530, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 7.5, 0, 0), -- Maelstrom Weapon (Rank 3) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 7ab580e304..dce89ec700 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -583,6 +583,7 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) case 34700: // Allergic Reaction case 31719: // Suspension case 61987: // Avenging Wrath Marker + case 11196: // Recently Bandadged return false; case 12042: // Arcane Power return true; diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index f217a64f29..09ab175966 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -459,6 +459,8 @@ enum ProcFlagsEx PROC_EX_EX_TRIGGER_ALWAYS = 0x0010000, // If set trigger always ( no matter another flags) used for drop charges PROC_EX_EX_ONE_TIME_TRIGGER = 0x0020000, // If set trigger always but only one time (not used) PROC_EX_INTERNAL_CANT_PROC = 0x0800000, + PROC_EX_INTERNAL_DOT = 0x1000000, // Only for internal use + PROC_EX_INTERNAL_HOT = 0x2000000 // Only for internal use PROC_EX_INTERNAL_TRIGGERED = 0x4000000, // Only for internal use PROC_EX_INTERNAL_REQ_FAMILY = 0x8000000 // Only for internal use }; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 38963dc51d..89728d586a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7757,6 +7757,11 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig ((Player*)this)->RemoveCategoryCooldown(1209); break; } + case 63375: // Improved Stormstrike + { + basepoints0 = GetCreateMana() * 0.20f; + break; + } // Brain Freeze case 57761: {