From 89939fe7b34d53b998d68ab2bfe073560dc83aaf Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sat, 9 Jan 2010 06:58:50 +0300 Subject: [PATCH] Fixed mangos.sql data for branch and partly related code. * Drop outdated data for 1535 (old totem summon, now instant area cast) Still need implement new way work. * Restore work broken in branch glyph 45785 with updated functionality, --- sql/330/4_spell_chain.sql | 8 ++++++++ sql/330/5_spell_bonus_data.sql | 1 + sql/330/6_spell_proc_event.sql | 5 +++++ sql/mangos.sql | 13 +++++-------- src/game/SpellAuras.cpp | 9 --------- src/game/Unit.cpp | 10 ++++------ 6 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 sql/330/4_spell_chain.sql create mode 100644 sql/330/5_spell_bonus_data.sql create mode 100644 sql/330/6_spell_proc_event.sql diff --git a/sql/330/4_spell_chain.sql b/sql/330/4_spell_chain.sql new file mode 100644 index 000000000..f911b6bf1 --- /dev/null +++ b/sql/330/4_spell_chain.sql @@ -0,0 +1,8 @@ +DELETE FROM spell_chain WHERE first_spell = 8443; + + +/* Desecration */ +DELETE FROM spell_chain WHERE spell_id in (55666,55667); +INSERT INTO spell_chain VALUES +(55666,0,55666,1,0), +(55667,55666,55666,2,0); diff --git a/sql/330/5_spell_bonus_data.sql b/sql/330/5_spell_bonus_data.sql new file mode 100644 index 000000000..dbcee35ab --- /dev/null +++ b/sql/330/5_spell_bonus_data.sql @@ -0,0 +1 @@ +DELETE FROM spell_bonus_data WHERE entry = 8443; diff --git a/sql/330/6_spell_proc_event.sql b/sql/330/6_spell_proc_event.sql new file mode 100644 index 000000000..6d190bf0f --- /dev/null +++ b/sql/330/6_spell_proc_event.sql @@ -0,0 +1,5 @@ +DELETE FROM spell_proc_event WHERE entry IN (55668,55669,55670,55667,58631,63320); + + +INSERT INTO `spell_proc_event` VALUES +(63320, 0x00000000, 5, 0x00040000, 0x00000000, 0x00008000, 0x00004000, 0x00000001, 0.000000, 0.000000, 0); diff --git a/sql/mangos.sql b/sql/mangos.sql index 1c265f227..19e86f328 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -14137,7 +14137,6 @@ INSERT INTO `spell_bonus_data` VALUES (1064, 1.34, 0, 0, 'Shaman - Chain Heal'), (421, 0.57, 0, 0, 'Shaman - Chain Lightning'), (8042, 0.3858, 0, 0, 'Shaman - Earth Shock'), -(8443, 0.2142, 0, 0, 'Shaman - Fire Nova Totem Casted by Totem'), (8050, 0.2142, 0.1, 0, 'Shaman - Flame Shock'), (8026, 0.1, 0, 0, 'Shaman - Flametongue Weapon Proc'), (8056, 0.3858, 0, 0, 'Shaman - Frost Shock'), @@ -16439,7 +16438,7 @@ INSERT INTO spell_chain VALUES (25454,10414,8042,8,0), (49230,25454,8042,9,0), (49231,49230,8042,10,0), -/*Fire Nova Totem*/ +/*Fire Nova*/ (1535,0,1535,1,0), (8498,1535,1535,2,0), (8499,8498,1535,3,0), @@ -17290,6 +17289,9 @@ INSERT INTO spell_chain VALUES (45463,49999,49998,3,0), (49923,45463,49998,4,0), (49924,49923,49998,5,0), +/* Desecration */ +(55666,0,55666,1,0), +(55667,55666,55666,2,0), /*Improved Unholy Presence*/ (50391,0,50391,1,0), (50392,50391,50391,2,0), @@ -18418,10 +18420,6 @@ INSERT INTO `spell_proc_event` VALUES (55440, 0x00000000, 11, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (55640, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45), (55666, 0x00000000, 15, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(55667, 0x00000000, 15, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(55668, 0x00000000, 15, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(55669, 0x00000000, 15, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(55670, 0x00000000, 15, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (55677, 0x00000000, 6, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (55680, 0x00000000, 6, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (55689, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), @@ -18466,7 +18464,6 @@ INSERT INTO `spell_proc_event` VALUES (58616, 0x00000000, 15, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58620, 0x00000000, 15, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58626, 0x00000000, 15, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(58631, 0x00000000, 15, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58644, 0x00000000, 15, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58647, 0x00000000, 15, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58677, 0x00000000, 15, 0x00002000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), @@ -18530,7 +18527,7 @@ INSERT INTO `spell_proc_event` VALUES (63108, 0x00000000, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (63156, 0x00000000, 0, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (63245, 0x00000000, 5, 0x00000100, 0x00800000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(63320, 0x00000000, 5, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), +(63320, 0x00000000, 5, 0x00040000, 0x00000000, 0x00008000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (63373, 0x00000000, 11, 0x80000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0), (63534, 0x00000000, 6, 0x00000040, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (63625, 0x00000000, 6, 0x02000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0), diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 8c77e8a10..376aa0d0c 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1521,15 +1521,6 @@ void Aura::TriggerSpell() // case 812: break; // // Polymorphic Ray // case 6965: break; -// // Fire Nova (1-7 ranks) -// case 8350: -// case 8508: -// case 8509: -// case 11312: -// case 11313: -// case 25540: -// case 25544: -// break; // Thaumaturgy Channel case 9712: trigger_spell_id = 21029; break; // // Egan's Blaster diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 1146cc6b2..3c26d5298 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5258,6 +5258,10 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu owner->CastSpell(owner,58227,true,castItem,triggeredByAura); return true; } + // Glyph of Life Tap + case 63320: + triggered_spell_id = 63321; + break; } break; } @@ -5584,12 +5588,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 63106; break; } - // Glyph of Life Tap - case 63320: - { - triggered_spell_id = 63321; - break; - } } break; }