@supalosa/chronodivide-bot 0.4.0 → 0.5.1

package/dist/exampleBot.js

@@ -1,3 +1,4 @@
+import "dotenv/config";
 import { cdapi } from "@chronodivide/game-api";
 import { SupalosaBot } from "./bot/bot.js";
 async function main() {
@@ -14,6 +15,19 @@ async function main() {
     
     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
@@ -38,35 +52,48 @@ async function main() {
     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(firstBotName, "Americans"), { name: secondBotName, country: "French" }],
+        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 debugBot = new SupalosaBot(secondBotName, "Russians", [secondBotName], true);
-    debugBot.setDebugMode(true);
-    const offlineSettings = {
+    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),
-            debugBot,
+            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({
-        ...offlineSettings,
-        buildOffAlly: false,
-        cratesAppear: false,
-        credits: 10000,
-        gameMode: cdapi.getAvailableGameModes(mapName)[0],
-        gameSpeed: 6,
-        mapName,
-        mcvRepacks: true,
-        shortGame: true,
-        superWeapons: false,
-        unitCount: 0,
-    });
+    const game = await cdapi.createGame(process.env.ONLINE_MATCH ? onlineSettings : offlineSettings1v1);
     while (!game.isFinished()) {
         await game.update();
     }

package/dist/exampleBot.js.map

@@ -1 +1 @@
-{"version":3,"file":"exampleBot.js","sourceRoot":"","sources":["../src/exampleBot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,KAAK,UAAU,IAAI;IACf;;;;;;;;;;;;;MAaE;IACF,MAAM,OAAO,GAAG,YAAY,CAAC;IAC7B,0CAA0C;IAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,MAAM,SAAS,EAAE,CAAC;IACvC,MAAM,aAAa,GAAG,MAAM,SAAS,EAAE,CAAC;IACxC,MAAM,YAAY,GAAG,OAAO,SAAS,EAAE,CAAC;IACxC,MAAM,aAAa,GAAG,UAAU,SAAS,EAAE,CAAC;IAE5C,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;IAE9C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,UAAW,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,UAAW,CAAC,CAAC;IAEtD;;;;;;;;;;;;MAYE;IAEF,MAAM,cAAc,GAAG;QACnB,MAAM,EAAE,IAAY;QACpB,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAW;QAClC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAW;QAClC,MAAM,EAAE,CAAC,IAAI,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,CAG9F;KACJ,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,UAAU,EAAE,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACnF,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,eAAe,GAAG;QACpB,MAAM,EAAE;YACJ,IAAI,WAAW,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC;YAC9D,QAAQ;YACR,IAAI,WAAW,CAAC,YAAY,EAAE,UAAU,EAAE,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC;YACjE,IAAI,WAAW,CAAC,aAAa,EAAE,QAAQ,EAAE,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC;SAClE;KACJ,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;QAChC,GAAG,eAAe;QAClB,YAAY,EAAE,KAAK;QACnB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACjD,SAAS,EAAE,CAAC;QACZ,OAAO;QACP,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,IAAI;QACf,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,CAAC;KACf,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE;QACvB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;KACvB;IAED,IAAI,CAAC,UAAU,EAAE,CAAC;IAClB,IAAI,CAAC,OAAO,EAAE,CAAC;AACnB,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"exampleBot.js","sourceRoot":"","sources":["../src/exampleBot.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@supalosa/chronodivide-bot",
-    "version": "0.4.0",
+    "version": "0.5.1",
     "description": "Example bot for Chrono Divide",
     "repository": "https://github.com/Supalosa/supalosa-chronodivide-bot",
     "main": "dist/exampleBot.js",
@@ -13,16 +13,17 @@
     },
     "license": "UNLICENSED",
     "devDependencies": {
-        "@chronodivide/game-api": "^0.49.0",
+        "@chronodivide/game-api": "^0.50.1",
         "@types/node": "^14.17.32",
         "prettier": "3.0.3",
         "typescript": "^4.3.5"
     },
     "peerDependencies": {
-        "@chronodivide/game-api": "^0.49.0"
+        "@chronodivide/game-api": "^0.50.1"
     },
     "dependencies": {
         "@datastructures-js/priority-queue": "^6.3.0",
-        "@timohausmann/quadtree-ts": "2.2.2"
+        "@timohausmann/quadtree-ts": "2.2.2",
+        "dotenv": "^16.3.1"
     }
 }

package/src/bot/bot.ts

@@ -1,19 +1,9 @@
-import {
-    ApiEventType,
-    Bot,
-    GameApi,
-    ApiEvent,
-    QueueStatus,
-    ObjectType,
-    FactoryType,
-    Size,
-} from "@chronodivide/game-api";
+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 { SquadController } from "./logic/squad/squadController.js";
-import { QUEUES, QueueController, queueTypeToName } from "./logic/building/queueController.js";
+import { QueueController } from "./logic/building/queueController.js";
 import { MatchAwareness, MatchAwarenessImpl } from "./logic/awareness.js";
 import { formatTimeDuration } from "./logic/common/utils.js";
 
@@ -27,7 +17,6 @@ export class SupalosaBot extends Bot {
     private tickRatio?: number;
     private knownMapBounds: Size | undefined;
     private missionController: MissionController;
-    private squadController: SquadController;
     private queueController: QueueController;
     private tickOfLastAttackOrder: number = 0;
 
@@ -41,7 +30,6 @@ export class SupalosaBot extends Bot {
     ) {
         super(name, country);
         this.missionController = new MissionController((message, sayInGame) => this.logBotStatus(message, sayInGame));
-        this.squadController = new SquadController((message, sayInGame) => this.logBotStatus(message, sayInGame));
         this.queueController = new QueueController();
     }
 
@@ -105,6 +93,13 @@ export class SupalosaBot extends Bot {
                 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,
@@ -112,18 +107,9 @@ export class SupalosaBot extends Bot {
                 this.actionsApi,
                 myPlayer,
                 threatCache,
+                unitTypeRequests,
                 (message) => this.logBotStatus(message),
             );
-
-            // Mission logic every 6 ticks
-            if (this.gameApi.getCurrentTick() % 6 === 0) {
-                this.missionController.onAiUpdate(game, myPlayer, this.matchAwareness, this.squadController);
-            }
-
-            // Squad logic every 3 ticks
-            if (this.gameApi.getCurrentTick() % 3 === 0) {
-                this.squadController.onAiUpdate(game, this.actionsApi, myPlayer, this.matchAwareness);
-            }
         }
     }
 
@@ -146,31 +132,19 @@ export class SupalosaBot extends Bot {
         if (!this.getDebugMode()) {
             return;
         }
-
+        // Update the global debug text.
         const myPlayer = game.getPlayerData(this.name);
-        const queueState = QUEUES.reduce((prev, queueType) => {
-            if (this.productionApi.getQueueData(queueType).size === 0) {
-                return prev;
-            }
-            const paused = this.productionApi.getQueueData(queueType).status === QueueStatus.OnHold;
-            return (
-                prev +
-                " [" +
-                queueTypeToName(queueType) +
-                (paused ? " PAUSED" : "") +
-                ": " +
-                this.productionApi.getQueueData(queueType).items.map((item) => item.rules.name + "x" + item.quantity) +
-                "]"
-            );
-        }, "");
-        let globalDebugText = `Cash: ${myPlayer.credits} | Queues: ${queueState}\n`;
         const harvesters = game.getVisibleUnits(this.name, "self", (r) => r.harvester).length;
-        globalDebugText += `Harvesters: ${harvesters}\n`;
-        globalDebugText += this.squadController.debugSquads(this.gameApi, this.actionsApi);
-        this.missionController.logDebugOutput();
+
+        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, "hostile").forEach((unitId) => {
+        game.getVisibleUnits(this.name, "enemy").forEach((unitId) => {
             this.actionsApi.setUnitDebugText(unitId, unitId.toString());
         });
 

package/src/bot/logic/awareness.ts

@@ -1,4 +1,4 @@
-import { GameApi, ObjectType, PlayerData, UnitData, Vector2 } from "@chronodivide/game-api";
+import { GameApi, GameObjectData, ObjectType, PlayerData, UnitData, Vector2 } from "@chronodivide/game-api";
 import { SectorCache } from "./map/sector";
 import { GlobalThreat } from "./threat/threat";
 import { calculateGlobalThreat } from "./threat/threatCalculator.js";
@@ -23,10 +23,15 @@ export interface MatchAwareness {
     getSectorCache(): SectorCache;
 
     /**
-     * Returns the enemy unit IDs in a certain radius of a point
+     * Returns the enemy unit IDs in a certain radius of a point.
+     * Warning: this may return non-combatant hostiles, such as neutral units.
      */
     getHostilesNearPoint2d(point: Vector2, radius: number): UnitPositionQuery[];
 
+    /**
+     * Returns the enemy unit IDs in a certain radius of a point.
+     * Warning: this may return non-combatant hostiles, such as neutral units.
+     */
     getHostilesNearPoint(x: number, y: number, radius: number): UnitPositionQuery[];
 
     /**
@@ -49,6 +54,8 @@ export interface MatchAwareness {
     shouldAttack(): boolean;
 
     getScoutingManager(): ScoutingManager;
+
+    getGlobalDebugText(): string | undefined;
 }
 
 const SECTORS_TO_UPDATE_PER_CYCLE = 8;
@@ -59,7 +66,7 @@ const THREAT_UPDATE_INTERVAL_TICKS = 30;
 
 type QTUnit = Circle<number>;
 
-const rebuildQuadtree = (quadtree: Quadtree<QTUnit>, units: UnitData[]) => {
+const rebuildQuadtree = (quadtree: Quadtree<QTUnit>, units: GameObjectData[]) => {
     quadtree.clear();
     units.forEach((unit) => {
         quadtree.insert(new Circle<number>({ x: unit.tile.rx, y: unit.tile.ry, r: 1, data: unit.id }));
@@ -91,7 +98,7 @@ export class MatchAwarenessImpl implements MatchAwareness {
         const intersections = this.hostileQuadTree.retrieve(new Circle({ x: searchX, y: searchY, r: radius }));
         return intersections
             .map(({ x, y, data: unitId }) => ({ x, y, unitId: unitId! }))
-            .filter(({ x, y }) => getDistanceBetweenPoints(new Vector2(x, y), new Vector2(searchX, searchY)) <= radius)
+            .filter(({ x, y }) => new Vector2(x, y).distanceTo(new Vector2(searchX, searchY)) <= radius)
             .filter(({ unitId }) => !!unitId);
     }
 
@@ -160,11 +167,14 @@ export class MatchAwarenessImpl implements MatchAwareness {
             .map((other) => other.name);
 
         // Build the quadtree, if this is too slow we should consider doing this periodically.
-        const hostileUnitIds = game.getVisibleUnits(playerData.name, "hostile");
+        const hostileUnitIds = game.getVisibleUnits(playerData.name, "enemy");
         try {
             const hostileUnits = hostileUnitIds
-                .map((id) => game.getUnitData(id))
-                .filter((unit) => this.isHostileUnit(unit, hostilePlayerNames)) as UnitData[];
+                .map((id) => game.getGameObjectData(id))
+                .filter(
+                    (gameObjectData: GameObjectData | undefined): gameObjectData is GameObjectData =>
+                        gameObjectData !== undefined,
+                );
 
             rebuildQuadtree(this.hostileQuadTree, hostileUnits);
         } catch (err) {
@@ -178,21 +188,6 @@ export class MatchAwarenessImpl implements MatchAwareness {
                 this.logger(`${Math.round(visibility * 1000.0) / 10}% of tiles visible. Calculating threat.`);
                 // Update the global threat cache
                 this.threatCache = calculateGlobalThreat(game, playerData, visibility);
-                this.logger(
-                    `Threat LAND: Them ${Math.round(this.threatCache.totalOffensiveLandThreat)}, us: ${Math.round(
-                        this.threatCache.totalAvailableAntiGroundFirepower,
-                    )}.`,
-                );
-                this.logger(
-                    `Threat DEFENSIVE: Them ${Math.round(this.threatCache.totalDefensiveThreat)}, us: ${Math.round(
-                        this.threatCache.totalDefensivePower,
-                    )}.`,
-                );
-                this.logger(
-                    `Threat AIR: Them ${Math.round(this.threatCache.totalOffensiveAirThreat)}, us: ${Math.round(
-                        this.threatCache.totalAvailableAntiAirFirepower,
-                    )}.`,
-                );
 
                 // As the game approaches 2 hours, be more willing to attack. (15 ticks per second)
                 const gameLengthFactor = Math.max(0, 1.0 - game.getCurrentTick() / (15 * 7200.0));
@@ -230,4 +225,21 @@ export class MatchAwarenessImpl implements MatchAwareness {
             );
         }
     }
+
+    public getGlobalDebugText(): string | undefined {
+        if (!this.threatCache) {
+            return undefined;
+        }
+        return (
+            `Threat LAND: Them ${Math.round(this.threatCache.totalOffensiveLandThreat)}, us: ${Math.round(
+                this.threatCache.totalAvailableAntiGroundFirepower,
+            )}.\n` +
+            `Threat DEFENSIVE: Them ${Math.round(this.threatCache.totalDefensiveThreat)}, us: ${Math.round(
+                this.threatCache.totalDefensivePower,
+            )}.\n` +
+            `Threat AIR: Them ${Math.round(this.threatCache.totalOffensiveAirThreat)}, us: ${Math.round(
+                this.threatCache.totalAvailableAntiAirFirepower,
+            )}.`
+        );
+    }
 }

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

@@ -0,0 +1,64 @@
+import { GameApi, PlayerData, TechnoRules, Vector2 } from "@chronodivide/game-api";
+import { getPointTowardsOtherPoint } from "../map/map.js";
+import { GlobalThreat } from "../threat/threat.js";
+import { AiBuildingRules, getDefaultPlacementLocation, numBuildingsOwnedOfType } from "./buildingRules.js";
+
+export class AntiAirStaticDefence implements AiBuildingRules {
+    constructor(
+        private basePriority: number,
+        private baseAmount: number,
+        private airStrength: number,
+    ) {}
+
+    getPlacementLocation(
+        game: GameApi,
+        playerData: PlayerData,
+        technoRules: TechnoRules,
+    ): { rx: number; ry: number } | undefined {
+        // Prefer front towards enemy.
+        let startLocation = playerData.startLocation;
+        let players = game.getPlayers();
+        let enemyFacingLocationCandidates: Vector2[] = [];
+        for (let i = 0; i < players.length; ++i) {
+            let playerName = players[i];
+            if (playerName == playerData.name) {
+                continue;
+            }
+            let enemyPlayer = game.getPlayerData(playerName);
+            enemyFacingLocationCandidates.push(
+                getPointTowardsOtherPoint(game, startLocation, enemyPlayer.startLocation, 4, 16, 1.5),
+            );
+        }
+        let selectedLocation =
+            enemyFacingLocationCandidates[Math.floor(game.generateRandom() * enemyFacingLocationCandidates.length)];
+        return getDefaultPlacementLocation(game, playerData, selectedLocation, technoRules, false, 0);
+    }
+
+    getPriority(
+        game: GameApi,
+        playerData: PlayerData,
+        technoRules: TechnoRules,
+        threatCache: GlobalThreat | null,
+    ): number {
+        if (threatCache) {
+            let denominator = threatCache.totalAvailableAntiAirFirepower + this.airStrength;
+            if (threatCache.totalOffensiveAirThreat > denominator * 1.1) {
+                return this.basePriority * (threatCache.totalOffensiveAirThreat / Math.max(1, denominator));
+            } else {
+                return 0;
+            }
+        }
+        const strengthPerCost = (this.airStrength / technoRules.cost) * 1000;
+        const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
+        return this.basePriority * (1.0 - numOwned / this.baseAmount) * strengthPerCost;
+    }
+
+    getMaxCount(
+        game: GameApi,
+        playerData: PlayerData,
+        technoRules: TechnoRules,
+        threatCache: GlobalThreat | null,
+    ): number | null {
+        return null;
+    }
+}

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

@@ -2,12 +2,13 @@ import { GameApi, PlayerData, TechnoRules, Vector2 } from "@chronodivide/game-ap
 import { getPointTowardsOtherPoint } from "../map/map.js";
 import { GlobalThreat } from "../threat/threat.js";
 import { AiBuildingRules, getDefaultPlacementLocation, numBuildingsOwnedOfType } from "./buildingRules.js";
+import { getStaticDefencePlacement } from "./common.js";
 
 export class AntiGroundStaticDefence implements AiBuildingRules {
     constructor(
         private basePriority: number,
         private baseAmount: number,
-        private strength: number,
+        private groundStrength: number,
     ) {}
 
     getPlacementLocation(
@@ -15,23 +16,7 @@ export class AntiGroundStaticDefence implements AiBuildingRules {
         playerData: PlayerData,
         technoRules: TechnoRules,
     ): { rx: number; ry: number } | undefined {
-        // Prefer front towards enemy.
-        let startLocation = playerData.startLocation;
-        let players = game.getPlayers();
-        let enemyFacingLocationCandidates: Vector2[] = [];
-        for (let i = 0; i < players.length; ++i) {
-            let playerName = players[i];
-            if (playerName == playerData.name) {
-                continue;
-            }
-            let enemyPlayer = game.getPlayerData(playerName);
-            enemyFacingLocationCandidates.push(
-                getPointTowardsOtherPoint(game, startLocation, enemyPlayer.startLocation, 4, 16, 1.5),
-            );
-        }
-        let selectedLocation =
-            enemyFacingLocationCandidates[Math.floor(game.generateRandom() * enemyFacingLocationCandidates.length)];
-        return getDefaultPlacementLocation(game, playerData, selectedLocation, technoRules, false, 0);
+        return getStaticDefencePlacement(game, playerData, technoRules);
     }
 
     getPriority(
@@ -43,12 +28,14 @@ export class AntiGroundStaticDefence implements AiBuildingRules {
         // If the enemy's ground power is increasing we should try to keep up.
         if (threatCache) {
             let denominator =
-                threatCache.totalAvailableAntiGroundFirepower + threatCache.totalDefensivePower + this.strength;
+                threatCache.totalAvailableAntiGroundFirepower + threatCache.totalDefensivePower + this.groundStrength;
             if (threatCache.totalOffensiveLandThreat > denominator * 1.1) {
                 return this.basePriority * (threatCache.totalOffensiveLandThreat / Math.max(1, denominator));
+            } else {
+                return 0;
             }
         }
-        const strengthPerCost = (this.strength / technoRules.cost) * 1000;
+        const strengthPerCost = (this.groundStrength / technoRules.cost) * 1000;
         const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
         return this.basePriority * (1.0 - numOwned / this.baseAmount) * strengthPerCost;
     }

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

@@ -24,34 +24,8 @@ export class ArtilleryUnit implements AiBuildingRules {
         technoRules: TechnoRules,
         threatCache: GlobalThreat | null,
     ): number {
-        const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
-        let priority = this.basePriority;
-        // If the enemy's defensive power is increasing we will start to build these.
-        if (threatCache && threatCache.totalDefensivePower > threatCache.totalAvailableAntiGroundFirepower) {
-            priority +=
-                this.artilleryPower *
-                (threatCache.totalAvailableAntiGroundFirepower / Math.max(1, threatCache.totalDefensivePower));
-        }
-        if (threatCache && this.antiGroundPower > 0) {
-            // If the enemy's power is increasing we should try to keep up.
-            if (threatCache.totalOffensiveLandThreat > threatCache.totalAvailableAntiGroundFirepower) {
-                priority +=
-                    this.antiGroundPower *
-                    this.basePriority *
-                    (threatCache.totalOffensiveLandThreat / Math.max(1, threatCache.totalAvailableAntiGroundFirepower));
-            } else {
-                // But also, if our power dwarfs the enemy, keep pressing the advantage.
-                priority +=
-                    (this.antiGroundPower *
-                        this.basePriority *
-                        GameMath.sqrt(
-                            threatCache.totalAvailableAntiGroundFirepower /
-                                Math.max(1, threatCache.totalOffensiveLandThreat + threatCache.totalDefensiveThreat),
-                        )) /
-                    (numOwned + 1);
-            }
-        }
-        return priority * (1.0 - numOwned / this.baseAmount);
+        // Units aren't built automatically, but are instead requested by missions.
+        return 0;
     }
 
     getMaxCount(

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

@@ -24,39 +24,8 @@ export class BasicAirUnit implements AiBuildingRules {
         technoRules: TechnoRules,
         threatCache: GlobalThreat | null,
     ): number {
-        // If the enemy's anti-air power is low we might build more.
-        if (threatCache) {
-            let priority = 0;
-            if (
-                this.antiGroundPower > 0 &&
-                threatCache.totalOffensiveLandThreat > threatCache.totalAvailableAntiGroundFirepower
-            ) {
-                priority +=
-                    this.basePriority *
-                    (threatCache.totalOffensiveLandThreat / Math.max(1, threatCache.totalAvailableAntiGroundFirepower));
-            }
-            if (
-                this.antiAirPower > 0 &&
-                threatCache.totalOffensiveAirThreat > threatCache.totalAvailableAntiAirFirepower
-            ) {
-                priority +=
-                    this.basePriority *
-                    (threatCache.totalOffensiveAirThreat / Math.max(1, threatCache.totalAvailableAntiAirFirepower));
-            }
-            // sqrt so we don't build too much of one unit type.
-            priority += Math.min(
-                1.0,
-                Math.max(
-                    1,
-                    GameMath.sqrt(
-                        threatCache.totalAvailableAirPower / Math.max(1, threatCache.totalOffensiveAntiAirThreat),
-                    ),
-                ),
-            );
-            return this.baseAmount * priority;
-        }
-        const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
-        return this.basePriority * (1.0 - numOwned / this.baseAmount);
+        // Units aren't built automatically, but are instead requested by missions.
+        return 0;
     }
 
     getMaxCount(

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

@@ -6,13 +6,13 @@ export class BasicBuilding implements AiBuildingRules {
     constructor(
         protected basePriority: number,
         protected maxNeeded: number,
-        protected onlyBuildWhenFloatingCreditsAmount?: number
+        protected onlyBuildWhenFloatingCreditsAmount?: number,
     ) {}
 
     getPlacementLocation(
         game: GameApi,
         playerData: PlayerData,
-        technoRules: TechnoRules
+        technoRules: TechnoRules,
     ): { rx: number; ry: number } | undefined {
         return getDefaultPlacementLocation(game, playerData, playerData.startLocation, technoRules);
     }
@@ -21,7 +21,7 @@ export class BasicBuilding implements AiBuildingRules {
         game: GameApi,
         playerData: PlayerData,
         technoRules: TechnoRules,
-        threatCache: GlobalThreat | null
+        threatCache: GlobalThreat | null,
     ): number {
         const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
         const calcMaxCount = this.getMaxCount(game, playerData, technoRules, threatCache);
@@ -29,18 +29,20 @@ export class BasicBuilding implements AiBuildingRules {
             return -100;
         }
 
+        const priority = this.basePriority * (1.0 - numOwned / this.maxNeeded);
+
         if (this.onlyBuildWhenFloatingCreditsAmount && playerData.credits < this.onlyBuildWhenFloatingCreditsAmount) {
-            return -100;
+            return priority * (playerData.credits / this.onlyBuildWhenFloatingCreditsAmount);
         }
 
-        return this.basePriority * (1.0 - numOwned / this.maxNeeded);
+        return priority;
     }
 
     getMaxCount(
         game: GameApi,
         playerData: PlayerData,
         technoRules: TechnoRules,
-        threatCache: GlobalThreat | null
+        threatCache: GlobalThreat | null,
     ): number | null {
         return this.maxNeeded;
     }

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

@@ -24,52 +24,8 @@ export class BasicGroundUnit implements AiBuildingRules {
         technoRules: TechnoRules,
         threatCache: GlobalThreat | null,
     ): number {
-        const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
-        if (threatCache) {
-            let priority = this.basePriority;
-            if (this.antiGroundPower > 0) {
-                // If the enemy's power is increasing we should try to keep up.
-                if (threatCache.totalOffensiveLandThreat > threatCache.totalAvailableAntiGroundFirepower) {
-                    priority +=
-                        this.antiGroundPower *
-                        this.basePriority *
-                        (threatCache.totalOffensiveLandThreat /
-                            Math.max(1, threatCache.totalAvailableAntiGroundFirepower));
-                } else {
-                    // But also, if our power dwarfs the enemy, keep pressing the advantage.
-                    priority +=
-                        (this.antiGroundPower *
-                            this.basePriority *
-                            GameMath.sqrt(
-                                threatCache.totalAvailableAntiGroundFirepower /
-                                    Math.max(
-                                        1,
-                                        threatCache.totalOffensiveLandThreat + threatCache.totalDefensiveThreat,
-                                    ),
-                            )) /
-                        (numOwned + 1);
-                }
-            }
-            if (this.antiAirPower > 0) {
-                if (threatCache.totalOffensiveAirThreat > threatCache.totalAvailableAntiAirFirepower) {
-                    priority +=
-                        this.antiAirPower *
-                        this.basePriority *
-                        (threatCache.totalOffensiveAirThreat / Math.max(1, threatCache.totalAvailableAntiAirFirepower));
-                } else {
-                    priority +=
-                        (this.antiAirPower *
-                            this.basePriority *
-                            GameMath.sqrt(
-                                threatCache.totalAvailableAntiAirFirepower /
-                                    Math.max(1, threatCache.totalOffensiveAirThreat + threatCache.totalDefensiveThreat),
-                            )) /
-                        (numOwned + 1);
-                }
-            }
-            return priority;
-        }
-        return this.basePriority * (1.0 - numOwned / this.baseAmount);
+        // Units aren't built automatically, but are instead requested by missions.
+        return 0;
     }
 
     getMaxCount(