1

.github/workflows/ci_suite.yml

@@ -131,34 +131,3 @@ jobs:
           bash tools/ci/run_server.sh
         env:
           CBT_BUILD_MODE: TEST_RUN
-
-  test_windows:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    name: Windows Build
-    runs-on: windows-latest
-    concurrency:
-      group: test_windows-${{ github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Restore Yarn cache
-        uses: actions/cache@v3
-        with:
-          path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - name: Compile
-        run: pwsh tools/ci/build.ps1
-        env:
-          DM_EXE: "C:\\byond\\bin\\dm.exe"
-      - name: Create artifact
-        run: |
-          md deploy
-          bash tools/deploy.sh ./deploy
-      - name: Deploy artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: deploy
-          path: deploy

SQL/database_schema.sql

@@ -6,6 +6,8 @@
  * PRESERVE ANY vr_'s! We need to replace those tables and features at some point, that's how we konw.
  **/
 
+-- core --
+
 --
 -- Table structure for table `schema_revision`
 --
@@ -16,6 +18,39 @@ CREATE TABLE IF NOT EXISTS `%_PREFIX_%schema_revision` (
   PRIMARY KEY (`major`, `minor`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
+-- photography --
+
+--           picture table            --
+-- used to store data about pictures  --
+-- hash is in sha1 format.            --
+CREATE TABLE IF NOT EXISTS `%_PREFIX_%pictures` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `hash` char(40) NOT NULL,
+  `created` datetime NOT NULL DEFAULT Now(),
+  `width` int NOT NULL,
+  `height` int NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `hash` (`hash`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+--             photograph table              --
+-- used to store data about photographs      --
+-- picture is picture hash in picture table  --
+CREATE TABLE IF NOT EXISTS `%_PREFIX_%photographs` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `picture` char(40) NOT NULL,
+  `created` datetime NOT NULL DEFAULT Now(),
+  `scene` MEDIUMTEXT null,
+  `desc` MEDIUMTEXT null,
+  CONSTRAINT `linked_picture` FOREIGN KEY (`picture`)
+  REFERENCES `%_PREFIX_%pictures` (`hash`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+-- players --
+
 --           Player lookup table                   --
 -- Used to look up player ID from ckey, as well as --
 -- store last computerid/ip for a ckey.            --
@@ -42,6 +77,57 @@ CREATE TABLE IF NOT EXISTS `%_PREFIX_%player` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
+-- Playtime / JEXP --
+
+--      Role Time Table - Master     --
+-- Stores total role time.           --
+
+CREATE TABLE IF NOT EXISTS `%_PREFIX_%playtime` (
+  `player` INT(11) NOT NULL,
+  `roleid` VARCHAR(64) NOT NULL,
+  `minutes` INT UNSIGNED NOT NULL,
+  PRIMARY KEY(`player`, `roleid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+--      Role Time - Logging       --
+-- Stores changes in role time    --
+CREATE TABLE IF NOT EXISTS `%_PREFIX_%playtime_log` (
+  `player` INT(11),
+  `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+  `roleid` VARCHAR(64) NOT NULL,
+  `delta` INT(11) NOT NULL,
+  `datetime` TIMESTAMP NOT NULL DEFAULT NOW() ON UPDATE NOW(),
+  PRIMARY KEY (`id`),
+  KEY `player` (`player`),
+  KEY `roleid` (`roleid`),
+  KEY `datetime` (`datetime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+DELIMITER $$
+CREATE TRIGGER `playtimeTlogupdate` AFTER UPDATE ON `%_PREFIX_%playtime` FOR EACH ROW BEGIN INSERT into `%_PREFIX_%playtime_log` (player, roleid, delta) VALUES (NEW.player, NEW.roleid, NEW.minutes-OLD.minutes);
+END
+$$
+CREATE TRIGGER `playtimeTloginsert` AFTER INSERT ON `%_PREFIX_%playtime` FOR EACH ROW BEGIN INSERT into `%_PREFIX_%playtime_log` (player, roleid, delta) VALUES (NEW.player, NEW.roleid, NEW.minutes);
+END
+$$
+CREATE TRIGGER `playtimeTlogdelete` AFTER DELETE ON `%_PREFIX_%playtime` FOR EACH ROW BEGIN INSERT into `%_PREFIX_%playtime_log` (player, roleid, delta) VALUES (OLD.player, OLD.roleid, 0-OLD.minutes);
+END
+$$
+DELIMITER ;
+
+-- Security - Ipintel --
+
+--        Ipintel Cache Table       --
+-- Stores cache entries for IPIntel --
+-- IP is in INET_ATON.              --
+CREATE TABLE IF NOT EXISTS `%_PREFIX_%ipintel` (
+  `ip` INT(10) unsigned NOT NULL,
+  `date` TIMESTAMP NOT NULL DEFAULT NOW() ON UPDATE NOW(),
+  `intel` double NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ip`),
+  KEY `idx_ipintel` (`ip`, `intel`, `date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
 --
 -- Table structure for table `round`
 --

SQL/database_schema_prefixed.sql

@@ -6,6 +6,8 @@
  * PRESERVE ANY vr_'s! We need to replace those tables and features at some point, that's how we konw.
  **/
 
+-- core --
+
 --
 -- Table structure for table `schema_revision`
 --
@@ -16,6 +18,39 @@ CREATE TABLE IF NOT EXISTS `rp_schema_revision` (
   PRIMARY KEY (`major`, `minor`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
+-- photography --
+
+--           picture table            --
+-- used to store data about pictures  --
+-- hash is in sha1 format.            --
+CREATE TABLE IF NOT EXISTS `rp_pictures` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `hash` char(40) NOT NULL,
+  `created` datetime NOT NULL DEFAULT Now(),
+  `width` int NOT NULL,
+  `height` int NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `hash` (`hash`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+--             photograph table              --
+-- used to store data about photographs      --
+-- picture is picture hash in picture table  --
+CREATE TABLE IF NOT EXISTS `rp_photographs` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `picture` char(40) NOT NULL,
+  `created` datetime NOT NULL DEFAULT Now(),
+  `scene` MEDIUMTEXT null,
+  `desc` MEDIUMTEXT null,
+  CONSTRAINT `linked_picture` FOREIGN KEY (`picture`)
+  REFERENCES `rp_pictures` (`hash`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+-- players --
+
 --           Player lookup table                   --
 -- Used to look up player ID from ckey, as well as --
 -- store last computerid/ip for a ckey.            --
@@ -42,6 +77,57 @@ CREATE TABLE IF NOT EXISTS `rp_player` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
+-- Playtime / JEXP --
+
+--      Role Time Table - Master     --
+-- Stores total role time.           --
+
+CREATE TABLE IF NOT EXISTS `rp_playtime` (
+  `player` INT(11) NOT NULL,
+  `roleid` VARCHAR(64) NOT NULL,
+  `minutes` INT UNSIGNED NOT NULL,
+  PRIMARY KEY(`player`, `roleid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+--      Role Time - Logging       --
+-- Stores changes in role time    --
+CREATE TABLE IF NOT EXISTS `rp_playtime_log` (
+  `player` INT(11),
+  `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+  `roleid` VARCHAR(64) NOT NULL,
+  `delta` INT(11) NOT NULL,
+  `datetime` TIMESTAMP NOT NULL DEFAULT NOW() ON UPDATE NOW(),
+  PRIMARY KEY (`id`),
+  KEY `player` (`player`),
+  KEY `roleid` (`roleid`),
+  KEY `datetime` (`datetime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+DELIMITER $$
+CREATE TRIGGER `playtimeTlogupdate` AFTER UPDATE ON `rp_playtime` FOR EACH ROW BEGIN INSERT into `rp_playtime_log` (player, roleid, delta) VALUES (NEW.player, NEW.roleid, NEW.minutes-OLD.minutes);
+END
+$$
+CREATE TRIGGER `playtimeTloginsert` AFTER INSERT ON `rp_playtime` FOR EACH ROW BEGIN INSERT into `rp_playtime_log` (player, roleid, delta) VALUES (NEW.player, NEW.roleid, NEW.minutes);
+END
+$$
+CREATE TRIGGER `playtimeTlogdelete` AFTER DELETE ON `rp_playtime` FOR EACH ROW BEGIN INSERT into `rp_playtime_log` (player, roleid, delta) VALUES (OLD.player, OLD.roleid, 0-OLD.minutes);
+END
+$$
+DELIMITER ;
+
+-- Security - Ipintel --
+
+--        Ipintel Cache Table       --
+-- Stores cache entries for IPIntel --
+-- IP is in INET_ATON.              --
+CREATE TABLE IF NOT EXISTS `rp_ipintel` (
+  `ip` INT(10) unsigned NOT NULL,
+  `date` TIMESTAMP NOT NULL DEFAULT NOW() ON UPDATE NOW(),
+  `intel` double NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ip`),
+  KEY `idx_ipintel` (`ip`, `intel`, `date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
 --
 -- Table structure for table `round`
 --

_mapload/_basemap.dm

@@ -1,16 +1,9 @@
-/// Uncomment this to load centcom and runtime station and thats it.
-// #define LOWMEMORYMODE
+/// load in the first reserved level, necessary to not have Dream Daemon start in MUD mode.
+#include "_basemap.dmm"
 
-#include "../maps/core/reservation_base_level.dmm"
+#ifdef ALL_MAPS
 
-/**
- * This map is 25x25x1.
- * The zlevel will expand as the world loads.
- */
-#ifndef LOWMEMORYMODE
-	#ifdef ALL_MAPS
-		#ifdef CIBUILDING
-			#include "..\maps\templates.dm"
-		#endif
+	#ifdef CIBUILDING
+		#include "..\maps\templates.dm"
 	#endif
 #endif

_mapload/rift.dm

@@ -1 +1,5 @@
-#define FORCE_MAP "_mapload/rift.json"
+#ifdef FORCE_MAP
+	#error Duplicate FORCE_MAP, what are you doing!?
+#endif
+
+#define FORCE_MAP "rift"