PartMan7 · PartMan7 · Aug 13, 2025 · Aug 1, 2025 · Aug 1, 2025 · Aug 3, 2025
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
 	"description": "A chatbot for Pokémon Showdown",
 	"main": "src/index.js",
 	"scripts": {
+		"debug": "./scripts/debug-games/start.sh",
 		"lint": "eslint src --ext .ts",
 		"lint:fix": "eslint src --ext .ts --fix",
 		"notify-unpushed": "sh scripts/notify_unpushed.sh",
@@ -47,6 +48,7 @@
 	},
 	"devDependencies": {
 		"@types/express": "^5.0.0",
+		"@types/livereload": "^0.9.5",
 		"@types/node": "^20.4.4",
 		"@types/react": "^18.2.48",
 		"@types/react-dom": "^18.2.18",
@@ -58,6 +60,7 @@
 		"eslint-import-resolver-typescript": "^3.6.3",
 		"eslint-plugin-import": "^2.31.0",
 		"husky": "^8.0.3",
+		"livereload": "^0.9.3",
 		"prettier": "^3.3.3"
 	}
 }
diff --git a/scripts/debug-games/live/.gitignore b/scripts/debug-games/live/.gitignore
@@ -0,0 +1 @@
+*.html
diff --git a/scripts/debug-games/start.sh b/scripts/debug-games/start.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+npx http-server src/web -p 8080 &
+USE_WEB=false WEB_PORT=8080 WEB_URL=http://localhost:8080 npx ts-node --project tsconfig.debug.json src/ps/games/debug.ts &
+npx http-server scripts/debug-games/live -p 8081 -o page.html
diff --git a/scripts/debug-games/templates/page.html b/scripts/debug-games/templates/page.html
@@ -0,0 +1,73 @@
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<title>Size: Desktop</title>
+		<style>
+			body {
+				/* Art by Daniel Kong */
+				background: url('https://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg') left center / cover no-repeat fixed
+					rgb(84, 107, 172);
+			}
+			#page {
+				border: 1px solid black;
+				padding: 12px;
+				background: #000a;
+				color: white;
+				border-radius: 12px;
+			}
+
+			#page.desktop {
+				width: 600px;
+				max-width: 600px;
+			}
+			#page.mobile {
+				width: 480px;
+				max-width: 480px;
+				overflow: auto;
+			}
+			#page.ruka {
+				width: 360px;
+				max-width: 360px;
+				max-height: 540px;
+				overflow: auto;
+			}
+		</style>
+		<script src="http://localhost:8082/livereload.js?snipver=1"></script>
+	</head>
+	<body>
+		<center>
+			<div style="display: flex; gap: 4px; justify-content: center; margin: 12px">
+				<button id="button-desktop" onclick="setView('desktop')">Desktop</button>
+				<button id="button-mobile" onclick="setView('mobile')">Mobile</button>
+				<button id="button-ruka" onclick="setView('ruka')">Ruka</button>
+			</div>
+			<center id="page">{HTML}</center>
+		</center>
+		<script>
+			/** @typedef {'desktop' | 'mobile' | 'ruka'} View */
+			/** @type View */
+			let view;
+
+			/** @type {Record<View, number>} */
+			const widths = { desktop: 600, mobile: 480, ruka: 360 };
+
+			/** @param {View} newView */
+			function setView(newView) {
+				view = newView;
+				localStorage.setItem('view', newView);
+
+				const page = document.getElementById('page');
+				page.classList.remove('desktop', 'mobile', 'ruka');
+				page.classList.add(newView);
+
+				document.querySelectorAll('button[id^=button-]').forEach(button => {
+					if (button.id === `button-${newView}`) button.setAttribute('disabled', 'true');
+					else button.removeAttribute('disabled');
+				});
+			}
+
+			setView(localStorage.getItem('view') || 'desktop');
+		</script>
+	</body>
+</html>
diff --git a/src/globals/index.ts b/src/globals/index.ts
@@ -1,2 +1,3 @@
+import '@/globals/augment';
 import '@/globals/patches';
 import '@/globals/prototypes';
diff --git a/src/globals/prototypes.ts b/src/globals/prototypes.ts
@@ -10,6 +10,10 @@ declare global {
 		count(): Record<T & (string | number), number>;
 		count(map: true): Map<T, number>;
 		group(size: number): T[][];
+		groupBy<Key extends string>(classification: (element: T) => Key): Partial<Record<Key, T[]>>;
+		/**
+		 * filterMap runs map. Only results that are NOT exactly 'undefined' are returned.
+		 */
 		filterMap<X>(cb: (element: T, index: number, thisArray: T[]) => X | undefined): X[];
 		list($T?: TranslationFn | string): string;
 		random(rng?: RNGSource): T | null;
@@ -19,26 +23,37 @@ declare global {
 		/** Default order is ascending */
 		sortBy(getSort: ((term: T, thisArray: T[]) => unknown) | null, dir?: 'asc' | 'desc'): T[];
 		space<S = unknown>(spacer: S): (T | S)[];
-		sum(): T;
+		sum(): T extends number ? number : never;
 		unique(): T[];
 	}
 	interface ReadonlyArray<T> {
 		access<V = ArrayAtom<T>>(pos: number[]): V;
 		count(): Record<T & (string | number), number>;
 		count(map: true): Map<T, number>;
+		/**
+		 * filterMap runs map. Only results that are NOT exactly 'undefined' are returned.
+		 */
 		filterMap<X>(cb: (element: T, index: number, thisArray: T[]) => X | undefined): X[];
 		group(size: number): T[][];
+		groupBy<Key extends string>(classification: (element: T) => Key): Partial<Record<Key, T[]>>;
 		list($T?: TranslationFn): string;
 		random(rng?: RNGSource): T | null;
 		sample(amount: number, rng?: RNGSource): T[];
 		space<S = unknown>(spacer: S): (T | S)[];
-		sum(): T;
+		sum(): T extends number ? number : never;
 		unique(): T[];
 	}
 
 	interface String {
 		gsub(match: RegExp, replace: string | ((arg: string, ...captures: string[]) => string)): string;
-		lazySplit(match: string | RegExp, cases: number): string[];
+
+		/**
+		 * Split the string exactly as many times as needed.
+		 * @param matcher Pattern/string to split by.
+		 * @param cases Number of cases to split.
+		 * @example 'a b c'.lazySplit(' ', 1); // ['a', 'bc']
+		 */
+		lazySplit(matcher: string | RegExp, cases: number): string[];
 	}
 
 	interface Number {
@@ -119,6 +134,19 @@ Object.defineProperties(Array.prototype, {
 			return [];
 		},
 	},
+	groupBy: {
+		enumerable: false,
+		writable: false,
+		configurable: false,
+		value: function <T, Key extends string>(this: T[], classification: (element: T) => Key): Partial<Record<Key, T[]>> {
+			return this.reduce<Partial<Record<Key, T[]>>>((acc, current) => {
+				const key = classification(current);
+				if (acc[key]) acc[key].push(current);
+				else acc[key] = [current];
+				return acc;
+			}, {});
+		},
+	},
 	list: {
 		enumerable: false,
 		writable: false,

diff --git a/src/ps/games/battleship/index.ts b/src/ps/games/battleship/index.ts
@@ -79,7 +79,7 @@ export class Battleship extends BaseGame<State> {
 				this.room.sendHTML(...renderMove(logEntry, this));
 				if (this.state.ready.A === true && this.state.ready.B === true) {
 					this.state.allReady = true;
-					this.nextPlayer();
+					this.endTurn();
 				} else {
 					this.update(player.id);
 				}
@@ -122,7 +122,7 @@ export class Battleship extends BaseGame<State> {
 					this.winCtx = { type: 'win', winner: player, loser: this.players[opponent] };
 					this.end();
 				}
-				this.nextPlayer();
+				this.endTurn();
 				this.update();
 				break;
 			}

diff --git a/src/ps/games/chess/index.ts b/src/ps/games/chess/index.ts
@@ -112,7 +112,7 @@ export class Chess extends BaseGame<State> {
 		this.cleanup();
 		this.state.pgn = this.lib.pgn();
 
-		this.nextPlayer();
+		this.endTurn();
 	}
 
 	// Cleans up stuff like selections and draw offers

diff --git a/src/ps/games/connectfour/index.ts b/src/ps/games/connectfour/index.ts
@@ -57,7 +57,7 @@ export class ConnectFour extends BaseGame<State> {
 			this.end();
 			return true;
 		}
-		this.nextPlayer();
+		this.endTurn();
 		return board;
 	}
 

diff --git a/src/ps/games/debug.ts b/src/ps/games/debug.ts
@@ -0,0 +1,40 @@
+/* eslint-disable no-console -- This isn't part of the bot */
+import 'dotenv/config';
+
+import { watch } from 'chokidar';
+import { promises as fs } from 'fs';
+import { createServer } from 'livereload';
+import path from 'path';
+
+import { debounce } from '@/utils/debounce';
+import { fsPath } from '@/utils/fsPath';
+
+const debugDir = fsPath('..', 'scripts', 'debug-games');
+
+async function baseRenderTemplates(): Promise<void> {
+	const { test } = await import('@/ps/games/test');
+	const html = await test();
+	console.log('Rendering templates!');
+	fs.readdir(path.join(debugDir, 'templates'))
+		.then(files => files.filter(file => file.endsWith('.html')))
+		.then(templates =>
+			Promise.all(
+				templates.map(async templateName => {
+					const template = await fs.readFile(path.join(debugDir, 'templates', templateName), 'utf8');
+					await fs.writeFile(path.join(debugDir, 'live', templateName), template.replace('{HTML}', html));
+				})
+			)
+		)
+		.then(() => console.log('Rendered templates.'));
+}
+
+const renderTemplates = debounce(baseRenderTemplates, 100);
+
+if (require.main === module) {
+	const watcher = watch([path.join(debugDir, 'templates'), fsPath('ps', 'games')]);
+	watcher.on('all', async () => {
+		renderTemplates();
+	});
+	const server = createServer({ port: 8082 });
+	server.watch(path.join(debugDir, 'live'));
+}
diff --git a/src/ps/games/game.ts b/src/ps/games/game.ts
@@ -97,7 +97,7 @@ export class BaseGame<State extends BaseState> {
 
 	onAddPlayer?(user: User, ctx: string): ActionResponse;
 	onAfterAddPlayer?(player: Player): void;
-	onLeavePlayer?(player: Player, ctx: string | User): ActionResponse;
+	onLeavePlayer?(player: Player, ctx: string | User): ActionResponse<'end' | null>;
 	onForfeitPlayer?(player: Player, ctx: string | User): ActionResponse;
 	onReplacePlayer?(turn: BaseState['turn'], withPlayer: User): ActionResponse;
 	onAfterReplacePlayer?(player: Player): void;
@@ -247,6 +247,7 @@ export class BaseGame<State extends BaseState> {
 	}
 	backup(): void {
 		if (this.meta.players === 'single') return; // Don't back up single-player games
+		if (this.endedAt) return;
 		const backup = this.serialize();
 		gameCache.set({ id: this.id, room: this.roomid, game: this.meta.id, backup, at: Date.now() });
 	}
@@ -345,7 +346,7 @@ export class BaseGame<State extends BaseState> {
 					cb: () => {
 						const playersLeft = Object.values(this.players).filter((player: Player) => !player.out);
 						if (playersLeft.length <= 1) this.end('dq');
-						else if (this.turn === player.turn) this.nextPlayer(); // Needs to be run AFTER consumer has finished DQing
+						else if (this.turn === player.turn) this.endTurn(); // Needs to be run AFTER consumer has finished DQing
 						this.backup();
 					},
 				},
@@ -356,7 +357,12 @@ export class BaseGame<State extends BaseState> {
 		delete this.players[player.turn];
 		return {
 			success: true,
-			data: { message: this.$T(staffAction ? 'GAME.REMOVED' : 'GAME.LEFT', { player: player.name }) },
+			data: {
+				message: this.$T(staffAction ? 'GAME.REMOVED' : 'GAME.LEFT', { player: player.name }),
+				cb: () => {
+					if (removePlayer?.data === 'end') this.end('dq');
+				},
+			},
 		};
 	}
 
@@ -377,7 +383,7 @@ export class BaseGame<State extends BaseState> {
 		this.players[newTurn] = { ...oldPlayer, ...assign, turn: newTurn };
 		if (!this.meta.turns) this.turns.splice(this.turns.indexOf(turn), 1, newTurn);
 		if (this.turn === turn) this.turn = newTurn;
-		this.spectators.remove(oldPlayer.id);
+		this.spectators.remove(oldPlayer.id, withPlayer.id);
 		this.onAfterReplacePlayer?.(this.players[newTurn]);
 		this.backup();
 		return { success: true, data: this.$T('GAME.SUB', { in: withPlayer.name, out: oldPlayer.name }) };
@@ -410,7 +416,7 @@ export class BaseGame<State extends BaseState> {
 		if (tryStart?.success === false) return tryStart;
 		this.started = true;
 		if (!this.turns.length) this.turns = Object.keys(this.players).shuffle(this.prng);
-		this.nextPlayer();
+		this.endTurn();
 		this.startedAt = new Date();
 		this.setTimer('Game started');
 		this.onAfterStart?.();
@@ -425,7 +431,7 @@ export class BaseGame<State extends BaseState> {
 	}
 
 	// Increments turn as needed and backs up state.
-	nextPlayer(): State['turn'] | null {
+	endTurn(): State['turn'] | null {
 		let current = this.turn;
 		do {
 			current = this.getNext(current);

diff --git a/src/ps/games/index.ts b/src/ps/games/index.ts
@@ -6,6 +6,7 @@ import { Mastermind, meta as MastermindMeta } from '@/ps/games/mastermind';
 import { Othello, meta as OthelloMeta } from '@/ps/games/othello';
 import { Scrabble, meta as ScrabbleMeta } from '@/ps/games/scrabble';
 import { SnakesLadders, meta as SnakesLaddersMeta } from '@/ps/games/snakesladders';
+import { Splendor, meta as SplendorMeta } from '@/ps/games/splendor';
 import { GamesList, type Meta } from '@/ps/games/types';
 
 export const Games = {
@@ -41,5 +42,9 @@ export const Games = {
 		meta: SnakesLaddersMeta,
 		instance: SnakesLadders,
 	},
+	[GamesList.Splendor]: {
+		meta: SplendorMeta,
+		instance: Splendor,
+	},
 } satisfies Readonly<Record<GamesList, Readonly<{ meta: Meta; instance: unknown }>>>;
 export type Games = typeof Games;
diff --git a/src/ps/games/lightsout/index.ts b/src/ps/games/lightsout/index.ts
@@ -84,7 +84,7 @@ export class LightsOut extends BaseGame<State> {
 		if (this.state.board.every(row => row.every(cell => cell === false))) {
 			return this.end();
 		}
-		this.nextPlayer();
+		this.endTurn();
 	}
 
 	onEnd(type: Exclude<EndType, 'loss'>): TranslatedText {

diff --git a/src/ps/games/mastermind/index.ts b/src/ps/games/mastermind/index.ts
@@ -53,7 +53,7 @@ export class Mastermind extends BaseGame<State> {
 		if (this.state.board.length >= this.state.cap) {
 			return this.end('loss');
 		}
-		this.nextPlayer();
+		this.endTurn();
 	}
 	guess(guess: Guess): GuessResult {
 		if (this.state.board.length === 0 && !this.setBy) this.closeSignups();

diff --git a/src/ps/games/othello/index.ts b/src/ps/games/othello/index.ts
@@ -85,7 +85,7 @@ export class Othello extends BaseGame<State> {
 		board[i][j] = turn;
 		this.log.push({ action: 'play', time: new Date(), turn, ctx: [i, j] });
 
-		const next = this.nextPlayer();
+		const next = this.endTurn();
 		if (!next) this.end();
 		return board;
 	}

diff --git a/src/ps/games/scrabble/index.ts b/src/ps/games/scrabble/index.ts
@@ -253,7 +253,7 @@ export class Scrabble extends BaseGame<State> {
 		this.passCount = 0;
 
 		if (rack.length === 0) return this.end();
-		const next = this.nextPlayer();
+		const next = this.endTurn();
 		if (!next) return this.end();
 	}
 
@@ -292,7 +292,7 @@ export class Scrabble extends BaseGame<State> {
 		this.log.push(logEntry);
 		this.room.sendHTML(...renderMove(logEntry, this));
 
-		this.nextPlayer();
+		this.endTurn();
 	}
 
 	pass(): void {
@@ -305,7 +305,7 @@ export class Scrabble extends BaseGame<State> {
 		if (this.passCount > Object.keys(this.players).length) {
 			return this.end('regular');
 		}
-		this.nextPlayer();
+		this.endTurn();
 	}
 
 	onEnd(type?: EndType): TranslatedText {