From 9370496c7fe49bd5bf89a4a31a6c3417773dfbaf Mon Sep 17 00:00:00 2001 From: evanpelle Date: Thu, 1 Jan 2026 16:14:20 -0800 Subject: [PATCH 1/4] Revert "Christmas Themed Homepage 2 (#2628)" This reverts commit 6d58abfdbb1f47eba0786221ae53a4ab7dc72fd6. --- src/client/components/Maps.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/components/Maps.ts b/src/client/components/Maps.ts index c4e0103f2..d5c184067 100644 --- a/src/client/components/Maps.ts +++ b/src/client/components/Maps.ts @@ -78,8 +78,8 @@ export class MapDisplay extends LitElement { } .option-card.selected { - border-color: var(--primaryColor); - background: rgba(229, 57, 53, 0.1); + border-color: #4a9eff; + background: rgba(74, 158, 255, 0.1); } .option-card-title { From e319de99ec1f0744dfebed0d0971ad52a0adf703 Mon Sep 17 00:00:00 2001 From: evanpelle Date: Thu, 1 Jan 2026 16:14:33 -0800 Subject: [PATCH 2/4] Revert "Add Christmas emojis (#2634)" This reverts commit 507f391aa1e9ac65e24361424c6aa96ca8ffbd4a. --- src/core/Util.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/Util.ts b/src/core/Util.ts index ce5e553b8..ff71c1a3d 100644 --- a/src/core/Util.ts +++ b/src/core/Util.ts @@ -317,7 +317,6 @@ export const emojiTable = [ ["↙️", "⬇️", "↘️", "❤️", "💔"], ["💰", "⚓", "⛵", "🏡", "🛡️"], ["🏭", "🚂", "❓", "🐔", "🐀"], - ["🎁", "🌟", "🎅", "🎄", "⛄"], ] as const; // 2d to 1d array export const flattenedEmojiTable = emojiTable.flat(); From e4a6e3bd2071e31a5876473a4c7537ba27890b73 Mon Sep 17 00:00:00 2001 From: evanpelle Date: Thu, 1 Jan 2026 16:30:41 -0800 Subject: [PATCH 3/4] Revert "Special bot names 2 (#2609)" This reverts commit 099337d83e7734348a797e0e1c3712d404c90cdc. --- src/core/execution/utils/BotNames.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/core/execution/utils/BotNames.ts b/src/core/execution/utils/BotNames.ts index 4f3dfb7f8..06aad17d7 100644 --- a/src/core/execution/utils/BotNames.ts +++ b/src/core/execution/utils/BotNames.ts @@ -281,15 +281,10 @@ export const COMMUNITY_FULL_ELF_NAMES = [ "MiraCZ the FP Elf", "aPuddle best Elf", "lucas the sound Elf", - "Fulayon the YT Elf", - "Drew durnell YT Elf", - "The Spiffing Brit YT Elf", - "Ultimus Rex YT Elf", - "MizuUmi the YT Elf", ]; export const SPECIAL_FULL_ELF_NAMES = [ "Santa", - "Rudolf the Reindeer", + "Rudolf the Red-Nosed Reindeer", "Frosty the Snowman", "Hermey the Elf", "Ivan the Elf", @@ -302,13 +297,11 @@ export const SPECIAL_FULL_ELF_NAMES = [ "Glorfindel", ]; export const COMMUNITY_PREFIXES = [ - "The Sparkling Elf", - "Valentino", - "Mr Cube", - "Nukeman", "Baguette Bot", "Kiwi", "FakeNeo", + "Nash", + "1brucben", "Toyatak", "Readix", "Danny", From 793efe4dd1bada597ed201059cfe27d21660f0c2 Mon Sep 17 00:00:00 2001 From: evanpelle Date: Thu, 1 Jan 2026 16:32:57 -0800 Subject: [PATCH 4/4] Revert "Special bot names (#2552)" This reverts commit 8f32746bb2a71f11278b9c0d2d179e65c68529cb. --- src/core/execution/BotSpawner.ts | 55 ++------ src/core/execution/utils/BotNames.ts | 181 --------------------------- 2 files changed, 7 insertions(+), 229 deletions(-) diff --git a/src/core/execution/BotSpawner.ts b/src/core/execution/BotSpawner.ts index 9c77bad38..134a7c666 100644 --- a/src/core/execution/BotSpawner.ts +++ b/src/core/execution/BotSpawner.ts @@ -4,16 +4,11 @@ import { PseudoRandom } from "../PseudoRandom"; import { GameID } from "../Schemas"; import { simpleHash } from "../Util"; import { SpawnExecution } from "./SpawnExecution"; -import { - COMMUNITY_FULL_ELF_NAMES, - COMMUNITY_PREFIXES, - SPECIAL_FULL_ELF_NAMES, -} from "./utils/BotNames"; +import { BOT_NAME_PREFIXES, BOT_NAME_SUFFIXES } from "./utils/BotNames"; export class BotSpawner { private random: PseudoRandom; private bots: SpawnExecution[] = []; - private nameIndex = 0; constructor( private gs: Game, @@ -29,13 +24,9 @@ export class BotSpawner { console.log("too many retries while spawning bots, giving up"); return this.bots; } - const candidate = this.nextCandidateName(); - const spawn = this.spawnBot(candidate.name); + const botName = this.randomBotName(); + const spawn = this.spawnBot(botName); if (spawn !== null) { - // Only use candidate name once bot successfully spawned - if (candidate.source === "list") { - this.nameIndex++; - } this.bots.push(spawn); } else { tries++; @@ -60,42 +51,10 @@ export class BotSpawner { ); } - private nextCandidateName(): { - name: string; - source: "list" | "random"; - } { - if (this.bots.length < 20) { - //first few usually overwritten by Nation spawn - return { name: this.getRandomElf(), source: "random" }; - } - - if (this.nameIndex < COMMUNITY_FULL_ELF_NAMES.length) { - return { - name: COMMUNITY_FULL_ELF_NAMES[this.nameIndex], - source: "list", - }; - } - const specialOffset = COMMUNITY_FULL_ELF_NAMES.length; - if (this.nameIndex < specialOffset + SPECIAL_FULL_ELF_NAMES.length) { - return { - name: SPECIAL_FULL_ELF_NAMES[this.nameIndex - specialOffset], - source: "list", - }; - } - const prefixOffset = specialOffset + SPECIAL_FULL_ELF_NAMES.length; - if (this.nameIndex < prefixOffset + COMMUNITY_PREFIXES.length) { - return { - name: `${COMMUNITY_PREFIXES[this.nameIndex - prefixOffset]} the Elf`, - source: "list", - }; - } - - return { name: this.getRandomElf(), source: "random" }; - } - - private getRandomElf(): string { - const suffixNumber = this.random.nextInt(1, 10001); - return `Elf ${suffixNumber}`; + private randomBotName(): string { + const prefixIndex = this.random.nextInt(0, BOT_NAME_PREFIXES.length); + const suffixIndex = this.random.nextInt(0, BOT_NAME_SUFFIXES.length); + return `${BOT_NAME_PREFIXES[prefixIndex]} ${BOT_NAME_SUFFIXES[suffixIndex]}`; } private randTile(): TileRef { diff --git a/src/core/execution/utils/BotNames.ts b/src/core/execution/utils/BotNames.ts index 06aad17d7..f75ff10bc 100644 --- a/src/core/execution/utils/BotNames.ts +++ b/src/core/execution/utils/BotNames.ts @@ -253,184 +253,3 @@ export const BOT_NAME_SUFFIXES = [ "Democracy", "Autocracy", ]; -export const COMMUNITY_FULL_ELF_NAMES = [ - "evan the Creator Elf", - "iamlewis the Head Elf", - "Restart the Community Elf", - "Mr Box the Dev Elf", - "InGloriousTom the Dev Elf", - "Sheikh the First Elf", - "N0ur the Flag Elf", - "Diessel the UI Elf", - "Nikola123 the Map Elf", - "Aotumuri the Language Elf", - "Pilkey the Admin Elf", - "Mr tryout33s Elf", - "Biffeur the YT Elf", - "Enzo the YT Elf", - "Molky the YT Elf", - "FuzeIII the YT Elf", - "Node the YT Elf", - "Lumiin the YT Elf", - "youngfentanyl OFM Elf", - "Remorse the Wiki Elf", - "Lonely Millennial Twitch Elf", - "Kaizeron OFM Elf", - "Zilka OFM Elf", - "JIZK Caster Elf", - "MiraCZ the FP Elf", - "aPuddle best Elf", - "lucas the sound Elf", -]; -export const SPECIAL_FULL_ELF_NAMES = [ - "Santa", - "Rudolf the Red-Nosed Reindeer", - "Frosty the Snowman", - "Hermey the Elf", - "Ivan the Elf", - "Elf on the Shelf", - "Buddy the Elf", - "Legolas", - "Elrond", - "Galadriel", - "Celeborn", - "Glorfindel", -]; -export const COMMUNITY_PREFIXES = [ - "Baguette Bot", - "Kiwi", - "FakeNeo", - "Nash", - "1brucben", - "Toyatak", - "Readix", - "Danny", - "php", - "Redincon", - "Sachx.", - "Fuity Mctooty", - "Vimacs", - "Wraith", - "Phantom", - "Crescent", - "OF Therapist", - "Aviid", - "brunoo", - "Ezaru", - "prices", - "Santos", - "Wonder", - "Vincent", - "Smith M", - "Acer Alex", - "Controller", - "d3n0x", - "devalnor", - "FloPinguin", - "falcon", - "GlacialDrift", - "Jax", - "Killersoren", - "MiniMeTiny", - "Remissile", - "Sorikairo", - "That Otter", - "Arya", - "Nebula", - "takeser", - "Kai IL PAZZO", - "Vanon", - "Foorack", - "Abod", - "aaa4xu", - "Goblinon", - "dx", - "Pod", - "Demonessica", - "Dovg", - "Joel", - "LegitimatelyCool1", - "OxMzimzy", - "RTHOne", - "Egophobic", - "djmrFunnyMan", - "5oliloguy", - "cfsolver", - "nvm", - "Supbro", - "Mischa", - "WALMART NINJA", - "Magico", - "sidious", - "Bruny", - "Goofer", - "Backn", - "EyeSeeEm", - "TrionX", - "Theodora", - "platz1de", - "Maths Empire", - "Moha", - "SyntaxPM", - "theskeleton4393", - "juliosilvaqwerty5", - "NewHappyRabbit", - "Moki", - "Xaelor", - "NiclasWK", - "cldprv", - "r3ms", - "Tanepro193", - "gx21", - "toldinsound", - "jacks0n", - "floriankilian", - "Fibig", - "Texxter", - "pantelispantelidis", - "ap ms", - "frappa10", - "Lollosean", - "daimyo panda2", - "gafunuko", - "Jinyoon", - "Perdiccas", - "zibi", - "RinkyDinky", - "Rulfam", - "Nobody", - "Vekser", - "extraextra", - "MotivatedMonkey", - "6uzm4n", - "theangel2", - "Keevee", - "Makonede", - "grassified", - "Zjefken", - "Summers Nick", - "Marvin", - "EagleEye", - "Shahiid", - "INGSOC", - "SIG", - "Bobo", - "seekerreturns", - "SlyTy", - "Leo 21", - "FX", - "Calrathan", - "AzloD", - "SunnyBoyWTF", - "BeGj", - "tnhnblgl", - "BrunoJurkovic", - "q8gazy", - "Kipstz", - "aqw42", - "TylerHavanan", - "KerodK", - "ghisloufou", - "dxtron", - "Sii", -];