@supalosa/chronodivide-bot 0.2.0 → 0.2.1

package/README.md

@@ -40,6 +40,14 @@ Contact the developer of Chrono Divide for details if you are seriously interest
 npx cross-env MIX_DIR="C:\path_to_ra2_install_dir" NODE_OPTIONS="--inspect" npm start
 ```
 
+## Publishing
+
+Have the npmjs token in ~/.npmrc or somewhere appropriate.
+
+```
+npm publish
+```
+
 # ignore me
 
 export GAMEPATH="G:\Origin\Ra2_YurisRevenge\Command and Conquer Red Alert II"

package/dist/bot/bot.js

@@ -14,8 +14,8 @@ export class SupalosaBot extends Bot {
         super(name, country);
         this.tickOfLastAttackOrder = 0;
         this.matchAwareness = null;
-        this.missionController = new MissionController((message) => this.logBotStatus(message));
-        this.squadController = new SquadController();
+        this.missionController = new MissionController((message, sayInGame) => this.logBotStatus(message, sayInGame));
+        this.squadController = new SquadController((message, sayInGame) => this.logBotStatus(message, sayInGame));
         this.queueController = new QueueController();
         this.enableLogging = enableLogging;
     }
@@ -25,7 +25,7 @@ export class SupalosaBot extends Bot {
         const botRate = botApm / 60;
         this.tickRatio = Math.ceil(gameRate / botRate);
         this.knownMapBounds = determineMapBounds(game.mapApi);
-        this.matchAwareness = new MatchAwarenessImpl(null, new SectorCache(game.mapApi, this.knownMapBounds), game.getPlayerData(this.name).startLocation, (msg) => this.logBotStatus(msg));
+        this.matchAwareness = new MatchAwarenessImpl(null, new SectorCache(game.mapApi, this.knownMapBounds), game.getPlayerData(this.name).startLocation, (message, sayInGame) => this.logBotStatus(message, sayInGame));
         this.logBotStatus(`Map bounds: ${this.knownMapBounds.x}, ${this.knownMapBounds.y}`);
     }
     onGameTick(game) {
@@ -59,18 +59,22 @@ export class SupalosaBot extends Bot {
             }
             // Squad logic every 3 ticks
             if (this.gameApi.getCurrentTick() % 3 === 0) {
-                this.squadController.onAiUpdate(game, this.actionsApi, myPlayer, this.matchAwareness, (message) => this.logBotStatus(message));
+                this.squadController.onAiUpdate(game, this.actionsApi, myPlayer, this.matchAwareness);
             }
         }
     }
     getHumanTimestamp(game) {
         return Duration.fromMillis((game.getCurrentTick() / NATURAL_TICK_RATE) * 1000).toFormat("hh:mm:ss");
     }
-    logBotStatus(message) {
+    logBotStatus(message, sayInGame = false) {
         if (!this.enableLogging) {
             return;
         }
-        console.log(`[${this.getHumanTimestamp(this.gameApi)} ${this.name}] ${message}`);
+        const timestamp = this.getHumanTimestamp(this.gameApi);
+        console.log(`[${timestamp} ${this.name}] ${message}`);
+        if (sayInGame) {
+            this.actionsApi.sayAll(`${timestamp}: ${message}`);
+        }
     }
     logDebugState(game) {
         if (!this.enableLogging) {
@@ -93,9 +97,9 @@ export class SupalosaBot extends Bot {
         this.logBotStatus(`----- Cash: ${myPlayer.credits} ----- | Queues: ${queueState}`);
         const harvesters = game.getVisibleUnits(this.name, "self", (r) => r.harvester).length;
         this.logBotStatus(`Harvesters: ${harvesters}`);
+        this.squadController.debugSquads(this.gameApi);
         this.logBotStatus(`----- End -----`);
         this.missionController.logDebugOutput();
-        this.actionsApi.sayAll(`Cash: ${myPlayer.credits}`);
     }
     onGameEvent(ev) {
         switch (ev.type) {

package/dist/bot/logic/building/building.js

@@ -45,6 +45,7 @@ export const BUILDING_NAME_TO_RULES = new Map([
     ["GADEPT", new BasicBuilding(1, 1, 10000)],
     ["GAAIRC", new BasicBuilding(8, 1, 6000)],
     ["GATECH", new BasicBuilding(20, 1, 4000)],
+    ["GAYARD", new BasicBuilding(0, 0, 0)],
     ["GAPILL", new AntiGroundStaticDefence(5, 1, 5)],
     ["ATESLA", new AntiGroundStaticDefence(5, 1, 10)],
     ["GAWALL", new AntiGroundStaticDefence(0, 0, 0)],
@@ -67,6 +68,7 @@ export const BUILDING_NAME_TO_RULES = new Map([
     ["NADEPT", new BasicBuilding(1, 1, 10000)],
     ["NARADR", new BasicBuilding(8, 1, 4000)],
     ["NANRCT", new PowerPlant()],
+    ["NAYARD", new BasicBuilding(0, 0, 0)],
     ["NATECH", new BasicBuilding(20, 1, 4000)],
     ["NALASR", new AntiGroundStaticDefence(5, 1, 5)],
     ["TESLA", new AntiGroundStaticDefence(5, 1, 10)],

package/dist/bot/logic/mission/missionController.js

@@ -30,11 +30,11 @@ export class MissionController {
         this.missions
             .filter((missions) => disbandedMissions.has(missions.getUniqueName()))
             .forEach((disbandedMission) => {
-            this.logger(`mission disbanded: ${disbandedMission.getUniqueName()}`);
             const reason = disbandedMissions.get(disbandedMission.getUniqueName());
+            this.logger(`mission disbanded: ${disbandedMission.getUniqueName()}, reason: ${reason}, hasSquad: ${!!disbandedMission.getSquad}`);
             disbandedMissionsArray.push({ mission: disbandedMission, reason });
-            disbandedMission.getSquad()?.setMission(null);
             disbandedMission.endMission(disbandedMissions.get(disbandedMission.getUniqueName()));
+            disbandedMission.getSquad()?.setMission(null);
         });
         this.missions = this.missions.filter((missions) => !disbandedMissions.has(missions.getUniqueName()));
         // Register new squads

package/dist/bot/logic/mission/missions/attackMission.js

@@ -96,11 +96,9 @@ export class AttackMissionFactory {
         }
         // TODO: not using a fixed value here. But performance slows to a crawl when this is unique.
         const squadName = "globalAttack";
-        const tryAttack = missionController
-            .addMission(new AttackMission(squadName, 100, matchAwareness.getMainRallyPoint(), attackArea, attackRadius))
-            ?.then((reason, squad) => {
+        const tryAttack = missionController.addMission(new AttackMission(squadName, 100, matchAwareness.getMainRallyPoint(), attackArea, attackRadius).then((reason, squad) => {
             missionController.addMission(new RetreatMission("retreat-from-" + squadName + gameApi.getCurrentTick(), 100, matchAwareness.getMainRallyPoint(), squad?.getUnitIds() ?? []));
-        });
+        }));
         if (tryAttack) {
             this.lastAttackAt = gameApi.getCurrentTick();
         }

package/dist/bot/logic/mission/missions/defenceMission.js

@@ -35,7 +35,7 @@ export class DefenceMission extends Mission {
 }
 const DEFENCE_CHECK_TICKS = 30;
 // Starting radius around the player's base to trigger defense.
-const DEFENCE_STARTING_RADIUS = 20;
+const DEFENCE_STARTING_RADIUS = 10;
 // Every game tick, we increase the defendable area by this amount.
 const DEFENCE_RADIUS_INCREASE_PER_GAME_TICK = 0.005;
 export class DefenceMissionFactory {
@@ -53,7 +53,7 @@ export class DefenceMissionFactory {
         const defendableRadius = DEFENCE_STARTING_RADIUS + DEFENCE_RADIUS_INCREASE_PER_GAME_TICK * gameApi.getCurrentTick();
         const enemiesNearSpawn = matchAwareness.getHostilesNearPoint2d(playerData.startLocation, defendableRadius);
         if (enemiesNearSpawn.length > 0) {
-            missionController.addMission(new DefenceMission("globalDefence", 1000, playerData.startLocation, defendableRadius * 1.2)?.then((reason, squad) => {
+            missionController.addMission(new DefenceMission("globalDefence", 1000, playerData.startLocation, defendableRadius * 1.2).then((reason, squad) => {
                 missionController.addMission(new RetreatMission("retreat-from-globalDefence" + gameApi.getCurrentTick(), 100, matchAwareness.getMainRallyPoint(), squad?.getUnitIds() ?? []));
             }));
         }

package/dist/bot/logic/squad/behaviours/combatSquad.js

@@ -67,7 +67,7 @@ export class CombatSquad {
                     maxDistance &&
                     gameApi.mapApi.getTile(centerOfMass.x, centerOfMass.y) !== undefined &&
                     maxDistance > requiredGatherRadius) {
-                    // Switch back to gather mode.
+                    // Switch back to gather mode
                     this.state = SquadState.Gathering;
                     return noop();
                 }

package/dist/bot/logic/squad/behaviours/common.js

@@ -1,9 +1,10 @@
-import { ObjectType, OrderType } from "@chronodivide/game-api";
+import { AttackState, ObjectType, OrderType, StanceType } from "@chronodivide/game-api";
 import { getDistanceBetweenUnits } from "../../map/map.js";
 // Micro methods
 export function manageMoveMicro(actionsApi, attacker, attackPoint) {
     if (attacker.name === "E1") {
-        if (!attacker.canMove) {
+        const isDeployed = attacker.stance === StanceType.Deployed;
+        if (isDeployed) {
             actionsApi.orderUnits([attacker.id], OrderType.DeploySelected);
         }
     }
@@ -14,11 +15,12 @@ export function manageAttackMicro(actionsApi, attacker, target) {
     if (attacker.name === "E1") {
         // Para (deployed weapon) range is 5.
         const deployedWeaponRange = attacker.secondaryWeapon?.maxRange || 5;
-        if (attacker.canMove && distance <= deployedWeaponRange * 0.8) {
+        const isDeployed = attacker.stance === StanceType.Deployed;
+        if (!isDeployed && (distance <= deployedWeaponRange || attacker.attackState === AttackState.JustFired)) {
             actionsApi.orderUnits([attacker.id], OrderType.DeploySelected);
             return;
         }
-        else if (!attacker.canMove && distance > deployedWeaponRange) {
+        else if (isDeployed && distance > deployedWeaponRange) {
             actionsApi.orderUnits([attacker.id], OrderType.DeploySelected);
             return;
         }

package/dist/bot/logic/squad/behaviours/retreatSquad.js

@@ -5,8 +5,6 @@ export class RetreatSquad {
     constructor(unitIds, retreatToPoint) {
         this.unitIds = unitIds;
         this.retreatToPoint = retreatToPoint;
-        this.hasRequestedUnits = false;
-        this.moveOrderSentAt = null;
         this.createdAt = null;
     }
     onAiUpdate(gameApi, actionsApi, playerData, squad, matchAwareness) {
@@ -15,18 +13,15 @@ export class RetreatSquad {
         }
         if (squad.getUnitIds().length > 0) {
             // Only send the order once we have managed to claim some units.
-            console.log(`Retreat squad ordered ${squad.getUnitIds()} to retreat`);
-            actionsApi.orderUnits(squad.getUnitIds(), OrderType.Move, this.retreatToPoint.x, this.retreatToPoint.y);
-            if (!this.moveOrderSentAt) {
-                this.moveOrderSentAt = gameApi.getCurrentTick();
-            }
+            actionsApi.orderUnits(squad.getUnitIds(), OrderType.AttackMove, this.retreatToPoint.x, this.retreatToPoint.y);
+            return disband();
         }
-        if ((this.moveOrderSentAt && gameApi.getCurrentTick() > this.moveOrderSentAt + 60) ||
-            (this.createdAt && gameApi.getCurrentTick() > this.createdAt + 240)) {
+        if (this.createdAt && gameApi.getCurrentTick() > this.createdAt + 240) {
+            // Disband automatically after 240 ticks in case we couldn't actually claim any units.
             return disband();
         }
         else {
-            return requestSpecificUnits(this.unitIds, 100);
+            return requestSpecificUnits(this.unitIds, 1000);
         }
     }
 }

package/dist/bot/logic/squad/squadController.js

@@ -1,12 +1,14 @@
 // Meta-controller for forming and controlling squads.
 import { SquadLiveness } from "./squad.js";
 import { getDistanceBetween } from "../map/map.js";
+import _ from "lodash";
 export class SquadController {
-    constructor() {
+    constructor(logger) {
+        this.logger = logger;
         this.squads = [];
         this.unitIdToSquad = new Map();
     }
-    onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, logger) {
+    onAiUpdate(gameApi, actionsApi, playerData, matchAwareness) {
         // Remove dead squads or those where the mission is dead.
         this.squads = this.squads.filter((squad) => squad.getLiveness() !== SquadLiveness.SquadDead);
         this.squads.sort((a, b) => a.getName().localeCompare(b.getName()));
@@ -15,7 +17,7 @@ export class SquadController {
         this.squads.forEach((squad) => {
             squad.getUnitIds().forEach((unitId) => {
                 if (this.unitIdToSquad.has(unitId)) {
-                    logger(`WARNING: unit ${unitId} is in multiple squads, please debug.`);
+                    this.logger(`WARNING: unit ${unitId} is in multiple squads, please debug.`);
                 }
                 else {
                     this.unitIdToSquad.set(unitId, squad);
@@ -35,7 +37,7 @@ export class SquadController {
         squadActions
             .filter((a) => isDisband(a.action))
             .forEach((a) => {
-            logger(`Squad ${a.squad.getName()} disbanding as requested.`);
+            this.logger(`Squad ${a.squad.getName()} disbanding as requested.`);
             a.squad.getMission()?.removeSquad();
             a.squad.getUnitIds().forEach((unitId) => {
                 this.unitIdToSquad.delete(unitId);
@@ -47,7 +49,7 @@ export class SquadController {
             .forEach((a) => {
             let mergeInto = a.action;
             if (disbandedSquads.has(mergeInto.mergeInto.getName())) {
-                logger(`Squad ${a.squad.getName()} tried to merge into disbanded squad ${mergeInto.mergeInto.getName()}, cancelling.`);
+                this.logger(`Squad ${a.squad.getName()} tried to merge into disbanded squad ${mergeInto.mergeInto.getName()}, cancelling.`);
                 return;
             }
             a.squad.getUnitIds().forEach((unitId) => mergeInto.mergeInto.addUnit(unitId));
@@ -80,11 +82,11 @@ export class SquadController {
             const { squad: requestingSquad } = request;
             const missionName = requestingSquad.getMission()?.getUniqueName();
             if (!unit) {
-                logger(`mission ${missionName} requested non-existent unit ${unitId}`);
+                this.logger(`mission ${missionName} requested non-existent unit ${unitId}`);
                 return;
             }
             if (!this.unitIdToSquad.has(unitId)) {
-                logger(`granting specific unit ${unitId} to squad ${requestingSquad.getName()} in mission ${missionName}`);
+                this.logger(`granting specific unit ${unitId} to squad ${requestingSquad.getName()} in mission ${missionName}`);
                 this.addUnitToSquad(requestingSquad, unit);
             }
         });
@@ -119,7 +121,7 @@ export class SquadController {
         freeUnits.forEach((freeUnit) => {
             if (unitTypeToHighestRequest.hasOwnProperty(freeUnit.name)) {
                 const { squad: requestingSquad } = unitTypeToHighestRequest[freeUnit.name];
-                logger(`granting unit ${freeUnit.id}#${freeUnit.name} to squad ${requestingSquad.getName()}`);
+                this.logger(`granting unit ${freeUnit.id}#${freeUnit.name} to squad ${requestingSquad.getName()}`);
                 this.addUnitToSquad(requestingSquad, freeUnit);
                 delete unitTypeToHighestRequest[freeUnit.name];
             }
@@ -128,7 +130,7 @@ export class SquadController {
                     const { squad: requestingSquad } = request;
                     if (freeUnit.rules.isSelectableCombatant &&
                         getDistanceBetween(freeUnit, request.action.point) <= request.action.radius) {
-                        logger(`granting unit ${freeUnit.id}#${freeUnit.name} to squad ${requestingSquad.getName()} via grab at ${request.action.point.x},${request.action.point.y}`);
+                        this.logger(`granting unit ${freeUnit.id}#${freeUnit.name} to squad ${requestingSquad.getName()} via grab at ${request.action.point.x},${request.action.point.y}`);
                         this.addUnitToSquad(requestingSquad, freeUnit);
                         return true;
                     }
@@ -146,4 +148,12 @@ export class SquadController {
     registerSquad(squad) {
         this.squads.push(squad);
     }
+    debugSquads(gameApi) {
+        const unitsInSquad = (unitIds) => _.countBy(unitIds, (unitId) => gameApi.getUnitData(unitId)?.name);
+        this.squads.forEach((squad) => {
+            this.logger(`Squad ${squad.getName()}: ${Object.entries(unitsInSquad(squad.getUnitIds()))
+                .map(([unitName, count]) => `${unitName} x ${count}`)
+                .join(", ")}`);
+        });
+    }
 }

package/dist/exampleBot.js

@@ -22,14 +22,30 @@ async function main() {
     await cdapi.init(process.env.MIX_DIR || "./");
     console.log("Server URL: " + process.env.SERVER_URL);
     console.log("Client URL: " + process.env.CLIENT_URL);
-    const game = await cdapi.createGame({
-        // Uncomment the following lines to play in real time versus the bot
-        /*online: true,
-        serverUrl: process.env.SERVER_URL!,
-        clientUrl: process.env.CLIENT_URL!,
-        agents: [new SupalosaBot(botName, "Americans"), { name: otherBotName, country: "French" }],*/
+    /*
+    Countries:
+    0=Americans
+    1=Alliance -> Korea
+    2=French
+    3=Germans
+    4=British
+
+    5=Africans -> Libya
+    6=Arabs -> Iraq
+    7=Confederation -> Cuba
+    8=Russians
+    */
+    const onlineSettings = {
+        online: true,
+        serverUrl: process.env.SERVER_URL,
+        clientUrl: process.env.CLIENT_URL,
+        agents: [new SupalosaBot(botName, "Americans"), { name: otherBotName, country: "French" }],
+    };
+    const offlineSettings = {
         agents: [new SupalosaBot(botName, "French", false), new SupalosaBot(otherBotName, "French", true)],
-        //agents: [new SupalosaBot(botName, "Americans", false), new SupalosaBot(otherBotName, "Russians", false)],
+    };
+    const game = await cdapi.createGame({
+        ...offlineSettings,
         buildOffAlly: false,
         cratesAppear: false,
         credits: 10000,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@supalosa/chronodivide-bot",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "Example bot for Chrono Divide",
     "repository": "https://github.com/Supalosa/supalosa-chronodivide-bot",
     "main": "dist/exampleBot.js",

package/src/bot/bot.ts

@@ -37,8 +37,8 @@ export class SupalosaBot extends Bot {
 
     constructor(name: string, country: string, enableLogging = true) {
         super(name, country);
-        this.missionController = new MissionController((message) => this.logBotStatus(message));
-        this.squadController = new SquadController();
+        this.missionController = new MissionController((message, sayInGame) => this.logBotStatus(message, sayInGame));
+        this.squadController = new SquadController((message, sayInGame) => this.logBotStatus(message, sayInGame));
         this.queueController = new QueueController();
         this.enableLogging = enableLogging;
     }
@@ -55,7 +55,7 @@ export class SupalosaBot extends Bot {
             null,
             new SectorCache(game.mapApi, this.knownMapBounds),
             game.getPlayerData(this.name).startLocation,
-            (msg) => this.logBotStatus(msg),
+            (message, sayInGame) => this.logBotStatus(message, sayInGame),
         );
 
         this.logBotStatus(`Map bounds: ${this.knownMapBounds.x}, ${this.knownMapBounds.y}`);
@@ -116,9 +116,7 @@ export class SupalosaBot extends Bot {
 
             // Squad logic every 3 ticks
             if (this.gameApi.getCurrentTick() % 3 === 0) {
-                this.squadController.onAiUpdate(game, this.actionsApi, myPlayer, this.matchAwareness, (message) =>
-                    this.logBotStatus(message),
-                );
+                this.squadController.onAiUpdate(game, this.actionsApi, myPlayer, this.matchAwareness);
             }
         }
     }
@@ -127,11 +125,15 @@ export class SupalosaBot extends Bot {
         return Duration.fromMillis((game.getCurrentTick() / NATURAL_TICK_RATE) * 1000).toFormat("hh:mm:ss");
     }
 
-    private logBotStatus(message: string) {
+    private logBotStatus(message: string, sayInGame: boolean = false) {
         if (!this.enableLogging) {
             return;
         }
-        console.log(`[${this.getHumanTimestamp(this.gameApi)} ${this.name}] ${message}`);
+        const timestamp = this.getHumanTimestamp(this.gameApi);
+        console.log(`[${timestamp} ${this.name}] ${message}`);
+        if (sayInGame) {
+            this.actionsApi.sayAll(`${timestamp}: ${message}`);
+        }
     }
 
     private logDebugState(game: GameApi) {
@@ -157,9 +159,9 @@ export class SupalosaBot extends Bot {
         this.logBotStatus(`----- Cash: ${myPlayer.credits} ----- | Queues: ${queueState}`);
         const harvesters = game.getVisibleUnits(this.name, "self", (r) => r.harvester).length;
         this.logBotStatus(`Harvesters: ${harvesters}`);
+        this.squadController.debugSquads(this.gameApi);
         this.logBotStatus(`----- End -----`);
         this.missionController.logDebugOutput();
-        this.actionsApi.sayAll(`Cash: ${myPlayer.credits}`);
     }
 
     override onGameEvent(ev: ApiEvent) {

package/src/bot/logic/awareness.ts

@@ -69,7 +69,7 @@ export class MatchAwarenessImpl implements MatchAwareness {
         private threatCache: GlobalThreat | null,
         private sectorCache: SectorCache,
         private mainRallyPoint: Point2D,
-        private logger: (message: string) => void,
+        private logger: (message: string, sayInGame?: boolean) => void,
     ) {
         const { x: width, y: height } = sectorCache.getMapBounds();
         this.hostileQuadTree = new Quadtree({ width, height });

package/src/bot/logic/building/building.ts

@@ -84,6 +84,7 @@ export const BUILDING_NAME_TO_RULES = new Map<string, AiBuildingRules>([
     ["GAAIRC", new BasicBuilding(8, 1, 6000)], // Airforce Command
 
     ["GATECH", new BasicBuilding(20, 1, 4000)], // Allied Battle Lab
+    ["GAYARD", new BasicBuilding(0, 0, 0)], // Naval Yard, disabled
 
     ["GAPILL", new AntiGroundStaticDefence(5, 1, 5)], // Pillbox
     ["ATESLA", new AntiGroundStaticDefence(5, 1, 10)], // Prism Cannon
@@ -109,6 +110,7 @@ export const BUILDING_NAME_TO_RULES = new Map<string, AiBuildingRules>([
     ["NADEPT", new BasicBuilding(1, 1, 10000)], // Repair Depot
     ["NARADR", new BasicBuilding(8, 1, 4000)], // Radar
     ["NANRCT", new PowerPlant()], // Nuclear Reactor
+    ["NAYARD", new BasicBuilding(0, 0, 0)], // Naval Yard, disabled
 
     ["NATECH", new BasicBuilding(20, 1, 4000)], // Soviet Battle Lab
 

package/src/bot/logic/mission/missionController.ts

@@ -13,7 +13,7 @@ export class MissionController {
 
     private forceDisbandedMissions: string[] = [];
 
-    constructor(private logger: (message: string) => void) {
+    constructor(private logger: (message: string, sayInGame?: boolean) => void) {
         this.missionFactories = createMissionFactories();
     }
 
@@ -48,11 +48,13 @@ export class MissionController {
         this.missions
             .filter((missions) => disbandedMissions.has(missions.getUniqueName()))
             .forEach((disbandedMission) => {
-                this.logger(`mission disbanded: ${disbandedMission.getUniqueName()}`);
                 const reason = disbandedMissions.get(disbandedMission.getUniqueName());
+                this.logger(
+                    `mission disbanded: ${disbandedMission.getUniqueName()}, reason: ${reason}, hasSquad: ${!!disbandedMission.getSquad}`,
+                );
                 disbandedMissionsArray.push({ mission: disbandedMission, reason });
-                disbandedMission.getSquad()?.setMission(null);
                 disbandedMission.endMission(disbandedMissions.get(disbandedMission.getUniqueName()));
+                disbandedMission.getSquad()?.setMission(null);
             });
         this.missions = this.missions.filter((missions) => !disbandedMissions.has(missions.getUniqueName()));
 

package/src/bot/logic/mission/missions/attackMission.ts

@@ -124,18 +124,20 @@ export class AttackMissionFactory implements MissionFactory {
         // TODO: not using a fixed value here. But performance slows to a crawl when this is unique.
         const squadName = "globalAttack";
 
-        const tryAttack = missionController
-            .addMission(new AttackMission(squadName, 100, matchAwareness.getMainRallyPoint(), attackArea, attackRadius))
-            ?.then((reason, squad) => {
-                missionController.addMission(
-                    new RetreatMission(
-                        "retreat-from-" + squadName + gameApi.getCurrentTick(),
-                        100,
-                        matchAwareness.getMainRallyPoint(),
-                        squad?.getUnitIds() ?? [],
-                    ),
-                );
-            });
+        const tryAttack = missionController.addMission(
+            new AttackMission(squadName, 100, matchAwareness.getMainRallyPoint(), attackArea, attackRadius).then(
+                (reason, squad) => {
+                    missionController.addMission(
+                        new RetreatMission(
+                            "retreat-from-" + squadName + gameApi.getCurrentTick(),
+                            100,
+                            matchAwareness.getMainRallyPoint(),
+                            squad?.getUnitIds() ?? [],
+                        ),
+                    );
+                },
+            ),
+        );
         if (tryAttack) {
             this.lastAttackAt = gameApi.getCurrentTick();
         }

package/src/bot/logic/mission/missions/defenceMission.ts

@@ -47,7 +47,7 @@ export class DefenceMission extends Mission<DefenceFailReason> {
 const DEFENCE_CHECK_TICKS = 30;
 
 // Starting radius around the player's base to trigger defense.
-const DEFENCE_STARTING_RADIUS = 20;
+const DEFENCE_STARTING_RADIUS = 10;
 // Every game tick, we increase the defendable area by this amount.
 const DEFENCE_RADIUS_INCREASE_PER_GAME_TICK = 0.005;
 
@@ -77,7 +77,7 @@ export class DefenceMissionFactory implements MissionFactory {
 
         if (enemiesNearSpawn.length > 0) {
             missionController.addMission(
-                new DefenceMission("globalDefence", 1000, playerData.startLocation, defendableRadius * 1.2)?.then(
+                new DefenceMission("globalDefence", 1000, playerData.startLocation, defendableRadius * 1.2).then(
                     (reason, squad) => {
                         missionController.addMission(
                             new RetreatMission(

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

@@ -92,7 +92,7 @@ export class CombatSquad implements SquadBehaviour {
                     gameApi.mapApi.getTile(centerOfMass.x, centerOfMass.y) !== undefined &&
                     maxDistance > requiredGatherRadius
                 ) {
-                    // Switch back to gather mode.
+                    // Switch back to gather mode
                     this.state = SquadState.Gathering;
                     return noop();
                 }

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

@@ -1,10 +1,11 @@
-import { ActionsApi, ObjectType, OrderType, Point2D, UnitData } from "@chronodivide/game-api";
+import { ActionsApi, AttackState, ObjectType, OrderType, Point2D, StanceType, UnitData } from "@chronodivide/game-api";
 import { getDistanceBetweenUnits } from "../../map/map.js";
 
 // Micro methods
 export function manageMoveMicro(actionsApi: ActionsApi, attacker: UnitData, attackPoint: Point2D) {
     if (attacker.name === "E1") {
-        if (!attacker.canMove) {
+        const isDeployed = attacker.stance === StanceType.Deployed;
+        if (isDeployed) {
             actionsApi.orderUnits([attacker.id], OrderType.DeploySelected);
         }
     }
@@ -16,10 +17,11 @@ export function manageAttackMicro(actionsApi: ActionsApi, attacker: UnitData, ta
     if (attacker.name === "E1") {
         // Para (deployed weapon) range is 5.
         const deployedWeaponRange = attacker.secondaryWeapon?.maxRange || 5;
-        if (attacker.canMove && distance <= deployedWeaponRange * 0.8) {
+        const isDeployed = attacker.stance === StanceType.Deployed;
+        if (!isDeployed && (distance <= deployedWeaponRange || attacker.attackState === AttackState.JustFired)) {
             actionsApi.orderUnits([attacker.id], OrderType.DeploySelected);
             return;
-        } else if (!attacker.canMove && distance > deployedWeaponRange) {
+        } else if (isDeployed && distance > deployedWeaponRange) {
             actionsApi.orderUnits([attacker.id], OrderType.DeploySelected);
             return;
         }

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

@@ -7,8 +7,6 @@ import { MatchAwareness } from "../../awareness.js";
 const SCOUT_MOVE_COOLDOWN_TICKS = 30;
 
 export class RetreatSquad implements SquadBehaviour {
-    private hasRequestedUnits: boolean = false;
-    private moveOrderSentAt: number | null = null;
     private createdAt: number | null = null;
 
     constructor(
@@ -28,19 +26,19 @@ export class RetreatSquad implements SquadBehaviour {
         }
         if (squad.getUnitIds().length > 0) {
             // Only send the order once we have managed to claim some units.
-            console.log(`Retreat squad ordered ${squad.getUnitIds()} to retreat`);
-            actionsApi.orderUnits(squad.getUnitIds(), OrderType.Move, this.retreatToPoint.x, this.retreatToPoint.y);
-            if (!this.moveOrderSentAt) {
-                this.moveOrderSentAt = gameApi.getCurrentTick();
-            }
+            actionsApi.orderUnits(
+                squad.getUnitIds(),
+                OrderType.AttackMove,
+                this.retreatToPoint.x,
+                this.retreatToPoint.y,
+            );
+            return disband();
         }
-        if (
-            (this.moveOrderSentAt && gameApi.getCurrentTick() > this.moveOrderSentAt + 60) ||
-            (this.createdAt && gameApi.getCurrentTick() > this.createdAt + 240)
-        ) {
+        if (this.createdAt && gameApi.getCurrentTick() > this.createdAt + 240) {
+            // Disband automatically after 240 ticks in case we couldn't actually claim any units.
             return disband();
         } else {
-            return requestSpecificUnits(this.unitIds, 100);
+            return requestSpecificUnits(this.unitIds, 1000);
         }
     }
 }

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

@@ -13,6 +13,7 @@ import {
 } from "./squadBehaviour.js";
 import { MatchAwareness } from "../awareness.js";
 import { getDistanceBetween } from "../map/map.js";
+import _ from "lodash";
 
 type SquadWithAction<T> = {
     squad: Squad;
@@ -23,14 +24,13 @@ export class SquadController {
     private squads: Squad[] = [];
     private unitIdToSquad: Map<number, Squad> = new Map();
 
-    constructor() {}
+    constructor(private logger: (message: string, sayInGame?: boolean) => void) {}
 
     public onAiUpdate(
         gameApi: GameApi,
         actionsApi: ActionsApi,
         playerData: PlayerData,
         matchAwareness: MatchAwareness,
-        logger: (message: string) => void
     ) {
         // Remove dead squads or those where the mission is dead.
         this.squads = this.squads.filter((squad) => squad.getLiveness() !== SquadLiveness.SquadDead);
@@ -41,7 +41,7 @@ export class SquadController {
         this.squads.forEach((squad) => {
             squad.getUnitIds().forEach((unitId) => {
                 if (this.unitIdToSquad.has(unitId)) {
-                    logger(`WARNING: unit ${unitId} is in multiple squads, please debug.`);
+                    this.logger(`WARNING: unit ${unitId} is in multiple squads, please debug.`);
                 } else {
                     this.unitIdToSquad.set(unitId, squad);
                 }
@@ -61,7 +61,7 @@ export class SquadController {
         squadActions
             .filter((a) => isDisband(a.action))
             .forEach((a) => {
-                logger(`Squad ${a.squad.getName()} disbanding as requested.`);
+                this.logger(`Squad ${a.squad.getName()} disbanding as requested.`);
                 a.squad.getMission()?.removeSquad();
                 a.squad.getUnitIds().forEach((unitId) => {
                     this.unitIdToSquad.delete(unitId);
@@ -73,8 +73,8 @@ export class SquadController {
             .forEach((a) => {
                 let mergeInto = a.action as SquadActionMergeInto;
                 if (disbandedSquads.has(mergeInto.mergeInto.getName())) {
-                    logger(
-                        `Squad ${a.squad.getName()} tried to merge into disbanded squad ${mergeInto.mergeInto.getName()}, cancelling.`
+                    this.logger(
+                        `Squad ${a.squad.getName()} tried to merge into disbanded squad ${mergeInto.mergeInto.getName()}, cancelling.`,
                     );
                     return;
                 }
@@ -88,31 +88,36 @@ export class SquadController {
         const isRequestSpecific = (a: SquadAction) => a.type === "requestSpecific";
         const unitIdToHighestRequest = squadActions
             .filter((a) => isRequestSpecific(a.action))
-            .reduce((prev, a) => {
-                const squadWithAction = a as SquadWithAction<SquadActionRequestSpecificUnits>;
-                const { unitIds } = squadWithAction.action;
-                unitIds.forEach((unitId) => {
-                    if (prev.hasOwnProperty(unitId)) {
-                        if (prev[unitId].action.priority > prev[unitId].action.priority) {
+            .reduce(
+                (prev, a) => {
+                    const squadWithAction = a as SquadWithAction<SquadActionRequestSpecificUnits>;
+                    const { unitIds } = squadWithAction.action;
+                    unitIds.forEach((unitId) => {
+                        if (prev.hasOwnProperty(unitId)) {
+                            if (prev[unitId].action.priority > prev[unitId].action.priority) {
+                                prev[unitId] = squadWithAction;
+                            }
+                        } else {
                             prev[unitId] = squadWithAction;
                         }
-                    } else {
-                        prev[unitId] = squadWithAction;
-                    }
-                });
-                return prev;
-            }, {} as Record<number, SquadWithAction<SquadActionRequestSpecificUnits>>);
+                    });
+                    return prev;
+                },
+                {} as Record<number, SquadWithAction<SquadActionRequestSpecificUnits>>,
+            );
         Object.entries(unitIdToHighestRequest).forEach(([id, request]) => {
             const unitId = Number.parseInt(id);
             const unit = gameApi.getUnitData(unitId);
             const { squad: requestingSquad } = request;
             const missionName = requestingSquad.getMission()?.getUniqueName();
             if (!unit) {
-                logger(`mission ${missionName} requested non-existent unit ${unitId}`);
+                this.logger(`mission ${missionName} requested non-existent unit ${unitId}`);
                 return;
             }
             if (!this.unitIdToSquad.has(unitId)) {
-                logger(`granting specific unit ${unitId} to squad ${requestingSquad.getName()} in mission ${missionName}`);
+                this.logger(
+                    `granting specific unit ${unitId} to squad ${requestingSquad.getName()} in mission ${missionName}`,
+                );
                 this.addUnitToSquad(requestingSquad, unit);
             }
         });
@@ -121,25 +126,28 @@ export class SquadController {
         const isRequest = (a: SquadAction) => a.type === "request";
         const unitTypeToHighestRequest = squadActions
             .filter((a) => isRequest(a.action))
-            .reduce((prev, a) => {
-                const squadWithAction = a as SquadWithAction<SquadActionRequestUnits>;
-                const { unitNames } = squadWithAction.action;
-                unitNames.forEach((unitName) => {
-                    if (prev.hasOwnProperty(unitName)) {
-                        if (prev[unitName].action.priority > prev[unitName].action.priority) {
+            .reduce(
+                (prev, a) => {
+                    const squadWithAction = a as SquadWithAction<SquadActionRequestUnits>;
+                    const { unitNames } = squadWithAction.action;
+                    unitNames.forEach((unitName) => {
+                        if (prev.hasOwnProperty(unitName)) {
+                            if (prev[unitName].action.priority > prev[unitName].action.priority) {
+                                prev[unitName] = squadWithAction;
+                            }
+                        } else {
                             prev[unitName] = squadWithAction;
                         }
-                    } else {
-                        prev[unitName] = squadWithAction;
-                    }
-                });
-                return prev;
-            }, {} as Record<string, SquadWithAction<SquadActionRequestUnits>>);
+                    });
+                    return prev;
+                },
+                {} as Record<string, SquadWithAction<SquadActionRequestUnits>>,
+            );
 
         // Request combat-capable units in an area
         const isGrab = (a: SquadAction) => a.type === "requestCombatants";
         const grabRequests = squadActions.filter((a) =>
-            isGrab(a.action)
+            isGrab(a.action),
         ) as SquadWithAction<SquadActionGrabFreeCombatants>[];
 
         // Find loose units
@@ -152,7 +160,7 @@ export class SquadController {
         freeUnits.forEach((freeUnit) => {
             if (unitTypeToHighestRequest.hasOwnProperty(freeUnit.name)) {
                 const { squad: requestingSquad } = unitTypeToHighestRequest[freeUnit.name];
-                logger(`granting unit ${freeUnit.id}#${freeUnit.name} to squad ${requestingSquad.getName()}`);
+                this.logger(`granting unit ${freeUnit.id}#${freeUnit.name} to squad ${requestingSquad.getName()}`);
                 this.addUnitToSquad(requestingSquad, freeUnit);
                 delete unitTypeToHighestRequest[freeUnit.name];
             } else if (grabRequests.length > 0) {
@@ -162,12 +170,12 @@ export class SquadController {
                         freeUnit.rules.isSelectableCombatant &&
                         getDistanceBetween(freeUnit, request.action.point) <= request.action.radius
                     ) {
-                        logger(
+                        this.logger(
                             `granting unit ${freeUnit.id}#${
                                 freeUnit.name
                             } to squad ${requestingSquad.getName()} via grab at ${request.action.point.x},${
                                 request.action.point.y
-                            }`
+                            }`,
                         );
                         this.addUnitToSquad(requestingSquad, freeUnit);
                         return true;
@@ -187,4 +195,16 @@ export class SquadController {
     public registerSquad(squad: Squad) {
         this.squads.push(squad);
     }
+
+    public debugSquads(gameApi: GameApi) {
+        const unitsInSquad = (unitIds: number[]) => _.countBy(unitIds, (unitId) => gameApi.getUnitData(unitId)?.name);
+
+        this.squads.forEach((squad) => {
+            this.logger(
+                `Squad ${squad.getName()}: ${Object.entries(unitsInSquad(squad.getUnitIds()))
+                    .map(([unitName, count]) => `${unitName} x ${count}`)
+                    .join(", ")}`,
+            );
+        });
+    }
 }

package/src/exampleBot.ts

@@ -1,4 +1,4 @@
-import { cdapi } from "@chronodivide/game-api";
+import { Agent, Bot, cdapi } from "@chronodivide/game-api";
 import { SupalosaBot } from "./bot/bot.js";
 
 async function main() {
@@ -26,14 +26,33 @@ async function main() {
     console.log("Server URL: " + process.env.SERVER_URL!);
     console.log("Client URL: " + process.env.CLIENT_URL!);
 
-    const game = await cdapi.createGame({
-        // Uncomment the following lines to play in real time versus the bot
-        /*online: true,
+    /*
+    Countries:
+    0=Americans
+    1=Alliance -> Korea
+    2=French
+    3=Germans
+    4=British
+
+    5=Africans -> Libya
+    6=Arabs -> Iraq
+    7=Confederation -> Cuba
+    8=Russians
+    */
+
+    const onlineSettings = {
+        online: true as true,
         serverUrl: process.env.SERVER_URL!,
         clientUrl: process.env.CLIENT_URL!,
-        agents: [new SupalosaBot(botName, "Americans"), { name: otherBotName, country: "French" }],*/
+        agents: [new SupalosaBot(botName, "Americans"), { name: otherBotName, country: "French" }] as [Bot, ...Agent[]],
+    };
+
+    const offlineSettings = {
         agents: [new SupalosaBot(botName, "French", false), new SupalosaBot(otherBotName, "French", true)],
-        //agents: [new SupalosaBot(botName, "Americans", false), new SupalosaBot(otherBotName, "Russians", false)],
+    };
+
+    const game = await cdapi.createGame({
+        ...offlineSettings,
         buildOffAlly: false,
         cratesAppear: false,
         credits: 10000,