@supalosa/chronodivide-bot 0.3.1 → 0.5.1

package/src/bot/logic/threat/threatCalculator.ts

@@ -4,25 +4,25 @@ import { GlobalThreat } from "./threat.js";
 export function calculateGlobalThreat(game: GameApi, playerData: PlayerData, visibleAreaPercent: number): GlobalThreat {
     let groundUnits = game.getVisibleUnits(
         playerData.name,
-        "hostile",
+        "enemy",
         (r) => r.type == ObjectType.Vehicle || r.type == ObjectType.Infantry,
     );
-    let airUnits = game.getVisibleUnits(playerData.name, "hostile", (r) => r.movementZone == MovementZone.Fly);
+    let airUnits = game.getVisibleUnits(playerData.name, "enemy", (r) => r.movementZone == MovementZone.Fly);
     let groundDefence = game
-        .getVisibleUnits(playerData.name, "hostile", (r) => r.type == ObjectType.Building)
+        .getVisibleUnits(playerData.name, "enemy", (r) => r.type == ObjectType.Building)
         .filter((unitId) => isAntiGround(game, unitId));
     let antiAirPower = game
-        .getVisibleUnits(playerData.name, "hostile", (r) => r.type != ObjectType.Building)
+        .getVisibleUnits(playerData.name, "enemy", (r) => r.type != ObjectType.Building)
         .filter((unitId) => isAntiAir(game, unitId));
 
     let ourAntiGroundUnits = game
         .getVisibleUnits(playerData.name, "self", (r) => r.isSelectableCombatant)
         .filter((unitId) => isAntiGround(game, unitId));
     let ourAntiAirUnits = game
-        .getVisibleUnits(playerData.name, "self", (r) => r.isSelectableCombatant)
+        .getVisibleUnits(playerData.name, "self", (r) => r.isSelectableCombatant || r.type === ObjectType.Building)
         .filter((unitId) => isAntiAir(game, unitId));
     let ourGroundDefence = game
-        .getVisibleUnits(playerData.name, "self", (r) => r.type == ObjectType.Building)
+        .getVisibleUnits(playerData.name, "self", (r) => r.type === ObjectType.Building)
         .filter((unitId) => isAntiGround(game, unitId));
     let ourAirUnits = game.getVisibleUnits(
         playerData.name,
@@ -45,8 +45,8 @@ export function calculateGlobalThreat(game: GameApi, playerData: PlayerData, vis
         observedGroundThreat,
         observedAirThreat,
         observedAntiAirThreat,
-        observedGroundDefence * 0.25,
-        ourGroundDefencePower * 0.25,
+        observedGroundDefence,
+        ourGroundDefencePower,
         ourAntiGroundPower,
         ourAntiAirPower,
         ourAirPower,
@@ -76,14 +76,14 @@ function calculateFirepowerForUnit(unitData: UnitData): number {
         threat +=
             (hpRatio *
                 ((unitData.primaryWeapon.rules.damage + 1) * GameMath.sqrt(unitData.primaryWeapon.rules.range + 1))) /
-            Math.max(unitData.primaryWeapon.cooldownTicks, 1);
+            Math.max(unitData.primaryWeapon.rules.rof, 1);
     }
     if (unitData.secondaryWeapon) {
         threat +=
             (hpRatio *
                 ((unitData.secondaryWeapon.rules.damage + 1) *
                     GameMath.sqrt(unitData.secondaryWeapon.rules.range + 1))) /
-            Math.max(unitData.secondaryWeapon.cooldownTicks, 1);
+            Math.max(unitData.secondaryWeapon.rules.rof, 1);
     }
     return Math.min(800, threat);
 }

package/src/exampleBot.ts

@@ -1,5 +1,7 @@
-import { Agent, Bot, cdapi } from "@chronodivide/game-api";
+import "dotenv/config";
+import { Agent, Bot, CreateBaseOpts, CreateOfflineOpts, CreateOnlineOpts, cdapi } from "@chronodivide/game-api";
 import { SupalosaBot } from "./bot/bot.js";
+import { off } from "process";
 
 async function main() {
     /*
@@ -8,18 +10,34 @@ async function main() {
     CDR2            1v1             4_country_swing_le_v2.map
     CDR2            1v1             mp01t4.map, large map, oil derricks
     CDR2            1v1             tn04t2.map, small map
-    CDR2            1v1             mp10s4.map <- depth charge, naval map (not supported)
+    CDR2            1v1             mp10s4.map <- depth charge, naval map (not supported). Cramped in position 1.
     CDR2            1v1             heckcorners.map
     CDR2            1v1             4_montana_dmz_le.map
     CDR2            1v1             barrel.map
     
     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 = "mp10s4.map";
+    const mapName = "mp03t4.map";
     // Bot names must be unique in online mode
-    const botName = `Joe${String(Date.now()).substr(-6)}`;
-    const otherBotName = `Bob${String(Date.now() + 1).substr(-6)}`;
+    const timestamp = String(Date.now()).substr(-6);
+    const firstBotName = `Joe${timestamp}`;
+    const secondBotName = `Bob${timestamp}`;
+    const thirdBotName = `Mike${timestamp}`;
+    const fourthBotName = `Charlie${timestamp}`;
 
     await cdapi.init(process.env.MIX_DIR || "./");
 
@@ -40,19 +58,7 @@ async function main() {
     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" }] as [Bot, ...Agent[]],
-    };
-
-    const offlineSettings = {
-        agents: [new SupalosaBot(botName, "French", false), new SupalosaBot(otherBotName, "Russians", true)],
-    };
-
-    const game = await cdapi.createGame({
-        ...offlineSettings,
+    const baseSettings: CreateBaseOpts = {
         buildOffAlly: false,
         cratesAppear: false,
         credits: 10000,
@@ -63,7 +69,41 @@ async function main() {
         shortGame: true,
         superWeapons: false,
         unitCount: 0,
-    });
+    };
+
+    const onlineSettings: CreateOnlineOpts = {
+        ...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" },
+        ] as [Bot, ...Agent[]],
+        botPassword: process.env.ONLINE_BOT_PASSWORD ?? "default",
+    };
+
+    const offlineSettings1v1: CreateOfflineOpts = {
+        ...baseSettings,
+        online: false,
+        agents: [
+            new SupalosaBot(firstBotName, "French", [], true).setDebugMode(true),
+            new SupalosaBot(secondBotName, "Russians", [], false),
+        ],
+    };
+
+    const offlineSettings2v2: CreateOfflineOpts = {
+        ...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()) {
         await game.update();
     }

package/.prettierrc

@@ -1,5 +0,0 @@
-{
-    "tabWidth": 4,
-    "useTabs": false,
-    "printWidth": 120
-}

package/TODO.md

@@ -1,18 +0,0 @@
-# TODO for Supabot
-
-Urgent
-
--   maybe not spam move commands for scouting and attacking missions
--   don't spam repair
--   handle multiple opponents or allies
--   leader pathfinding
-
-Medium priority
-
--   detect naval map (can scan tiles to check if more of the map is water or not)
--   handle naval construction
--   detect islands and implement island-hopping
-
-Not urgent
-
--   Remove squad paradigm, all unit-related for mission can just go into the mission.

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

@@ -1 +0,0 @@
-{"version":3,"file":"artilleryUnit.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/artilleryUnit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAA2B,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAmB,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,OAAO,aAAa;IACtB,YACY,YAAoB,EACpB,cAAsB,EACtB,eAAuB,EACvB,UAAkB;QAHlB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,mBAAc,GAAd,cAAc,CAAQ;QACtB,oBAAe,GAAf,eAAe,CAAQ;QACvB,eAAU,GAAV,UAAU,CAAQ;IAC3B,CAAC;IAEJ,oBAAoB,CAChB,IAAa,EACb,UAAsB,EACtB,WAAwB;QAExB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACxE,IAAI,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC;QACjC,6EAA6E;QAC7E,IAAI,WAAW,IAAI,WAAW,CAAC,mBAAmB,GAAG,WAAW,CAAC,iCAAiC,EAAE;YAChG,QAAQ;gBACJ,IAAI,CAAC,cAAc;oBACnB,CAAC,WAAW,CAAC,iCAAiC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;SACtG;QACD,IAAI,WAAW,IAAI,IAAI,CAAC,eAAe,GAAG,CAAC,EAAE;YACzC,+DAA+D;YAC/D,IAAI,WAAW,CAAC,wBAAwB,GAAG,WAAW,CAAC,iCAAiC,EAAE;gBACtF,QAAQ;oBACJ,IAAI,CAAC,eAAe;wBACpB,IAAI,CAAC,YAAY;wBACjB,CAAC,WAAW,CAAC,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,iCAAiC,CAAC,CAAC,CAAC;aAC3G;iBAAM;gBACH,wEAAwE;gBACxE,QAAQ;oBACJ,CAAC,IAAI,CAAC,eAAe;wBACjB,IAAI,CAAC,YAAY;wBACjB,QAAQ,CAAC,IAAI,CACT,WAAW,CAAC,iCAAiC;4BACzC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,wBAAwB,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAC3F,CAAC;wBACN,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}

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

@@ -1,20 +0,0 @@
-import { numBuildingsOwnedOfType } from "./building.js";
-export class MassedAntiGroundUnit {
-    constructor(basePriority, baseAmount) {
-        this.basePriority = basePriority;
-        this.baseAmount = baseAmount;
-    }
-    getPlacementLocation(game, playerData, technoRules) {
-        return undefined;
-    }
-    getPriority(game, playerData, technoRules, threatCache) {
-        // If the enemy's ground power is increasing we should try to keep up.
-        if (threatCache) {
-            if (threatCache.totalAvailableAntiGroundFirepower * threatCache.certainty > threatCache.totalAvailableAntiGroundFirepower) {
-                return this.basePriority * (threatCache.totalAvailableAntiGroundFirepower / Math.max(1, threatCache.totalAvailableAntiGroundFirepower));
-            }
-        }
-        const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
-        return this.basePriority * (1.0 - (numOwned / this.baseAmount));
-    }
-}

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

@@ -1,19 +0,0 @@
-import { QueueType } from "@chronodivide/game-api";
-export const queueTypeToName = (queue) => {
-    switch (queue) {
-        case QueueType.Structures:
-            return "Structures";
-        case QueueType.Armory:
-            return "Armory";
-        case QueueType.Infantry:
-            return "Infantry";
-        case QueueType.Vehicles:
-            return "Vehicles";
-        case QueueType.Aircrafts:
-            return "Aircrafts";
-        case QueueType.Ships:
-            return "Ships";
-        default:
-            return "Unknown";
-    }
-};

package/dist/bot/logic/knowledge.js

@@ -1 +0,0 @@
-export {};

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

@@ -1,26 +0,0 @@
-// A basic mission requests specific units.
-export class BasicMission {
-    constructor(uniqueName, priority = 1, squads = []) {
-        this.uniqueName = uniqueName;
-        this.priority = priority;
-        this.squads = squads;
-    }
-    getUniqueName() {
-        return this.uniqueName;
-    }
-    isActive() {
-        return true;
-    }
-    removeSquad(squad) {
-        this.squads = this.squads.filter((s) => s != squad);
-    }
-    addSquad(squad) {
-        if (!this.squads.find((s) => s == squad)) {
-            this.squads.push(squad);
-        }
-    }
-    getSquads() {
-        return this.squads;
-    }
-    onSquadAdded(gameApi, playerData, threatData) { }
-}

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

@@ -1,32 +0,0 @@
-import { Mission, disbandMission, noop } from "./mission.js";
-import { SquadExpansion } from "../squad/behaviours/expansionSquad.js";
-import { Squad } from "../squad/squad.js";
-/**
- * A mission that tries to create an MCV (if it doesn't exist) and deploy it somewhere it can be deployed.
- */
-export class ExpansionMission extends Mission {
-    constructor(uniqueName, priority) {
-        super(uniqueName, priority);
-        this.hadSquad = false;
-    }
-    onAiUpdate(gameApi, playerData, threatData) {
-        if (this.getSquad() === null) {
-            if (!this.hadSquad) {
-                this.hadSquad = true;
-                return this.setSquad(new Squad(this.getUniqueName(), new SquadExpansion(), this));
-            }
-            else {
-                return disbandMission();
-            }
-        }
-        else {
-            return noop();
-        }
-    }
-}
-export class ExpansionMissionFactory {
-    maybeCreateMission(gameApi, playerData, threatData, existingMissions) {
-        // No auto-expansion missions.
-        return null;
-    }
-}

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

@@ -1,31 +0,0 @@
-import { OrderType, SideType } from "@chronodivide/game-api";
-import { disband, noop, requestUnits } from "../squadBehaviour.js";
-const DEPLOY_COOLDOWN_TICKS = 30;
-// Expansion or initial base.
-export class SquadExpansion {
-    constructor() {
-        this.hasAttemptedDeployWith = null;
-    }
-    onAiUpdate(gameApi, actionsApi, playerData, squad, threatData) {
-        let myMcvName = playerData.country?.side == SideType.GDI ? "AMCV" : "SMCV";
-        const mcvs = squad.getUnitsOfType(gameApi, myMcvName);
-        if (mcvs.length === 0) {
-            // Perhaps we deployed already (or the unit was destroyed), end the mission.
-            if (this.hasAttemptedDeployWith !== null) {
-                return disband();
-            }
-            // We need an mcv!
-            return requestUnits(myMcvName, 100);
-        }
-        else if (!this.hasAttemptedDeployWith ||
-            gameApi.getCurrentTick() > this.hasAttemptedDeployWith.gameTick + DEPLOY_COOLDOWN_TICKS) {
-            actionsApi.orderUnits(mcvs.map((mcv) => mcv.id), OrderType.DeploySelected);
-            // Add a cooldown to deploy attempts.
-            this.hasAttemptedDeployWith = {
-                unitId: mcvs[0].id,
-                gameTick: gameApi.getCurrentTick(),
-            };
-        }
-        return noop();
-    }
-}

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

@@ -1,8 +0,0 @@
-export class SquadScouters {
-    requestConstruction(gameApi, playerData, squad, threatData) {
-        return [];
-    }
-    onAiUpdate(gameApi, playerData, squad, threatData) {
-        return {};
-    }
-}