diff --git a/common/version.h b/common/version.h index 82fe629b6..d6647f2c1 100644 --- a/common/version.h +++ b/common/version.h @@ -34,7 +34,7 @@ * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt */ -#define CURRENT_BINARY_DATABASE_VERSION 9158 +#define CURRENT_BINARY_DATABASE_VERSION 9159 #ifdef BOTS #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9027 diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt index 9f005365b..bdc41a337 100644 --- a/utils/sql/db_update_manifest.txt +++ b/utils/sql/db_update_manifest.txt @@ -412,6 +412,7 @@ 9156|2020_08_16_virtual_zonepoints.sql|SHOW COLUMNS from `zone_points` LIKE 'is_virtual'|empty| 9157|2020_09_02_pet_taunting.sql|SHOW COLUMNS from `character_pet_info` LIKE 'taunting'|empty| 9158|2020_12_09_underworld.sql|SHOW COLUMNS from `zone` LIKE 'underworld_teleport_index'|empty| +9159|2020_12_22_expedition_system.sql|SELECT * FROM db_version WHERE version >= 9159|empty| # Upgrade conditions: # This won't be needed after this system is implemented, but it is used database that are not diff --git a/utils/sql/git/required/wip_expeditions.sql b/utils/sql/git/required/2020_12_22_expedition_system.sql similarity index 68% rename from utils/sql/git/required/wip_expeditions.sql rename to utils/sql/git/required/2020_12_22_expedition_system.sql index a51d07095..820940500 100644 --- a/utils/sql/git/required/wip_expeditions.sql +++ b/utils/sql/git/required/2020_12_22_expedition_system.sql @@ -55,3 +55,28 @@ CREATE TABLE `character_expedition_lockouts` ( COLLATE='latin1_swedish_ci' ENGINE=InnoDB ; + +CREATE TABLE `dynamic_zones` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `instance_id` INT(10) NOT NULL DEFAULT 0, + `type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, + `compass_zone_id` INT(10) UNSIGNED NOT NULL DEFAULT 0, + `compass_x` FLOAT NOT NULL DEFAULT 0, + `compass_y` FLOAT NOT NULL DEFAULT 0, + `compass_z` FLOAT NOT NULL DEFAULT 0, + `safe_return_zone_id` INT(10) UNSIGNED NOT NULL DEFAULT 0, + `safe_return_x` FLOAT NOT NULL DEFAULT 0, + `safe_return_y` FLOAT NOT NULL DEFAULT 0, + `safe_return_z` FLOAT NOT NULL DEFAULT 0, + `safe_return_heading` FLOAT NOT NULL DEFAULT 0, + `zone_in_x` FLOAT NOT NULL DEFAULT 0, + `zone_in_y` FLOAT NOT NULL DEFAULT 0, + `zone_in_z` FLOAT NOT NULL DEFAULT 0, + `zone_in_heading` FLOAT NOT NULL DEFAULT 0, + `has_zone_in` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + UNIQUE INDEX `instance_id` (`instance_id`) +) +COLLATE='utf8mb4_general_ci' +ENGINE=InnoDB +; diff --git a/utils/sql/git/required/wip_dynamiczones.sql b/utils/sql/git/required/wip_dynamiczones.sql deleted file mode 100644 index dcc4575a2..000000000 --- a/utils/sql/git/required/wip_dynamiczones.sql +++ /dev/null @@ -1,24 +0,0 @@ -CREATE TABLE `dynamic_zones` ( - `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `instance_id` INT(10) NOT NULL DEFAULT 0, - `type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, - `compass_zone_id` INT(10) UNSIGNED NOT NULL DEFAULT 0, - `compass_x` FLOAT NOT NULL DEFAULT 0, - `compass_y` FLOAT NOT NULL DEFAULT 0, - `compass_z` FLOAT NOT NULL DEFAULT 0, - `safe_return_zone_id` INT(10) UNSIGNED NOT NULL DEFAULT 0, - `safe_return_x` FLOAT NOT NULL DEFAULT 0, - `safe_return_y` FLOAT NOT NULL DEFAULT 0, - `safe_return_z` FLOAT NOT NULL DEFAULT 0, - `safe_return_heading` FLOAT NOT NULL DEFAULT 0, - `zone_in_x` FLOAT NOT NULL DEFAULT 0, - `zone_in_y` FLOAT NOT NULL DEFAULT 0, - `zone_in_z` FLOAT NOT NULL DEFAULT 0, - `zone_in_heading` FLOAT NOT NULL DEFAULT 0, - `has_zone_in` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, - PRIMARY KEY (`id`), - UNIQUE INDEX `instance_id` (`instance_id`) -) -COLLATE='utf8mb4_general_ci' -ENGINE=InnoDB -;