@supalosa/chronodivide-bot 0.4.0 → 0.5.2

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

@@ -0,0 +1,13 @@
+import { Mission } from "../mission.js";
+/**
+ * A mission that just delegates to the mission behaviour.
+ */
+export class BasicMission extends Mission {
+    constructor(uniqueName, behaviour, logger) {
+        super(uniqueName, behaviour, logger);
+    }
+    _onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, actionBatcher) {
+        return this.getBehaviour.onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, this, matchAwareness, this.logger);
+    }
+}
+//# sourceMappingURL=basicMission.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"basicMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/basicMission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAuC,MAAM,eAAe,CAAC;AAM7E;;GAEG;AACH,MAAM,OAAgB,YAAwD,SAAQ,OAAa;IAC/F,YAAY,UAAkB,EAAE,SAAY,EAAE,MAAmB;QAC7D,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,WAAW,CACP,OAAgB,EAChB,UAAsB,EACtB,UAAsB,EACtB,cAA8B,EAC9B,aAA4B;QAE5B,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAC/B,OAAO,EACP,UAAU,EACV,aAAa,EACb,UAAU,EACV,IAAI,EACJ,cAAc,EACd,IAAI,CAAC,MAAM,CACd,CAAC;IACN,CAAC;CACJ"}

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

@@ -1,40 +1,54 @@
 import { Vector2 } from "@chronodivide/game-api";
-import { Mission, disbandMission, noop } from "../mission.js";
-import { Squad } from "../../squad/squad.js";
-import { CombatSquad } from "../../squad/behaviours/combatSquad.js";
-import { RetreatMission } from "./retreatMission.js";
-export var DefenceFailReason;
-(function (DefenceFailReason) {
-    DefenceFailReason[DefenceFailReason["NoTargets"] = 0] = "NoTargets";
-})(DefenceFailReason || (DefenceFailReason = {}));
+import { Mission, grabCombatants, noop, releaseUnits } from "../mission.js";
+import { CombatSquad } from "./squads/combatSquad.js";
+import { isOwnedByNeutral } from "../../common/utils.js";
+export const MAX_PRIORITY = 100;
+export const PRIORITY_INCREASE_PER_TICK_RATIO = 1.025;
 /**
  * A mission that tries to defend a certain area.
  */
 export class DefenceMission extends Mission {
-    constructor(uniqueName, priority, defenceArea, radius, logger) {
-        super(uniqueName, priority, logger);
+    constructor(uniqueName, priority, rallyArea, defenceArea, radius, logger) {
+        super(uniqueName, logger);
+        this.priority = priority;
         this.defenceArea = defenceArea;
         this.radius = radius;
+        this.squad = new CombatSquad(rallyArea, defenceArea, radius);
     }
-    onAiUpdate(gameApi, playerData, matchAwareness) {
-        if (this.getSquad() === null && !this.combatSquad) {
-            this.combatSquad = new CombatSquad(matchAwareness.getMainRallyPoint(), this.defenceArea, this.radius);
-            return this.setSquad(new Squad("defenceSquad-" + this.getUniqueName(), this.combatSquad, this));
+    _onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, actionBatcher) {
+        // Dispatch missions.
+        const foundTargets = matchAwareness
+            .getHostilesNearPoint2d(this.defenceArea, this.radius)
+            .map((unit) => gameApi.getUnitData(unit.unitId))
+            .filter((unit) => !isOwnedByNeutral(unit));
+        const update = this.squad.onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, this, matchAwareness, this.logger);
+        if (update.type !== "noop") {
+            return update;
         }
-        else {
-            // Dispatch missions.
-            const foundTargets = matchAwareness.getHostilesNearPoint2d(this.defenceArea, this.radius);
-            if (foundTargets.length === 0) {
-                this.logger(`(Defence Mission ${this.getUniqueName()}): No targets found, disbanding.`);
-                return disbandMission(DefenceFailReason.NoTargets);
+        if (foundTargets.length === 0) {
+            this.priority = 0;
+            if (this.getUnitIds().length > 0) {
+                this.logger(`(Defence Mission ${this.getUniqueName()}): No targets found, releasing units.`);
+                return releaseUnits(this.getUnitIds());
             }
             else {
-                const targetUnit = gameApi.getUnitData(foundTargets[0].unitId);
-                this.logger(`(Defence Mission ${this.getUniqueName()}): Focused on target ${targetUnit?.name} (${foundTargets.length} found in area ${this.radius})`);
-                this.combatSquad?.setAttackArea(new Vector2(foundTargets[0].x, foundTargets[0].y));
+                return noop();
             }
         }
-        return noop();
+        else {
+            const targetUnit = foundTargets[0];
+            this.logger(`(Defence Mission ${this.getUniqueName()}): Focused on target ${targetUnit?.name} (${foundTargets.length} found in area ${this.radius})`);
+            this.squad.setAttackArea(new Vector2(foundTargets[0].tile.rx, foundTargets[0].tile.ry));
+            this.priority = MAX_PRIORITY; // Math.min(MAX_PRIORITY, this.priority * PRIORITY_INCREASE_PER_TICK_RATIO);
+            return grabCombatants(playerData.startLocation, this.priority);
+        }
+        //return requestUnits(["E1", "E2", "FV", "HTK", "MTNK", "HTNK"], this.priority);
+    }
+    getGlobalDebugText() {
+        return this.squad.getGlobalDebugText() ?? "<none>";
+    }
+    getPriority() {
+        return this.priority;
     }
 }
 const DEFENCE_CHECK_TICKS = 30;
@@ -55,12 +69,13 @@ export class DefenceMissionFactory {
         }
         this.lastDefenceCheckAt = gameApi.getCurrentTick();
         const defendableRadius = DEFENCE_STARTING_RADIUS + DEFENCE_RADIUS_INCREASE_PER_GAME_TICK * gameApi.getCurrentTick();
-        const enemiesNearSpawn = matchAwareness.getHostilesNearPoint2d(playerData.startLocation, defendableRadius);
+        const enemiesNearSpawn = matchAwareness
+            .getHostilesNearPoint2d(playerData.startLocation, defendableRadius)
+            .map((unit) => gameApi.getUnitData(unit.unitId))
+            .filter((unit) => !isOwnedByNeutral(unit));
         if (enemiesNearSpawn.length > 0) {
             logger(`Starting defence mission, ${enemiesNearSpawn.length} found in radius ${defendableRadius} (tick ${gameApi.getCurrentTick()})`);
-            missionController.addMission(new DefenceMission("globalDefence", 1000, playerData.startLocation, defendableRadius * 1.2, logger).then((reason, squad) => {
-                missionController.addMission(new RetreatMission("retreat-from-globalDefence" + gameApi.getCurrentTick(), 100, matchAwareness.getMainRallyPoint(), squad?.getUnitIds() ?? [], logger));
-            }));
+            missionController.addMission(new DefenceMission("globalDefence", 10, matchAwareness.getMainRallyPoint(), playerData.startLocation, defendableRadius * 1.2, logger));
         }
     }
     onMissionFailed(gameApi, playerData, matchAwareness, failedMission, failureReason, missionController) { }

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

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

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

@@ -1,11 +1,42 @@
-import { OneTimeMission } from "./oneTimeMission.js";
-import { EngineerSquad } from "../../squad/behaviours/engineerSquad.js";
+import { OrderType } from "@chronodivide/game-api";
+import { Mission, disbandMission, noop, requestUnits } from "../mission.js";
+const CAPTURE_COOLDOWN_TICKS = 30;
 /**
  * A mission that tries to send an engineer into a building (e.g. to capture tech building or repair bridge)
  */
-export class EngineerMission extends OneTimeMission {
-    constructor(uniqueName, priority, selectedTechBuilding, logger) {
-        super(uniqueName, priority, () => new EngineerSquad(selectedTechBuilding), logger);
+export class EngineerMission extends Mission {
+    constructor(uniqueName, priority, captureTargetId, logger) {
+        super(uniqueName, logger);
+        this.priority = priority;
+        this.captureTargetId = captureTargetId;
+        this.hasAttemptedCaptureWith = null;
+    }
+    _onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, actionBatcher) {
+        const engineerTypes = ["ENGINEER", "SENGINEER"];
+        const engineers = this.getUnitsOfTypes(gameApi, ...engineerTypes);
+        if (engineers.length === 0) {
+            // Perhaps we deployed already (or the unit was destroyed), end the mission.
+            if (this.hasAttemptedCaptureWith !== null) {
+                return disbandMission();
+            }
+            return requestUnits(engineerTypes, this.priority);
+        }
+        else if (!this.hasAttemptedCaptureWith ||
+            gameApi.getCurrentTick() > this.hasAttemptedCaptureWith.gameTick + CAPTURE_COOLDOWN_TICKS) {
+            actionsApi.orderUnits(engineers.map((engineer) => engineer.id), OrderType.Capture, this.captureTargetId);
+            // Add a cooldown to deploy attempts.
+            this.hasAttemptedCaptureWith = {
+                unitId: engineers[0].id,
+                gameTick: gameApi.getCurrentTick(),
+            };
+        }
+        return noop();
+    }
+    getGlobalDebugText() {
+        return undefined;
+    }
+    getPriority() {
+        return this.priority;
     }
 }
 // Only try to capture tech buildings within this radius of the starting point.
@@ -28,7 +59,6 @@ export class EngineerMissionFactory {
             missionController.addMission(new EngineerMission("capture-" + techBuildingId, 100, techBuildingId, logger));
         });
     }
-    onMissionFailed(gameApi, playerData, matchAwareness, failedMission, failureReason, missionController) {
-    }
+    onMissionFailed(gameApi, playerData, matchAwareness, failedMission, failureReason, missionController) { }
 }
 //# sourceMappingURL=engineerMission.js.map

package/dist/bot/logic/mission/missions/engineerMission.js.map

@@ -1 +1 @@
-{"version":3,"file":"engineerMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/engineerMission.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAExE;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,cAAc;IAC/C,YAAY,UAAkB,EAAE,QAAgB,EAAE,oBAA4B,EAC1E,MAAmB;QACnB,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,aAAa,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC,CAAC;IACvF,CAAC;CACJ;AAED,+EAA+E;AAC/E,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC,MAAM,yBAAyB,GAAG,GAAG,CAAC;AAEtC,MAAM,OAAO,sBAAsB;IAAnC;QACY,gBAAW,GAAG,CAAC,CAAC;IAiC5B,CAAC;IA/BG,OAAO;QACH,OAAO,wBAAwB,CAAC;IACpC,CAAC;IAED,mBAAmB,CACf,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,iBAAoC,EACpC,MAAmB;QAEnB,IAAI,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,yBAAyB,CAAC,EAAE;YAC5E,OAAO;SACV;QACD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC;QAElI,qBAAqB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;YAC7C,iBAAiB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,UAAU,GAAG,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;QAChH,CAAC,CAAC,CAAC;IACP,CAAC;IAED,eAAe,CACX,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,aAAsB,EACtB,aAAwB,EACxB,iBAAoC;IAExC,CAAC;CACJ"}
+{"version":3,"file":"engineerMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/engineerMission.ts"],"names":[],"mappings":"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"}

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

@@ -1,11 +1,48 @@
-import { ExpansionSquad } from "../../squad/behaviours/expansionSquad.js";
-import { OneTimeMission } from "./oneTimeMission.js";
+import { OrderType } from "@chronodivide/game-api";
+import { Mission, disbandMission, noop, requestSpecificUnits, requestUnits } from "../mission.js";
+const DEPLOY_COOLDOWN_TICKS = 30;
 /**
  * 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 OneTimeMission {
+export class ExpansionMission extends Mission {
     constructor(uniqueName, priority, selectedMcv, logger) {
-        super(uniqueName, priority, () => new ExpansionSquad(selectedMcv), logger);
+        super(uniqueName, logger);
+        this.priority = priority;
+        this.selectedMcv = selectedMcv;
+        this.hasAttemptedDeployWith = null;
+    }
+    _onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, actionBatcher) {
+        const mcvTypes = ["AMCV", "SMCV"];
+        const mcvs = this.getUnitsOfTypes(gameApi, ...mcvTypes);
+        if (mcvs.length === 0) {
+            // Perhaps we deployed already (or the unit was destroyed), end the mission.
+            if (this.hasAttemptedDeployWith !== null) {
+                return disbandMission();
+            }
+            // We need an mcv!
+            if (this.selectedMcv) {
+                return requestSpecificUnits([this.selectedMcv], this.priority);
+            }
+            else {
+                return requestUnits(mcvTypes, this.priority);
+            }
+        }
+        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();
+    }
+    getGlobalDebugText() {
+        return `Expand with MCV ${this.selectedMcv}`;
+    }
+    getPriority() {
+        return this.priority;
     }
 }
 export class ExpansionMissionFactory {
@@ -19,7 +56,6 @@ export class ExpansionMissionFactory {
             missionController.addMission(new ExpansionMission("expand-with-" + mcv, 100, mcv, logger));
         });
     }
-    onMissionFailed(gameApi, playerData, matchAwareness, failedMission, failureReason, missionController) {
-    }
+    onMissionFailed(gameApi, playerData, matchAwareness, failedMission, failureReason, missionController) { }
 }
 //# sourceMappingURL=expansionMission.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"expansionMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/expansionMission.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,cAAc;IAChD,YAAY,UAAkB,EAAE,QAAgB,EAAE,WAA0B,EACxE,MAAmB;QACnB,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/E,CAAC;CACJ;AAED,MAAM,OAAO,uBAAuB;IAChC,OAAO;QACH,OAAO,yBAAyB,CAAC;IACrC,CAAC;IAED,mBAAmB,CACf,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,iBAAoC,EACpC,MAAmB;QAEnB,qDAAqD;QACrD,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAChE,OAAO,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CACtD,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjB,iBAAiB,CAAC,UAAU,CAAC,IAAI,gBAAgB,CAAC,cAAc,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;IACP,CAAC;IAED,eAAe,CACX,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,aAAsB,EACtB,aAAwB,EACxB,iBAAoC;IAExC,CAAC;CACJ"}
+{"version":3,"file":"expansionMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/expansionMission.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=missionBehaviour.js.map

package/dist/bot/logic/mission/missions/missionBehaviour.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"missionBehaviour.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/missionBehaviour.ts"],"names":[],"mappings":""}

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

@@ -1,8 +1,34 @@
-import { OneTimeMission } from "./oneTimeMission.js";
-import { RetreatSquad } from "../../squad/behaviours/retreatSquad.js";
-export class RetreatMission extends OneTimeMission {
-    constructor(uniqueName, priority, retreatToPoint, unitIds, logger) {
-        super(uniqueName, priority, () => new RetreatSquad(unitIds, retreatToPoint), logger);
+import { OrderType } from "@chronodivide/game-api";
+import { Mission, disbandMission, requestSpecificUnits } from "../mission.js";
+export class RetreatMission extends Mission {
+    constructor(uniqueName, retreatToPoint, withUnitIds, logger) {
+        super(uniqueName, logger);
+        this.retreatToPoint = retreatToPoint;
+        this.withUnitIds = withUnitIds;
+        this.createdAt = null;
+    }
+    _onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, actionBatcher) {
+        if (!this.createdAt) {
+            this.createdAt = gameApi.getCurrentTick();
+        }
+        if (this.getUnitIds().length > 0) {
+            // Only send the order once we have managed to claim some units.
+            actionsApi.orderUnits(this.getUnitIds(), OrderType.AttackMove, this.retreatToPoint.x, this.retreatToPoint.y);
+            return disbandMission();
+        }
+        if (this.createdAt && gameApi.getCurrentTick() > this.createdAt + 240) {
+            // Disband automatically after 240 ticks in case we couldn't actually claim any units.
+            return disbandMission();
+        }
+        else {
+            return requestSpecificUnits(this.withUnitIds, 1000);
+        }
+    }
+    getGlobalDebugText() {
+        return `retreat with ${this.withUnitIds.length} units`;
+    }
+    getPriority() {
+        return 100;
     }
 }
 //# sourceMappingURL=retreatMission.js.map

package/dist/bot/logic/mission/missions/retreatMission.js.map

@@ -1 +1 @@
-{"version":3,"file":"retreatMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/retreatMission.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAItE,MAAM,OAAO,cAAe,SAAQ,cAAc;IAC9C,YAAY,UAAkB,EAAE,QAAgB,EAAE,cAAuB,EAAE,OAAiB,EAAE,MAAmB;QAC7G,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;IACzF,CAAC;CACJ"}
+{"version":3,"file":"retreatMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/retreatMission.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EAAE,OAAO,EAAiB,cAAc,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAI7F,MAAM,OAAO,cAAe,SAAQ,OAAO;IAGvC,YACI,UAAkB,EACV,cAAuB,EACvB,WAAqB,EAC7B,MAAmB;QAEnB,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAJlB,mBAAc,GAAd,cAAc,CAAS;QACvB,gBAAW,GAAX,WAAW,CAAU;QALzB,cAAS,GAAkB,IAAI,CAAC;IASxC,CAAC;IAEM,WAAW,CACd,OAAgB,EAChB,UAAsB,EACtB,UAAsB,EACtB,cAA8B,EAC9B,aAA4B;QAE5B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,gEAAgE;YAChE,UAAU,CAAC,UAAU,CACjB,IAAI,CAAC,UAAU,EAAE,EACjB,SAAS,CAAC,UAAU,EACpB,IAAI,CAAC,cAAc,CAAC,CAAC,EACrB,IAAI,CAAC,cAAc,CAAC,CAAC,CACxB,CAAC;YACF,OAAO,cAAc,EAAE,CAAC;SAC3B;QACD,IAAI,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,GAAG,EAAE;YACnE,sFAAsF;YACtF,OAAO,cAAc,EAAE,CAAC;SAC3B;aAAM;YACH,OAAO,oBAAoB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACvD;IACL,CAAC;IAEM,kBAAkB;QACrB,OAAO,gBAAgB,IAAI,CAAC,WAAW,CAAC,MAAM,QAAQ,CAAC;IAC3D,CAAC;IAEM,WAAW;QACd,OAAO,GAAG,CAAC;IACf,CAAC;CACJ"}

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

@@ -1,12 +1,102 @@
-import { ScoutingSquad } from "../../squad/behaviours/scoutingSquad.js";
-import { OneTimeMission } from "./oneTimeMission.js";
+import { OrderType } from "@chronodivide/game-api";
+import { Mission, disbandMission, noop, requestUnits } from "../mission.js";
 import { AttackMission } from "./attackMission.js";
+import { getDistanceBetweenTileAndPoint } from "../../map/map.js";
+const SCOUT_MOVE_COOLDOWN_TICKS = 30;
+// Max units to spend on a particular scout target.
+const MAX_ATTEMPTS_PER_TARGET = 5;
+// Maximum ticks to spend trying to scout a target *without making progress towards it*.
+// Every time a unit gets closer to the target, the timer refreshes.
+const MAX_TICKS_PER_TARGET = 600;
 /**
  * A mission that tries to scout around the map with a cheap, fast unit (usually attack dogs)
  */
-export class ScoutingMission extends OneTimeMission {
+export class ScoutingMission extends Mission {
     constructor(uniqueName, priority, logger) {
-        super(uniqueName, priority, () => new ScoutingSquad(), logger);
+        super(uniqueName, logger);
+        this.priority = priority;
+        this.scoutTarget = null;
+        this.attemptsOnCurrentTarget = 0;
+        this.scoutTargetRefreshedAt = 0;
+        this.lastMoveCommandTick = 0;
+        this.scoutTargetIsPermanent = false;
+        this.hadUnit = false;
+    }
+    _onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, actionBatcher) {
+        const scoutNames = ["ADOG", "DOG", "E1", "E2", "FV", "HTK"];
+        const scouts = this.getUnitsOfTypes(gameApi, ...scoutNames);
+        if ((matchAwareness.getSectorCache().getOverallVisibility() || 0) > 0.9) {
+            return disbandMission();
+        }
+        if (scouts.length === 0) {
+            // Count the number of times the scout dies trying to uncover the current scoutTarget.
+            if (this.scoutTarget && this.hadUnit) {
+                this.attemptsOnCurrentTarget++;
+                this.hadUnit = false;
+            }
+            return requestUnits(scoutNames, this.priority);
+        }
+        else if (this.scoutTarget) {
+            this.hadUnit = true;
+            if (!this.scoutTargetIsPermanent) {
+                if (this.attemptsOnCurrentTarget > MAX_ATTEMPTS_PER_TARGET) {
+                    this.logger(`Scout target ${this.scoutTarget.x},${this.scoutTarget.y} took too many attempts, moving to next`);
+                    this.setScoutTarget(null, 0);
+                    return noop();
+                }
+                if (gameApi.getCurrentTick() > this.scoutTargetRefreshedAt + MAX_TICKS_PER_TARGET) {
+                    this.logger(`Scout target ${this.scoutTarget.x},${this.scoutTarget.y} took too long, moving to next`);
+                    this.setScoutTarget(null, 0);
+                    return noop();
+                }
+            }
+            const targetTile = gameApi.mapApi.getTile(this.scoutTarget.x, this.scoutTarget.y);
+            if (!targetTile) {
+                throw new Error(`target tile ${this.scoutTarget.x},${this.scoutTarget.y} does not exist`);
+            }
+            if (gameApi.getCurrentTick() > this.lastMoveCommandTick + SCOUT_MOVE_COOLDOWN_TICKS) {
+                this.lastMoveCommandTick = gameApi.getCurrentTick();
+                scouts.forEach((unit) => {
+                    if (this.scoutTarget) {
+                        actionsApi.orderUnits([unit.id], OrderType.AttackMove, this.scoutTarget.x, this.scoutTarget.y);
+                    }
+                });
+                // Check that a scout is actually moving closer to the target.
+                const distances = scouts.map((unit) => getDistanceBetweenTileAndPoint(unit.tile, this.scoutTarget));
+                const newMinDistance = Math.min(...distances);
+                if (!this.scoutMinDistance || newMinDistance < this.scoutMinDistance) {
+                    this.logger(`Scout timeout refreshed because unit moved closer to point (${newMinDistance} < ${this.scoutMinDistance})`);
+                    this.scoutTargetRefreshedAt = gameApi.getCurrentTick();
+                    this.scoutMinDistance = newMinDistance;
+                }
+            }
+            if (gameApi.mapApi.isVisibleTile(targetTile, playerData.name)) {
+                this.logger(`Scout target ${this.scoutTarget.x},${this.scoutTarget.y} successfully scouted, moving to next`);
+                this.setScoutTarget(null, gameApi.getCurrentTick());
+            }
+        }
+        else {
+            const nextScoutTarget = matchAwareness.getScoutingManager().getNewScoutTarget();
+            if (!nextScoutTarget) {
+                this.logger(`No more scouting targets available, disbanding.`);
+                return disbandMission();
+            }
+            this.setScoutTarget(nextScoutTarget, gameApi.getCurrentTick());
+        }
+        return noop();
+    }
+    setScoutTarget(target, currentTick) {
+        this.attemptsOnCurrentTarget = 0;
+        this.scoutTargetRefreshedAt = currentTick;
+        this.scoutTarget = target?.asVector2() ?? null;
+        this.scoutMinDistance = undefined;
+        this.scoutTargetIsPermanent = target?.isPermanent ?? false;
+    }
+    getGlobalDebugText() {
+        return "scouting";
+    }
+    getPriority() {
+        return this.priority;
     }
 }
 const SCOUT_COOLDOWN_TICKS = 300;
@@ -24,13 +114,20 @@ export class ScoutingMissionFactory {
         if (!matchAwareness.getScoutingManager().hasScoutTargets()) {
             return;
         }
-        if (!missionController.addMission(new ScoutingMission("globalScout", 100, logger))) {
+        if (!missionController.addMission(new ScoutingMission("globalScout", 10, logger))) {
             this.lastScoutAt = gameApi.getCurrentTick();
         }
     }
     onMissionFailed(gameApi, playerData, matchAwareness, failedMission, failureReason, missionController, logger) {
+        if (gameApi.getCurrentTick() < this.lastScoutAt + SCOUT_COOLDOWN_TICKS) {
+            return;
+        }
+        if (!matchAwareness.getScoutingManager().hasScoutTargets()) {
+            return;
+        }
         if (failedMission instanceof AttackMission) {
-            missionController.addMission(new ScoutingMission("globalScout", 100, logger));
+            missionController.addMission(new ScoutingMission("globalScout", 10, logger));
+            this.lastScoutAt = gameApi.getCurrentTick();
         }
     }
 }

package/dist/bot/logic/mission/missions/scoutingMission.js.map

@@ -1 +1 @@
-{"version":3,"file":"scoutingMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/scoutingMission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAExE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKnD;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,cAAc;IAC/C,YAAY,UAAkB,EAAE,QAAgB,EAC5C,MAAmB;QACnB,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,aAAa,EAAE,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;CACJ;AAED,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,MAAM,OAAO,sBAAsB;IAC/B,YAAoB,cAAsB,CAAC,oBAAoB;QAA3C,gBAAW,GAAX,WAAW,CAAgC;IAAG,CAAC;IAEnE,OAAO;QACH,OAAO,wBAAwB,CAAC;IACpC,CAAC;IAED,mBAAmB,CACf,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,iBAAoC,EACpC,MAAmB;QAEnB,IAAI,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,oBAAoB,EAAE;YACpE,OAAO;SACV;QACD,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,eAAe,EAAE,EAAE;YACxD,OAAO;SACV;QACD,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE;YAChF,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;SAC/C;IACL,CAAC;IAED,eAAe,CACX,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,aAAsB,EACtB,aAAwB,EACxB,iBAAoC,EACpC,MAAmB;QAEnB,IAAI,aAAa,YAAY,aAAa,EAAE;YACxC,iBAAiB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;SACjF;IACL,CAAC;CACJ"}
+{"version":3,"file":"scoutingMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/scoutingMission.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAG7F,OAAO,EAAE,OAAO,EAAiB,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAGlE,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAErC,mDAAmD;AACnD,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC,wFAAwF;AACxF,oEAAoE;AACpE,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,OAAO;IAYxC,YACI,UAAkB,EACV,QAAgB,EACxB,MAAmB;QAEnB,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAHlB,aAAQ,GAAR,QAAQ,CAAQ;QAbpB,gBAAW,GAAmB,IAAI,CAAC;QACnC,4BAAuB,GAAW,CAAC,CAAC;QACpC,2BAAsB,GAAW,CAAC,CAAC;QACnC,wBAAmB,GAAW,CAAC,CAAC;QAChC,2BAAsB,GAAY,KAAK,CAAC;QAKxC,YAAO,GAAY,KAAK,CAAC;IAQjC,CAAC;IAEM,WAAW,CACd,OAAgB,EAChB,UAAsB,EACtB,UAAsB,EACtB,cAA8B,EAC9B,aAA4B;QAE5B,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;QAE5D,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE;YACrE,OAAO,cAAc,EAAE,CAAC;SAC3B;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,sFAAsF;YACtF,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,EAAE;gBAClC,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC/B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;aACxB;YACD,OAAO,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClD;aAAM,IAAI,IAAI,CAAC,WAAW,EAAE;YACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBAC9B,IAAI,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,EAAE;oBACxD,IAAI,CAAC,MAAM,CACP,gBAAgB,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,yCAAyC,CACpG,CAAC;oBACF,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC7B,OAAO,IAAI,EAAE,CAAC;iBACjB;gBACD,IAAI,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,sBAAsB,GAAG,oBAAoB,EAAE;oBAC/E,IAAI,CAAC,MAAM,CACP,gBAAgB,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,gCAAgC,CAC3F,CAAC;oBACF,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC7B,OAAO,IAAI,EAAE,CAAC;iBACjB;aACJ;YACD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC,CAAC;aAC7F;YACD,IAAI,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,mBAAmB,GAAG,yBAAyB,EAAE;gBACjF,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;gBACpD,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACpB,IAAI,IAAI,CAAC,WAAW,EAAE;wBAClB,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;qBAClG;gBACL,CAAC,CAAC,CAAC;gBACH,8DAA8D;gBAC9D,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,8BAA8B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,WAAY,CAAC,CAAC,CAAC;gBACrG,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,cAAc,GAAG,IAAI,CAAC,gBAAgB,EAAE;oBAClE,IAAI,CAAC,MAAM,CACP,+DAA+D,cAAc,MAAM,IAAI,CAAC,gBAAgB,GAAG,CAC9G,CAAC;oBACF,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;oBACvD,IAAI,CAAC,gBAAgB,GAAG,cAAc,CAAC;iBAC1C;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;gBAC3D,IAAI,CAAC,MAAM,CACP,gBAAgB,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,uCAAuC,CAClG,CAAC;gBACF,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;aACvD;SACJ;aAAM;YACH,MAAM,eAAe,GAAG,cAAc,CAAC,kBAAkB,EAAE,CAAC,iBAAiB,EAAE,CAAC;YAChF,IAAI,CAAC,eAAe,EAAE;gBAClB,IAAI,CAAC,MAAM,CAAC,iDAAiD,CAAC,CAAC;gBAC/D,OAAO,cAAc,EAAE,CAAC;aAC3B;YACD,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;SAClE;QACD,OAAO,IAAI,EAAE,CAAC;IAClB,CAAC;IAED,cAAc,CAAC,MAAqC,EAAE,WAAmB;QACrE,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,sBAAsB,GAAG,WAAW,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC;QAC/C,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,sBAAsB,GAAG,MAAM,EAAE,WAAW,IAAI,KAAK,CAAC;IAC/D,CAAC;IAEM,kBAAkB;QACrB,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAED,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,MAAM,OAAO,sBAAsB;IAC/B,YAAoB,cAAsB,CAAC,oBAAoB;QAA3C,gBAAW,GAAX,WAAW,CAAgC;IAAG,CAAC;IAEnE,OAAO;QACH,OAAO,wBAAwB,CAAC;IACpC,CAAC;IAED,mBAAmB,CACf,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,iBAAoC,EACpC,MAAmB;QAEnB,IAAI,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,oBAAoB,EAAE;YACpE,OAAO;SACV;QACD,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,eAAe,EAAE,EAAE;YACxD,OAAO;SACV;QACD,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE;YAC/E,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;SAC/C;IACL,CAAC;IAED,eAAe,CACX,OAAgB,EAChB,UAAsB,EACtB,cAA8B,EAC9B,aAA2B,EAC3B,aAAwB,EACxB,iBAAoC,EACpC,MAAmB;QAEnB,IAAI,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,oBAAoB,EAAE;YACpE,OAAO;SACV;QACD,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,eAAe,EAAE,EAAE;YACxD,OAAO;SACV;QACD,IAAI,aAAa,YAAY,aAAa,EAAE;YACxC,iBAAiB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;YAC7E,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;SAC/C;IACL,CAAC;CACJ"}

package/dist/bot/logic/mission/missions/squads/combatSquad.js

@@ -0,0 +1,116 @@
+import { GameMath, MovementZone, } from "@chronodivide/game-api";
+import { getAttackWeight, manageAttackMicro, manageMoveMicro } from "./common.js";
+import { isOwnedByNeutral, maxBy, minBy } from "../../../common/utils.js";
+import { noop } from "../../mission.js";
+const TARGET_UPDATE_INTERVAL_TICKS = 10;
+// Units must be in a certain radius of the center of mass before attacking.
+// This scales for number of units in the squad though.
+const MIN_GATHER_RADIUS = 5;
+// If the radius expands beyond this amount then we should switch back to gathering mode.
+const MAX_GATHER_RADIUS = 15;
+const GATHER_RATIO = 10;
+const ATTACK_SCAN_AREA = 15;
+var SquadState;
+(function (SquadState) {
+    SquadState[SquadState["Gathering"] = 0] = "Gathering";
+    SquadState[SquadState["Attacking"] = 1] = "Attacking";
+})(SquadState || (SquadState = {}));
+export class CombatSquad {
+    /**
+     *
+     * @param rallyArea the initial location to grab combatants
+     * @param targetArea
+     * @param radius
+     */
+    constructor(rallyArea, targetArea, radius) {
+        this.rallyArea = rallyArea;
+        this.targetArea = targetArea;
+        this.radius = radius;
+        this.lastCommand = null;
+        this.state = SquadState.Gathering;
+        this.lastOrderGiven = {};
+    }
+    getGlobalDebugText() {
+        return this.debugLastTarget ?? "<none>";
+    }
+    setAttackArea(targetArea) {
+        this.targetArea = targetArea;
+    }
+    onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, mission, matchAwareness, logger) {
+        if (mission.getUnitIds().length > 0 &&
+            (!this.lastCommand || gameApi.getCurrentTick() > this.lastCommand + TARGET_UPDATE_INTERVAL_TICKS)) {
+            this.lastCommand = gameApi.getCurrentTick();
+            const centerOfMass = mission.getCenterOfMass();
+            const maxDistance = mission.getMaxDistanceToCenterOfMass();
+            const units = mission.getUnitsMatching(gameApi, (r) => r.rules.isSelectableCombatant);
+            // Only use ground units for center of mass.
+            const groundUnits = mission.getUnitsMatching(gameApi, (r) => r.rules.isSelectableCombatant &&
+                (r.rules.movementZone === MovementZone.Infantry ||
+                    r.rules.movementZone === MovementZone.Normal ||
+                    r.rules.movementZone === MovementZone.InfantryDestroyer));
+            if (this.state === SquadState.Gathering) {
+                const requiredGatherRadius = GameMath.sqrt(groundUnits.length) * GATHER_RATIO + MIN_GATHER_RADIUS;
+                if (centerOfMass &&
+                    maxDistance &&
+                    gameApi.mapApi.getTile(centerOfMass.x, centerOfMass.y) !== undefined &&
+                    maxDistance > requiredGatherRadius) {
+                    units.forEach((unit) => {
+                        this.submitActionIfNew(actionBatcher, manageMoveMicro(unit, centerOfMass));
+                    });
+                }
+                else {
+                    logger(`CombatSquad ${mission.getUniqueName()} switching back to attack mode (${maxDistance})`);
+                    this.state = SquadState.Attacking;
+                }
+            }
+            else {
+                const targetPoint = this.targetArea || playerData.startLocation;
+                const requiredGatherRadius = GameMath.sqrt(groundUnits.length) * GATHER_RATIO + MAX_GATHER_RADIUS;
+                if (centerOfMass &&
+                    maxDistance &&
+                    gameApi.mapApi.getTile(centerOfMass.x, centerOfMass.y) !== undefined &&
+                    maxDistance > requiredGatherRadius) {
+                    // Switch back to gather mode
+                    logger(`CombatSquad ${mission.getUniqueName()} switching back to gather (${maxDistance})`);
+                    this.state = SquadState.Gathering;
+                    return noop();
+                }
+                // The unit with the shortest range chooses the target. Otherwise, a base range of 5 is chosen.
+                const getRangeForUnit = (unit) => unit.primaryWeapon?.maxRange ?? unit.secondaryWeapon?.maxRange ?? 5;
+                const attackLeader = minBy(units, getRangeForUnit);
+                if (!attackLeader) {
+                    return noop();
+                }
+                // Find units within double the range of the leader.
+                const nearbyHostiles = matchAwareness
+                    .getHostilesNearPoint(attackLeader.tile.rx, attackLeader.tile.ry, ATTACK_SCAN_AREA)
+                    .map(({ unitId }) => gameApi.getUnitData(unitId))
+                    .filter((unit) => !isOwnedByNeutral(unit));
+                for (const unit of units) {
+                    const bestUnit = maxBy(nearbyHostiles, (target) => getAttackWeight(unit, target));
+                    if (bestUnit) {
+                        this.submitActionIfNew(actionBatcher, manageAttackMicro(unit, bestUnit));
+                        this.debugLastTarget = `Unit ${bestUnit.id.toString()}`;
+                    }
+                    else {
+                        this.submitActionIfNew(actionBatcher, manageMoveMicro(unit, targetPoint));
+                        this.debugLastTarget = `@${targetPoint.x},${targetPoint.y}`;
+                    }
+                }
+            }
+        }
+        return noop();
+    }
+    /**
+     * Sends an action to the acitonBatcher if and only if the action is different from the last action we submitted to it.
+     * Prevents spamming redundant orders, which affects performance and can also ccause the unit to sit around doing nothing.
+     */
+    submitActionIfNew(actionBatcher, action) {
+        const lastAction = this.lastOrderGiven[action.unitId];
+        if (!lastAction || !lastAction.isSameAs(action)) {
+            actionBatcher.push(action);
+            this.lastOrderGiven[action.unitId] = action;
+        }
+    }
+}
+//# sourceMappingURL=combatSquad.js.map

package/dist/bot/logic/mission/missions/squads/combatSquad.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"combatSquad.js","sourceRoot":"","sources":["../../../../../../src/bot/logic/mission/missions/squads/combatSquad.ts"],"names":[],"mappings":"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"}