diff options
| author | megamage <none@none> | 2009-06-27 17:10:17 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-27 17:10:17 -0500 |
| commit | e4cfd6318105b1e5cbe93ac2accd5267039430c0 (patch) | |
| tree | 4213c7e7369ca088644a6826976285ec12e8ee02 /sql | |
| parent | c688528f72682cfafe5dff5f11cfdcc4278525d6 (diff) | |
[8067] Fixed tabs and trailing whitespaces in code. Author: VladimirMangos
--HG--
branch : trunk
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mangos.sql | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index 460a7a152b6..8aecd6c0596 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -23,7 +23,11 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, +<<<<<<< HEAD:sql/mangos.sql `required_8053_01_mangos_command` bit(1) default NULL +======= + `required_8065_01_mangos_spell_proc_event` bit(1) default NULL +>>>>>>> fda6c4804e4f8718648d82cf43237be33fac3dd3:sql/mangos.sql ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -16151,6 +16155,10 @@ INSERT INTO spell_chain VALUES (27681,0,27681,1,14752), (32999,27681,27681,2,0), (48074,32999,27681,3,0), +/*Rapture*/ +(47535,0,47535,1,0), +(47536,47535,47535,2,0), +(47537,47536,47535,3,0), /*ShackleUndead*/ (9484,0,9484,1,0), (9485,9484,9484,2,0), @@ -17349,9 +17357,6 @@ INSERT INTO `spell_proc_event` VALUES (47515, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (47516, 0x00000000, 6, 0x00001800, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (47517, 0x00000000, 6, 0x00001800, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(47535, 0x00000000, 6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(47536, 0x00000000, 6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(47537, 0x00000000, 6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (47580, 0x00000000, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000, 0), (47581, 0x00000000, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000, 0), (47582, 0x00000000, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000, 0), @@ -17550,7 +17555,6 @@ INSERT INTO `spell_proc_event` VALUES (58364, 0x00000000, 4, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58372, 0x00000000, 4, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58386, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0.000000, 0.000000, 0), -(58435, 0x00000000, 5, 0x00000002, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (58616, 0x00000000, 15, 0x00040000, 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), |