Add the ability to use a different AI for each player.

GitOrigin-RevId: af7fc55a9ab791ebbe29bf735634d96b7a9d365a
nkzw-tech · May 14, 2024 · c80d0cc · c80d0cc
1 parent 4db9562
commit c80d0cc
Show file tree

Hide file tree

Showing 17 changed files with 174 additions and 74 deletions.
diff --git a/apollo/actions/executeGameAction.tsx b/apollo/actions/executeGameAction.tsx
@@ -1,3 +1,4 @@
+import { hasAI } from '@deities/athena/map/Player.tsx';
 import MapData from '@deities/athena/MapData.tsx';
 import { VisionT } from '@deities/athena/Vision.tsx';
 import { Action, execute, MutateActionResponseFn } from '../Action.tsx';
@@ -7,19 +8,24 @@ import applyConditions from '../lib/applyConditions.tsx';
 import gameHasEnded from '../lib/gameHasEnded.tsx';
 import { GameState } from '../Types.tsx';
 
-type AIClass = {
-  new (effects: Effects): AIType;
-};
-
 type AIType = {
   act(map: MapData): MapData | null;
   retrieveEffects(): Effects;
   retrieveGameState(): GameState;
 };
 
+export type AIRegistryEntry = Readonly<{
+  class: {
+    new (effects: Effects): AIType;
+  };
+  name: string;
+}>;
+
+export type AIRegistryT = ReadonlyMap<number, AIRegistryEntry>;
+
 export function executeAIAction(
   activeMap: MapData | null,
-  AIClass: AIClass,
+  AIRegistry: AIRegistryT,
   effects: Effects,
   gameState: GameState = [],
 ): [GameState, Effects] {
@@ -31,6 +37,12 @@ export function executeAIAction(
     activeMap.active.length > 1 &&
     activeMap.getCurrentPlayer().isBot()
   ) {
+    const player = activeMap.getCurrentPlayer();
+    const AIClass = ((hasAI(player) &&
+      player.ai != null &&
+      AIRegistry.get(player.ai)) ||
+      AIRegistry.get(0))!.class;
+
     const ai = new AIClass(effects);
     while (activeMap) {
       activeMap = ai.act(activeMap);
@@ -72,7 +84,7 @@ export default function executeGameAction(
   vision: VisionT,
   effects: Effects,
   action: Action,
-  AIClass: AIClass | null,
+  AIRegistry: AIRegistryT | null,
   mutateAction?: MutateActionResponseFn,
 ): [ActionResponse, MapData, GameState, Effects] | [null, null, null, null] {
   const actionResult = execute(map, vision, action, mutateAction);
@@ -91,15 +103,15 @@ export default function executeGameAction(
     activeMap = gameState.at(-1)![1];
   }
   const shouldInvokeAI = !!(
-    AIClass &&
+    AIRegistry &&
     !gameHasEnded(gameState) &&
     (gameState.at(-1)?.[1] || activeMap).getCurrentPlayer().isBot()
   );
   return [
     actionResponse,
     activeMap,
     ...((shouldInvokeAI &&
-      executeAIAction(activeMap, AIClass, newEffects, gameState)) || [
+      executeAIAction(activeMap, AIRegistry, newEffects, gameState)) || [
       gameState,
       newEffects,
     ]),

diff --git a/athena/lib/__tests__/validateTeams.test.tsx b/athena/lib/__tests__/validateTeams.test.tsx
@@ -73,6 +73,7 @@ test('validates teams', () => {
             "name": "",
             "players": [
               {
+                "ai": undefined,
                 "funds": 0,
                 "id": 1,
                 "skills": [],
@@ -87,6 +88,7 @@ test('validates teams', () => {
             "name": "",
             "players": [
               {
+                "ai": undefined,
                 "funds": 0,
                 "id": 2,
                 "skills": [],
@@ -101,6 +103,7 @@ test('validates teams', () => {
             "name": "",
             "players": [
               {
+                "ai": undefined,
                 "funds": 0,
                 "id": 3,
                 "skills": [],
@@ -115,6 +118,7 @@ test('validates teams', () => {
             "name": "",
             "players": [
               {
+                "ai": undefined,
                 "funds": 0,
                 "id": 4,
                 "skills": [],
@@ -153,6 +157,7 @@ test('validates teams', () => {
             "name": "",
             "players": [
               {
+                "ai": undefined,
                 "funds": 0,
                 "id": 1,
                 "skills": [],
@@ -167,6 +172,7 @@ test('validates teams', () => {
             "name": "",
             "players": [
               {
+                "ai": undefined,
                 "funds": 0,
                 "id": 2,
                 "skills": [],

diff --git a/athena/lib/validateMap.tsx b/athena/lib/validateMap.tsx
@@ -1,5 +1,6 @@
 import isPositiveInteger from '@deities/hephaestus/isPositiveInteger.tsx';
 import ImmutableMap from '@nkzw/immutable-map';
+import AIRegistry from '../../dionysus/AIRegistry.tsx';
 import {
   Behavior,
   getBuildingInfo,
@@ -25,6 +26,7 @@ import {
 } from '../map/Configuration.tsx';
 import Entity from '../map/Entity.tsx';
 import Player, {
+  hasAI,
   PlaceholderPlayer,
   PlayerID,
   toPlayerID,
@@ -376,25 +378,28 @@ export default function validateMap(
   }
 
   const teams = ImmutableMap(
-    active.map(
-      (id) =>
-        [
+    active.map((id) => {
+      const player = map.getPlayer(id);
+      return [
+        id,
+        new Team(
           id,
-          new Team(
-            id,
-            '',
-            ImmutableMap<PlayerID, Player>().set(
+          '',
+          ImmutableMap<PlayerID, Player>().set(
+            toPlayerID(id),
+            new PlaceholderPlayer(
               toPlayerID(id),
-              new PlaceholderPlayer(
-                toPlayerID(id),
-                id,
-                0,
-                map.getPlayer(id).skills,
-              ),
+              id,
+              0,
+              hasAI(player) && player.ai != null && AIRegistry.has(player.ai)
+                ? player.ai
+                : undefined,
+              player.skills,
             ),
           ),
-        ] as const,
-    ),
+        ),
+      ] as const;
+    }),
   );
 
   const newMap = map.copy({

diff --git a/athena/lib/validateTeams.tsx b/athena/lib/validateTeams.tsx
@@ -67,6 +67,7 @@ export default function validateTeams(
                         id,
                         teamId,
                         0,
+                        undefined,
                         validateSkills(
                           { skillSlots: DefaultMapSkillSlots, skills: Skills },
                           map.getPlayer(id).skills,

diff --git a/athena/map/Player.tsx b/athena/map/Player.tsx
@@ -41,11 +41,13 @@ export type PlainPlayerType = BasePlainPlayerType &
 
 type PlainBotType = BasePlainPlayerType &
   Readonly<{
+    ai?: number;
     name: string;
   }>;
 
 type PlaceholderPlayerType = Readonly<{
   activeSkills?: undefined;
+  ai?: number;
   funds: number;
   id: PlayerID;
   skills?: ReadonlyArray<Skill>;
@@ -175,17 +177,20 @@ export class PlaceholderPlayer extends Player {
     id: PlayerID,
     teamId: PlayerID,
     funds: number,
+    public readonly ai: number | undefined,
     skills: ReadonlySet<Skill>,
   ) {
     super(id, teamId, funds, skills, new Set(), 0, null, 0);
   }
 
   copy({
+    ai,
     funds,
     id,
     skills,
     teamId,
   }: {
+    ai?: number | undefined;
     funds?: number;
     id?: PlayerID;
     skills?: ReadonlySet<Skill>;
@@ -195,13 +200,14 @@ export class PlaceholderPlayer extends Player {
       id ?? this.id,
       teamId ?? this.teamId,
       funds ?? this.funds,
+      ai ?? this.ai,
       skills ?? this.skills,
     ) as this;
   }
 
   toJSON(): PlaceholderPlayerType {
-    const { funds, id, skills } = this;
-    return { funds, id, skills: [...skills] };
+    const { ai, funds, id, skills } = this;
+    return { ai, funds, id, skills: [...skills] };
   }
 
   static from(player: Player): PlaceholderPlayer {
@@ -211,6 +217,7 @@ export class PlaceholderPlayer extends Player {
           player.id,
           player.teamId,
           player.funds,
+          player.isBot() ? player.ai : undefined,
           player.skills,
         );
   }
@@ -224,6 +231,7 @@ export class Bot extends Player {
     public readonly name: string,
     teamId: PlayerID,
     funds: number,
+    public readonly ai: number | undefined,
     skills: ReadonlySet<Skill>,
     activeSkills: ReadonlySet<Skill>,
     charge: number,
@@ -235,6 +243,7 @@ export class Bot extends Player {
 
   copy({
     activeSkills,
+    ai,
     charge,
     funds,
     id,
@@ -245,6 +254,7 @@ export class Bot extends Player {
     teamId,
   }: {
     activeSkills?: ReadonlySet<Skill>;
+    ai?: number | undefined;
     charge?: number;
     funds?: number;
     id?: PlayerID;
@@ -259,6 +269,7 @@ export class Bot extends Player {
       name ?? this.name,
       teamId ?? this.teamId,
       funds ?? this.funds,
+      ai ?? this.ai,
       skills ?? this.skills,
       activeSkills ?? this.activeSkills,
       charge ?? this.charge,
@@ -268,10 +279,11 @@ export class Bot extends Player {
   }
 
   toJSON(): PlainBotType {
-    const { activeSkills, charge, funds, id, misses, name, skills, stats } =
+    const { activeSkills, ai, charge, funds, id, misses, name, skills, stats } =
       this;
     return {
       activeSkills: [...activeSkills],
+      ai,
       charge,
       funds,
       id,
@@ -290,6 +302,7 @@ export class Bot extends Player {
           name,
           player.teamId,
           player.funds,
+          player.isPlaceholder() ? player.ai : undefined,
           player.skills,
           player.activeSkills,
           player.charge,
@@ -495,3 +508,7 @@ export function isHumanPlayer(player: Player): player is HumanPlayer {
 export function isBot(player: Player): player is Bot {
   return player.isBot();
 }
+
+export function hasAI(player: Player): player is Bot | PlaceholderPlayer {
+  return isBot(player) || player.isPlaceholder();
+}
diff --git a/athena/map/Serialization.tsx b/athena/map/Serialization.tsx
@@ -65,13 +65,20 @@ export function decodePlayers(
                 player.name,
                 teamId,
                 player.funds,
+                player.ai,
                 skills,
                 activeSkills,
                 player.charge || 0,
                 decodePlayerStatistics(player.stats),
                 player.misses || 0,
               )
-            : new PlaceholderPlayer(playerID, teamId, player.funds, skills),
+            : new PlaceholderPlayer(
+                playerID,
+                teamId,
+                player.funds,
+                player.ai,
+                skills,
+              ),
       );
     }),
   );

diff --git a/dionysus/AIRegistry.tsx b/dionysus/AIRegistry.tsx
@@ -0,0 +1,8 @@
+import { AIRegistryT } from '@deities/apollo/actions/executeGameAction.tsx';
+import DionysusAlpha from './DionysusAlpha.tsx';
+
+const AIRegistry: AIRegistryT = new Map([
+  [0, { class: DionysusAlpha, name: 'Alpha' }],
+]);
+
+export default AIRegistry;
diff --git a/hera/hooks/useClientGameAction.tsx b/hera/hooks/useClientGameAction.tsx
@@ -10,7 +10,7 @@ import dropLabelsFromGameState from '@deities/apollo/lib/dropLabelsFromGameState
 import { GameActionResponse, GameState } from '@deities/apollo/Types.tsx';
 import MapData from '@deities/athena/MapData.tsx';
 import { getHiddenLabels } from '@deities/athena/WinConditions.tsx';
-import DionysusAlpha from '@deities/dionysus/DionysusAlpha.tsx';
+import AIRegistry from '@deities/dionysus/AIRegistry.tsx';
 import onGameEnd from '@deities/hermes/game/onGameEnd.tsx';
 import toClientGame, {
   ClientGame,
@@ -52,7 +52,7 @@ export default function useClientGameAction(
             vision,
             game.effects,
             action,
-            DionysusAlpha,
+            AIRegistry,
             mutateAction,
           ) || [null, null, null];
       } catch (error) {