cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into hair-gradients

Browse Source
This commit is contained in:
mochi
2021-10-27 13:33:12 +02:00
parent 2dd4c07c34 2d3e44511e
commit c7046c0756
1117 changed files with 53392 additions and 61705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SQL/paradise_schema.sql
+32 -2
View File
@@ -118,6 +118,7 @@ CREATE TABLE `death` (
`pod` text NOT NULL COMMENT 'Place of death',
`coord` text NOT NULL COMMENT 'X, Y, Z POD',
`tod` datetime NOT NULL COMMENT 'Time of death',
`server_id` TEXT NULL DEFAULT NULL,
`job` text NOT NULL,
`special` text NOT NULL,
`name` text NOT NULL,
@@ -201,6 +202,7 @@ CREATE TABLE `ban` (
`bantime` datetime NOT NULL,
`ban_round_id` INT(11) NULL DEFAULT NULL,
`serverip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
`server_id` VARCHAR(50) NULL DEFAULT NULL COLLATE utf8mb4_general_ci,
`bantype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
`reason` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
`job` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -324,6 +326,7 @@ CREATE TABLE `karma` (
`receiverspecial` text,
`isnegative` tinyint(1) DEFAULT NULL,
`spenderip` text NOT NULL,
`server_id` TEXT NULL DEFAULT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4;
@@ -378,6 +381,7 @@ CREATE TABLE `legacy_population` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`playercount` int(11) DEFAULT NULL,
`admincount` int(11) DEFAULT NULL,
`server_id` VARCHAR(50) NULL DEFAULT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4;
@@ -536,6 +540,7 @@ CREATE TABLE `connection_log` (
`ckey` varchar(32) NOT NULL,
`ip` varchar(32) NOT NULL,
`computerid` varchar(32) NOT NULL,
`server_id` VARCHAR(50) NULL DEFAULT NULL,
`result` ENUM('ESTABLISHED','DROPPED - IPINTEL','DROPPED - BANNED','DROPPED - INVALID') NOT NULL DEFAULT 'ESTABLISHED' COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`),
@@ -588,6 +593,7 @@ CREATE TABLE `round` (
`shuttle_name` VARCHAR(64) NULL,
`map_name` VARCHAR(32) NULL,
`station_name` VARCHAR(80) NULL,
`server_id` VARCHAR(50) NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -601,5 +607,29 @@ CREATE TABLE `2fa_secrets` (
`date_setup` DATETIME NOT NULL DEFAULT current_timestamp(),
`last_time` DATETIME NULL DEFAULT NULL,
PRIMARY KEY (`ckey`) USING BTREE
)
COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
--
-- Table structure for table `pai_saves`
--
CREATE TABLE `pai_saves` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`pai_name` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`description` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`preferred_role` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`ooc_comments` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `ckey` (`ckey`) USING BTREE
) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
--
-- Table structure for table `instance_data_cache`
--
CREATE TABLE `instance_data_cache` (
`server_id` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`key_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`key_value` VARCHAR(12345) NOT NULL COLLATE 'utf8mb4_general_ci',
`last_updated` TIMESTAMP NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
PRIMARY KEY (`server_id`, `key_name`) USING HASH
) COLLATE='utf8mb4_general_ci' ENGINE=MEMORY;
SQL/updates/25-26.sql
+13 -6
View File
@@ -1,6 +1,13 @@
# Updates DB from 25 to 26 -dearmochi
# Adds support for hair gradient
ALTER TABLE `characters` ADD COLUMN `hair_gradient` varchar(45) COLLATE utf8mb4_unicode_ci NOT NULL;
ALTER TABLE `characters` ADD COLUMN `hair_gradient_offset` varchar(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0,0';
ALTER TABLE `characters` ADD COLUMN `hair_gradient_colour` varchar(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#000000';
ALTER TABLE `characters` ADD COLUMN `hair_gradient_alpha` tinyint(3) UNSIGNED NOT NULL DEFAULT '255'
# Updates DB from 25-25, -AffectedArc07
# Adds a pAI saves table to the DB
CREATE TABLE `pai_saves` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`pai_name` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`description` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`preferred_role` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`ooc_comments` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `ckey` (`ckey`) USING BTREE
) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
SQL/updates/26-27.sql
+32
View File
@@ -0,0 +1,32 @@
# Updates DB from 26 to 27 -AffectedArc07
# Adds a new table for instance data caching, and server_id fields on other tables
CREATE TABLE `instance_data_cache` (
`server_id` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`key_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`key_value` VARCHAR(12345) NOT NULL COLLATE 'utf8mb4_general_ci',
`last_updated` TIMESTAMP NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
PRIMARY KEY (`server_id`, `key_name`) USING HASH
) COLLATE='utf8mb4_general_ci' ENGINE=MEMORY;
ALTER TABLE `ban`
ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `serverip`;
ALTER TABLE `connection_log`
ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `computerid`;
ALTER TABLE `death`
ADD COLUMN `server_id` TEXT NULL AFTER `tod`;
ALTER TABLE `karma`
ADD COLUMN `server_id` TEXT NULL AFTER `spenderip`;
ALTER TABLE `legacy_population`
ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `admincount`;
# Notes already has a column for this
ALTER TABLE `notes`
CHANGE COLUMN `server` `server` VARCHAR(50) NULL COLLATE 'utf8mb4_general_ci' AFTER `edits`;
ALTER TABLE `round`
ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `station_name`;
SQL/updates/27-28.sql
+6
View File
@@ -0,0 +1,6 @@
# Updates DB from 27 to 28 -dearmochi
# Adds support for hair gradient
ALTER TABLE `characters` ADD COLUMN `hair_gradient` varchar(45) COLLATE utf8mb4_unicode_ci NOT NULL;
ALTER TABLE `characters` ADD COLUMN `hair_gradient_offset` varchar(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0,0';
ALTER TABLE `characters` ADD COLUMN `hair_gradient_colour` varchar(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#000000';
ALTER TABLE `characters` ADD COLUMN `hair_gradient_alpha` tinyint(3) UNSIGNED NOT NULL DEFAULT '255'