Merge

--HG--
branch : trunk

10 files changed, 22 insertions, 0 deletions

diff --git a/sql/updates/7691_world_creature_template.sql b/sql/updates/7691_world_creature_template.sql
new file mode 100644
index 00000000000..9487f5f0e8f
--- /dev/null
+++ b/sql/updates/7691_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Spells for Wintergarde Gryphon
+UPDATE `creature_template` SET `spell1`=48363,`spell2`=48397,`spell3`=54170 WHERE `entry`=27258;
diff --git a/sql/updates/7691_world_spell_dbc.sql b/sql/updates/7691_world_spell_dbc.sql
new file mode 100644
index 00000000000..79b55b77285
--- /dev/null
+++ b/sql/updates/7691_world_spell_dbc.sql
@@ -0,0 +1,10 @@
+-- Add serverside spells place holders for future development
+DELETE FROM `spell_dbc` WHERE `Id` IN (42876,44987,48803,68496,72958,32780,45453);
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(42876, 'Quest 9275 reward serverside spell'),
+(44987, 'Quest 11521 reward serverside spell'),
+(48803, 'Quest 12214 reward serverside spell'),
+(68496, 'Item_template serverside spell'),
+(72958, 'Item_template serverside spell'),
+(32780, 'Quest 10040 reward serverside spell'),
+(45453, 'Quest 11587 reward serverside spell');
diff --git a/sql/updates/7692_world_creature_template.sql b/sql/updates/7692_world_creature_template.sql
new file mode 100644
index 00000000000..a094f2ca9f2
--- /dev/null
+++ b/sql/updates/7692_world_creature_template.sql
@@ -0,0 +1 @@
+ALTER TABLE `creature_template` CHANGE COLUMN `WDBVerified` `WDBVerified` smallint(5) signed DEFAULT '1';
\ No newline at end of file
diff --git a/sql/updates/7692_world_gameobject_template.sql b/sql/updates/7692_world_gameobject_template.sql
new file mode 100644
index 00000000000..8e9e5cb59aa
--- /dev/null
+++ b/sql/updates/7692_world_gameobject_template.sql
@@ -0,0 +1 @@
+ALTER TABLE `gameobject_template` CHANGE COLUMN `WDBVerified` `WDBVerified` smallint(5) signed DEFAULT '1';
\ No newline at end of file
diff --git a/sql/updates/7692_world_item_template.sql b/sql/updates/7692_world_item_template.sql
new file mode 100644
index 00000000000..cab268a8c68
--- /dev/null
+++ b/sql/updates/7692_world_item_template.sql
@@ -0,0 +1 @@
+ALTER TABLE `item_template` CHANGE COLUMN `WDBVerified` `WDBVerified` smallint(5) signed DEFAULT '1';
\ No newline at end of file
diff --git a/sql/updates/7692_world_npc_text.sql b/sql/updates/7692_world_npc_text.sql
new file mode 100644
index 00000000000..adcb38b570f
--- /dev/null
+++ b/sql/updates/7692_world_npc_text.sql
@@ -0,0 +1 @@
+ALTER TABLE `npc_text` CHANGE COLUMN `WDBVerified` `WDBVerified` smallint(5) signed DEFAULT '1';
\ No newline at end of file
diff --git a/sql/updates/7692_world_page_text.sql b/sql/updates/7692_world_page_text.sql
new file mode 100644
index 00000000000..ccbe66997e1
--- /dev/null
+++ b/sql/updates/7692_world_page_text.sql
@@ -0,0 +1 @@
+ALTER TABLE `page_text` CHANGE COLUMN `WDBVerified` `WDBVerified` smallint(5) signed DEFAULT '1';
\ No newline at end of file
diff --git a/sql/updates/7692_world_quest_template.sql b/sql/updates/7692_world_quest_template.sql
new file mode 100644
index 00000000000..1c0cb7dc47f
--- /dev/null
+++ b/sql/updates/7692_world_quest_template.sql
@@ -0,0 +1 @@
+ALTER TABLE `quest_template` CHANGE COLUMN `WDBVerified` `WDBVerified` smallint(5) signed DEFAULT '1';
\ No newline at end of file
diff --git a/sql/updates/7694_world_npc_trainer.sql b/sql/updates/7694_world_npc_trainer.sql
new file mode 100644
index 00000000000..0e79b01c931
--- /dev/null
+++ b/sql/updates/7694_world_npc_trainer.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `npc_trainer` MODIFY COLUMN `spell` MEDIUMINT(8) NOT NULL DEFAULT 0;
+
diff --git a/sql/updates/7694_world_npc_vendor.sql b/sql/updates/7694_world_npc_vendor.sql
new file mode 100644
index 00000000000..e2fcff7deb1
--- /dev/null
+++ b/sql/updates/7694_world_npc_vendor.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `npc_vendor` MODIFY COLUMN `item` MEDIUMINT(8) NOT NULL DEFAULT 0;
+