Merge

--HG--
branch : trunk

16 files changed, 137 insertions, 0 deletions

diff --git a/sql/updates/3263_world_scripts_(missing in full).sql b/sql/updates/3263_world_scripts_#missing_in_full.sql
index 942ffd1ccfd..942ffd1ccfd 100644
--- a/sql/updates/3263_world_scripts_(missing in full).sql
+++ b/sql/updates/3263_world_scripts_#missing_in_full.sql
diff --git a/sql/updates/3427_world_scripts_(naxx).sql b/sql/updates/3427_world_scripts_#naxx.sql
index bb437c29669..bb437c29669 100644
--- a/sql/updates/3427_world_scripts_(naxx).sql
+++ b/sql/updates/3427_world_scripts_#naxx.sql
diff --git a/sql/updates/3466_world_scripts_(wintergrasp).sql b/sql/updates/3466_world_scripts_#wintergrasp.sql
index ac757d126de..ac757d126de 100644
--- a/sql/updates/3466_world_scripts_(wintergrasp).sql
+++ b/sql/updates/3466_world_scripts_#wintergrasp.sql
diff --git a/sql/updates/3467_world_spellclick_(dk).sql b/sql/updates/3467_world_spellclick_#dk.sql
index 52cc8eb4459..52cc8eb4459 100644
--- a/sql/updates/3467_world_spellclick_(dk).sql
+++ b/sql/updates/3467_world_spellclick_#dk.sql
diff --git a/sql/updates/3592_world_spell_(dk).sql b/sql/updates/3592_world_spell_#dk.sql
index 4f7c4e294ac..4f7c4e294ac 100644
--- a/sql/updates/3592_world_spell_(dk).sql
+++ b/sql/updates/3592_world_spell_#dk.sql
diff --git a/sql/updates/3593_world_spellclick_(dk).sql b/sql/updates/3593_world_spellclick_#dk.sql
index c0550f03c60..c0550f03c60 100644
--- a/sql/updates/3593_world_spellclick_(dk).sql
+++ b/sql/updates/3593_world_spellclick_#dk.sql
diff --git a/sql/updates/3612_world_spell_(dk).sql b/sql/updates/3612_world_spell_#dk.sql
index 62f8a9b8b7a..62f8a9b8b7a 100644
--- a/sql/updates/3612_world_spell_(dk).sql
+++ b/sql/updates/3612_world_spell_#dk.sql
diff --git a/sql/updates/3643_world_(wintergrasp).sql b/sql/updates/3643_world_#wintergrasp.sql
index 58137883790..58137883790 100644
--- a/sql/updates/3643_world_(wintergrasp).sql
+++ b/sql/updates/3643_world_#wintergrasp.sql
diff --git a/sql/updates/3736_world_spell_(dk).sql b/sql/updates/3736_world_spell_#dk.sql
index 4aa0c6b557c..4aa0c6b557c 100644
--- a/sql/updates/3736_world_spell_(dk).sql
+++ b/sql/updates/3736_world_spell_#dk.sql
diff --git a/sql/updates/3813_world_spell_(dk).sql b/sql/updates/3813_world_spell_#dk.sql
index ee12a70afd0..ee12a70afd0 100644
--- a/sql/updates/3813_world_spell_(dk).sql
+++ b/sql/updates/3813_world_spell_#dk.sql
diff --git a/sql/updates/3856_world_spell_(naxx).sql b/sql/updates/3856_world_spell_#naxx.sql
index 3b3895b3c4d..3b3895b3c4d 100644
--- a/sql/updates/3856_world_spell_(naxx).sql
+++ b/sql/updates/3856_world_spell_#naxx.sql
diff --git a/sql/updates/3873_world_spell_(dk).sql b/sql/updates/3873_world_spell_#dk.sql
index 09d130a4f6b..09d130a4f6b 100644
--- a/sql/updates/3873_world_spell_(dk).sql
+++ b/sql/updates/3873_world_spell_#dk.sql
diff --git a/sql/updates/3886_world_script_(nexus).sql b/sql/updates/3886_world_script_#nexus.sql
index 7495a5f61c1..7495a5f61c1 100644
--- a/sql/updates/3886_world_script_(nexus).sql
+++ b/sql/updates/3886_world_script_#nexus.sql
diff --git a/sql/updates/3914_world_spell_proc_event.sql b/sql/updates/3914_world_spell_proc_event.sql
new file mode 100644
index 00000000000..54ee080f1a4
--- /dev/null
+++ b/sql/updates/3914_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (59088, 59089, 58388);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(59088,	0x00,	4,	0x00000000,	0x00000002,	0x00000000,	0x00010000,	0x00000000,	0,	0,	0), -- Improved Spell Reflection
+(59089,	0x00,	4,	0x00000000,	0x00000002,	0x00000000,	0x00010000,	0x00000000,	0,	0,	0); -- Improved Spell Reflection
\ No newline at end of file
diff --git a/sql/updates/3920_characters_#309-313_converter.sql b/sql/updates/3920_characters_#309-313_converter.sql
new file mode 100644
index 00000000000..812217daf8e
--- /dev/null
+++ b/sql/updates/3920_characters_#309-313_converter.sql
@@ -0,0 +1,67 @@
+
+CREATE TABLE `character_equipmentsets` (
+  `guid` int(11) NOT NULL default '0',
+  `setguid` bigint(20) NOT NULL auto_increment,
+  `setindex` tinyint(4) NOT NULL default '0',
+  `name` varchar(100) NOT NULL,
+  `iconname` varchar(100) NOT NULL,
+  `item0` int(11) NOT NULL default '0',
+  `item1` int(11) NOT NULL default '0',
+  `item2` int(11) NOT NULL default '0',
+  `item3` int(11) NOT NULL default '0',
+  `item4` int(11) NOT NULL default '0',
+  `item5` int(11) NOT NULL default '0',
+  `item6` int(11) NOT NULL default '0',
+  `item7` int(11) NOT NULL default '0',
+  `item8` int(11) NOT NULL default '0',
+  `item9` int(11) NOT NULL default '0',
+  `item10` int(11) NOT NULL default '0',
+  `item11` int(11) NOT NULL default '0',
+  `item12` int(11) NOT NULL default '0',
+  `item13` int(11) NOT NULL default '0',
+  `item14` int(11) NOT NULL default '0',
+  `item15` int(11) NOT NULL default '0',
+  `item16` int(11) NOT NULL default '0',
+  `item17` int(11) NOT NULL default '0',
+  `item18` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`setguid`),
+  UNIQUE KEY `idx_set` (`guid`,`setguid`,`setindex`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+UPDATE characters SET data = REPLACE(data,'  ',' ');
+UPDATE characters SET data = CONCAT(TRIM(data),' ');
+
+UPDATE `characters` SET `data` = CONCAT(
+	SUBSTRING_INDEX(`data`, ' ', 257 + 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 1), ' ', -261 + 260 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18 + 1), ' ', -261 - 18 + 260 + 18 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*2 + 1), ' ', -261 - 18*2 + 260 + 18*2 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*3 + 1), ' ', -261 - 18*3 + 260 + 18*3 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*4 + 1), ' ', -261 - 18*4 + 260 + 18*4 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*5 + 1), ' ', -261 - 18*5 + 260 + 18*5 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*6 + 1), ' ', -261 - 18*6 + 260 + 18*6 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*7 + 1), ' ', -261 - 18*7 + 260 + 18*7 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*8 + 1), ' ', -261 - 18*8 + 260 + 18*8 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*9 + 1), ' ', -261 - 18*9 + 260 + 18*9 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*10 + 1), ' ', -261 - 18*10 + 260 + 18*10 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*11 + 1), ' ', -261 - 18*11 + 260 + 18*11 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*12 + 1), ' ', -261 - 18*12 + 260 + 18*12 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*13 + 1), ' ', -261 - 18*13 + 260 + 18*13 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*14 + 1), ' ', -261 - 18*14 + 260 + 18*14 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*15 + 1), ' ', -261 - 18*15 + 260 + 18*15 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*16 + 1), ' ', -261 - 18*16 + 260 + 18*16 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*17 + 1), ' ', -261 - 18*17 + 260 + 18*17 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*18 + 1), ' ', -261 - 18*18 + 260 + 18*18 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 837 + 1), ' ', -837 + 600 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 937 + 1), ' ', -937 + 874 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1007 + 1), ' ', -1007 + 1002 - 1), ' ',
+	'0 0 ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1688 + 1), ' ', -1688 + 1008 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1696 + 1), ' ', -1696 + 1691 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1700 + 1), ' ', -1700 + 1699 - 1), ' '
+	)
+WHERE length(SUBSTRING_INDEX(data, ' ', 1700)) < length(data) and length(SUBSTRING_INDEX(data, ' ', 1701)) >= length(data);
+
+UPDATE characters SET data = REPLACE(data,'  ',' ');
+UPDATE characters SET data = CONCAT(TRIM(data),' ');
diff --git a/sql/updates/3920_world_#309-313_converter.sql b/sql/updates/3920_world_#309-313_converter.sql
new file mode 100644
index 00000000000..c0b23c83626
--- /dev/null
+++ b/sql/updates/3920_world_#309-313_converter.sql
@@ -0,0 +1,66 @@
+alter table `item_template`
+    drop column `dmg_type3`,
+    drop column `dmg_max3`,
+    drop column `dmg_min3`,
+    drop column `dmg_type4`,
+    drop column `dmg_max4`,
+    drop column `dmg_min4`,
+    drop column `dmg_type5`,
+    drop column `dmg_max5`,
+    drop column `dmg_min5`;
+
+alter table `creature_template`
+    add column `unk1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `heroic_entry`,
+    add column `unk2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `unk1`,
+    add column `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `RacialLeader`,
+    add column `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem1`,
+    add column `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem2`,
+    add column `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem3`,
+    add column `movementId` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem4`;
+
+alter table `item_template`
+    add column `HolidayId` int(11) UNSIGNED DEFAULT '0' NOT NULL after `ItemLimitCategory`;
+
+alter table `gameobject_template`
+    add column `unk1` varchar(100) NOT NULL default ''            after `castBarCaption`,
+    add column `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `size`,
+    add column `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem1`,
+    add column `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem2`,
+    add column `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem3`;
+
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (18265);
+
+/* Blackout removed */
+DELETE FROM spell_proc_event WHERE entry IN (15268, 15269, 15323, 15324, 15325, 15326);
+/* Improved Wing Clip removed */
+DELETE FROM spell_proc_event WHERE entry IN (19228, 19232, 19233);
+/* Shadow Mastery, not have charges now */
+DELETE FROM spell_proc_event WHERE entry IN (17794,17797,17798,17799,17800);
+/* Lightning Overload have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (30680,30681);
+/* Unleashed Rage have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (30806,30807,30810,30811);
+/* Concussive Barrage have 2 ranks now, 1 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (35103);
+/* Demonic Empathy, removed */
+DELETE FROM spell_proc_event WHERE entry IN (47232,47234,47235);
+/* Rapture have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (47538,47539);
+/* Psychic Horror have 1 rank now, 1 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (47572);
+/* Sudden Doom have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (49531,49532);
+/* Hunting Party have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (53293,53294);
+/* Righteous Vengeance have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (53383,53384);
+/* Night of the Dead not have charges now */
+DELETE FROM spell_proc_event WHERE entry IN (55620,55623);
+/* Pandemic have 1 rank, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (58436,58437);
+/* Improved Holy Concentration, removed */
+DELETE FROM spell_proc_event WHERE entry IN (47549,47551,47552);
+/* Serendipity, replace by aanother spell ids */
+DELETE FROM spell_proc_event WHERE entry IN (47555,47556,47557);
+/* T.N.T. non triggring now */
+DELETE FROM spell_proc_event WHERE entry IN (56333,56336,56337);