Merge remote-tracking branch 'upstream/master' into zombies

SQL/paradise_schema.sql

@@ -254,7 +254,7 @@ CREATE TABLE `player` (
   `UI_style_alpha` smallint(4) DEFAULT '255',
   `be_role` mediumtext,
   `default_slot` smallint(4) DEFAULT '1',
-  `toggles` mediumint(8) DEFAULT '383',
+  `toggles` int(8) DEFAULT '383',
   `sound` mediumint(8) DEFAULT '31',
   `randomslot` tinyint(1) DEFAULT '0',
   `volume` smallint(4) DEFAULT '100',
@@ -266,6 +266,9 @@ CREATE TABLE `player` (
   `exp` mediumtext,
   `clientfps` smallint(4) DEFAULT '0',
   `atklog` smallint(4) DEFAULT '0',
+  `fuid` BIGINT(20) NULL DEFAULT NULL,
+  `fupdate` SMALLINT(4) NULL DEFAULT 0,
+  `afk_watch` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;
@@ -523,15 +526,27 @@ CREATE TABLE `memo` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `discord`
+-- Table structure for table `ipintel`
 --
-DROP TABLE IF EXISTS `discord`;
+DROP TABLE IF EXISTS `ipintel`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE IF NOT EXISTS `discord` (
-  `ckey` varchar(32) NOT NULL,
-  `discord_id` bigint(20) NOT NULL,
-  `notify` int(11) NOT NULL,
-  PRIMARY KEY (`ckey`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE  `ipintel` (
+`ip` INT UNSIGNED NOT NULL ,
+`date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL ,
+`intel` REAL NOT NULL DEFAULT  '0',
+PRIMARY KEY (  `ip` )
+) ENGINE = INNODB;
 /*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `vpn_whitelist`
+--
+DROP TABLE IF EXISTS `vpn_whitelist`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vpn_whitelist` (
+  `ckey` VARCHAR(32) NOT NULL,
+  `reason` text
+  PRIMARY KEY (`ckey`)
+) ENGINE=INNODB;

SQL/paradise_schema_prefixed.sql

@@ -253,7 +253,7 @@ CREATE TABLE `SS13_player` (
   `UI_style_alpha` smallint(4) DEFAULT '255',
   `be_role` mediumtext,
   `default_slot` smallint(4) DEFAULT '1',
-  `toggles` mediumint(8) DEFAULT '383',
+  `toggles` int(8) DEFAULT '383',
   `sound` mediumint(8) DEFAULT '31',
   `randomslot` tinyint(1) DEFAULT '0',
   `volume` smallint(4) DEFAULT '100',
@@ -265,6 +265,9 @@ CREATE TABLE `SS13_player` (
   `exp` mediumtext,
   `clientfps` smallint(4) DEFAULT '0',
   `atklog` smallint(4) DEFAULT '0',
+  `fuid` BIGINT(20) NULL DEFAULT NULL,
+  `fupdate` SMALLINT(4) NULL DEFAULT 0,
+  `afk_watch` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;
@@ -522,15 +525,27 @@ CREATE TABLE `SS13_memo` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `SS13_discord`
+-- Table structure for table `SS13_ipintel`
 --
-DROP TABLE IF EXISTS `SS13_discord`;
+DROP TABLE IF EXISTS `SS13_ipintel`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE IF NOT EXISTS `SS13_discord` (
-  `ckey` varchar(32) NOT NULL,
-  `discord_id` bigint(20) NOT NULL,
-  `notify` int(11) NOT NULL,
-  PRIMARY KEY (`ckey`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE  `SS13_ipintel` (
+`ip` INT UNSIGNED NOT NULL ,
+`date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL ,
+`intel` REAL NOT NULL DEFAULT  '0',
+PRIMARY KEY (  `ip` )
+) ENGINE = INNODB;
 /*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `SS13_vpn_whitelist`
+--
+DROP TABLE IF EXISTS `SS13_vpn_whitelist`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SS13_vpn_whitelist` (
+  `ckey` VARCHAR(32) NOT NULL,
+  `reason` text,
+  PRIMARY KEY (`ckey`)
+) ENGINE=INNODB;

SQL/updates/5-6.sql

@@ -0,0 +1,34 @@
+#Updating the SQL from version 5 to version 6. -Kyep
+
+#Make a table to track the results of VPN/proxy lookups for IPs (IPINTEL, TG PORT)
+CREATE TABLE  `ipintel` (
+`ip` INT UNSIGNED NOT NULL ,
+`date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL ,
+`intel` REAL NOT NULL DEFAULT  '0',
+PRIMARY KEY (  `ip` )
+) ENGINE = INNODB;
+
+#Make a table to track which ckeys are whitelisted for use of VPNs (IPINTEL, CUSTOM)
+CREATE TABLE `vpn_whitelist` (
+  `ckey` VARCHAR(32) NOT NULL,
+  `reason` text,
+  PRIMARY KEY (`ckey`)
+) ENGINE=INNODB;
+
+# Add fuid (forum userid) which enables quick lookup of which ckey is associated with a specific forum account. (FORUM LINK)
+ALTER TABLE `player` ADD `fuid` BIGINT(20) NULL DEFAULT NULL;
+ALTER TABLE `player` ADD INDEX(`fuid`);
+
+# Add fupdate (forum update required) which flags specific ckeys as having been banned/unbanned, which requires an update of their forum/etc permissions (FORUM LINK)
+ALTER TABLE `player` ADD `fupdate` SMALLINT(4) NULL DEFAULT 0;
+ALTER TABLE `player` ADD INDEX(`fupdate`);
+
+#Make a table to track oauth tokens for linking forum/web accounts (FORUM LINK)
+CREATE TABLE `oauth_tokens` (
+  `ckey` VARCHAR(32) NOT NULL,
+  `token` VARCHAR(32) NOT NULL,
+  PRIMARY KEY (`token`)
+) ENGINE=INNODB;
+
+#Drop the old 'discord' table that is not used anymore
+DROP TABLE `discord`;

SQL/updates/6-7.sql

@@ -0,0 +1,2 @@
+ALTER TABLE player
+MODIFY COLUMN toggles int;

SQL/updates/7-8.sql

@@ -0,0 +1,2 @@
+# Add afk_watch which gives users the option to make use of the AFK watcher subsystem
+ALTER TABLE `player` ADD `afk_watch` tinyint(1) NOT NULL DEFAULT '0';

_maps/__MAP_DEFINES.dm

@@ -31,7 +31,7 @@
 	#define CENTCOMM "CentComm"
 	#define TELECOMMS "Telecomms Satellite"
 	#define DERELICT "Derelicted Station"
-	#define MINING "Mining Asteroid"
+	#define MINING "Lavaland"
 	#define CONSTRUCTION "Construction Area"
 	#define EMPTY_AREA "Empty Area"
 	#define EMPTY_AREA_2 "Empty Area 2"

_maps/cyberiad.dm

@@ -17,16 +17,17 @@ z7 = empty
 	#include "map_files\cyberiad\z2.dmm"
 	#include "map_files\cyberiad\z3.dmm"
 	#include "map_files\cyberiad\z4.dmm"
-	#include "map_files\generic\z5.dmm"
+	#include "map_files\generic\Lavaland.dmm"
 	#include "map_files\cyberiad\z6.dmm"
 	#include "map_files\generic\z7.dmm"
 
+	#define MINETYPE "lavaland"
 	#define MAP_TRANSITION_CONFIG list(\
-DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL,STATION_CONTACT,REACHABLE,AI_OK)),\
+DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
 DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
 DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\
 DECLARE_LEVEL(CONSTRUCTION, CROSSLINKED, list(REACHABLE)),\
-DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\
+DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\
 DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\
 DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)))
 

_maps/delta.dm

@@ -26,12 +26,13 @@ Lovingly ported by Purpose2 to Paradise
 
 	#define MAP_FILE "delta.dmm"
 	#define MAP_NAME "Kerberos"
+	#define MINETYPE "lavaland"
 	#define MAP_TRANSITION_CONFIG list(\
-DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL,STATION_CONTACT,REACHABLE,AI_OK)),\
+DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
 DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
 DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\
 DECLARE_LEVEL(CONSTRUCTION, CROSSLINKED, list(REACHABLE)),\
-DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\
+DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\
 DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\
 DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)))