Merge branch 'master' of https://github.com/EQEmu/Server into bots_updater

This commit is contained in:
Uleat 2015-10-02 20:49:13 -04:00
commit 3ac87c8e31
3 changed files with 7 additions and 4 deletions

View File

@ -32,7 +32,7 @@
#define CURRENT_BINARY_DATABASE_VERSION 9087
#ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 8001
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9001
#else
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 0 // must be 0
#endif

View File

@ -1,7 +1,7 @@
8000|2015_09_30_bots_fix_existing.sql|SHOW TABLES LIKE 'bot%'|not_empty|
8001|2015_09_30_bots.sql|SHOW TABLES LIKE 'bot%'|empty|
9000|2015_09_30_bots_fix_existing.sql|SHOW TABLES LIKE 'bot%'|not_empty|
9001|2015_09_30_bots.sql|SHOW TABLES LIKE 'bot%'|empty|
9000|2015_09_30_bots_initial_updates.sql|||
9002|2015_09_30_bots_initial_updates.sql|||
# Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not

View File

@ -1,3 +1,6 @@
UPDATE `npc_types` SET `bodytype` = 0 WHERE `bodytype` IS NULL;
ALTER TABLE `npc_types` MODIFY `bodytype` INT(11) NOT NULL DEFAULT '1';
UPDATE `npc_types` SET `d_melee_texture1` = 0 WHERE `d_melee_texture1` IS NULL;
ALTER TABLE `npc_types` MODIFY `d_melee_texture1` INT(11) NOT NULL DEFAULT '0';
UPDATE `npc_types` SET `d_melee_texture2` = 0 WHERE `d_melee_texture2` IS NULL;
ALTER TABLE `npc_types` MODIFY `d_melee_texture2` INT(11) NOT NULL DEFAULT '0';