@supalosa/chronodivide-bot 0.3.1 → 0.4.0

package/src/bot/logic/squad/behaviours/engineerSquad.ts

@@ -2,6 +2,7 @@ import { ActionsApi, GameApi, OrderType, PlayerData, SideType } from "@chronodiv
 import { Squad } from "../squad.js";
 import { SquadAction, SquadBehaviour, disband, noop, requestSpecificUnits, requestUnits } from "../squadBehaviour.js";
 import { MatchAwareness } from "../../awareness.js";
+import { ActionBatcher } from "./actionBatcher.js";
 
 const CAPTURE_COOLDOWN_TICKS = 30;
 
@@ -15,15 +16,15 @@ export class EngineerSquad implements SquadBehaviour {
     /**
      * @param captureTarget ID of the target to try and capture/send engineer into.
      */
-    constructor(private captureTarget: number) {
-    };
+    constructor(private captureTarget: number) {}
 
     public onAiUpdate(
         gameApi: GameApi,
         actionsApi: ActionsApi,
+        actionBatcher: ActionBatcher,
         playerData: PlayerData,
         squad: Squad,
-        matchAwareness: MatchAwareness
+        matchAwareness: MatchAwareness,
     ): SquadAction {
         const engineerTypes = ["ENGINEER", "SENGINEER"];
         const engineers = squad.getUnitsOfTypes(gameApi, ...engineerTypes);
@@ -40,7 +41,7 @@ export class EngineerSquad implements SquadBehaviour {
             actionsApi.orderUnits(
                 engineers.map((engineer) => engineer.id),
                 OrderType.Capture,
-                this.captureTarget
+                this.captureTarget,
             );
             // Add a cooldown to deploy attempts.
             this.hasAttemptedCaptureWith = {
@@ -50,4 +51,8 @@ export class EngineerSquad implements SquadBehaviour {
         }
         return noop();
     }
+
+    public getGlobalDebugText(): string | undefined {
+        return undefined;
+    }
 }

package/src/bot/logic/squad/behaviours/expansionSquad.ts

@@ -3,6 +3,7 @@ import { GlobalThreat } from "../../threat/threat.js";
 import { Squad } from "../squad.js";
 import { SquadAction, SquadBehaviour, disband, noop, requestSpecificUnits, requestUnits } from "../squadBehaviour.js";
 import { MatchAwareness } from "../../awareness.js";
+import { ActionBatcher } from "./actionBatcher.js";
 
 const DEPLOY_COOLDOWN_TICKS = 30;
 
@@ -17,15 +18,15 @@ export class ExpansionSquad implements SquadBehaviour {
      * @param selectedMcv ID of the MCV to try to expand with. If that unit dies, the squad will disband. If no value is provided,
      * the mission requests an MCV.
      */
-    constructor(private selectedMcv: number | null) {
-    };
+    constructor(private selectedMcv: number | null) {}
 
     public onAiUpdate(
         gameApi: GameApi,
         actionsApi: ActionsApi,
+        actionBatcher: ActionBatcher,
         playerData: PlayerData,
         squad: Squad,
-        matchAwareness: MatchAwareness
+        matchAwareness: MatchAwareness,
     ): SquadAction {
         const mcvTypes = ["AMCV", "SMCV"];
         const mcvs = squad.getUnitsOfTypes(gameApi, ...mcvTypes);
@@ -46,7 +47,7 @@ export class ExpansionSquad implements SquadBehaviour {
         ) {
             actionsApi.orderUnits(
                 mcvs.map((mcv) => mcv.id),
-                OrderType.DeploySelected
+                OrderType.DeploySelected,
             );
             // Add a cooldown to deploy attempts.
             this.hasAttemptedDeployWith = {
@@ -56,4 +57,8 @@ export class ExpansionSquad implements SquadBehaviour {
         }
         return noop();
     }
+
+    public getGlobalDebugText(): string | undefined {
+        return undefined;
+    }
 }

package/src/bot/logic/squad/behaviours/retreatSquad.ts

@@ -3,6 +3,7 @@ import { GlobalThreat } from "../../threat/threat.js";
 import { Squad } from "../squad.js";
 import { SquadAction, SquadBehaviour, disband, noop, requestSpecificUnits, requestUnits } from "../squadBehaviour.js";
 import { MatchAwareness } from "../../awareness.js";
+import { ActionBatcher } from "./actionBatcher.js";
 
 const SCOUT_MOVE_COOLDOWN_TICKS = 30;
 
@@ -17,6 +18,7 @@ export class RetreatSquad implements SquadBehaviour {
     public onAiUpdate(
         gameApi: GameApi,
         actionsApi: ActionsApi,
+        actionBatcher: ActionBatcher,
         playerData: PlayerData,
         squad: Squad,
         matchAwareness: MatchAwareness,
@@ -41,4 +43,8 @@ export class RetreatSquad implements SquadBehaviour {
             return requestSpecificUnits(this.unitIds, 1000);
         }
     }
+
+    public getGlobalDebugText(): string | undefined {
+        return undefined;
+    }
 }

package/src/bot/logic/squad/behaviours/scoutingSquad.ts

@@ -5,6 +5,7 @@ import { MatchAwareness } from "../../awareness.js";
 import { DebugLogger } from "../../common/utils.js";
 import { getDistanceBetweenTileAndPoint } from "../../map/map.js";
 import { PrioritisedScoutTarget } from "../../common/scout.js";
+import { ActionBatcher } from "./actionBatcher.js";
 
 const SCOUT_MOVE_COOLDOWN_TICKS = 30;
 
@@ -30,6 +31,7 @@ export class ScoutingSquad implements SquadBehaviour {
     public onAiUpdate(
         gameApi: GameApi,
         actionsApi: ActionsApi,
+        actionBatcher: ActionBatcher,
         playerData: PlayerData,
         squad: Squad,
         matchAwareness: MatchAwareness,
@@ -109,4 +111,8 @@ export class ScoutingSquad implements SquadBehaviour {
         this.scoutMinDistance = undefined;
         this.scoutTargetIsPermanent = target?.isPermanent ?? false;
     }
+
+    public getGlobalDebugText(): string | undefined {
+        return undefined;
+    }
 }

package/src/bot/logic/squad/squad.ts

@@ -4,6 +4,7 @@ import { SquadAction, SquadBehaviour, disband } from "./squadBehaviour.js";
 import { MatchAwareness } from "../awareness.js";
 import { getDistanceBetweenTileAndPoint } from "../map/map.js";
 import { DebugLogger } from "../common/utils.js";
+import { ActionBatcher } from "./behaviours/actionBatcher.js";
 
 export enum SquadLiveness {
     SquadDead,
@@ -70,6 +71,7 @@ export class Squad {
     public onAiUpdate(
         gameApi: GameApi,
         actionsApi: ActionsApi,
+        actionBatcher: ActionBatcher,
         playerData: PlayerData,
         matchAwareness: MatchAwareness,
         logger: DebugLogger,
@@ -97,7 +99,7 @@ export class Squad {
         } else if (!this.mission) {
             return disband();
         }
-        return this.behaviour.onAiUpdate(gameApi, actionsApi, playerData, this, matchAwareness, logger);
+        return this.behaviour.onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, this, matchAwareness, logger);
     }
     public getMission(): Mission | null {
         return this.mission;
@@ -156,4 +158,8 @@ export class Squad {
     public getLiveness() {
         return this.liveness;
     }
+
+    public getGlobalDebugText(): string | undefined {
+        return this.behaviour.getGlobalDebugText();
+    }
 }

package/src/bot/logic/squad/squadBehaviour.ts

@@ -2,6 +2,7 @@ import { ActionsApi, GameApi, PlayerData, Vector2 } from "@chronodivide/game-api
 import { Squad } from "./squad.js";
 import { MatchAwareness } from "../awareness.js";
 import { DebugLogger } from "../common/utils.js";
+import { ActionBatcher } from "./behaviours/actionBatcher.js";
 
 export type SquadActionNoop = {
     type: "noop";
@@ -54,9 +55,12 @@ export interface SquadBehaviour {
     onAiUpdate(
         gameApi: GameApi,
         actionsApi: ActionsApi,
+        actionBatcher: ActionBatcher,
         playerData: PlayerData,
         squad: Squad,
         matchAwareness: MatchAwareness,
         logger: DebugLogger,
     ): SquadAction;
+
+    getGlobalDebugText(): string | undefined;
 }

package/src/bot/logic/squad/squadController.ts

@@ -13,6 +13,7 @@ import {
 import { MatchAwareness } from "../awareness.js";
 import { getDistanceBetween } from "../map/map.js";
 import { countBy } from "../common/utils.js";
+import { ActionBatcher } from "./behaviours/actionBatcher.js";
 
 type SquadWithAction<T> = {
     squad: Squad;
@@ -47,12 +48,16 @@ export class SquadController {
             });
         });
 
+        // Batch actions to reduce spamming of actions for larger armies.
+        const actionBatcher = new ActionBatcher();
+
         const squadActions: SquadWithAction<SquadAction>[] = this.squads.map((squad) => {
             return {
                 squad,
-                action: squad.onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, this.logger),
+                action: squad.onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, matchAwareness, this.logger),
             };
         });
+
         // Handle disbands and merges.
         const isDisband = (a: SquadAction): a is SquadActionDisband => a.type === "disband";
         const isMerge = (a: SquadAction): a is SquadActionMergeInto => a.type === "mergeInto";
@@ -64,6 +69,7 @@ export class SquadController {
                 a.squad.getMission()?.removeSquad();
                 a.squad.getUnitIds().forEach((unitId) => {
                     this.unitIdToSquad.delete(unitId);
+                    actionsApi.setUnitDebugText(unitId, undefined);
                 });
                 disbandedSquads.add(a.squad.getName());
             });
@@ -229,6 +235,8 @@ export class SquadController {
                     .join(", ")}`,
             );
         });
+
+        actionBatcher.resolve(actionsApi);
     }
 
     private addUnitToSquad(squad: Squad, unit: UnitData) {
@@ -240,15 +248,24 @@ export class SquadController {
         this.squads.push(squad);
     }
 
-    public debugSquads(gameApi: GameApi) {
+    // return text to display for global debug
+    public debugSquads(gameApi: GameApi, actionsApi: ActionsApi): string {
         const unitsInSquad = (unitIds: number[]) => countBy(unitIds, (unitId) => gameApi.getUnitData(unitId)?.name);
 
+        let globalDebugText = "";
+
         this.squads.forEach((squad) => {
             this.logger(
                 `Squad ${squad.getName()}: ${Object.entries(unitsInSquad(squad.getUnitIds()))
                     .map(([unitName, count]) => `${unitName} x ${count}`)
                     .join(", ")}`,
             );
+            squad.getUnitIds().forEach((unitId) => actionsApi.setUnitDebugText(unitId, squad.getName()));
+            const squadDebugText = squad.getGlobalDebugText();
+            if (squadDebugText) {
+                globalDebugText += squad.getName() + ": " + squadDebugText + "\n";
+            }
         });
+        return globalDebugText;
     }
 }

package/src/exampleBot.ts

@@ -8,7 +8,7 @@ async function main() {
     CDR2            1v1             4_country_swing_le_v2.map
     CDR2            1v1             mp01t4.map, large map, oil derricks
     CDR2            1v1             tn04t2.map, small map
-    CDR2            1v1             mp10s4.map <- depth charge, naval map (not supported)
+    CDR2            1v1             mp10s4.map <- depth charge, naval map (not supported). Cramped in position 1.
     CDR2            1v1             heckcorners.map
     CDR2            1v1             4_montana_dmz_le.map
     CDR2            1v1             barrel.map
@@ -16,10 +16,13 @@ async function main() {
     Other maps:
     mp03t4 large map, no oil derricks
     */
-    const mapName = "mp10s4.map";
+    const mapName = "mp03t4.map";
     // Bot names must be unique in online mode
-    const botName = `Joe${String(Date.now()).substr(-6)}`;
-    const otherBotName = `Bob${String(Date.now() + 1).substr(-6)}`;
+    const timestamp = String(Date.now()).substr(-6);
+    const firstBotName = `Joe${timestamp}`;
+    const secondBotName = `Bob${timestamp}`;
+    const thirdBotName = `Mike${timestamp}`;
+    const fourthBotName = `Charlie${timestamp}`;
 
     await cdapi.init(process.env.MIX_DIR || "./");
 
@@ -44,11 +47,22 @@ async function main() {
         online: true as true,
         serverUrl: process.env.SERVER_URL!,
         clientUrl: process.env.CLIENT_URL!,
-        agents: [new SupalosaBot(botName, "Americans"), { name: otherBotName, country: "French" }] as [Bot, ...Agent[]],
+        agents: [new SupalosaBot(firstBotName, "Americans"), { name: secondBotName, country: "French" }] as [
+            Bot,
+            ...Agent[],
+        ],
     };
 
+    const debugBot = new SupalosaBot(secondBotName, "Russians", [secondBotName], true);
+    debugBot.setDebugMode(true);
+
     const offlineSettings = {
-        agents: [new SupalosaBot(botName, "French", false), new SupalosaBot(otherBotName, "Russians", true)],
+        agents: [
+            new SupalosaBot(firstBotName, "French", [firstBotName], false),
+            debugBot,
+            new SupalosaBot(thirdBotName, "Russians", [fourthBotName], false),
+            new SupalosaBot(fourthBotName, "French", [thirdBotName], false),
+        ],
     };
 
     const game = await cdapi.createGame({