From 7a29bce9317b11e43dd16bedadb05881786a010c Mon Sep 17 00:00:00 2001 From: Salja Date: Mon, 13 Aug 2012 18:34:12 +0200 Subject: [PATCH] [0076] Some Cleans and highest lookup entries for 4.3.4 DB2. Signed-off-by: Salja --- sql/updates/0014_xxxxx_01_realmd_account_access.sql | 2 +- sql/updates/0023_xxxxx_01_mangos_player_classlevelstats.sql | 2 +- .../0028_xxxxx_01_characters_character_phase_data.sql | 2 +- sql/updates/0028_xxxxx_02_mangos_quest_phase_maps.sql | 2 +- sql/updates/0028_xxxxx_03_mangos_playercreateinfo.sql | 2 +- sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql | 2 +- sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql | 2 +- sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql | 2 +- sql/updates/0038_xxxxx_01_mangos_player_classlevelstats.sql | 2 +- sql/updates/0040_xxxxx_01_mangos_playercreateinfo.sql | 2 +- sql/updates/0046_xxxxx_01_mangos_player_xp_for_level.sql | 2 +- src/game/DB2Stores.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sql/updates/0014_xxxxx_01_realmd_account_access.sql b/sql/updates/0014_xxxxx_01_realmd_account_access.sql index e8e0ea3d6..10c17071e 100644 --- a/sql/updates/0014_xxxxx_01_realmd_account_access.sql +++ b/sql/updates/0014_xxxxx_01_realmd_account_access.sql @@ -15,4 +15,4 @@ INSERT INTO `account_access` VALUES (1,3,-1), (2,2,-1), (3,1,-1), -(4,0,-1); \ No newline at end of file +(4,0,-1); diff --git a/sql/updates/0023_xxxxx_01_mangos_player_classlevelstats.sql b/sql/updates/0023_xxxxx_01_mangos_player_classlevelstats.sql index fc8309226..e3f71062e 100644 --- a/sql/updates/0023_xxxxx_01_mangos_player_classlevelstats.sql +++ b/sql/updates/0023_xxxxx_01_mangos_player_classlevelstats.sql @@ -1,3 +1,3 @@ ALTER TABLE db_version CHANGE COLUMN required_0001_xxxxx_01_mangos required_0023_xxxxx_01_mangos_player_classlevelstats bit; -DROP TABLE IF EXISTS `player_classlevelstats`; \ No newline at end of file +DROP TABLE IF EXISTS `player_classlevelstats`; diff --git a/sql/updates/0028_xxxxx_01_characters_character_phase_data.sql b/sql/updates/0028_xxxxx_01_characters_character_phase_data.sql index 4e19b4e03..024b33254 100644 --- a/sql/updates/0028_xxxxx_01_characters_character_phase_data.sql +++ b/sql/updates/0028_xxxxx_01_characters_character_phase_data.sql @@ -13,4 +13,4 @@ CREATE TABLE `character_phase_data` ( -- ---------------------------- -- Records of character_phase_data --- ---------------------------- \ No newline at end of file +-- ---------------------------- diff --git a/sql/updates/0028_xxxxx_02_mangos_quest_phase_maps.sql b/sql/updates/0028_xxxxx_02_mangos_quest_phase_maps.sql index 20d1b72d9..0ef2dc4b6 100644 --- a/sql/updates/0028_xxxxx_02_mangos_quest_phase_maps.sql +++ b/sql/updates/0028_xxxxx_02_mangos_quest_phase_maps.sql @@ -13,4 +13,4 @@ CREATE TABLE `quest_phase_maps` ( -- ---------------------------- -- Records of quest_phase_maps --- ---------------------------- \ No newline at end of file +-- ---------------------------- diff --git a/sql/updates/0028_xxxxx_03_mangos_playercreateinfo.sql b/sql/updates/0028_xxxxx_03_mangos_playercreateinfo.sql index ffe44feca..a18759c17 100644 --- a/sql/updates/0028_xxxxx_03_mangos_playercreateinfo.sql +++ b/sql/updates/0028_xxxxx_03_mangos_playercreateinfo.sql @@ -1,4 +1,4 @@ ALTER TABLE db_version CHANGE COLUMN required_0028_xxxxx_02_mangos_quest_phase_maps required_0028_xxxxx_03_mangos_playercreateinfo bit; ALTER TABLE `playercreateinfo` -ADD COLUMN `phaseMap` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `orientation`; \ No newline at end of file +ADD COLUMN `phaseMap` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `orientation`; diff --git a/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql b/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql index 97cb416f6..757d05cf6 100644 --- a/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql +++ b/sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql @@ -102,4 +102,4 @@ INSERT INTO `playercreateinfo` VALUES (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; \ No newline at end of file +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 042731f1c..aeb820ed9 100644 --- a/sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql +++ b/sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql @@ -9660,4 +9660,4 @@ INSERT INTO `player_levelstats` VALUES (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; \ No newline at end of file +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 7c605d98a..7791e7c34 100644 --- a/sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql +++ b/sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql @@ -871,4 +871,4 @@ INSERT INTO `player_classlevelstats` VALUES (11,84,38865,13335), (11,85,39533,21751); /*!40000 ALTER TABLE `player_classlevelstats` ENABLE KEYS */; -UNLOCK TABLES; \ No newline at end of file +UNLOCK TABLES; diff --git a/sql/updates/0038_xxxxx_01_mangos_player_classlevelstats.sql b/sql/updates/0038_xxxxx_01_mangos_player_classlevelstats.sql index 221966e5d..f378e7001 100644 --- a/sql/updates/0038_xxxxx_01_mangos_player_classlevelstats.sql +++ b/sql/updates/0038_xxxxx_01_mangos_player_classlevelstats.sql @@ -1,3 +1,3 @@ ALTER TABLE db_version CHANGE COLUMN required_0034_xxxxx_03_mangos_player_classlevelstats required_0038_xxxxx_01_mangos_player_classlevelstats bit; -DROP TABLE IF EXISTS `player_classlevelstats`; \ No newline at end of file +DROP TABLE IF EXISTS `player_classlevelstats`; diff --git a/sql/updates/0040_xxxxx_01_mangos_playercreateinfo.sql b/sql/updates/0040_xxxxx_01_mangos_playercreateinfo.sql index f2c22a68f..75858afe2 100644 --- a/sql/updates/0040_xxxxx_01_mangos_playercreateinfo.sql +++ b/sql/updates/0040_xxxxx_01_mangos_playercreateinfo.sql @@ -1,3 +1,3 @@ ALTER TABLE db_version CHANGE COLUMN required_0038_xxxxx_01_mangos_player_classlevelstats required_0040_xxxxx_01_mangos_playercreateinfo bit; -UPDATE playercreateinfo SET phaseMap=638 WHERE race=22; \ No newline at end of file +UPDATE playercreateinfo SET phaseMap=638 WHERE race=22; diff --git a/sql/updates/0046_xxxxx_01_mangos_player_xp_for_level.sql b/sql/updates/0046_xxxxx_01_mangos_player_xp_for_level.sql index 29310dbeb..09246c54a 100644 --- a/sql/updates/0046_xxxxx_01_mangos_player_xp_for_level.sql +++ b/sql/updates/0046_xxxxx_01_mangos_player_xp_for_level.sql @@ -17,4 +17,4 @@ INSERT INTO `player_xp_for_level` VALUES ('81', '2121500'), ('82', '4004000'), ('83', '5203400'), -('84', '9165100'); \ No newline at end of file +('84', '9165100'); diff --git a/src/game/DB2Stores.cpp b/src/game/DB2Stores.cpp index 67cf8c0d5..0aa7e7d1f 100644 --- a/src/game/DB2Stores.cpp +++ b/src/game/DB2Stores.cpp @@ -123,9 +123,9 @@ void LoadDB2Stores(const std::string& dataPath) exit(1); } - // Check loaded DBC files proper version - if (!sItemStore.LookupEntry(68815) || // last client known item added in 4.2.0 - !sItemExtendedCostStore.LookupEntry(3652)) // last item extended cost added in 4.2.0 + // Check loaded DB2 files proper version + if (!sItemStore.LookupEntry(83086) || // last item added in 4.3.4 (15595) + !sItemExtendedCostStore.LookupEntry(3872) ) // last item extended cost added in 4.3.4 (15595) { sLog.outString(""); sLog.outError("Please extract correct db2 files from build %s", AcceptableClientBuildsListStr().c_str()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d187dfa94..bc16744a0 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 "0075" + #define REVISION_NR "0076" #endif // __REVISION_NR_H__