@supalosa/chronodivide-bot 0.5.3 → 0.6.4

package/dist/exampleBot.js

@@ -1,113 +1,101 @@
-import "dotenv/config";
-import { cdapi } from "@chronodivide/game-api";
-import { SupalosaBot } from "./bot/bot.js";
-// The game will automatically end after this time. This is to handle stalemates.
-const MAX_GAME_LENGTH_SECONDS = 7200; // 7200 = two hours
-async function main() {
-    /*
-    Ladder maps:
-    CDR2            1v1             2_malibu_cliffs_le.map
-    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). Cramped in position 1.
-    CDR2            1v1             heckcorners.map
-    CDR2            1v1             4_montana_dmz_le.map
-    CDR2            1v1             barrel.map
-    
-    Other maps:
-    mp03t4 large map, no oil derricks
-    mp02t2.map,mp06t2.map,mp11t2.map,mp08t2.map,mp21s2.map,mp14t2.map,mp29u2.map,mp31s2.map,mp18s3.map,mp09t3.map,mp01t4.map,mp03t4.map,mp05t4.map,mp10s4.map,mp12s4.map,mp13s4.map,mp19t4.map,
-    mp15s4.map,mp16s4.map,mp23t4.map,mp33u4.map,mp34u4.map,mp17t6.map,mp20t6.map,mp25t6.map,mp26s6.map,mp30s6.map,mp22s8.map,mp27t8.map,mp32s8.map,mp06mw.map,mp08mw.map,mp14mw.map,mp29mw.map,
-    mp05mw.map,mp13mw.map,mp15mw.map,mp16mw.map,mp23mw.map,mp17mw.map,mp25mw.map,mp30mw.map,mp22mw.map,mp27mw.map,mp32mw.map,mp09du.map,mp01du.map,mp05du.map,mp13du.map,mp15du.map,mp18du.map,
-    mp24du.map,mp17du.map,mp25du.map,mp27du.map,mp32du.map,c1m1a.map,c1m1b.map,c1m1c.map,c1m2a.map,c1m2b.map,c1m2c.map,c1m3a.map,c1m3b.map,c1m3c.map,c1m4a.map,c1m4b.map,c1m4c.map,c1m5a.map,
-    c1m5b.map,c1m5c.map,c2m1a.map,c2m1b.map,c2m1c.map,c2m2a.map,c2m2b.map,c2m2c.map,c2m3a.map,c2m3b.map,c2m3c.map,c2m4a.map,c2m4b.map,c2m4c.map,c2m5a.map,c2m5b.map,c2m5c.map,c3m1a.map,c3m1b.map,
-    c3m1c.map,c3m2a.map,c3m2b.map,c3m2c.map,c3m3a.map,c3m3b.map,c3m3c.map,c3m4a.map,c3m4b.map,c3m4c.map,c3m5a.map,c3m5b.map,c3m5c.map,c4m1a.map,c4m1b.map,c4m1c.map,c4m2a.map,c4m2b.map,c4m2c.map,
-    c4m3a.map,c4m3b.map,c4m3c.map,c4m4a.map,c4m4b.map,c4m4c.map,c4m5a.map,c4m5b.map,c4m5c.map,c5m1a.map,c5m1b.map,c5m1c.map,c5m2a.map,c5m2b.map,c5m2c.map,c5m3a.map,c5m3b.map,c5m3c.map,c5m4a.map,
-    c5m4b.map,c5m4c.map,c5m5a.map,c5m5b.map,c5m5c.map,tn01t2.map,tn01mw.map,tn04t2.map,tn04mw.map,tn02s4.map,tn02mw.map,amazon01.map,eb1.map,eb2.map,eb3.map,eb4.map,eb5.map,invasion.map,arena.map,
-    barrel.map,bayopigs.map,bermuda.map,break.map,carville.map,deadman.map,death.map,disaster.map,dustbowl.map,goldst.map,grinder.map,hailmary.map,hills.map,kaliforn.map,killer.map,lostlake.map,
-    newhghts.map,oceansid.map,pacific.map,potomac.map,powdrkeg.map,rockets.map,roulette.map,round.map,seaofiso.map,shrapnel.map,tanyas.map,tower.map,tsunami.map,valley.map,xmas.map,yuriplot.map,
-    cavernsofsiberia.map,countryswingfixed.map,4_country_swing_le_v2.map,dorado_descent_yr_port.mpr,dryheat.map,dunepatrolremake.map,heckbvb.map,heckcorners.map,heckgolden.mpr,heckcorners_b.map,
-    heckcorners_b_golden.map,hecklvl.map,heckrvr.map,hecktvt.map,isleland.map,jungleofvietnam.map,2_malibu_cliffs_le.map,mojosprt.map,4_montana_dmz_le.map,6_near_ore_far.map,8_near_ore_far.map,
-    offensedefense.map,ore2_startfixed.map,rekoool_fast_6players.mpr,rekoool_fast_8players.mpr,riverram.map,tourofegypt.map,unrepent.map,sinkswim_yr_port.map
-    */
-    const mapName = "mp03t4.map";
-    // Bot names must be unique in online mode
-    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 || "./");
-    console.log("Server URL: " + process.env.SERVER_URL);
-    console.log("Client URL: " + process.env.CLIENT_URL);
-    /*
-    Countries:
-    0=Americans
-    1=Alliance -> Korea
-    2=French
-    3=Germans
-    4=British
-
-    5=Africans -> Libya
-    6=Arabs -> Iraq
-    7=Confederation -> Cuba
-    8=Russians
-    */
-    const baseSettings = {
-        buildOffAlly: false,
-        cratesAppear: false,
-        credits: 10000,
-        gameMode: cdapi.getAvailableGameModes(mapName)[0],
-        gameSpeed: 6,
-        mapName,
-        mcvRepacks: true,
-        shortGame: true,
-        superWeapons: false,
-        unitCount: 0,
-    };
-    const onlineSettings = {
-        ...baseSettings,
-        online: true,
-        serverUrl: process.env.SERVER_URL,
-        clientUrl: process.env.CLIENT_URL,
-        agents: [
-            new SupalosaBot(process.env.ONLINE_BOT_NAME ?? firstBotName, "Americans"),
-            { name: process.env.PLAYER_NAME ?? secondBotName, country: "French" },
-        ],
-        botPassword: process.env.ONLINE_BOT_PASSWORD ?? "default",
-    };
-    const offlineSettings1v1 = {
-        ...baseSettings,
-        online: false,
-        agents: [
-            new SupalosaBot(firstBotName, "French", [], true).setDebugMode(true),
-            new SupalosaBot(secondBotName, "Russians", [], false),
-        ],
-    };
-    const offlineSettings2v2 = {
-        ...baseSettings,
-        online: false,
-        agents: [
-            new SupalosaBot(firstBotName, "French", [firstBotName], false),
-            new SupalosaBot(secondBotName, "Russians", [firstBotName], true).setDebugMode(true),
-            new SupalosaBot(thirdBotName, "Russians", [fourthBotName], false),
-            new SupalosaBot(fourthBotName, "French", [thirdBotName], false),
-        ],
-    };
-    const game = await cdapi.createGame(process.env.ONLINE_MATCH ? onlineSettings : offlineSettings1v1);
-    while (!game.isFinished()) {
-        if (!!MAX_GAME_LENGTH_SECONDS && game.getCurrentTick() / 15 > MAX_GAME_LENGTH_SECONDS) {
-            console.log(`Game forced to end due to timeout`);
-            break;
-        }
-        await game.update();
-    }
-    game.saveReplay();
-    game.dispose();
-}
-main().catch((e) => {
-    console.error(e);
-    process.exit(1);
-});
+import "dotenv/config";
+import { cdapi } from "@chronodivide/game-api";
+import { SupalosaBot } from "./bot/bot.js";
+import { Countries } from "./bot/logic/common/utils.js";
+// The game will automatically end after this time. This is to handle stalemates.
+const MAX_GAME_LENGTH_SECONDS = 7200; // 7200 = two hours
+async function main() {
+    /*
+    Ladder maps:
+    CDR2            1v1             2_malibu_cliffs_le.map
+    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). Cramped in position 1.
+    CDR2            1v1             heckcorners.map
+    CDR2            1v1             4_montana_dmz_le.map
+    CDR2            1v1             barrel.map
+    
+    Other maps:
+    mp03t4 large map, no oil derricks
+    mp02t2.map,mp06t2.map,mp11t2.map,mp08t2.map,mp21s2.map,mp14t2.map,mp29u2.map,mp31s2.map,mp18s3.map,mp09t3.map,mp01t4.map,mp03t4.map,mp05t4.map,mp10s4.map,mp12s4.map,mp13s4.map,mp19t4.map,
+    mp15s4.map,mp16s4.map,mp23t4.map,mp33u4.map,mp34u4.map,mp17t6.map,mp20t6.map,mp25t6.map,mp26s6.map,mp30s6.map,mp22s8.map,mp27t8.map,mp32s8.map,mp06mw.map,mp08mw.map,mp14mw.map,mp29mw.map,
+    mp05mw.map,mp13mw.map,mp15mw.map,mp16mw.map,mp23mw.map,mp17mw.map,mp25mw.map,mp30mw.map,mp22mw.map,mp27mw.map,mp32mw.map,mp09du.map,mp01du.map,mp05du.map,mp13du.map,mp15du.map,mp18du.map,
+    mp24du.map,mp17du.map,mp25du.map,mp27du.map,mp32du.map,c1m1a.map,c1m1b.map,c1m1c.map,c1m2a.map,c1m2b.map,c1m2c.map,c1m3a.map,c1m3b.map,c1m3c.map,c1m4a.map,c1m4b.map,c1m4c.map,c1m5a.map,
+    c1m5b.map,c1m5c.map,c2m1a.map,c2m1b.map,c2m1c.map,c2m2a.map,c2m2b.map,c2m2c.map,c2m3a.map,c2m3b.map,c2m3c.map,c2m4a.map,c2m4b.map,c2m4c.map,c2m5a.map,c2m5b.map,c2m5c.map,c3m1a.map,c3m1b.map,
+    c3m1c.map,c3m2a.map,c3m2b.map,c3m2c.map,c3m3a.map,c3m3b.map,c3m3c.map,c3m4a.map,c3m4b.map,c3m4c.map,c3m5a.map,c3m5b.map,c3m5c.map,c4m1a.map,c4m1b.map,c4m1c.map,c4m2a.map,c4m2b.map,c4m2c.map,
+    c4m3a.map,c4m3b.map,c4m3c.map,c4m4a.map,c4m4b.map,c4m4c.map,c4m5a.map,c4m5b.map,c4m5c.map,c5m1a.map,c5m1b.map,c5m1c.map,c5m2a.map,c5m2b.map,c5m2c.map,c5m3a.map,c5m3b.map,c5m3c.map,c5m4a.map,
+    c5m4b.map,c5m4c.map,c5m5a.map,c5m5b.map,c5m5c.map,tn01t2.map,tn01mw.map,tn04t2.map,tn04mw.map,tn02s4.map,tn02mw.map,amazon01.map,eb1.map,eb2.map,eb3.map,eb4.map,eb5.map,invasion.map,arena.map,
+    barrel.map,bayopigs.map,bermuda.map,break.map,carville.map,deadman.map,death.map,disaster.map,dustbowl.map,goldst.map,grinder.map,hailmary.map,hills.map,kaliforn.map,killer.map,lostlake.map,
+    newhghts.map,oceansid.map,pacific.map,potomac.map,powdrkeg.map,rockets.map,roulette.map,round.map,seaofiso.map,shrapnel.map,tanyas.map,tower.map,tsunami.map,valley.map,xmas.map,yuriplot.map,
+    cavernsofsiberia.map,countryswingfixed.map,4_country_swing_le_v2.map,dorado_descent_yr_port.mpr,dryheat.map,dunepatrolremake.map,heckbvb.map,heckcorners.map,heckgolden.mpr,heckcorners_b.map,
+    heckcorners_b_golden.map,hecklvl.map,heckrvr.map,hecktvt.map,isleland.map,jungleofvietnam.map,2_malibu_cliffs_le.map,mojosprt.map,4_montana_dmz_le.map,6_near_ore_far.map,8_near_ore_far.map,
+    offensedefense.map,ore2_startfixed.map,rekoool_fast_6players.mpr,rekoool_fast_8players.mpr,riverram.map,tourofegypt.map,unrepent.map,sinkswim_yr_port.map
+    */
+    const mapName = "heckcorners_b.map";
+    // Bot names must be unique in online mode
+    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 || "./");
+    console.log("Server URL: " + process.env.SERVER_URL);
+    console.log("Client URL: " + process.env.CLIENT_URL);
+    const baseSettings = {
+        buildOffAlly: false,
+        cratesAppear: false,
+        credits: 10000,
+        gameMode: cdapi.getAvailableGameModes(mapName)[0],
+        gameSpeed: 6,
+        mapName,
+        mcvRepacks: true,
+        shortGame: true,
+        superWeapons: false,
+        unitCount: 0,
+    };
+    const onlineSettings = {
+        ...baseSettings,
+        online: true,
+        serverUrl: process.env.SERVER_URL,
+        clientUrl: process.env.CLIENT_URL,
+        agents: [
+            new SupalosaBot(process.env.ONLINE_BOT_NAME ?? firstBotName, Countries.USA),
+            { name: process.env.PLAYER_NAME ?? secondBotName, country: Countries.FRANCE },
+        ],
+        botPassword: process.env.ONLINE_BOT_PASSWORD ?? "default",
+    };
+    const offlineSettings1v1 = {
+        ...baseSettings,
+        online: false,
+        agents: [
+            new SupalosaBot(firstBotName, Countries.FRANCE, [], false),
+            new SupalosaBot(secondBotName, Countries.RUSSIA, [], true).setDebugMode(true),
+        ],
+    };
+    const offlineSettings2v2 = {
+        ...baseSettings,
+        online: false,
+        agents: [
+            new SupalosaBot(firstBotName, Countries.FRANCE, [firstBotName], false),
+            new SupalosaBot(secondBotName, Countries.RUSSIA, [firstBotName], true).setDebugMode(true),
+            new SupalosaBot(thirdBotName, Countries.RUSSIA, [fourthBotName], false),
+            new SupalosaBot(fourthBotName, Countries.FRANCE, [thirdBotName], false),
+        ],
+    };
+    const game = await cdapi.createGame(process.env.ONLINE_MATCH ? onlineSettings : offlineSettings1v1);
+    while (!game.isFinished()) {
+        if (!!MAX_GAME_LENGTH_SECONDS && game.getCurrentTick() / 15 > MAX_GAME_LENGTH_SECONDS) {
+            console.log(`Game forced to end due to timeout`);
+            break;
+        }
+        await game.update();
+    }
+    game.saveReplay();
+    game.dispose();
+}
+main().catch((e) => {
+    console.error(e);
+    process.exit(1);
+});
 //# sourceMappingURL=exampleBot.js.map

package/dist/exampleBot.js.map

@@ -1 +1 @@
-{"version":3,"file":"exampleBot.js","sourceRoot":"","sources":["../src/exampleBot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exampleBot.js","sourceRoot":"","sources":["../src/exampleBot.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,29 +1,32 @@
-{
-    "name": "@supalosa/chronodivide-bot",
-    "version": "0.5.3",
-    "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": {
-        "@chronodivide/game-api": "^0.50.1",
-        "@types/node": "^14.17.32",
-        "prettier": "3.0.3",
-        "typescript": "^4.3.5"
-    },
-    "peerDependencies": {
-        "@chronodivide/game-api": "^0.50.1"
-    },
-    "dependencies": {
-        "@datastructures-js/priority-queue": "^6.3.0",
-        "@timohausmann/quadtree-ts": "2.2.2",
-        "dotenv": "^16.3.1"
-    }
-}
+{
+    "name": "@supalosa/chronodivide-bot",
+    "version": "0.6.4",
+    "description": "Example bot for Chrono Divide",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/Supalosa/supalosa-chronodivide-bot.git"
+    },
+    "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": {
+        "@chronodivide/game-api": "^0.73.0",
+        "@types/node": "^14.17.32",
+        "prettier": "3.0.3",
+        "typescript": "^4.3.5"
+    },
+    "peerDependencies": {
+        "@chronodivide/game-api": "^0.73.0"
+    },
+    "dependencies": {
+        "@datastructures-js/priority-queue": "^6.3.0",
+        "@timohausmann/quadtree-ts": "2.2.2",
+        "dotenv": "^16.3.1"
+    }
+}

package/src/bot/bot.ts

@@ -1,161 +1,161 @@
-import { ApiEventType, Bot, GameApi, ApiEvent, ObjectType, FactoryType, Size } from "@chronodivide/game-api";
-
-import { determineMapBounds } from "./logic/map/map.js";
-import { SectorCache } from "./logic/map/sector.js";
-import { MissionController } from "./logic/mission/missionController.js";
-import { QueueController } from "./logic/building/queueController.js";
-import { MatchAwareness, MatchAwarenessImpl } from "./logic/awareness.js";
-import { formatTimeDuration } from "./logic/common/utils.js";
-
-const DEBUG_STATE_UPDATE_INTERVAL_SECONDS = 6;
-
-// Number of ticks per second at the base speed.
-const NATURAL_TICK_RATE = 15;
-
-export class SupalosaBot extends Bot {
-    private tickRatio?: number;
-    private knownMapBounds: Size | undefined;
-    private missionController: MissionController;
-    private queueController: QueueController;
-    private tickOfLastAttackOrder: number = 0;
-
-    private matchAwareness: MatchAwareness | null = null;
-
-    constructor(
-        name: string,
-        country: string,
-        private tryAllyWith: string[] = [],
-        private enableLogging = true,
-    ) {
-        super(name, country);
-        this.missionController = new MissionController((message, sayInGame) => this.logBotStatus(message, sayInGame));
-        this.queueController = new QueueController();
-    }
-
-    override onGameStart(game: GameApi) {
-        const gameRate = game.getTickRate();
-        const botApm = 300;
-        const botRate = botApm / 60;
-        this.tickRatio = Math.ceil(gameRate / botRate);
-
-        this.knownMapBounds = determineMapBounds(game.mapApi);
-        const myPlayer = game.getPlayerData(this.name);
-
-        this.matchAwareness = new MatchAwarenessImpl(
-            null,
-            new SectorCache(game.mapApi, this.knownMapBounds),
-            myPlayer.startLocation,
-            (message, sayInGame) => this.logBotStatus(message, sayInGame),
-        );
-        this.matchAwareness.onGameStart(game, myPlayer);
-
-        this.logBotStatus(`Map bounds: ${this.knownMapBounds.width}, ${this.knownMapBounds.height}`);
-
-        this.tryAllyWith.forEach((playerName) => this.actionsApi.toggleAlliance(playerName, true));
-    }
-
-    override onGameTick(game: GameApi) {
-        if (!this.matchAwareness) {
-            return;
-        }
-
-        const threatCache = this.matchAwareness.getThreatCache();
-
-        if ((game.getCurrentTick() / NATURAL_TICK_RATE) % DEBUG_STATE_UPDATE_INTERVAL_SECONDS === 0) {
-            this.updateDebugState(game);
-        }
-
-        if (game.getCurrentTick() % this.tickRatio! === 0) {
-            const myPlayer = game.getPlayerData(this.name);
-
-            this.matchAwareness.onAiUpdate(game, myPlayer);
-
-            // hacky resign condition
-            const armyUnits = game.getVisibleUnits(this.name, "self", (r) => r.isSelectableCombatant);
-            const mcvUnits = game.getVisibleUnits(
-                this.name,
-                "self",
-                (r) => !!r.deploysInto && game.getGeneralRules().baseUnit.includes(r.name),
-            );
-            const productionBuildings = game.getVisibleUnits(
-                this.name,
-                "self",
-                (r) => r.type == ObjectType.Building && r.factory != FactoryType.None,
-            );
-            if (armyUnits.length == 0 && productionBuildings.length == 0 && mcvUnits.length == 0) {
-                this.logBotStatus(`No army or production left, quitting.`);
-                this.actionsApi.quitGame();
-            }
-
-            // Mission logic every 3 ticks
-            if (this.gameApi.getCurrentTick() % 3 === 0) {
-                this.missionController.onAiUpdate(game, this.actionsApi, myPlayer, this.matchAwareness);
-            }
-
-            const unitTypeRequests = this.missionController.getRequestedUnitTypes();
-
-            // Build logic.
-            this.queueController.onAiUpdate(
-                game,
-                this.productionApi,
-                this.actionsApi,
-                myPlayer,
-                threatCache,
-                unitTypeRequests,
-                (message) => this.logBotStatus(message),
-            );
-        }
-    }
-
-    private getHumanTimestamp(game: GameApi) {
-        return formatTimeDuration(game.getCurrentTick() / NATURAL_TICK_RATE);
-    }
-
-    private logBotStatus(message: string, sayInGame: boolean = false) {
-        if (!this.enableLogging) {
-            return;
-        }
-        this.logger.info(message);
-        if (sayInGame) {
-            const timestamp = this.getHumanTimestamp(this.gameApi);
-            this.actionsApi.sayAll(`${timestamp}: ${message}`);
-        }
-    }
-
-    private updateDebugState(game: GameApi) {
-        if (!this.getDebugMode()) {
-            return;
-        }
-        // Update the global debug text.
-        const myPlayer = game.getPlayerData(this.name);
-        const harvesters = game.getVisibleUnits(this.name, "self", (r) => r.harvester).length;
-
-        let globalDebugText = `Cash: ${myPlayer.credits} | Harvesters: ${harvesters}\n`;
-        globalDebugText += this.queueController.getGlobalDebugText(this.gameApi, this.productionApi);
-        globalDebugText += this.missionController.getGlobalDebugText(this.gameApi);
-        globalDebugText += this.matchAwareness?.getGlobalDebugText();
-
-        this.missionController.updateDebugText(this.actionsApi);
-
-        // Tag enemy units with IDs
-        game.getVisibleUnits(this.name, "enemy").forEach((unitId) => {
-            this.actionsApi.setUnitDebugText(unitId, unitId.toString());
-        });
-
-        this.actionsApi.setGlobalDebugText(globalDebugText);
-    }
-
-    override onGameEvent(ev: ApiEvent) {
-        switch (ev.type) {
-            case ApiEventType.ObjectDestroy: {
-                // Add to the stalemate detection.
-                if (ev.attackerInfo?.playerName == this.name) {
-                    this.tickOfLastAttackOrder += (this.gameApi.getCurrentTick() - this.tickOfLastAttackOrder) / 2;
-                }
-                break;
-            }
-            default:
-                break;
-        }
-    }
-}
+import { ApiEventType, Bot, GameApi, ApiEvent, ObjectType, FactoryType, Size } from "@chronodivide/game-api";
+
+import { determineMapBounds } from "./logic/map/map.js";
+import { SectorCache } from "./logic/map/sector.js";
+import { MissionController } from "./logic/mission/missionController.js";
+import { QueueController } from "./logic/building/queueController.js";
+import { MatchAwareness, MatchAwarenessImpl } from "./logic/awareness.js";
+import { Countries, formatTimeDuration } from "./logic/common/utils.js";
+
+const DEBUG_STATE_UPDATE_INTERVAL_SECONDS = 6;
+
+// Number of ticks per second at the base speed.
+const NATURAL_TICK_RATE = 15;
+
+export class SupalosaBot extends Bot {
+    private tickRatio?: number;
+    private knownMapBounds: Size | undefined;
+    private missionController: MissionController;
+    private queueController: QueueController;
+    private tickOfLastAttackOrder: number = 0;
+
+    private matchAwareness: MatchAwareness | null = null;
+
+    constructor(
+        name: string,
+        country: Countries,
+        private tryAllyWith: string[] = [],
+        private enableLogging = true,
+    ) {
+        super(name, country);
+        this.missionController = new MissionController((message, sayInGame) => this.logBotStatus(message, sayInGame));
+        this.queueController = new QueueController();
+    }
+
+    override onGameStart(game: GameApi) {
+        const gameRate = game.getTickRate();
+        const botApm = 300;
+        const botRate = botApm / 60;
+        this.tickRatio = Math.ceil(gameRate / botRate);
+
+        this.knownMapBounds = determineMapBounds(game.mapApi);
+        const myPlayer = game.getPlayerData(this.name);
+
+        this.matchAwareness = new MatchAwarenessImpl(
+            null,
+            new SectorCache(game.mapApi, this.knownMapBounds),
+            myPlayer.startLocation,
+            (message, sayInGame) => this.logBotStatus(message, sayInGame),
+        );
+        this.matchAwareness.onGameStart(game, myPlayer);
+
+        this.logBotStatus(`Map bounds: ${this.knownMapBounds.width}, ${this.knownMapBounds.height}`);
+
+        this.tryAllyWith.forEach((playerName) => this.actionsApi.toggleAlliance(playerName, true));
+    }
+
+    override onGameTick(game: GameApi) {
+        if (!this.matchAwareness) {
+            return;
+        }
+
+        const threatCache = this.matchAwareness.getThreatCache();
+
+        if ((game.getCurrentTick() / NATURAL_TICK_RATE) % DEBUG_STATE_UPDATE_INTERVAL_SECONDS === 0) {
+            this.updateDebugState(game);
+        }
+
+        if (game.getCurrentTick() % this.tickRatio! === 0) {
+            const myPlayer = game.getPlayerData(this.name);
+
+            this.matchAwareness.onAiUpdate(game, myPlayer);
+
+            // hacky resign condition
+            const armyUnits = game.getVisibleUnits(this.name, "self", (r) => r.isSelectableCombatant);
+            const mcvUnits = game.getVisibleUnits(
+                this.name,
+                "self",
+                (r) => !!r.deploysInto && game.getGeneralRules().baseUnit.includes(r.name),
+            );
+            const productionBuildings = game.getVisibleUnits(
+                this.name,
+                "self",
+                (r) => r.type == ObjectType.Building && r.factory != FactoryType.None,
+            );
+            if (armyUnits.length == 0 && productionBuildings.length == 0 && mcvUnits.length == 0) {
+                this.logBotStatus(`No army or production left, quitting.`);
+                this.actionsApi.quitGame();
+            }
+
+            // Mission logic every 3 ticks
+            if (this.gameApi.getCurrentTick() % 3 === 0) {
+                this.missionController.onAiUpdate(game, this.actionsApi, myPlayer, this.matchAwareness);
+            }
+
+            const unitTypeRequests = this.missionController.getRequestedUnitTypes();
+
+            // Build logic.
+            this.queueController.onAiUpdate(
+                game,
+                this.productionApi,
+                this.actionsApi,
+                myPlayer,
+                threatCache,
+                unitTypeRequests,
+                (message) => this.logBotStatus(message),
+            );
+        }
+    }
+
+    private getHumanTimestamp(game: GameApi) {
+        return formatTimeDuration(game.getCurrentTick() / NATURAL_TICK_RATE);
+    }
+
+    private logBotStatus(message: string, sayInGame: boolean = false) {
+        if (!this.enableLogging) {
+            return;
+        }
+        this.logger.info(message);
+        if (sayInGame) {
+            const timestamp = this.getHumanTimestamp(this.gameApi);
+            this.actionsApi.sayAll(`${timestamp}: ${message}`);
+        }
+    }
+
+    private updateDebugState(game: GameApi) {
+        if (!this.getDebugMode()) {
+            return;
+        }
+        // Update the global debug text.
+        const myPlayer = game.getPlayerData(this.name);
+        const harvesters = game.getVisibleUnits(this.name, "self", (r) => r.harvester).length;
+
+        let globalDebugText = `Cash: ${myPlayer.credits} | Harvesters: ${harvesters}\n`;
+        globalDebugText += this.queueController.getGlobalDebugText(this.gameApi, this.productionApi);
+        globalDebugText += this.missionController.getGlobalDebugText(this.gameApi);
+        globalDebugText += this.matchAwareness?.getGlobalDebugText();
+
+        this.missionController.updateDebugText(this.actionsApi);
+
+        // Tag enemy units with IDs
+        game.getVisibleUnits(this.name, "enemy").forEach((unitId) => {
+            this.actionsApi.setUnitDebugText(unitId, unitId.toString());
+        });
+
+        this.actionsApi.setGlobalDebugText(globalDebugText);
+    }
+
+    override onGameEvent(ev: ApiEvent) {
+        switch (ev.type) {
+            case ApiEventType.ObjectDestroy: {
+                // Add to the stalemate detection.
+                if (ev.attackerInfo?.playerName == this.name) {
+                    this.tickOfLastAttackOrder += (this.gameApi.getCurrentTick() - this.tickOfLastAttackOrder) / 2;
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+}