From d049568b24b1e719fb6d388c42eb31b1552f029c Mon Sep 17 00:00:00 2001 From: Salja Date: Fri, 24 Aug 2012 09:27:54 +0200 Subject: [PATCH] [0166] Some SQL Typos Signed-off-by: Salja --- .../0034_xxxxx_01_mangos_playercreateinfo.sql | 26 +---------------- ...0034_xxxxx_02_mangos_player_levelstats.sql | 25 +---------------- ...xxxxx_03_mangos_player_classlevelstats.sql | 21 +------------- ...xxxx_01_mangos_playercreateinfo_spell.sql} | 3 +- ...xxx_02_mangos_playercreateinfo_action.sql} | 3 +- ...xxx_01_mangos_playercreateinfo_action.sql} | 25 ++--------------- ...0156_xxxxx_02_mangos_playercreateinfo.sql} | 28 ++----------------- ...xxxx_03_mangos_playercreateinfo_spell.sql} | 23 ++------------- ...157_xxxxx_01_mangos_player_levelstats.sql} | 25 ++--------------- .../0159_xxxxx_01_mangos_quest_template.sql | 2 +- src/shared/revision_nr.h | 2 +- 11 files changed, 17 insertions(+), 166 deletions(-) rename sql/updates/{0155_xxxxx_01_playercreateinfo_spell.sql => 0155_xxxxx_01_mangos_playercreateinfo_spell.sql} (99%) rename sql/updates/{0155_xxxxx_02_playercreateinfo_action.sql => 0155_xxxxx_02_mangos_playercreateinfo_action.sql} (74%) rename sql/updates/{0156_xxxxx_01_playercreateinfo_action.sql => 0156_xxxxx_01_mangos_playercreateinfo_action.sql} (86%) rename sql/updates/{0156_xxxxx_02_playercreateinfo.sql => 0156_xxxxx_02_mangos_playercreateinfo.sql} (80%) rename sql/updates/{0156_xxxxx_03playercreateinfo_spell.sql => 0156_xxxxx_03_mangos_playercreateinfo_spell.sql} (99%) rename sql/updates/{0157_xxxxx_01_player_levelstats.sql => 0157_xxxxx_01_mangos_player_levelstats.sql} (99%) diff --git a/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql b/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql index 757d05cf6..15e09e773 100644 --- a/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql +++ b/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql @@ -1,29 +1,7 @@ ALTER TABLE db_version CHANGE COLUMN required_0028_xxxxx_03_mangos_playercreateinfo required_0034_xxxxx_01_mangos_playercreateinfo bit; --- --- Table structure for table `playercreateinfo` --- +DELETE FROM playercreateinfo WHERE race BETWEEN 1 AND 22; -DROP TABLE IF EXISTS `playercreateinfo`; -CREATE TABLE `playercreateinfo` ( - `race` tinyint(3) unsigned NOT NULL default '0', - `class` tinyint(3) unsigned NOT NULL default '0', - `map` smallint(5) unsigned NOT NULL default '0', - `zone` mediumint(8) unsigned NOT NULL default '0', - `position_x` float NOT NULL default '0', - `position_y` float NOT NULL default '0', - `position_z` float NOT NULL default '0', - `orientation` float NOT NULL default '0', - `phaseMap` smallint(5) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`race`,`class`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- --- Dumping data for table `playercreateinfo` --- - -LOCK TABLES `playercreateinfo` WRITE; -/*!40000 ALTER TABLE `playercreateinfo` DISABLE KEYS */; INSERT INTO `playercreateinfo` VALUES (1,1,0,12,-8949,-132,84,0,0), (1,2,0,12,-8949,-132,84,0,0), @@ -101,5 +79,3 @@ INSERT INTO `playercreateinfo` VALUES (22,8,654,4756,-1451.53,1403.35,35.5561,0,0), (22,9,654,4756,-1451.53,1403.35,35.5561,0,0), (22,11,654,4756,-1451.53,1403.35,35.5561,0,0); -/*!40000 ALTER TABLE `playercreateinfo` ENABLE KEYS */; -UNLOCK TABLES; diff --git a/sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql b/sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql index aeb820ed9..c2f5a43cb 100644 --- a/sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql +++ b/sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql @@ -1,28 +1,7 @@ ALTER TABLE db_version CHANGE COLUMN required_0034_xxxxx_01_mangos_playercreateinfo required_0034_xxxxx_02_mangos_player_levelstats bit; --- --- Table structure for table `player_levelstats` --- +DELETE FROM player_levelstats WHERE race BETWEEN 1 AND 22; -DROP TABLE IF EXISTS `player_levelstats`; -CREATE TABLE `player_levelstats` ( - `race` tinyint(3) unsigned NOT NULL, - `class` tinyint(3) unsigned NOT NULL, - `level` tinyint(3) unsigned NOT NULL, - `str` tinyint(3) unsigned NOT NULL, - `agi` tinyint(3) unsigned NOT NULL, - `sta` tinyint(3) unsigned NOT NULL, - `inte` tinyint(3) unsigned NOT NULL, - `spi` tinyint(3) unsigned NOT NULL, - PRIMARY KEY (`race`,`class`,`level`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.'; - --- --- Dumping data for table `player_levelstats` --- - -LOCK TABLES `player_levelstats` WRITE; -/*!40000 ALTER TABLE `player_levelstats` DISABLE KEYS */; INSERT INTO `player_levelstats` VALUES (1,1,1,23,20,22,20,20), (1,1,2,24,21,23,20,20), @@ -9659,5 +9638,3 @@ INSERT INTO `player_levelstats` VALUES (22,1,83,214,143,198,66,90), (22,1,82,204,133,188,56,80), (22,1,81,194,123,178,46,70); -/*!40000 ALTER TABLE `player_levelstats` ENABLE KEYS */; -UNLOCK TABLES; diff --git a/sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql b/sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql index 7791e7c34..7a5fa4788 100644 --- a/sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql +++ b/sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql @@ -1,24 +1,7 @@ ALTER TABLE db_version CHANGE COLUMN required_0034_xxxxx_02_mangos_player_levelstats required_0034_xxxxx_03_mangos_player_classlevelstats bit; --- --- Table structure for table `player_classlevelstats` --- +DELETE FROM player_classlevelstats WHERE race BETWEEN 1 AND 22; -DROP TABLE IF EXISTS `player_classlevelstats`; -CREATE TABLE `player_classlevelstats` ( - `class` tinyint(3) unsigned NOT NULL, - `level` tinyint(3) unsigned NOT NULL, - `basehp` smallint(5) unsigned NOT NULL, - `basemana` smallint(5) unsigned NOT NULL, - PRIMARY KEY (`class`,`level`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.'; - --- --- Dumping data for table `player_classlevelstats` --- - -LOCK TABLES `player_classlevelstats` WRITE; -/*!40000 ALTER TABLE `player_classlevelstats` DISABLE KEYS */; INSERT INTO `player_classlevelstats` VALUES (1,1,20,0), (1,2,29,0), @@ -870,5 +853,3 @@ INSERT INTO `player_classlevelstats` VALUES (11,83,26487,9542), (11,84,38865,13335), (11,85,39533,21751); -/*!40000 ALTER TABLE `player_classlevelstats` ENABLE KEYS */; -UNLOCK TABLES; diff --git a/sql/updates/0155_xxxxx_01_playercreateinfo_spell.sql b/sql/updates/0155_xxxxx_01_mangos_playercreateinfo_spell.sql similarity index 99% rename from sql/updates/0155_xxxxx_01_playercreateinfo_spell.sql rename to sql/updates/0155_xxxxx_01_mangos_playercreateinfo_spell.sql index 46d86ff7a..ea634647a 100644 --- a/sql/updates/0155_xxxxx_01_playercreateinfo_spell.sql +++ b/sql/updates/0155_xxxxx_01_mangos_playercreateinfo_spell.sql @@ -1,6 +1,7 @@ -ALTER TABLE db_version CHANGE COLUMN required_0128_12097_01_mangos_mangos_string required_0155_xxxxx_01_playercreateinfo_spell bit; +ALTER TABLE db_version CHANGE COLUMN required_0128_12097_01_mangos_mangos_string required_0155_xxxxx_01_mangos_playercreateinfo_spell bit; DELETE FROM `playercreateinfo_spell` WHERE race IN (22); + INSERT INTO `playercreateinfo_spell` VALUES (22,1,81,'Dodge'), (22,1,107,'Block'), diff --git a/sql/updates/0155_xxxxx_02_playercreateinfo_action.sql b/sql/updates/0155_xxxxx_02_mangos_playercreateinfo_action.sql similarity index 74% rename from sql/updates/0155_xxxxx_02_playercreateinfo_action.sql rename to sql/updates/0155_xxxxx_02_mangos_playercreateinfo_action.sql index 11c94ffbb..16f59ad8c 100644 --- a/sql/updates/0155_xxxxx_02_playercreateinfo_action.sql +++ b/sql/updates/0155_xxxxx_02_mangos_playercreateinfo_action.sql @@ -1,6 +1,7 @@ -ALTER TABLE db_version CHANGE COLUMN required_0155_xxxxx_01_playercreateinfo_spell required_0155_xxxxx_02_playercreateinfo_action bit; +ALTER TABLE db_version CHANGE COLUMN required_0155_xxxxx_01_mangos_playercreateinfo_spell required_0155_xxxxx_02_mangos_playercreateinfo_action bit; DELETE FROM `playercreateinfo_action` WHERE race IN (22); + INSERT INTO `playercreateinfo_action` VALUES (22,1,0,88161,0), (22,1,72,22627,1), diff --git a/sql/updates/0156_xxxxx_01_playercreateinfo_action.sql b/sql/updates/0156_xxxxx_01_mangos_playercreateinfo_action.sql similarity index 86% rename from sql/updates/0156_xxxxx_01_playercreateinfo_action.sql rename to sql/updates/0156_xxxxx_01_mangos_playercreateinfo_action.sql index 76b2bd3bd..797e2250f 100644 --- a/sql/updates/0156_xxxxx_01_playercreateinfo_action.sql +++ b/sql/updates/0156_xxxxx_01_mangos_playercreateinfo_action.sql @@ -1,26 +1,7 @@ -ALTER TABLE db_version CHANGE COLUMN required_0155_xxxxx_02_playercreateinfo_action required_0156_xxxxx_01_playercreateinfo_action bit; +ALTER TABLE db_version CHANGE COLUMN required_0155_xxxxx_02_mangos_playercreateinfo_action required_0156_xxxxx_01_mangos_playercreateinfo_action bit; --- --- Table structure for table `playercreateinfo_action` --- +DELETE FROM playercreateinfo_action WHERE race BETWEEN 1 AND 22; -DROP TABLE IF EXISTS `playercreateinfo_action`; -CREATE TABLE `playercreateinfo_action` ( - `race` tinyint(3) unsigned NOT NULL default '0', - `class` tinyint(3) unsigned NOT NULL default '0', - `button` smallint(5) unsigned NOT NULL default '0', - `action` int(11) unsigned NOT NULL default '0', - `type` smallint(5) unsigned NOT NULL default '0', - KEY `playercreateinfo_race_class_index` (`race`,`class`), - PRIMARY KEY (`race`,`class`,`button`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- --- Dumping data for table `playercreateinfo_action` --- - -LOCK TABLES `playercreateinfo_action` WRITE; -/*!40000 ALTER TABLE `playercreateinfo_action` DISABLE KEYS */; INSERT INTO `playercreateinfo_action` VALUES (1,1,72,88163,0), (1,1,73,88161,0), @@ -374,5 +355,3 @@ INSERT INTO `playercreateinfo_action` VALUES (22,6,9,68992,0), (22,6,10,68996,0), (22,6,11,87840,0); -/*!40000 ALTER TABLE `playercreateinfo_action` ENABLE KEYS */; -UNLOCK TABLES; diff --git a/sql/updates/0156_xxxxx_02_playercreateinfo.sql b/sql/updates/0156_xxxxx_02_mangos_playercreateinfo.sql similarity index 80% rename from sql/updates/0156_xxxxx_02_playercreateinfo.sql rename to sql/updates/0156_xxxxx_02_mangos_playercreateinfo.sql index 6c8032192..61bc86516 100644 --- a/sql/updates/0156_xxxxx_02_playercreateinfo.sql +++ b/sql/updates/0156_xxxxx_02_mangos_playercreateinfo.sql @@ -1,29 +1,7 @@ -ALTER TABLE db_version CHANGE COLUMN required_0156_xxxxx_01_playercreateinfo_action required_0156_xxxxx_02_playercreateinfo bit; +ALTER TABLE db_version CHANGE COLUMN required_0156_xxxxx_01_mangos_playercreateinfo_action required_0156_xxxxx_02_mangos_playercreateinfo bit; --- --- Table structure for table `playercreateinfo` --- +DELETE FROM playercreateinfo WHERE race BETWEEN 1 AND 22; -DROP TABLE IF EXISTS `playercreateinfo`; -CREATE TABLE `playercreateinfo` ( - `race` tinyint(3) unsigned NOT NULL default '0', - `class` tinyint(3) unsigned NOT NULL default '0', - `map` smallint(5) unsigned NOT NULL default '0', - `zone` mediumint(8) unsigned NOT NULL default '0', - `position_x` float NOT NULL default '0', - `position_y` float NOT NULL default '0', - `position_z` float NOT NULL default '0', - `orientation` float NOT NULL default '0', - `phaseMap` smallint(5) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`race`,`class`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- --- Dumping data for table `playercreateinfo` --- - -LOCK TABLES `playercreateinfo` WRITE; -/*!40000 ALTER TABLE `playercreateinfo` DISABLE KEYS */; INSERT INTO `playercreateinfo` VALUES (1,9,0,9,-8914.57,-133.909,80.5378,0,0), (1,8,0,9,-8914.57,-133.909,80.5378,0,0), @@ -116,5 +94,3 @@ INSERT INTO `playercreateinfo` VALUES (22,9,654,4756,-1451.53,1403.35,35.5561,0,638), (22,11,654,4756,-1451.53,1403.35,35.5561,0,638), (22,6,609,0,2356.21,-5662.21,426.026,0,0); -/*!40000 ALTER TABLE `playercreateinfo` ENABLE KEYS */; -UNLOCK TABLES; diff --git a/sql/updates/0156_xxxxx_03playercreateinfo_spell.sql b/sql/updates/0156_xxxxx_03_mangos_playercreateinfo_spell.sql similarity index 99% rename from sql/updates/0156_xxxxx_03playercreateinfo_spell.sql rename to sql/updates/0156_xxxxx_03_mangos_playercreateinfo_spell.sql index f7dcb84d5..c8162aebb 100644 --- a/sql/updates/0156_xxxxx_03playercreateinfo_spell.sql +++ b/sql/updates/0156_xxxxx_03_mangos_playercreateinfo_spell.sql @@ -1,24 +1,7 @@ -ALTER TABLE db_version CHANGE COLUMN required_0156_xxxxx_02_playercreateinfo required_0156_xxxxx_03_playercreateinfo_spell bit; +ALTER TABLE db_version CHANGE COLUMN required_0156_xxxxx_02_mangos_playercreateinfo required_0156_xxxxx_03_mangos_playercreateinfo_spell bit; --- --- Table structure for table `playercreateinfo_spell` --- +DELETE FROM playercreateinfo_spell WHERE race BETWEEN 1 AND 22; -DROP TABLE IF EXISTS `playercreateinfo_spell`; -CREATE TABLE `playercreateinfo_spell` ( - `race` tinyint(3) unsigned NOT NULL default '0', - `class` tinyint(3) unsigned NOT NULL default '0', - `Spell` mediumint(8) unsigned NOT NULL default '0', - `Note` varchar(255) default NULL, - PRIMARY KEY (`race`,`class`,`Spell`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- --- Dumping data for table `playercreateinfo_spell` --- - -LOCK TABLES `playercreateinfo_spell` WRITE; -/*!40000 ALTER TABLE `playercreateinfo_spell` DISABLE KEYS */; INSERT INTO `playercreateinfo_spell` VALUES (1,1,202,'Two-Handed Swords'), (1,1,196,'One-Handed Axes'), @@ -5116,5 +5099,3 @@ INSERT INTO `playercreateinfo_spell` VALUES (22,6,10841,'Heavy Mageweave Bandage'), (22,6,18629,'Runecloth Bandage'), (22,6,7934,'Anti-Venom'); -/*!40000 ALTER TABLE `playercreateinfo_spell` ENABLE KEYS */; -UNLOCK TABLES; diff --git a/sql/updates/0157_xxxxx_01_player_levelstats.sql b/sql/updates/0157_xxxxx_01_mangos_player_levelstats.sql similarity index 99% rename from sql/updates/0157_xxxxx_01_player_levelstats.sql rename to sql/updates/0157_xxxxx_01_mangos_player_levelstats.sql index 61880919d..9ffaa13c3 100644 --- a/sql/updates/0157_xxxxx_01_player_levelstats.sql +++ b/sql/updates/0157_xxxxx_01_mangos_player_levelstats.sql @@ -1,28 +1,7 @@ -ALTER TABLE db_version CHANGE COLUMN required_0156_xxxxx_03_playercreateinfo_spell required_0157_xxxxx_01_player_levelstats bit; +ALTER TABLE db_version CHANGE COLUMN required_0156_xxxxx_03_mangos_playercreateinfo_spell required_0157_xxxxx_01_mangos_player_levelstats bit; --- --- Table structure for table `player_levelstats` --- +DELETE FROM player_levelstats WHERE race BETWEEN 1 AND 22; -DROP TABLE IF EXISTS `player_levelstats`; -CREATE TABLE `player_levelstats` ( - `race` tinyint(3) unsigned NOT NULL, - `class` tinyint(3) unsigned NOT NULL, - `level` tinyint(3) unsigned NOT NULL, - `str` tinyint(3) unsigned NOT NULL, - `agi` tinyint(3) unsigned NOT NULL, - `sta` tinyint(3) unsigned NOT NULL, - `inte` tinyint(3) unsigned NOT NULL, - `spi` tinyint(3) unsigned NOT NULL, - PRIMARY KEY (`race`,`class`,`level`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.'; - --- --- Dumping data for table `player_levelstats` --- - -LOCK TABLES `player_levelstats` WRITE; -/*!40000 ALTER TABLE `player_levelstats` DISABLE KEYS */; INSERT INTO `player_levelstats` VALUES (1,1,1,23,20,22,20,20), (1,1,2,24,21,23,20,20), diff --git a/sql/updates/0159_xxxxx_01_mangos_quest_template.sql b/sql/updates/0159_xxxxx_01_mangos_quest_template.sql index bd7eaca1a..f9292e6aa 100644 --- a/sql/updates/0159_xxxxx_01_mangos_quest_template.sql +++ b/sql/updates/0159_xxxxx_01_mangos_quest_template.sql @@ -1,4 +1,4 @@ -ALTER TABLE db_version CHANGE COLUMN required_0157_xxxxx_01_player_levelstats required_0159_xxxxx_01_mangos_quest_template bit; +ALTER TABLE db_version CHANGE COLUMN required_0157_xxxxx_01_mangos_player_levelstats required_0159_xxxxx_01_mangos_quest_template bit; ALTER TABLE `quest_template` MODIFY COLUMN `RequiredRaces` int(7) unsigned NOT NULL DEFAULT '0'; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 04f6412a5..ace5bd721 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ -#define REVISION_NR "0165" +#define REVISION_NR "0166" #endif // __REVISION_NR_H__