@supalosa/chronodivide-bot 0.5.1 → 0.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bot/bot.js +0 -5
- package/dist/bot/bot.js.map +1 -1
- package/dist/bot/logic/building/antiGroundStaticDefence.js +3 -16
- package/dist/bot/logic/building/antiGroundStaticDefence.js.map +1 -1
- package/dist/bot/logic/building/building.js +11 -55
- package/dist/bot/logic/building/buildingRules.js +6 -5
- package/dist/bot/logic/building/buildingRules.js.map +1 -1
- package/dist/bot/logic/building/massedAntiGroundUnit.js +20 -0
- package/dist/bot/logic/building/queues.js +19 -0
- package/dist/bot/logic/knowledge.js +1 -0
- package/dist/bot/logic/mission/basicMission.js +26 -0
- package/dist/bot/logic/mission/behaviours/combatSquad.js +1 -1
- package/dist/bot/logic/mission/behaviours/combatSquad.js.map +1 -1
- package/dist/bot/logic/mission/behaviours/common.js +3 -5
- package/dist/bot/logic/mission/behaviours/common.js.map +1 -1
- package/dist/bot/logic/mission/expansionMission.js +32 -0
- package/dist/bot/logic/squad/behaviours/actionBatcher.js +36 -0
- package/dist/bot/logic/squad/behaviours/actionBatcher.js.map +1 -0
- package/dist/bot/logic/squad/behaviours/attackSquad.js +56 -63
- package/dist/bot/logic/squad/behaviours/combatSquad.js +25 -21
- package/dist/bot/logic/squad/behaviours/combatSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/common.js +26 -11
- package/dist/bot/logic/squad/behaviours/common.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/defenceSquad.js +2 -15
- package/dist/bot/logic/squad/behaviours/engineerSquad.js +4 -2
- package/dist/bot/logic/squad/behaviours/engineerSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/expansionSquad.js +4 -2
- package/dist/bot/logic/squad/behaviours/expansionSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/retreatSquad.js +4 -1
- package/dist/bot/logic/squad/behaviours/retreatSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/scoutingSquad.js +25 -18
- package/dist/bot/logic/squad/behaviours/scoutingSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/squadExpansion.js +31 -0
- package/dist/bot/logic/squad/behaviours/squadScouters.js +8 -0
- package/dist/bot/logic/squad/squad.js +10 -10
- package/dist/bot/logic/squad/squad.js.map +1 -1
- package/dist/bot/logic/squad/squadBehaviour.js.map +1 -1
- package/dist/bot/logic/squad/squadController.js +21 -5
- package/dist/bot/logic/squad/squadController.js.map +1 -1
- package/dist/bot/logic/threat/threatCalculator.js +4 -4
- package/dist/bot/logic/threat/threatCalculator.js.map +1 -1
- package/dist/exampleBot.js +5 -0
- package/dist/exampleBot.js.map +1 -1
- package/package.json +1 -1
- package/src/bot/bot.ts +0 -6
- package/src/bot/logic/threat/threat.ts +15 -15
- package/src/exampleBot.ts +7 -1
- package/dist/bot/logic/awarenessImpl.js +0 -132
- package/dist/bot/logic/awarenessImpl.js.map +0 -1
- package/dist/bot/logic/building/building.js.map +0 -1
- /package/dist/bot/logic/building/{ArtilleryUnit.js.map → artilleryUnit.js.map} +0 -0
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { MovementZone } from "@chronodivide/game-api";
|
|
1
|
+
import { GameMath, MovementZone } from "@chronodivide/game-api";
|
|
3
2
|
import { grabCombatants, noop } from "../squadBehaviour.js";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
3
|
+
import { getAttackWeight, manageAttackMicro, manageMoveMicro } from "./common.js";
|
|
4
|
+
import { maxBy } from "../../common/utils.js";
|
|
6
5
|
const TARGET_UPDATE_INTERVAL_TICKS = 10;
|
|
7
6
|
const GRAB_INTERVAL_TICKS = 10;
|
|
8
7
|
const GRAB_RADIUS = 20;
|
|
@@ -32,11 +31,15 @@ export class CombatSquad {
|
|
|
32
31
|
this.lastCommand = null;
|
|
33
32
|
this.state = SquadState.Gathering;
|
|
34
33
|
}
|
|
34
|
+
getGlobalDebugText() {
|
|
35
|
+
return this.debugLastTarget ?? "<none>";
|
|
36
|
+
}
|
|
35
37
|
setAttackArea(targetArea) {
|
|
36
38
|
this.targetArea = targetArea;
|
|
37
39
|
}
|
|
38
|
-
onAiUpdate(gameApi, actionsApi, playerData, squad, matchAwareness, logger) {
|
|
39
|
-
if (squad.getUnitIds().length > 0 &&
|
|
40
|
+
onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, squad, matchAwareness, logger) {
|
|
41
|
+
if (squad.getUnitIds().length > 0 &&
|
|
42
|
+
(!this.lastCommand || gameApi.getCurrentTick() > this.lastCommand + TARGET_UPDATE_INTERVAL_TICKS)) {
|
|
40
43
|
this.lastCommand = gameApi.getCurrentTick();
|
|
41
44
|
const centerOfMass = squad.getCenterOfMass();
|
|
42
45
|
const maxDistance = squad.getMaxDistanceToCenterOfMass();
|
|
@@ -47,13 +50,13 @@ export class CombatSquad {
|
|
|
47
50
|
r.rules.movementZone === MovementZone.Normal ||
|
|
48
51
|
r.rules.movementZone === MovementZone.InfantryDestroyer));
|
|
49
52
|
if (this.state === SquadState.Gathering) {
|
|
50
|
-
const requiredGatherRadius =
|
|
53
|
+
const requiredGatherRadius = GameMath.sqrt(groundUnits.length) * GATHER_RATIO + MIN_GATHER_RADIUS;
|
|
51
54
|
if (centerOfMass &&
|
|
52
55
|
maxDistance &&
|
|
53
56
|
gameApi.mapApi.getTile(centerOfMass.x, centerOfMass.y) !== undefined &&
|
|
54
57
|
maxDistance > requiredGatherRadius) {
|
|
55
58
|
units.forEach((unit) => {
|
|
56
|
-
manageMoveMicro(
|
|
59
|
+
actionBatcher.push(manageMoveMicro(unit, centerOfMass));
|
|
57
60
|
});
|
|
58
61
|
}
|
|
59
62
|
else {
|
|
@@ -63,7 +66,7 @@ export class CombatSquad {
|
|
|
63
66
|
}
|
|
64
67
|
else {
|
|
65
68
|
const targetPoint = this.targetArea || playerData.startLocation;
|
|
66
|
-
const requiredGatherRadius =
|
|
69
|
+
const requiredGatherRadius = GameMath.sqrt(groundUnits.length) * GATHER_RATIO + MAX_GATHER_RADIUS;
|
|
67
70
|
if (centerOfMass &&
|
|
68
71
|
maxDistance &&
|
|
69
72
|
gameApi.mapApi.getTile(centerOfMass.x, centerOfMass.y) !== undefined &&
|
|
@@ -74,18 +77,19 @@ export class CombatSquad {
|
|
|
74
77
|
return noop();
|
|
75
78
|
}
|
|
76
79
|
for (const unit of units) {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
80
|
+
const { rx: x, ry: y } = unit.tile;
|
|
81
|
+
const range = unit.primaryWeapon?.maxRange ?? unit.secondaryWeapon?.maxRange ?? 5;
|
|
82
|
+
const nearbyHostiles = matchAwareness
|
|
83
|
+
.getHostilesNearPoint(x, y, range * 2)
|
|
84
|
+
.map(({ unitId }) => gameApi.getUnitData(unitId));
|
|
85
|
+
const bestUnit = maxBy(nearbyHostiles, (target) => getAttackWeight(unit, target));
|
|
86
|
+
if (bestUnit) {
|
|
87
|
+
actionBatcher.push(manageAttackMicro(unit, bestUnit));
|
|
88
|
+
this.debugLastTarget = `Unit ${bestUnit.id.toString()}`;
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
actionBatcher.push(manageMoveMicro(unit, targetPoint));
|
|
92
|
+
this.debugLastTarget = `@${targetPoint.x},${targetPoint.y}`;
|
|
89
93
|
}
|
|
90
94
|
}
|
|
91
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combatSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/combatSquad.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"combatSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/combatSquad.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,28 +1,26 @@
|
|
|
1
|
-
import { AttackState, ObjectType, OrderType, StanceType } from "@chronodivide/game-api";
|
|
2
|
-
import { getDistanceBetweenUnits } from "../../map/map.js";
|
|
1
|
+
import { AttackState, ObjectType, OrderType, StanceType, Vector2, ZoneType, } from "@chronodivide/game-api";
|
|
2
|
+
import { getDistanceBetweenPoints, getDistanceBetweenUnits } from "../../map/map.js";
|
|
3
3
|
// Micro methods
|
|
4
|
-
export function manageMoveMicro(
|
|
4
|
+
export function manageMoveMicro(attacker, attackPoint) {
|
|
5
5
|
if (attacker.name === "E1") {
|
|
6
6
|
const isDeployed = attacker.stance === StanceType.Deployed;
|
|
7
7
|
if (isDeployed) {
|
|
8
|
-
|
|
8
|
+
return { unitId: attacker.id, orderType: OrderType.DeploySelected };
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
|
|
11
|
+
return { unitId: attacker.id, orderType: OrderType.Move, point: attackPoint };
|
|
12
12
|
}
|
|
13
|
-
export function manageAttackMicro(
|
|
13
|
+
export function manageAttackMicro(attacker, target) {
|
|
14
14
|
const distance = getDistanceBetweenUnits(attacker, target);
|
|
15
15
|
if (attacker.name === "E1") {
|
|
16
16
|
// Para (deployed weapon) range is 5.
|
|
17
17
|
const deployedWeaponRange = attacker.secondaryWeapon?.maxRange || 5;
|
|
18
18
|
const isDeployed = attacker.stance === StanceType.Deployed;
|
|
19
19
|
if (!isDeployed && (distance <= deployedWeaponRange || attacker.attackState === AttackState.JustFired)) {
|
|
20
|
-
|
|
21
|
-
return;
|
|
20
|
+
return { unitId: attacker.id, orderType: OrderType.DeploySelected };
|
|
22
21
|
}
|
|
23
22
|
else if (isDeployed && distance > deployedWeaponRange) {
|
|
24
|
-
|
|
25
|
-
return;
|
|
23
|
+
return { unitId: attacker.id, orderType: OrderType.DeploySelected };
|
|
26
24
|
}
|
|
27
25
|
}
|
|
28
26
|
let targetData = target;
|
|
@@ -35,6 +33,23 @@ export function manageAttackMicro(actionsApi, attacker, target) {
|
|
|
35
33
|
// Special case for mirage tank/spy as otherwise they just sit next to it.
|
|
36
34
|
orderType = OrderType.Attack;
|
|
37
35
|
}
|
|
38
|
-
|
|
36
|
+
return { unitId: attacker.id, orderType, targetId: target.id };
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
*
|
|
40
|
+
* @param attacker
|
|
41
|
+
* @param target
|
|
42
|
+
* @returns A number describing the weight of the given target for the attacker, or null if it should not attack it.
|
|
43
|
+
*/
|
|
44
|
+
export function getAttackWeight(attacker, target) {
|
|
45
|
+
const { rx: x, ry: y } = attacker.tile;
|
|
46
|
+
const { rx: hX, ry: hY } = target.tile;
|
|
47
|
+
if (!attacker.primaryWeapon?.projectileRules.isAntiAir && target.zone === ZoneType.Air) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
if (!attacker.primaryWeapon?.projectileRules.isAntiGround && target.zone === ZoneType.Ground) {
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
return 1000000 - getDistanceBetweenPoints(new Vector2(x, y), new Vector2(hX, hY));
|
|
39
54
|
}
|
|
40
55
|
//# sourceMappingURL=common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/common.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,WAAW,EACX,UAAU,EACV,SAAS,EACT,UAAU,EAEV,OAAO,EACP,QAAQ,GACX,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAGrF,gBAAgB;AAChB,MAAM,UAAU,eAAe,CAAC,QAAkB,EAAE,WAAoB;IACpE,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE;QACxB,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,KAAK,UAAU,CAAC,QAAQ,CAAC;QAC3D,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC;SACvE;KACJ;IAED,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAkB,EAAE,MAAgB;IAClE,MAAM,QAAQ,GAAG,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC3D,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE;QACxB,qCAAqC;QACrC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,eAAe,EAAE,QAAQ,IAAI,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,KAAK,UAAU,CAAC,QAAQ,CAAC;QAC3D,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,mBAAmB,IAAI,QAAQ,CAAC,WAAW,KAAK,WAAW,CAAC,SAAS,CAAC,EAAE;YACpG,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC;SACvE;aAAM,IAAI,UAAU,IAAI,QAAQ,GAAG,mBAAmB,EAAE;YACrD,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC;SACvE;KACJ;IACD,IAAI,UAAU,GAAG,MAAM,CAAC;IACxB,IAAI,SAAS,GAAc,SAAS,CAAC,MAAM,CAAC;IAC5C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,EAAE,QAAQ,IAAI,CAAC,CAAC;IACjE,IAAI,UAAU,EAAE,IAAI,IAAI,UAAU,CAAC,QAAQ,IAAI,QAAQ,GAAG,kBAAkB,GAAG,GAAG,EAAE;QAChF,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC;KAChC;SAAM,IAAI,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE;QACtC,0EAA0E;QAC1E,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC;KAChC;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;AACnE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,QAAkB,EAAE,MAAgB;IAChE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IACvC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IAEvC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,GAAG,EAAE;QACpF,OAAO,IAAI,CAAC;KACf;IAED,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE;QAC1F,OAAO,IAAI,CAAC;KACf;IAED,OAAO,OAAO,GAAG,wBAAwB,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _ from "lodash";
|
|
2
|
-
import { OrderType, } from "@chronodivide/game-api";
|
|
3
2
|
import { disband, grabCombatants } from "../squadBehaviour.js";
|
|
4
3
|
import { getDistanceBetween, getDistanceBetweenUnits } from "../../map/map.js";
|
|
4
|
+
import { manageAttackMicro } from "./common.js";
|
|
5
5
|
// If no enemies are seen in a circle IDLE_CHECK_RADIUS*radius for IDLE_COOLDOWN_TICKS ticks, the mission is disbanded.
|
|
6
6
|
const IDLE_CHECK_RADIUS_RATIO = 2;
|
|
7
7
|
const IDLE_COOLDOWN_TICKS = 15 * 30;
|
|
@@ -39,23 +39,10 @@ export class DefenceSquad {
|
|
|
39
39
|
distance: getDistanceBetweenUnits(defender, enemy),
|
|
40
40
|
})), "distance");
|
|
41
41
|
if (closestEnemy) {
|
|
42
|
-
|
|
42
|
+
manageAttackMicro(actionsApi, defender, closestEnemy.enemy);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
});
|
|
46
46
|
return grabCombatants(this.defenceArea, this.radius * GRAB_RADIUS);
|
|
47
47
|
}
|
|
48
|
-
// Micro methods
|
|
49
|
-
manageMicro(actionsApi, defender, closestEnemy, distance) {
|
|
50
|
-
if (defender.name === "E1") {
|
|
51
|
-
// Para (deployed weapon) range is 5.
|
|
52
|
-
if (defender.canMove && distance <= 4) {
|
|
53
|
-
actionsApi.orderUnits([defender.id], OrderType.DeploySelected);
|
|
54
|
-
}
|
|
55
|
-
else if (!defender.canMove && distance >= 5) {
|
|
56
|
-
actionsApi.orderUnits([defender.id], OrderType.DeploySelected);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
actionsApi.orderUnits([defender.id], OrderType.AttackMove, closestEnemy.tile.rx, closestEnemy.tile.ry);
|
|
60
|
-
}
|
|
61
48
|
}
|
|
@@ -10,8 +10,7 @@ export class EngineerSquad {
|
|
|
10
10
|
this.captureTarget = captureTarget;
|
|
11
11
|
this.hasAttemptedCaptureWith = null;
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
onAiUpdate(gameApi, actionsApi, playerData, squad, matchAwareness) {
|
|
13
|
+
onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, squad, matchAwareness) {
|
|
15
14
|
const engineerTypes = ["ENGINEER", "SENGINEER"];
|
|
16
15
|
const engineers = squad.getUnitsOfTypes(gameApi, ...engineerTypes);
|
|
17
16
|
if (engineers.length === 0) {
|
|
@@ -32,5 +31,8 @@ export class EngineerSquad {
|
|
|
32
31
|
}
|
|
33
32
|
return noop();
|
|
34
33
|
}
|
|
34
|
+
getGlobalDebugText() {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
35
37
|
}
|
|
36
38
|
//# sourceMappingURL=engineerSquad.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engineerSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/engineerSquad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,EAAwB,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAA+B,OAAO,EAAE,IAAI,EAAwB,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"engineerSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/engineerSquad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,EAAwB,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAA+B,OAAO,EAAE,IAAI,EAAwB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAItH,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAElC,gBAAgB;AAChB,MAAM,OAAO,aAAa;IAMtB;;OAEG;IACH,YAAoB,aAAqB;QAArB,kBAAa,GAAb,aAAa,CAAQ;QARjC,4BAAuB,GAGpB,IAAI,CAAC;IAK4B,CAAC;IAEtC,UAAU,CACb,OAAgB,EAChB,UAAsB,EACtB,aAA4B,EAC5B,UAAsB,EACtB,KAAY,EACZ,cAA8B;QAE9B,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC;QACnE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,4EAA4E;YAC5E,IAAI,IAAI,CAAC,uBAAuB,KAAK,IAAI,EAAE;gBACvC,OAAO,OAAO,EAAE,CAAC;aACpB;YACD,OAAO,YAAY,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;SAC3C;aAAM,IACH,CAAC,IAAI,CAAC,uBAAuB;YAC7B,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,GAAG,sBAAsB,EAC3F;YACE,UAAU,CAAC,UAAU,CACjB,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EACxC,SAAS,CAAC,OAAO,EACjB,IAAI,CAAC,aAAa,CACrB,CAAC;YACF,qCAAqC;YACrC,IAAI,CAAC,uBAAuB,GAAG;gBAC3B,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;gBACvB,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE;aACrC,CAAC;SACL;QACD,OAAO,IAAI,EAAE,CAAC;IAClB,CAAC;IAEM,kBAAkB;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
|
|
@@ -11,8 +11,7 @@ export class ExpansionSquad {
|
|
|
11
11
|
this.selectedMcv = selectedMcv;
|
|
12
12
|
this.hasAttemptedDeployWith = null;
|
|
13
13
|
}
|
|
14
|
-
|
|
15
|
-
onAiUpdate(gameApi, actionsApi, playerData, squad, matchAwareness) {
|
|
14
|
+
onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, squad, matchAwareness) {
|
|
16
15
|
const mcvTypes = ["AMCV", "SMCV"];
|
|
17
16
|
const mcvs = squad.getUnitsOfTypes(gameApi, ...mcvTypes);
|
|
18
17
|
if (mcvs.length === 0) {
|
|
@@ -39,5 +38,8 @@ export class ExpansionSquad {
|
|
|
39
38
|
}
|
|
40
39
|
return noop();
|
|
41
40
|
}
|
|
41
|
+
getGlobalDebugText() {
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
42
44
|
}
|
|
43
45
|
//# sourceMappingURL=expansionSquad.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expansionSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/expansionSquad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,EAAwB,MAAM,wBAAwB,CAAC;AAG9F,OAAO,EAA+B,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"expansionSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/expansionSquad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,EAAwB,MAAM,wBAAwB,CAAC;AAG9F,OAAO,EAA+B,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAItH,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC,6BAA6B;AAC7B,MAAM,OAAO,cAAc;IAMvB;;;OAGG;IACH,YAAoB,WAA0B;QAA1B,gBAAW,GAAX,WAAW,CAAe;QATtC,2BAAsB,GAGnB,IAAI,CAAC;IAMiC,CAAC;IAE3C,UAAU,CACb,OAAgB,EAChB,UAAsB,EACtB,aAA4B,EAC5B,UAAsB,EACtB,KAAY,EACZ,cAA8B;QAE9B,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,CAAC;QACzD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACnB,4EAA4E;YAC5E,IAAI,IAAI,CAAC,sBAAsB,KAAK,IAAI,EAAE;gBACtC,OAAO,OAAO,EAAE,CAAC;aACpB;YACD,kBAAkB;YAClB,IAAI,IAAI,CAAC,WAAW,EAAE;gBAClB,OAAO,oBAAoB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC;aACxD;iBAAM;gBACH,OAAO,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;aACtC;SACJ;aAAM,IACH,CAAC,IAAI,CAAC,sBAAsB;YAC5B,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,GAAG,qBAAqB,EACzF;YACE,UAAU,CAAC,UAAU,CACjB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EACzB,SAAS,CAAC,cAAc,CAC3B,CAAC;YACF,qCAAqC;YACrC,IAAI,CAAC,sBAAsB,GAAG;gBAC1B,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBAClB,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE;aACrC,CAAC;SACL;QACD,OAAO,IAAI,EAAE,CAAC;IAClB,CAAC;IAEM,kBAAkB;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
|
|
@@ -7,7 +7,7 @@ export class RetreatSquad {
|
|
|
7
7
|
this.retreatToPoint = retreatToPoint;
|
|
8
8
|
this.createdAt = null;
|
|
9
9
|
}
|
|
10
|
-
onAiUpdate(gameApi, actionsApi, playerData, squad, matchAwareness) {
|
|
10
|
+
onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, squad, matchAwareness) {
|
|
11
11
|
if (!this.createdAt) {
|
|
12
12
|
this.createdAt = gameApi.getCurrentTick();
|
|
13
13
|
}
|
|
@@ -24,5 +24,8 @@ export class RetreatSquad {
|
|
|
24
24
|
return requestSpecificUnits(this.unitIds, 1000);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
+
getGlobalDebugText() {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
27
30
|
}
|
|
28
31
|
//# sourceMappingURL=retreatSquad.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retreatSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/retreatSquad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,
|
|
1
|
+
{"version":3,"file":"retreatSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/retreatSquad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAG7F,OAAO,EAA+B,OAAO,EAAQ,oBAAoB,EAAgB,MAAM,sBAAsB,CAAC;AAItH,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAErC,MAAM,OAAO,YAAY;IAGrB,YACY,OAAiB,EACjB,cAAuB;QADvB,YAAO,GAAP,OAAO,CAAU;QACjB,mBAAc,GAAd,cAAc,CAAS;QAJ3B,cAAS,GAAkB,IAAI,CAAC;IAKrC,CAAC;IAEG,UAAU,CACb,OAAgB,EAChB,UAAsB,EACtB,aAA4B,EAC5B,UAAsB,EACtB,KAAY,EACZ,cAA8B;QAE9B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;SAC7C;QACD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,gEAAgE;YAChE,UAAU,CAAC,UAAU,CACjB,KAAK,CAAC,UAAU,EAAE,EAClB,SAAS,CAAC,UAAU,EACpB,IAAI,CAAC,cAAc,CAAC,CAAC,EACrB,IAAI,CAAC,cAAc,CAAC,CAAC,CACxB,CAAC;YACF,OAAO,OAAO,EAAE,CAAC;SACpB;QACD,IAAI,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,GAAG,EAAE;YACnE,sFAAsF;YACtF,OAAO,OAAO,EAAE,CAAC;SACpB;aAAM;YACH,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SACnD;IACL,CAAC;IAEM,kBAAkB;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { OrderType } from "@chronodivide/game-api";
|
|
2
2
|
import { disband, noop, requestUnits } from "../squadBehaviour.js";
|
|
3
|
-
import
|
|
4
|
-
import { getDistanceBetweenPoints } from "../../map/map.js";
|
|
3
|
+
import { getDistanceBetweenTileAndPoint } from "../../map/map.js";
|
|
5
4
|
const SCOUT_MOVE_COOLDOWN_TICKS = 30;
|
|
6
5
|
// Max units to spend on a particular scout target.
|
|
7
6
|
const MAX_ATTEMPTS_PER_TARGET = 5;
|
|
@@ -14,9 +13,10 @@ export class ScoutingSquad {
|
|
|
14
13
|
this.attemptsOnCurrentTarget = 0;
|
|
15
14
|
this.scoutTargetRefreshedAt = 0;
|
|
16
15
|
this.lastMoveCommandTick = 0;
|
|
16
|
+
this.scoutTargetIsPermanent = false;
|
|
17
17
|
this.hadUnit = false;
|
|
18
18
|
}
|
|
19
|
-
onAiUpdate(gameApi, actionsApi, playerData, squad, matchAwareness, logger) {
|
|
19
|
+
onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, squad, matchAwareness, logger) {
|
|
20
20
|
const scoutNames = ["ADOG", "DOG", "E1", "E2", "FV", "HTK"];
|
|
21
21
|
const scouts = squad.getUnitsOfTypes(gameApi, ...scoutNames);
|
|
22
22
|
if ((matchAwareness.getSectorCache().getOverallVisibility() || 0) > 0.9) {
|
|
@@ -32,15 +32,17 @@ export class ScoutingSquad {
|
|
|
32
32
|
}
|
|
33
33
|
else if (this.scoutTarget) {
|
|
34
34
|
this.hadUnit = true;
|
|
35
|
-
if (this.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
35
|
+
if (!this.scoutTargetIsPermanent) {
|
|
36
|
+
if (this.attemptsOnCurrentTarget > MAX_ATTEMPTS_PER_TARGET) {
|
|
37
|
+
logger(`Scout target ${this.scoutTarget.x},${this.scoutTarget.y} took too many attempts, moving to next`);
|
|
38
|
+
this.setScoutTarget(null, 0);
|
|
39
|
+
return noop();
|
|
40
|
+
}
|
|
41
|
+
if (gameApi.getCurrentTick() > this.scoutTargetRefreshedAt + MAX_TICKS_PER_TARGET) {
|
|
42
|
+
logger(`Scout target ${this.scoutTarget.x},${this.scoutTarget.y} took too long, moving to next`);
|
|
43
|
+
this.setScoutTarget(null, 0);
|
|
44
|
+
return noop();
|
|
45
|
+
}
|
|
44
46
|
}
|
|
45
47
|
const targetTile = gameApi.mapApi.getTile(this.scoutTarget.x, this.scoutTarget.y);
|
|
46
48
|
if (!targetTile) {
|
|
@@ -54,7 +56,8 @@ export class ScoutingSquad {
|
|
|
54
56
|
}
|
|
55
57
|
});
|
|
56
58
|
// Check that a scout is actually moving closer to the target.
|
|
57
|
-
const
|
|
59
|
+
const distances = scouts.map((unit) => getDistanceBetweenTileAndPoint(unit.tile, this.scoutTarget));
|
|
60
|
+
const newMinDistance = Math.min(...distances);
|
|
58
61
|
if (!this.scoutMinDistance || newMinDistance < this.scoutMinDistance) {
|
|
59
62
|
logger(`Scout timeout refreshed because unit moved closer to point (${newMinDistance} < ${this.scoutMinDistance})`);
|
|
60
63
|
this.scoutTargetRefreshedAt = gameApi.getCurrentTick();
|
|
@@ -67,20 +70,24 @@ export class ScoutingSquad {
|
|
|
67
70
|
}
|
|
68
71
|
}
|
|
69
72
|
else {
|
|
70
|
-
const
|
|
71
|
-
if (!
|
|
73
|
+
const nextScoutTarget = matchAwareness.getScoutingManager().getNewScoutTarget();
|
|
74
|
+
if (!nextScoutTarget) {
|
|
72
75
|
logger(`No more scouting targets available, disbanding.`);
|
|
73
76
|
return disband();
|
|
74
77
|
}
|
|
75
|
-
this.setScoutTarget(
|
|
78
|
+
this.setScoutTarget(nextScoutTarget, gameApi.getCurrentTick());
|
|
76
79
|
}
|
|
77
80
|
return noop();
|
|
78
81
|
}
|
|
79
|
-
setScoutTarget(
|
|
82
|
+
setScoutTarget(target, currentTick) {
|
|
80
83
|
this.attemptsOnCurrentTarget = 0;
|
|
81
84
|
this.scoutTargetRefreshedAt = currentTick;
|
|
82
|
-
this.scoutTarget =
|
|
85
|
+
this.scoutTarget = target?.asVector2() ?? null;
|
|
83
86
|
this.scoutMinDistance = undefined;
|
|
87
|
+
this.scoutTargetIsPermanent = target?.isPermanent ?? false;
|
|
88
|
+
}
|
|
89
|
+
getGlobalDebugText() {
|
|
90
|
+
return undefined;
|
|
84
91
|
}
|
|
85
92
|
}
|
|
86
93
|
//# sourceMappingURL=scoutingSquad.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scoutingSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/scoutingSquad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,SAAS,
|
|
1
|
+
{"version":3,"file":"scoutingSquad.js","sourceRoot":"","sources":["../../../../../src/bot/logic/squad/behaviours/scoutingSquad.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { OrderType, SideType } from "@chronodivide/game-api";
|
|
2
|
+
import { disband, noop, requestUnits } from "../squadBehaviour.js";
|
|
3
|
+
const DEPLOY_COOLDOWN_TICKS = 30;
|
|
4
|
+
// Expansion or initial base.
|
|
5
|
+
export class SquadExpansion {
|
|
6
|
+
constructor() {
|
|
7
|
+
this.hasAttemptedDeployWith = null;
|
|
8
|
+
}
|
|
9
|
+
onAiUpdate(gameApi, actionsApi, playerData, squad, threatData) {
|
|
10
|
+
let myMcvName = playerData.country?.side == SideType.GDI ? "AMCV" : "SMCV";
|
|
11
|
+
const mcvs = squad.getUnitsOfType(gameApi, myMcvName);
|
|
12
|
+
if (mcvs.length === 0) {
|
|
13
|
+
// Perhaps we deployed already (or the unit was destroyed), end the mission.
|
|
14
|
+
if (this.hasAttemptedDeployWith !== null) {
|
|
15
|
+
return disband();
|
|
16
|
+
}
|
|
17
|
+
// We need an mcv!
|
|
18
|
+
return requestUnits(myMcvName, 100);
|
|
19
|
+
}
|
|
20
|
+
else if (!this.hasAttemptedDeployWith ||
|
|
21
|
+
gameApi.getCurrentTick() > this.hasAttemptedDeployWith.gameTick + DEPLOY_COOLDOWN_TICKS) {
|
|
22
|
+
actionsApi.orderUnits(mcvs.map((mcv) => mcv.id), OrderType.DeploySelected);
|
|
23
|
+
// Add a cooldown to deploy attempts.
|
|
24
|
+
this.hasAttemptedDeployWith = {
|
|
25
|
+
unitId: mcvs[0].id,
|
|
26
|
+
gameTick: gameApi.getCurrentTick(),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
return noop();
|
|
30
|
+
}
|
|
31
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { Vector2 } from "@chronodivide/game-api";
|
|
1
2
|
import { disband } from "./squadBehaviour.js";
|
|
2
|
-
import {
|
|
3
|
-
import _ from "lodash";
|
|
3
|
+
import { getDistanceBetweenTileAndPoint } from "../map/map.js";
|
|
4
4
|
export var SquadLiveness;
|
|
5
5
|
(function (SquadLiveness) {
|
|
6
6
|
SquadLiveness[SquadLiveness["SquadDead"] = 0] = "SquadDead";
|
|
@@ -17,13 +17,10 @@ const calculateCenterOfMass = (unitTiles) => {
|
|
|
17
17
|
y: y + (tile?.ry || 0),
|
|
18
18
|
};
|
|
19
19
|
}, { x: 0, y: 0 });
|
|
20
|
-
const centerOfMass =
|
|
21
|
-
x: Math.round(sums.x / unitTiles.length),
|
|
22
|
-
y: Math.round(sums.y / unitTiles.length),
|
|
23
|
-
};
|
|
20
|
+
const centerOfMass = new Vector2(Math.round(sums.x / unitTiles.length), Math.round(sums.y / unitTiles.length));
|
|
24
21
|
// max distance of units to the center of mass
|
|
25
|
-
const distances = unitTiles.map((tile) =>
|
|
26
|
-
const maxDistance =
|
|
22
|
+
const distances = unitTiles.map((tile) => getDistanceBetweenTileAndPoint(tile, centerOfMass));
|
|
23
|
+
const maxDistance = Math.max(...distances);
|
|
27
24
|
return { centerOfMass, maxDistance };
|
|
28
25
|
};
|
|
29
26
|
export class Squad {
|
|
@@ -47,7 +44,7 @@ export class Squad {
|
|
|
47
44
|
getMaxDistanceToCenterOfMass() {
|
|
48
45
|
return this.maxDistanceToCenterOfMass;
|
|
49
46
|
}
|
|
50
|
-
onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, logger) {
|
|
47
|
+
onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, matchAwareness, logger) {
|
|
51
48
|
this.updateLiveness(gameApi);
|
|
52
49
|
const movableUnitTiles = this.unitIds
|
|
53
50
|
.map((unitId) => gameApi.getUnitData(unitId))
|
|
@@ -72,7 +69,7 @@ export class Squad {
|
|
|
72
69
|
else if (!this.mission) {
|
|
73
70
|
return disband();
|
|
74
71
|
}
|
|
75
|
-
return this.behaviour.onAiUpdate(gameApi, actionsApi, playerData, this, matchAwareness, logger);
|
|
72
|
+
return this.behaviour.onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, this, matchAwareness, logger);
|
|
76
73
|
}
|
|
77
74
|
getMission() {
|
|
78
75
|
return this.mission;
|
|
@@ -122,5 +119,8 @@ export class Squad {
|
|
|
122
119
|
getLiveness() {
|
|
123
120
|
return this.liveness;
|
|
124
121
|
}
|
|
122
|
+
getGlobalDebugText() {
|
|
123
|
+
return this.behaviour.getGlobalDebugText();
|
|
124
|
+
}
|
|
125
125
|
}
|
|
126
126
|
//# sourceMappingURL=squad.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"squad.js","sourceRoot":"","sources":["../../../../src/bot/logic/squad/squad.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"squad.js","sourceRoot":"","sources":["../../../../src/bot/logic/squad/squad.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"squadBehaviour.js","sourceRoot":"","sources":["../../../../src/bot/logic/squad/squadBehaviour.ts"],"names":[],"mappings":"AAgCA,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"squadBehaviour.js","sourceRoot":"","sources":["../../../../src/bot/logic/squad/squadBehaviour.ts"],"names":[],"mappings":"AAgCA,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAoB,CAAC;AAEhE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAuB,CAAC;AAEzE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAmB,EAAE,QAAgB,EAAE,EAAE,CAClE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,CAA4B,CAAC;AAE1E,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAiB,EAAE,QAAgB,EAAE,EAAE,CACxE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAoC,CAAC;AAExF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAc,EAAE,MAAc,EAAE,EAAE,CAC7D,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,EAAE,CAAkC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
// Meta-controller for forming and controlling squads.
|
|
2
2
|
import { SquadLiveness } from "./squad.js";
|
|
3
3
|
import { getDistanceBetween } from "../map/map.js";
|
|
4
|
-
import
|
|
4
|
+
import { countBy } from "../common/utils.js";
|
|
5
|
+
import { ActionBatcher } from "./behaviours/actionBatcher.js";
|
|
5
6
|
export class SquadController {
|
|
6
7
|
constructor(logger) {
|
|
7
8
|
this.logger = logger;
|
|
@@ -24,10 +25,12 @@ export class SquadController {
|
|
|
24
25
|
}
|
|
25
26
|
});
|
|
26
27
|
});
|
|
28
|
+
// Batch actions to reduce spamming of actions for larger armies.
|
|
29
|
+
const actionBatcher = new ActionBatcher();
|
|
27
30
|
const squadActions = this.squads.map((squad) => {
|
|
28
31
|
return {
|
|
29
32
|
squad,
|
|
30
|
-
action: squad.onAiUpdate(gameApi, actionsApi, playerData, matchAwareness, this.logger),
|
|
33
|
+
action: squad.onAiUpdate(gameApi, actionsApi, actionBatcher, playerData, matchAwareness, this.logger),
|
|
31
34
|
};
|
|
32
35
|
});
|
|
33
36
|
// Handle disbands and merges.
|
|
@@ -41,6 +44,7 @@ export class SquadController {
|
|
|
41
44
|
a.squad.getMission()?.removeSquad();
|
|
42
45
|
a.squad.getUnitIds().forEach((unitId) => {
|
|
43
46
|
this.unitIdToSquad.delete(unitId);
|
|
47
|
+
actionsApi.setUnitDebugText(unitId, undefined);
|
|
44
48
|
});
|
|
45
49
|
disbandedSquads.add(a.squad.getName());
|
|
46
50
|
});
|
|
@@ -136,7 +140,6 @@ export class SquadController {
|
|
|
136
140
|
.map((unitId) => gameApi.getUnitData(unitId))
|
|
137
141
|
.filter((unit) => !!unit && !this.unitIdToSquad.has(unit.id || 0))
|
|
138
142
|
.map((unit) => unit);
|
|
139
|
-
// [squadName][unitName]['type' | 'grab']
|
|
140
143
|
const newAssignmentsByType = freeUnits
|
|
141
144
|
.flatMap((freeUnit) => {
|
|
142
145
|
if (unitTypeToHighestRequest.hasOwnProperty(freeUnit.name)) {
|
|
@@ -179,6 +182,7 @@ export class SquadController {
|
|
|
179
182
|
.map(([method, count]) => unitType + " x " + count + " (by " + method + ")"))
|
|
180
183
|
.join(", ")}`);
|
|
181
184
|
});
|
|
185
|
+
actionBatcher.resolve(actionsApi);
|
|
182
186
|
}
|
|
183
187
|
addUnitToSquad(squad, unit) {
|
|
184
188
|
squad.addUnit(unit.id);
|
|
@@ -187,12 +191,24 @@ export class SquadController {
|
|
|
187
191
|
registerSquad(squad) {
|
|
188
192
|
this.squads.push(squad);
|
|
189
193
|
}
|
|
190
|
-
|
|
191
|
-
|
|
194
|
+
// return text to display for global debug
|
|
195
|
+
getGlobalDebugText(gameApi) {
|
|
196
|
+
const unitsInSquad = (unitIds) => countBy(unitIds, (unitId) => gameApi.getUnitData(unitId)?.name);
|
|
197
|
+
let globalDebugText = "";
|
|
192
198
|
this.squads.forEach((squad) => {
|
|
193
199
|
this.logger(`Squad ${squad.getName()}: ${Object.entries(unitsInSquad(squad.getUnitIds()))
|
|
194
200
|
.map(([unitName, count]) => `${unitName} x ${count}`)
|
|
195
201
|
.join(", ")}`);
|
|
202
|
+
const squadDebugText = squad.getGlobalDebugText();
|
|
203
|
+
if (squadDebugText) {
|
|
204
|
+
globalDebugText += squad.getName() + ": " + squadDebugText + "\n";
|
|
205
|
+
}
|
|
206
|
+
});
|
|
207
|
+
return globalDebugText;
|
|
208
|
+
}
|
|
209
|
+
updateDebugText(actionsApi) {
|
|
210
|
+
this.squads.forEach((squad) => {
|
|
211
|
+
squad.getUnitIds().forEach((unitId) => actionsApi.setUnitDebugText(unitId, squad.getName()));
|
|
196
212
|
});
|
|
197
213
|
}
|
|
198
214
|
}
|