More nation emoji

Author: scottanderson

src/core/execution/FakeHumanExecution.ts

@@ -1,3 +1,4 @@
+import { BotBehavior, EMOJI_HECKLE } from "./utils/BotBehavior";
 import {
   Cell,
   Difficulty,
@@ -15,8 +16,7 @@ import {
   UnitType,
 } from "../game/Game";
 import { TileRef, euclDistFN, manhattanDistFN } from "../game/GameMap";
-import { calculateBoundingBox, flattenedEmojiTable, simpleHash } from "../Util";
-import { BotBehavior } from "./utils/BotBehavior";
+import { calculateBoundingBox, simpleHash } from "../Util";
 import { ConstructionExecution } from "./ConstructionExecution";
 import { EmojiExecution } from "./EmojiExecution";
 import { GameID } from "../Schemas";
@@ -42,7 +42,6 @@ export class FakeHumanExecution implements Execution {
   private readonly lastEmojiSent = new Map<Player, Tick>();
   private readonly lastNukeSent: [Tick, TileRef][] = [];
   private readonly embargoMalusApplied = new Set<PlayerID>();
-  private readonly heckleEmoji: number[];
 
   constructor(
     gameID: GameID,
@@ -56,7 +55,6 @@ export class FakeHumanExecution implements Execution {
     this.triggerRatio = this.random.nextInt(60, 90) / 100;
     this.reserveRatio = this.random.nextInt(30, 60) / 100;
     this.expandRatio = this.random.nextInt(15, 25) / 100;
-    this.heckleEmoji = ["🤡", "😡"].map((e) => flattenedEmojiTable.indexOf(e));
   }
 
   init(mg: Game) {
@@ -270,7 +268,7 @@ export class FakeHumanExecution implements Execution {
       new EmojiExecution(
         this.player,
         enemy.id(),
-        this.random.randElement(this.heckleEmoji),
+        this.random.randElement(EMOJI_HECKLE),
       ),
     );
   }

src/core/execution/utils/BotBehavior.ts

@@ -14,12 +14,34 @@ import { EmojiExecution } from "../EmojiExecution";
 import { PseudoRandom } from "../../PseudoRandom";
 import { flattenedEmojiTable } from "../../Util";
 
+const emojiId = (e: string) => flattenedEmojiTable.indexOf(e);
+const EMOJI_ASSIST_ACCEPT = [
+  "👍",
+  "⛵",
+  "🤝",
+  "🎯",
+].map(emojiId);
+const EMOJI_RELATION_TOO_LOW = [
+  "🥱",
+  "🤦",
+].map(emojiId);
+const EMOJI_TARGET_ME = [
+  "🥺",
+  "💀",
+].map(emojiId);
+const EMOJI_TARGET_ALLY = [
+  "🕊️",
+  "👎",
+].map(emojiId);
+export const EMOJI_HECKLE = [
+  "🤡",
+  "😡",
+].map(emojiId);
+
 export class BotBehavior {
   private enemy: Player | null = null;
   private enemyUpdated: Tick | undefined;
 
-  private readonly assistAcceptEmoji = flattenedEmojiTable.indexOf("👍");
-
   constructor(
     private readonly random: PseudoRandom,
     private readonly game: Game,
@@ -155,26 +177,26 @@ export class BotBehavior {
   }
 
   assistAllies() {
-    outer: for (const ally of this.player.allies()) {
+    for (const ally of this.player.allies()) {
       if (ally.targets().length === 0) continue;
       if (this.player.relation(ally) < Relation.Friendly) {
-        // this.emoji(ally, "🤦");
+        this.emoji(ally, this.random.randElement(EMOJI_RELATION_TOO_LOW));
         continue;
       }
       for (const target of ally.targets()) {
         if (target === this.player) {
-          // this.emoji(ally, "💀");
+          this.emoji(ally, this.random.randElement(EMOJI_TARGET_ME));
           continue;
         }
         if (this.player.isAlliedWith(target)) {
-          // this.emoji(ally, "👎");
+          this.emoji(ally, this.random.randElement(EMOJI_TARGET_ALLY));
           continue;
         }
         // All checks passed, assist them
         this.player.updateRelation(ally, -20);
         this.setNewEnemy(target);
-        this.emoji(ally, this.assistAcceptEmoji);
-        break outer;
+        this.emoji(ally, this.random.randElement(EMOJI_ASSIST_ACCEPT));
+        return;
       }
     }
   }