mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-21 19:38:25 +00:00
Merge branch 'master' into shared_tasks
This commit is contained in:
@@ -1,3 +1,66 @@
|
||||
DROP TABLE IF EXISTS `inventory_versions`;
|
||||
DROP TABLE IF EXISTS `inventory_snapshots`;
|
||||
|
||||
|
||||
CREATE TABLE `inventory_versions` (
|
||||
`version` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`step` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`bot_step` INT(11) UNSIGNED NOT NULL DEFAULT '0'
|
||||
)
|
||||
COLLATE='latin1_swedish_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
INSERT INTO `inventory_versions` VALUES (2, 0, 0);
|
||||
|
||||
|
||||
CREATE TABLE `inventory_snapshots` (
|
||||
`time_index` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`charid` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`slotid` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`itemid` INT(11) UNSIGNED NULL DEFAULT '0',
|
||||
`charges` SMALLINT(3) UNSIGNED NULL DEFAULT '0',
|
||||
`color` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot1` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot2` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot3` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot4` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot5` MEDIUMINT(7) UNSIGNED NULL DEFAULT '0',
|
||||
`augslot6` MEDIUMINT(7) NOT NULL DEFAULT '0',
|
||||
`instnodrop` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`custom_data` TEXT NULL,
|
||||
`ornamenticon` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornamentidfile` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornament_hero_model` INT(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`time_index`, `charid`, `slotid`)
|
||||
)
|
||||
COLLATE='latin1_swedish_ci'
|
||||
ENGINE=InnoDB;
|
||||
|
||||
|
||||
CREATE TABLE `inventory_snapshots_v1_bak` (
|
||||
`time_index` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`charid` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`slotid` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`itemid` INT(11) UNSIGNED NULL DEFAULT '0',
|
||||
`charges` SMALLINT(3) UNSIGNED NULL DEFAULT '0',
|
||||
`color` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot1` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot2` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot3` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot4` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot5` MEDIUMINT(7) UNSIGNED NULL DEFAULT '0',
|
||||
`augslot6` MEDIUMINT(7) NOT NULL DEFAULT '0',
|
||||
`instnodrop` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`custom_data` TEXT NULL,
|
||||
`ornamenticon` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornamentidfile` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornament_hero_model` INT(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`time_index`, `charid`, `slotid`)
|
||||
)
|
||||
COLLATE='latin1_swedish_ci'
|
||||
ENGINE=InnoDB;
|
||||
|
||||
|
||||
-- create inventory v1 backup
|
||||
SELECT @pre_timestamp := UNIX_TIMESTAMP(NOW());
|
||||
INSERT INTO `inventory_snapshots_v1_bak`
|
||||
|
||||
@@ -1,61 +1 @@
|
||||
DROP TABLE IF EXISTS `inventory_version`;
|
||||
DROP TABLE IF EXISTS `inventory_snapshots`;
|
||||
|
||||
|
||||
CREATE TABLE `inventory_versions` (
|
||||
`version` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`step` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`bot_step` INT(11) UNSIGNED NOT NULL DEFAULT '0'
|
||||
)
|
||||
COLLATE='latin1_swedish_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
INSERT INTO `inventory_versions` VALUES (2, 0, 0);
|
||||
|
||||
|
||||
CREATE TABLE `inventory_snapshots` (
|
||||
`time_index` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`charid` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`slotid` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`itemid` INT(11) UNSIGNED NULL DEFAULT '0',
|
||||
`charges` SMALLINT(3) UNSIGNED NULL DEFAULT '0',
|
||||
`color` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot1` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot2` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot3` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot4` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot5` MEDIUMINT(7) UNSIGNED NULL DEFAULT '0',
|
||||
`augslot6` MEDIUMINT(7) NOT NULL DEFAULT '0',
|
||||
`instnodrop` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`custom_data` TEXT NULL,
|
||||
`ornamenticon` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornamentidfile` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornament_hero_model` INT(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`time_index`, `charid`, `slotid`)
|
||||
)
|
||||
COLLATE='latin1_swedish_ci'
|
||||
ENGINE=InnoDB;
|
||||
|
||||
|
||||
CREATE TABLE `inventory_snapshots_v1_bak` (
|
||||
`time_index` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`charid` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`slotid` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`itemid` INT(11) UNSIGNED NULL DEFAULT '0',
|
||||
`charges` SMALLINT(3) UNSIGNED NULL DEFAULT '0',
|
||||
`color` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot1` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot2` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot3` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot4` MEDIUMINT(7) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`augslot5` MEDIUMINT(7) UNSIGNED NULL DEFAULT '0',
|
||||
`augslot6` MEDIUMINT(7) NOT NULL DEFAULT '0',
|
||||
`instnodrop` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`custom_data` TEXT NULL,
|
||||
`ornamenticon` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornamentidfile` INT(11) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`ornament_hero_model` INT(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`time_index`, `charid`, `slotid`)
|
||||
)
|
||||
COLLATE='latin1_swedish_ci'
|
||||
ENGINE=InnoDB;
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
ALTER TABLE `name_filter`
|
||||
ADD COLUMN `id` INT(11) NULL AUTO_INCREMENT FIRST,
|
||||
DROP PRIMARY KEY,
|
||||
ADD PRIMARY KEY (`id`) USING BTREE,
|
||||
ADD INDEX `name_search_index`(`name`);
|
||||
@@ -0,0 +1,10 @@
|
||||
CREATE TABLE `spell_buckets` (
|
||||
`spellid` bigint(11) unsigned NOT NULL,
|
||||
`key` varchar(100) DEFAULT NULL,
|
||||
`value` text,
|
||||
PRIMARY KEY (`spellid`),
|
||||
KEY `key_index` (`key`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:EnableSpellBuckets', 'false', 'Enables spell buckets');
|
||||
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Character:PerCharacterBucketMaxLevel', 'false', 'Enables data bucket-based max level.');
|
||||
Reference in New Issue
Block a user