@supalosa/chronodivide-bot 0.1.1 → 0.2.1

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

@@ -1,43 +1,47 @@
 // 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(squads = [], unitIdToSquad = new Map()) {
-        this.squads = squads;
-        this.unitIdToSquad = unitIdToSquad;
+    constructor(logger) {
+        this.logger = logger;
+        this.squads = [];
+        this.unitIdToSquad = new Map();
     }
-    onAiUpdate(gameApi, playerData, threatData) {
-        // Remove dead squads.
-        this.squads = this.squads.filter((squad) => squad.getLiveness() == SquadLiveness.SquadDead);
+    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()));
         // Check for units in multiple squads, this shouldn't happen.
         this.unitIdToSquad = new Map();
         this.squads.forEach((squad) => {
             squad.getUnitIds().forEach((unitId) => {
                 if (this.unitIdToSquad.has(unitId)) {
-                    console.log(`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);
                 }
             });
         });
-        let squadActions = this.squads.map((squad) => {
+        const squadActions = this.squads.map((squad) => {
             return {
                 squad,
-                action: squad.onAiUpdate(gameApi, playerData, threatData),
+                action: squad.onAiUpdate(gameApi, actionsApi, playerData, matchAwareness),
             };
         });
         // Handle disbands and merges.
-        const isDisband = (a) => a.type == "disband";
-        const isMerge = (a) => a.type == "mergeInto";
+        const isDisband = (a) => a.type === "disband";
+        const isMerge = (a) => a.type === "mergeInto";
         let disbandedSquads = new Set();
         squadActions
             .filter((a) => isDisband(a.action))
             .forEach((a) => {
+            this.logger(`Squad ${a.squad.getName()} disbanding as requested.`);
+            a.squad.getMission()?.removeSquad();
             a.squad.getUnitIds().forEach((unitId) => {
                 this.unitIdToSquad.delete(unitId);
             });
-            a.squad.clearUnits();
             disbandedSquads.add(a.squad.getName());
         });
         squadActions
@@ -45,14 +49,111 @@ export class SquadController {
             .forEach((a) => {
             let mergeInto = a.action;
             if (disbandedSquads.has(mergeInto.mergeInto.getName())) {
-                console.log("Merging into a disbanded squad, 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));
             disbandedSquads.add(a.squad.getName());
         });
         // remove disbanded and merged squads.
-        this.squads.filter((squad) => !disbandedSquads.has(squad.getName()));
-        // Form squads.
+        this.squads = this.squads.filter((squad) => !disbandedSquads.has(squad.getName()));
+        // Request specific units by ID
+        const isRequestSpecific = (a) => a.type === "requestSpecific";
+        const unitIdToHighestRequest = squadActions
+            .filter((a) => isRequestSpecific(a.action))
+            .reduce((prev, a) => {
+            const squadWithAction = a;
+            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;
+                }
+            });
+            return prev;
+        }, {});
+        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) {
+                this.logger(`mission ${missionName} requested non-existent unit ${unitId}`);
+                return;
+            }
+            if (!this.unitIdToSquad.has(unitId)) {
+                this.logger(`granting specific unit ${unitId} to squad ${requestingSquad.getName()} in mission ${missionName}`);
+                this.addUnitToSquad(requestingSquad, unit);
+            }
+        });
+        // Request units by type
+        const isRequest = (a) => a.type === "request";
+        const unitTypeToHighestRequest = squadActions
+            .filter((a) => isRequest(a.action))
+            .reduce((prev, a) => {
+            const squadWithAction = a;
+            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;
+                }
+            });
+            return prev;
+        }, {});
+        // Request combat-capable units in an area
+        const isGrab = (a) => a.type === "requestCombatants";
+        const grabRequests = squadActions.filter((a) => isGrab(a.action));
+        // Find loose units
+        const unitIds = gameApi.getVisibleUnits(playerData.name, "self");
+        const freeUnits = unitIds
+            .map((unitId) => gameApi.getUnitData(unitId))
+            .filter((unit) => !!unit && !this.unitIdToSquad.has(unit.id || 0))
+            .map((unit) => unit);
+        freeUnits.forEach((freeUnit) => {
+            if (unitTypeToHighestRequest.hasOwnProperty(freeUnit.name)) {
+                const { squad: requestingSquad } = unitTypeToHighestRequest[freeUnit.name];
+                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) {
+                grabRequests.some((request) => {
+                    const { squad: requestingSquad } = request;
+                    if (freeUnit.rules.isSelectableCombatant &&
+                        getDistanceBetween(freeUnit, request.action.point) <= request.action.radius) {
+                        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;
+                    }
+                    else {
+                        return false;
+                    }
+                });
+            }
+        });
+    }
+    addUnitToSquad(squad, unit) {
+        squad.addUnit(unit.id);
+        this.unitIdToSquad.set(unit.id, squad);
+    }
+    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

@@ -1,20 +1,51 @@
 import { cdapi } from "@chronodivide/game-api";
-import { ExampleBot } from "./bot/bot.js";
+import { SupalosaBot } from "./bot/bot.js";
 async function main() {
-    const mapName = "mp03t4.map";
+    /*
+    Ladder maps:
+    CDR2            1v1             2_malibu_cliffs_le.map
+    CDR2            1v1             4_country_swing_le_v2.map
+    CDR2            1v1             mp01t4.map
+    CDR2            1v1             tn04t2.map
+    CDR2            1v1             mp10s4.map
+    CDR2            1v1             heckcorners.map
+    CDR2            1v1             4_montana_dmz_le.map
+    CDR2            1v1             barrel.map
+    
+    Other maps:
+    mp03t4
+    */
+    const mapName = "mp01t4.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)}`;
     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
+    /*
+    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 ExampleBot(botName, "Americans"), { name: otherBotName, country: "French" }],
-        //agents: [new ExampleBot(botName, "Russians", false), new ExampleBot(otherBotName, "Americans", true)],
+        agents: [new SupalosaBot(botName, "Americans"), { name: otherBotName, country: "French" }],
+    };
+    const offlineSettings = {
+        agents: [new SupalosaBot(botName, "French", false), new SupalosaBot(otherBotName, "French", true)],
+    };
+    const game = await cdapi.createGame({
+        ...offlineSettings,
         buildOffAlly: false,
         cratesAppear: false,
         credits: 10000,

package/package.json

@@ -1,24 +1,29 @@
-{
-    "name": "@supalosa/chronodivide-bot",
-    "version": "0.1.1",
-    "description": "Example bot for Chrono Divide",
-    "main": "dist/exampleBot.js",
-    "type": "module",
-    "scripts": {
-        "build": "tsc -p .",
-        "watch": "tsc -p . -w",
-        "start": "node . --es-module-specifier-resolution=node",
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "license": "UNLICENSED",
-    "devDependencies": {
-        "@types/node": "^14.17.32",
-        "typescript": "^4.3.5"
-    },
-    "dependencies": {
-        "@chronodivide/game-api": "^0.43.0",
-        "@types/luxon": "^3.3.2",
-        "luxon": "^3.4.3",
-        "priority-queue-typescript": "^1.0.1"
-    }
-}
+{
+    "name": "@supalosa/chronodivide-bot",
+    "version": "0.2.1",
+    "description": "Example bot for Chrono Divide",
+    "repository": "https://github.com/Supalosa/supalosa-chronodivide-bot",
+    "main": "dist/exampleBot.js",
+    "type": "module",
+    "scripts": {
+        "build": "tsc -p .",
+        "watch": "tsc -p . -w",
+        "start": "node . --es-module-specifier-resolution=node",
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "license": "UNLICENSED",
+    "devDependencies": {
+        "@timohausmann/quadtree-ts": "^2.0.0-beta.1",
+        "@types/node": "^14.17.32",
+        "prettier": "3.0.3",
+        "typescript": "^4.3.5"
+    },
+    "dependencies": {
+        "@chronodivide/game-api": "^0.45.0",
+        "@types/lodash": "^4.14.199",
+        "@types/luxon": "^3.3.2",
+        "lodash": "^4.17.21",
+        "luxon": "^3.4.3",
+        "priority-queue-typescript": "^1.0.1"
+    }
+}