From 84ab289a40c0fcf40a6d9f5177e0328604fea8be Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Sat, 8 Aug 2009 21:51:55 -0700
Subject: *Cleaned up SQL, updated FULLs

--HG--
branch : trunk
---
 sql/FULL/world_scripts_full.sql        |  1 +
 sql/FULL/world_trinity_string_full.sql |  3 ++-
 sql/updates/4836_world_announce.sql    | 15 +++++++++++++++
 sql/updates/XXX_world_announce.sql     | 14 --------------
 sql/world.sql                          | 11 +++++++++++
 5 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 sql/updates/4836_world_announce.sql
 delete mode 100644 sql/updates/XXX_world_announce.sql

(limited to 'sql')

diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index c2c872abda4..f9873ddef7b 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1022,6 +1022,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_dragonflayer_forge_master' WHER
 /* VAULT OF ARCHAVON */
 UPDATE `creature_template` SET `ScriptName`='boss_archavon' WHERE `entry`=31125;
 UPDATE `creature_template` SET `ScriptName`='mob_archavon_warder' WHERE `entry`=32353;
+UPDATE `creature_template` SET `ScriptName`='boss_emalon' WHERE `entry`=33993;
 
 /* WAILING CAVERNS */
 
diff --git a/sql/FULL/world_trinity_string_full.sql b/sql/FULL/world_trinity_string_full.sql
index 56eea9d053e..edbab4ff593 100644
--- a/sql/FULL/world_trinity_string_full.sql
+++ b/sql/FULL/world_trinity_string_full.sql
@@ -795,4 +795,5 @@ INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `conte
 (10052, 'Take me to Eastwall Tower.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (10053, 'Take me to Crown Guard Tower.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (10054, 'Give me the flag, I''ll take it to the central beacon for the glory of the Alliance!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(10055, 'Give me the flag, I''ll take it to the central beacon for the glory of the Horde!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(10055, 'Give me the flag, I''ll take it to the central beacon for the glory of the Horde!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11000, '|cffffff00[|c00077766Autobroadcast|cffffff00]: |cFFF222FF%s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/4836_world_announce.sql b/sql/updates/4836_world_announce.sql
new file mode 100644
index 00000000000..1e8920baa7c
--- /dev/null
+++ b/sql/updates/4836_world_announce.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS `autobroadcast`;
+CREATE TABLE `autobroadcast` (
+`id` int(11) NOT NULL AUTO_INCREMENT,
+`text` longtext NOT NULL,
+PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DELETE FROM `trinity_string` WHERE `entry` = 11000;
+INSERT INTO `trinity_string` (entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8)
+VALUES (11000, '|cffffff00[|c00077766Autobroadcast|cffffff00]: |cFFF222FF%s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+-- optional examples
+-- insert into `autobroadcast` (`id`, `text`) values('1','All Battlegrounds and Arena's work on this server.');
+-- insert into `autobroadcast` (`id`, `text`) values('2','This server has 2 realms, The other realm is a PVP instant level 70 realm. Try it!');
+-- insert into `autobroadcast` (`id`, `text`) values('3','The Auction House on this server is always full, because we use an AH Bot.');
diff --git a/sql/updates/XXX_world_announce.sql b/sql/updates/XXX_world_announce.sql
deleted file mode 100644
index 59accbfc9bb..00000000000
--- a/sql/updates/XXX_world_announce.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE `autobroadcast` (
-`id` int(11) NOT NULL AUTO_INCREMENT,
-`text` longtext NOT NULL,
-PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-DELETE FROM `trinity_string` WHERE `entry` = 11000;
-INSERT INTO `trinity_string` (entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8)
-VALUES (11000, '|cffffff00[|c00077766Autobroadcast|cffffff00]: |cFFF222FF%s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
--- optional examples
--- insert into `autobroadcast` (`id`, `text`) values('1','All Battlegrounds and Arena's work on this server.');
--- insert into `autobroadcast` (`id`, `text`) values('2','This server has 2 realms, The other realm is a PVP instant level 70 realm. Try it!');
--- insert into `autobroadcast` (`id`, `text`) values('3','The Auction House on this server is always full, because we use an AH Bot.');
diff --git a/sql/world.sql b/sql/world.sql
index 4d1313c4c65..21ae1fe7a35 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -138,6 +138,17 @@ CREATE TABLE `areatrigger_teleport` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Trigger System';
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `autobroadcast`
+--
+
+DROP TABLE IF EXISTS `autobroadcast`;
+CREATE TABLE `autobroadcast` (
+`id` int(11) NOT NULL AUTO_INCREMENT,
+`text` longtext NOT NULL,
+PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 --
 -- Table structure for table `battleground_template`
 --
-- 
cgit v1.2.3