Merge branch 'v28'

src/core/execution/BotSpawner.ts

@@ -3,16 +3,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,
@@ -23,12 +18,8 @@ export class BotSpawner {
 
   spawnBots(numBots: number): SpawnExecution[] {
     for (let i = 0; i < numBots; i++) {
-      const candidate = this.nextCandidateName();
-      const spawn = this.spawnBot(candidate.name);
-
-      if (candidate.source === "list") {
-        this.nameIndex++;
-      }
+      const name = this.randomBotName();
+      const spawn = this.spawnBot(name);
       this.bots.push(spawn);
     }
 
@@ -42,41 +33,9 @@ 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]}`;
   }
 }