*Merge some fixes from tc1

--HG--
branch : trunk

1 files changed, 12 insertions, 64 deletions

diff --git a/sql/world_scripts_structure.sql b/sql/world_scripts_structure.sql
index 7ac482bb493..a9fea4e7514 100644
--- a/sql/world_scripts_structure.sql
+++ b/sql/world_scripts_structure.sql
@@ -1,25 +1,5 @@
-DROP TABLE IF EXISTS `custom_texts`;
-CREATE TABLE IF NOT EXISTS `custom_texts` (
-  `entry` mediumint(8) NOT NULL,
-  `content_default` text NOT NULL,
-  `content_loc1` text,
-  `content_loc2` text,
-  `content_loc3` text,
-  `content_loc4` text,
-  `content_loc5` text,
-  `content_loc6` text,
-  `content_loc7` text,
-  `content_loc8` text,
-  `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `comment` text,
-  PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Custom Texts';
-
-DROP TABLE IF EXISTS `eventai_scripts`;
-CREATE TABLE `eventai_scripts` (
+DROP TABLE IF EXISTS `creature_ai_scripts`;
+CREATE TABLE `creature_ai_scripts` (
   `id` int(11) unsigned NOT NULL COMMENT 'Identifier' AUTO_INCREMENT,
   `creature_id` int(11) unsigned NOT NULL default '0' COMMENT 'Creature Template Identifier',
   `event_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Event Type',
@@ -46,8 +26,8 @@ CREATE TABLE `eventai_scripts` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='EventAI Scripts';
 
-DROP TABLE IF EXISTS `eventai_summons`;
-CREATE TABLE `eventai_summons` (
+DROP TABLE IF EXISTS `creature_ai_summons`;
+CREATE TABLE `creature_ai_summons` (
   `id` int(11) unsigned NOT NULL COMMENT 'Location Identifier' AUTO_INCREMENT,
   `position_x` float NOT NULL default '0',
   `position_y` float NOT NULL default '0',
@@ -58,8 +38,8 @@ CREATE TABLE `eventai_summons` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='EventAI Summoning Locations';
 
-DROP TABLE IF EXISTS `eventai_texts`;
-CREATE TABLE `eventai_texts` (
+DROP TABLE IF EXISTS `creature_ai_texts`;
+CREATE TABLE `creature_ai_texts` (
   `entry` mediumint(8) NOT NULL,
   `content_default` text NOT NULL,
   `content_loc1` text,
@@ -78,41 +58,9 @@ CREATE TABLE `eventai_texts` (
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
 
-DROP TABLE IF EXISTS `script_texts`;
-CREATE TABLE IF NOT EXISTS `script_texts` (
-  `entry` mediumint(8) NOT NULL,
-  `content_default` text NOT NULL,
-  `content_loc1` text,
-  `content_loc2` text,
-  `content_loc3` text,
-  `content_loc4` text,
-  `content_loc5` text,
-  `content_loc6` text,
-  `content_loc7` text,
-  `content_loc8` text,
-  `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `comment` text,
-  PRIMARY KEY  (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
-
-DROP TABLE IF EXISTS script_waypoint;
-CREATE TABLE script_waypoint (
-  entry mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'creature_template entry',
-  pointid mediumint(8) unsigned NOT NULL DEFAULT '0',
-  location_x float NOT NULL DEFAULT '0',
-  location_y float NOT NULL DEFAULT '0',
-  location_z float NOT NULL DEFAULT '0',
-  waittime int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'waittime in millisecs',
-  point_comment text,
-  PRIMARY KEY (entry, pointid)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
-
-
-DROP TABLE IF EXISTS `sd2_db_version`;
-DROP TABLE IF EXISTS `script_db_version`;
-CREATE TABLE `script_db_version` (
-`version` varchar(255) NOT NULL default '' COMMENT 'Database version string'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
+CREATE TABLE IF NOT EXISTS `version` (
+    `core_version` varchar(120) default NULL COMMENT 'Core revision dumped at startup.',
+    `core_revision` BIGINT UNSIGNED default '0',
+    `db_version` varchar(120) default NULL COMMENT 'Version of world DB.',
+    `script_version` varchar(120) default NULL COMMENT 'Version of scripts DB.'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Version Notes';
\ No newline at end of file