@supalosa/chronodivide-bot 0.3.1 → 0.4.0
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/README.md +12 -1
- package/TODO.md +0 -3
- package/dist/bot/bot.js +17 -11
- package/dist/bot/bot.js.map +1 -1
- package/dist/bot/logic/building/antiGroundStaticDefence.js +1 -1
- package/dist/bot/logic/building/antiGroundStaticDefence.js.map +1 -1
- package/dist/bot/logic/building/buildingRules.js +52 -45
- package/dist/bot/logic/building/buildingRules.js.map +1 -1
- package/dist/bot/logic/building/queueController.js +7 -2
- package/dist/bot/logic/building/queueController.js.map +1 -1
- package/dist/bot/logic/common/utils.js +14 -0
- package/dist/bot/logic/common/utils.js.map +1 -1
- package/dist/bot/logic/mission/missions/attackMission.js +59 -26
- package/dist/bot/logic/mission/missions/attackMission.js.map +1 -1
- 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/combatSquad.js +9 -4
- package/dist/bot/logic/squad/behaviours/combatSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/common.js +7 -9
- package/dist/bot/logic/squad/behaviours/common.js.map +1 -1
- 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 +4 -1
- package/dist/bot/logic/squad/behaviours/scoutingSquad.js.map +1 -1
- package/dist/bot/logic/squad/squad.js +5 -2
- 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 +15 -2
- package/dist/bot/logic/squad/squadController.js.map +1 -1
- package/dist/exampleBot.js +16 -6
- package/dist/exampleBot.js.map +1 -1
- package/package.json +3 -3
- package/src/bot/bot.ts +24 -13
- package/src/bot/logic/building/antiGroundStaticDefence.ts +1 -1
- package/src/bot/logic/building/buildingRules.ts +58 -48
- package/src/bot/logic/building/queueController.ts +10 -2
- package/src/bot/logic/common/utils.ts +19 -0
- package/src/bot/logic/mission/missions/attackMission.ts +72 -31
- package/src/bot/logic/squad/behaviours/actionBatcher.ts +65 -0
- package/src/bot/logic/squad/behaviours/combatSquad.ts +13 -3
- package/src/bot/logic/squad/behaviours/common.ts +9 -9
- package/src/bot/logic/squad/behaviours/engineerSquad.ts +9 -4
- package/src/bot/logic/squad/behaviours/expansionSquad.ts +9 -4
- package/src/bot/logic/squad/behaviours/retreatSquad.ts +6 -0
- package/src/bot/logic/squad/behaviours/scoutingSquad.ts +6 -0
- package/src/bot/logic/squad/squad.ts +7 -1
- package/src/bot/logic/squad/squadBehaviour.ts +4 -0
- package/src/bot/logic/squad/squadController.ts +19 -2
- package/src/exampleBot.ts +20 -6
package/README.md
CHANGED
|
@@ -50,15 +50,26 @@ npm publish
|
|
|
50
50
|
|
|
51
51
|
# ignore me
|
|
52
52
|
|
|
53
|
+
```
|
|
54
|
+
# dev pc
|
|
53
55
|
export GAMEPATH="G:\Origin\Ra2_YurisRevenge\Command and Conquer Red Alert II"
|
|
54
|
-
|
|
56
|
+
# dev laptop
|
|
55
57
|
export GAMEPATH="D:\EA Games\Command and Conquer Red Alert II"
|
|
56
58
|
|
|
57
59
|
---
|
|
58
60
|
|
|
61
|
+
# run without any debug
|
|
59
62
|
npm run build && npx cross-env MIX_DIR="${GAMEPATH}" npm start
|
|
63
|
+
|
|
64
|
+
# run with attached debugger
|
|
60
65
|
npm run build && npx cross-env MIX_DIR="${GAMEPATH}" npm --node-options="${NODE_OPTIONS} --inspect" start
|
|
61
66
|
|
|
67
|
+
# run with attached debugger and verbose API logging
|
|
68
|
+
npm run build && DEBUG_LOGGING="action" npx cross-env MIX_DIR="${GAMEPATH}" npm --node-options="${NODE_OPTIONS} --inspect" start
|
|
69
|
+
|
|
70
|
+
# DEBUG_LOGGING can also be narrowed down to a specific logger, e.g. "action" or "move"
|
|
71
|
+
```
|
|
72
|
+
|
|
62
73
|
---
|
|
63
74
|
|
|
64
75
|
ladder maps: https://github.com/chronodivide/pvpgn-server/blob/26bbbe39613751cff696a73f087ce5b4cd938fc8/conf/bnmaps.conf.in#L321-L328
|
package/TODO.md
CHANGED
package/dist/bot/bot.js
CHANGED
|
@@ -6,19 +6,20 @@ import { SquadController } from "./logic/squad/squadController.js";
|
|
|
6
6
|
import { QUEUES, QueueController, queueTypeToName } from "./logic/building/queueController.js";
|
|
7
7
|
import { MatchAwarenessImpl } from "./logic/awareness.js";
|
|
8
8
|
import { formatTimeDuration } from "./logic/common/utils.js";
|
|
9
|
-
const
|
|
9
|
+
const DEBUG_STATE_UPDATE_INTERVAL_SECONDS = 6;
|
|
10
10
|
// Number of ticks per second at the base speed.
|
|
11
11
|
const NATURAL_TICK_RATE = 15;
|
|
12
12
|
const BOT_AUTO_SURRENDER_TIME_SECONDS = 7200; // 7200 = 2 hours (approx 30 mins in real time, given a game speed of 4)
|
|
13
13
|
export class SupalosaBot extends Bot {
|
|
14
|
-
constructor(name, country, enableLogging = true) {
|
|
14
|
+
constructor(name, country, tryAllyWith = [], enableLogging = true) {
|
|
15
15
|
super(name, country);
|
|
16
|
+
this.tryAllyWith = tryAllyWith;
|
|
17
|
+
this.enableLogging = enableLogging;
|
|
16
18
|
this.tickOfLastAttackOrder = 0;
|
|
17
19
|
this.matchAwareness = null;
|
|
18
20
|
this.missionController = new MissionController((message, sayInGame) => this.logBotStatus(message, sayInGame));
|
|
19
21
|
this.squadController = new SquadController((message, sayInGame) => this.logBotStatus(message, sayInGame));
|
|
20
22
|
this.queueController = new QueueController();
|
|
21
|
-
this.enableLogging = enableLogging;
|
|
22
23
|
}
|
|
23
24
|
onGameStart(game) {
|
|
24
25
|
const gameRate = game.getTickRate();
|
|
@@ -30,14 +31,15 @@ export class SupalosaBot extends Bot {
|
|
|
30
31
|
this.matchAwareness = new MatchAwarenessImpl(null, new SectorCache(game.mapApi, this.knownMapBounds), myPlayer.startLocation, (message, sayInGame) => this.logBotStatus(message, sayInGame));
|
|
31
32
|
this.matchAwareness.onGameStart(game, myPlayer);
|
|
32
33
|
this.logBotStatus(`Map bounds: ${this.knownMapBounds.width}, ${this.knownMapBounds.height}`);
|
|
34
|
+
this.tryAllyWith.forEach((playerName) => this.actionsApi.toggleAlliance(playerName, true));
|
|
33
35
|
}
|
|
34
36
|
onGameTick(game) {
|
|
35
37
|
if (!this.matchAwareness) {
|
|
36
38
|
return;
|
|
37
39
|
}
|
|
38
40
|
const threatCache = this.matchAwareness.getThreatCache();
|
|
39
|
-
if ((game.getCurrentTick() / NATURAL_TICK_RATE) %
|
|
40
|
-
this.
|
|
41
|
+
if ((game.getCurrentTick() / NATURAL_TICK_RATE) % DEBUG_STATE_UPDATE_INTERVAL_SECONDS === 0) {
|
|
42
|
+
this.updateDebugState(game);
|
|
41
43
|
}
|
|
42
44
|
if (game.getCurrentTick() % this.tickRatio === 0) {
|
|
43
45
|
const myPlayer = game.getPlayerData(this.name);
|
|
@@ -79,8 +81,8 @@ export class SupalosaBot extends Bot {
|
|
|
79
81
|
this.actionsApi.sayAll(`${timestamp}: ${message}`);
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
|
-
|
|
83
|
-
if (!this.
|
|
84
|
+
updateDebugState(game) {
|
|
85
|
+
if (!this.getDebugMode()) {
|
|
84
86
|
return;
|
|
85
87
|
}
|
|
86
88
|
const myPlayer = game.getPlayerData(this.name);
|
|
@@ -97,12 +99,16 @@ export class SupalosaBot extends Bot {
|
|
|
97
99
|
this.productionApi.getQueueData(queueType).items.map((item) => item.rules.name + "x" + item.quantity) +
|
|
98
100
|
"]");
|
|
99
101
|
}, "");
|
|
100
|
-
|
|
102
|
+
let globalDebugText = `Cash: ${myPlayer.credits} | Queues: ${queueState}\n`;
|
|
101
103
|
const harvesters = game.getVisibleUnits(this.name, "self", (r) => r.harvester).length;
|
|
102
|
-
|
|
103
|
-
this.squadController.debugSquads(this.gameApi);
|
|
104
|
-
this.logBotStatus(`----- End -----`);
|
|
104
|
+
globalDebugText += `Harvesters: ${harvesters}\n`;
|
|
105
|
+
globalDebugText += this.squadController.debugSquads(this.gameApi, this.actionsApi);
|
|
105
106
|
this.missionController.logDebugOutput();
|
|
107
|
+
// Tag enemy units with IDs
|
|
108
|
+
game.getVisibleUnits(this.name, "hostile").forEach((unitId) => {
|
|
109
|
+
this.actionsApi.setUnitDebugText(unitId, unitId.toString());
|
|
110
|
+
});
|
|
111
|
+
this.actionsApi.setGlobalDebugText(globalDebugText);
|
|
106
112
|
}
|
|
107
113
|
onGameEvent(ev) {
|
|
108
114
|
switch (ev.type) {
|
package/dist/bot/bot.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../../src/bot/bot.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,GAAG,EAGH,WAAW,EACX,UAAU,EACV,WAAW,GAEd,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC/F,OAAO,EAAkB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,
|
|
1
|
+
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../../src/bot/bot.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export class AntiGroundStaticDefence {
|
|
|
20
20
|
enemyFacingLocationCandidates.push(getPointTowardsOtherPoint(game, startLocation, enemyPlayer.startLocation, 4, 16, 1.5));
|
|
21
21
|
}
|
|
22
22
|
let selectedLocation = enemyFacingLocationCandidates[Math.floor(game.generateRandom() * enemyFacingLocationCandidates.length)];
|
|
23
|
-
return getDefaultPlacementLocation(game, playerData, selectedLocation, technoRules, 0);
|
|
23
|
+
return getDefaultPlacementLocation(game, playerData, selectedLocation, technoRules, false, 0);
|
|
24
24
|
}
|
|
25
25
|
getPriority(game, playerData, technoRules, threatCache) {
|
|
26
26
|
// If the enemy's ground power is increasing we should try to keep up.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"antiGroundStaticDefence.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/antiGroundStaticDefence.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAAmB,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE3G,MAAM,OAAO,uBAAuB;IAChC,YACY,YAAoB,EACpB,UAAkB,EAClB,QAAgB;QAFhB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,eAAU,GAAV,UAAU,CAAQ;QAClB,aAAQ,GAAR,QAAQ,CAAQ;IACzB,CAAC;IAEJ,oBAAoB,CAChB,IAAa,EACb,UAAsB,EACtB,WAAwB;QAExB,8BAA8B;QAC9B,IAAI,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;QAC7C,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChC,IAAI,6BAA6B,GAAc,EAAE,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YACrC,IAAI,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE;gBAC/B,SAAS;aACZ;YACD,IAAI,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACjD,6BAA6B,CAAC,IAAI,CAC9B,yBAAyB,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CACxF,CAAC;SACL;QACD,IAAI,gBAAgB,GAChB,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5G,OAAO,2BAA2B,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"antiGroundStaticDefence.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/antiGroundStaticDefence.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAAmB,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE3G,MAAM,OAAO,uBAAuB;IAChC,YACY,YAAoB,EACpB,UAAkB,EAClB,QAAgB;QAFhB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,eAAU,GAAV,UAAU,CAAQ;QAClB,aAAQ,GAAR,QAAQ,CAAQ;IACzB,CAAC;IAEJ,oBAAoB,CAChB,IAAa,EACb,UAAsB,EACtB,WAAwB;QAExB,8BAA8B;QAC9B,IAAI,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;QAC7C,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChC,IAAI,6BAA6B,GAAc,EAAE,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YACrC,IAAI,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE;gBAC/B,SAAS;aACZ;YACD,IAAI,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACjD,6BAA6B,CAAC,IAAI,CAC9B,yBAAyB,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CACxF,CAAC;SACL;QACD,IAAI,gBAAgB,GAChB,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5G,OAAO,2BAA2B,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAClG,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,sEAAsE;QACtE,IAAI,WAAW,EAAE;YACb,IAAI,WAAW,GACX,WAAW,CAAC,iCAAiC,GAAG,WAAW,CAAC,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC;YACpG,IAAI,WAAW,CAAC,wBAAwB,GAAG,WAAW,GAAG,GAAG,EAAE;gBAC1D,OAAO,IAAI,CAAC,YAAY,GAAG,CAAC,WAAW,CAAC,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;aAChG;SACJ;QACD,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAClE,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,GAAG,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC;IACpF,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GameMath, ObjectType, Vector2, } from "@chronodivide/game-api";
|
|
1
|
+
import { GameMath, LandType, ObjectType, Vector2, } from "@chronodivide/game-api";
|
|
2
2
|
import { AntiGroundStaticDefence } from "./antiGroundStaticDefence.js";
|
|
3
3
|
import { ArtilleryUnit } from "./artilleryUnit.js";
|
|
4
4
|
import { BasicAirUnit } from "./basicAirUnit.js";
|
|
@@ -15,24 +15,26 @@ export function numBuildingsOwnedOfName(game, playerData, name) {
|
|
|
15
15
|
return game.getVisibleUnits(playerData.name, "self", (r) => r.name === name).length;
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
|
-
* Computes a rect 'centered' around a structure of a certain size with additional radius.
|
|
18
|
+
* Computes a rect 'centered' around a structure of a certain size with an additional radius (`adjacent`).
|
|
19
|
+
* The radius is optionally expanded by the size of the new building.
|
|
19
20
|
*
|
|
20
|
-
* This is essentially the
|
|
21
|
+
* This is essentially the candidate placement around a given structure.
|
|
21
22
|
*
|
|
22
23
|
* @param point Top-left location of the inner rect.
|
|
23
24
|
* @param t Size of the inner rect.
|
|
24
|
-
* @param adjacent
|
|
25
|
+
* @param adjacent Amount to expand the building's inner rect by (so buildings must be adjacent by this many tiles)
|
|
26
|
+
* @param newBuildingSize? Size of the new building
|
|
25
27
|
* @returns
|
|
26
28
|
*/
|
|
27
|
-
function computeAdjacentRect(point, t, adjacent) {
|
|
29
|
+
function computeAdjacentRect(point, t, adjacent, newBuildingSize) {
|
|
28
30
|
return {
|
|
29
|
-
x: point.x - adjacent,
|
|
30
|
-
y: point.y - adjacent,
|
|
31
|
-
width: t.width + 2 * adjacent,
|
|
32
|
-
height: t.height + 2 * adjacent,
|
|
31
|
+
x: point.x - adjacent - (newBuildingSize?.width || 0),
|
|
32
|
+
y: point.y - adjacent - (newBuildingSize?.height || 0),
|
|
33
|
+
width: t.width + 2 * adjacent + (newBuildingSize?.width || 0),
|
|
34
|
+
height: t.height + 2 * adjacent + (newBuildingSize?.height || 0),
|
|
33
35
|
};
|
|
34
36
|
}
|
|
35
|
-
export function getAdjacencyTiles(game, playerData, technoRules, minimumSpace) {
|
|
37
|
+
export function getAdjacencyTiles(game, playerData, technoRules, onWater, minimumSpace) {
|
|
36
38
|
const placementRules = game.getBuildingPlacementData(technoRules.name);
|
|
37
39
|
const { width: newBuildingWidth, height: newBuildingHeight } = placementRules.foundation;
|
|
38
40
|
const tiles = [];
|
|
@@ -40,38 +42,42 @@ export function getAdjacencyTiles(game, playerData, technoRules, minimumSpace) {
|
|
|
40
42
|
const removedTiles = new Set();
|
|
41
43
|
for (let buildingId of buildings) {
|
|
42
44
|
const building = game.getUnitData(buildingId);
|
|
43
|
-
if (building?.rules?.baseNormal) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const buildingSize = {
|
|
47
|
-
width: foundation?.width,
|
|
48
|
-
height: foundation?.height,
|
|
49
|
-
};
|
|
50
|
-
const range = computeAdjacentRect(buildingBase, buildingSize, technoRules.adjacent);
|
|
51
|
-
const baseTile = game.mapApi.getTile(range.x, range.y);
|
|
52
|
-
if (!baseTile) {
|
|
53
|
-
continue;
|
|
54
|
-
}
|
|
55
|
-
const adjacentTiles = game.mapApi.getTilesInRect(baseTile, {
|
|
56
|
-
width: range.width,
|
|
57
|
-
height: range.height,
|
|
58
|
-
});
|
|
59
|
-
tiles.push(...adjacentTiles);
|
|
60
|
-
// Prevent placing the new building on tiles that would cause it to overlap with this building.
|
|
61
|
-
const modifiedBase = new Vector2(buildingBase.x - (newBuildingWidth - 1), buildingBase.y - (newBuildingHeight - 1));
|
|
62
|
-
const modifiedSize = {
|
|
63
|
-
width: buildingSize.width + (newBuildingWidth - 1),
|
|
64
|
-
height: buildingSize.height + (newBuildingHeight - 1),
|
|
65
|
-
};
|
|
66
|
-
const blockedRect = computeAdjacentRect(modifiedBase, modifiedSize, minimumSpace);
|
|
67
|
-
const buildingTiles = adjacentTiles.filter((tile) => {
|
|
68
|
-
return (tile.rx >= blockedRect.x &&
|
|
69
|
-
tile.rx < blockedRect.x + blockedRect.width &&
|
|
70
|
-
tile.ry >= blockedRect.y &&
|
|
71
|
-
tile.ry < blockedRect.y + blockedRect.height);
|
|
72
|
-
});
|
|
73
|
-
buildingTiles.forEach((buildingTile) => removedTiles.add(buildingTile.id));
|
|
45
|
+
if (!building?.rules?.baseNormal) {
|
|
46
|
+
// This building is not considered for adjacency checks.
|
|
47
|
+
continue;
|
|
74
48
|
}
|
|
49
|
+
const { foundation, tile } = building;
|
|
50
|
+
const buildingBase = new Vector2(tile.rx, tile.ry);
|
|
51
|
+
const buildingSize = {
|
|
52
|
+
width: foundation?.width,
|
|
53
|
+
height: foundation?.height,
|
|
54
|
+
};
|
|
55
|
+
const range = computeAdjacentRect(buildingBase, buildingSize, technoRules.adjacent, placementRules.foundation);
|
|
56
|
+
const baseTile = game.mapApi.getTile(range.x, range.y);
|
|
57
|
+
if (!baseTile) {
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
const adjacentTiles = game.mapApi
|
|
61
|
+
.getTilesInRect(baseTile, {
|
|
62
|
+
width: range.width,
|
|
63
|
+
height: range.height,
|
|
64
|
+
})
|
|
65
|
+
.filter((tile) => !onWater || tile.landType === LandType.Water);
|
|
66
|
+
tiles.push(...adjacentTiles);
|
|
67
|
+
// Prevent placing the new building on tiles that would cause it to overlap with this building.
|
|
68
|
+
const modifiedBase = new Vector2(buildingBase.x - (newBuildingWidth - 1), buildingBase.y - (newBuildingHeight - 1));
|
|
69
|
+
const modifiedSize = {
|
|
70
|
+
width: buildingSize.width + (newBuildingWidth - 1),
|
|
71
|
+
height: buildingSize.height + (newBuildingHeight - 1),
|
|
72
|
+
};
|
|
73
|
+
const blockedRect = computeAdjacentRect(modifiedBase, modifiedSize, minimumSpace);
|
|
74
|
+
const buildingTiles = adjacentTiles.filter((tile) => {
|
|
75
|
+
return (tile.rx >= blockedRect.x &&
|
|
76
|
+
tile.rx < blockedRect.x + blockedRect.width &&
|
|
77
|
+
tile.ry >= blockedRect.y &&
|
|
78
|
+
tile.ry < blockedRect.y + blockedRect.height);
|
|
79
|
+
});
|
|
80
|
+
buildingTiles.forEach((buildingTile) => removedTiles.add(buildingTile.id));
|
|
75
81
|
}
|
|
76
82
|
// Remove duplicate tiles.
|
|
77
83
|
const withDuplicatesRemoved = uniqBy(tiles, (tile) => tile.id);
|
|
@@ -97,14 +103,14 @@ function distance(x1, y1, x2, y2) {
|
|
|
97
103
|
}
|
|
98
104
|
return GameMath.sqrt(tmp);
|
|
99
105
|
}
|
|
100
|
-
export function getDefaultPlacementLocation(game, playerData,
|
|
101
|
-
//
|
|
106
|
+
export function getDefaultPlacementLocation(game, playerData, idealPoint, technoRules, onWater = false, minSpace = 1) {
|
|
107
|
+
// Closest possible location near `startPoint`.
|
|
102
108
|
const size = game.getBuildingPlacementData(technoRules.name);
|
|
103
109
|
if (!size) {
|
|
104
110
|
return undefined;
|
|
105
111
|
}
|
|
106
|
-
const tiles = getAdjacencyTiles(game, playerData, technoRules, minSpace);
|
|
107
|
-
const tileDistances = getTileDistances(
|
|
112
|
+
const tiles = getAdjacencyTiles(game, playerData, technoRules, onWater, minSpace);
|
|
113
|
+
const tileDistances = getTileDistances(idealPoint, tiles);
|
|
108
114
|
for (let tileDistance of tileDistances) {
|
|
109
115
|
if (tileDistance.tile && game.canPlaceBuilding(playerData.name, technoRules.name, tileDistance.tile)) {
|
|
110
116
|
return tileDistance.tile;
|
|
@@ -123,6 +129,7 @@ export const BUILDING_NAME_TO_RULES = new Map([
|
|
|
123
129
|
["ENGINEER", new BasicBuilding(10, 1, 1000)],
|
|
124
130
|
["GADEPT", new BasicBuilding(1, 1, 10000)],
|
|
125
131
|
["GAAIRC", new BasicBuilding(10, 1, 500)],
|
|
132
|
+
["AMRADR", new BasicBuilding(10, 1, 500)],
|
|
126
133
|
["GATECH", new BasicBuilding(20, 1, 4000)],
|
|
127
134
|
["GAYARD", new BasicBuilding(0, 0, 0)],
|
|
128
135
|
["GAPILL", new AntiGroundStaticDefence(5, 1, 5)],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildingRules.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/buildingRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,QAAQ,EACR,UAAU,EAKV,OAAO,GACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAwB5C,MAAM,UAAU,uBAAuB,CAAC,IAAa,EAAE,UAAsB,EAAE,WAAwB;IACnG,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,MAAM,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAa,EAAE,UAAsB,EAAE,IAAY;IACvF,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;AACxF,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"buildingRules.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/buildingRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,9 @@ export class QueueController {
|
|
|
52
52
|
if (!unit || !unit.hitPoints || !unit.maxHitPoints || unit.hasWrenchRepair) {
|
|
53
53
|
return;
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
if (unit.hitPoints < unit.maxHitPoints) {
|
|
56
|
+
actionsApi.toggleRepairWrench(unitId);
|
|
57
|
+
}
|
|
56
58
|
});
|
|
57
59
|
}
|
|
58
60
|
updateBuildQueue(game, productionApi, actionsApi, playerData, threatCache, queueType, decision, totalWeightAcrossQueues, totalCostAcrossQueues, logger) {
|
|
@@ -69,11 +71,14 @@ export class QueueController {
|
|
|
69
71
|
// Consider placing it.
|
|
70
72
|
const objectReady = queueData.items[0].rules;
|
|
71
73
|
if (queueType == QueueType.Structures || queueType == QueueType.Armory) {
|
|
72
|
-
logger(`Complete ${queueTypeToName(queueType)}: ${objectReady.name}`);
|
|
73
74
|
let location = this.getBestLocationForStructure(game, playerData, objectReady);
|
|
74
75
|
if (location !== undefined) {
|
|
76
|
+
logger(`Completed: ${queueTypeToName(queueType)}: ${objectReady.name}, placing at ${location.rx},${location.ry}`);
|
|
75
77
|
actionsApi.placeBuilding(objectReady.name, location.rx, location.ry);
|
|
76
78
|
}
|
|
79
|
+
else {
|
|
80
|
+
logger(`Completed: ${queueTypeToName(queueType)}: ${objectReady.name} but nowhere to place it`);
|
|
81
|
+
}
|
|
77
82
|
}
|
|
78
83
|
}
|
|
79
84
|
else if (queueData.status == QueueStatus.Active && queueData.items.length > 0 && decision != null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueController.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/queueController.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,WAAW,EACX,SAAS,GAEZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAEH,sBAAsB,EACtB,yBAAyB,EACzB,2BAA2B,GAC9B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB,SAAS,CAAC,UAAU;IACpB,SAAS,CAAC,MAAM;IAChB,SAAS,CAAC,QAAQ;IAClB,SAAS,CAAC,QAAQ;IAClB,SAAS,CAAC,SAAS;IACnB,SAAS,CAAC,KAAK;CAClB,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAgB,EAAE,EAAE;IAChD,QAAQ,KAAK,EAAE;QACX,KAAK,SAAS,CAAC,UAAU;YACrB,OAAO,YAAY,CAAC;QACxB,KAAK,SAAS,CAAC,MAAM;YACjB,OAAO,QAAQ,CAAC;QACpB,KAAK,SAAS,CAAC,QAAQ;YACnB,OAAO,UAAU,CAAC;QACtB,KAAK,SAAS,CAAC,QAAQ;YACnB,OAAO,UAAU,CAAC;QACtB,KAAK,SAAS,CAAC,SAAS;YACpB,OAAO,WAAW,CAAC;QACvB,KAAK,SAAS,CAAC,KAAK;YAChB,OAAO,OAAO,CAAC;QACnB;YACI,OAAO,SAAS,CAAC;KACxB;AACL,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,OAAO,eAAe;IACxB,gBAAe,CAAC;IAET,UAAU,CACb,IAAa,EACb,aAA4B,EAC5B,UAAsB,EACtB,UAAsB,EACtB,WAAgC,EAChC,MAAiC;QAEjC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YACvC,MAAM,OAAO,GAAG,aAAa,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC7D,OAAO;gBACH,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC;aAC1F,CAAC;QACN,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC;QACnD,IAAI,uBAAuB,GAAG,SAAS;aAClC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAS,CAAC;aAC/C,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QACpC,IAAI,qBAAqB,GAAG,SAAS;aAChC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAK,CAAC;aAChD,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QAEpC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC3B,IAAI,CAAC,gBAAgB,CACjB,IAAI,EACJ,aAAa,EACb,UAAU,EACV,UAAU,EACV,WAAW,EACX,QAAQ,CAAC,KAAK,EACd,QAAQ,CAAC,QAAQ,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,MAAM,CACT,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,4DAA4D;QAC5D,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClF,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,eAAe,EAAE;gBACxE,OAAO;aACV;YACD,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"queueController.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/queueController.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export function pad(n, format = "0000") {
|
|
|
11
11
|
let str = "" + n;
|
|
12
12
|
return format.substring(0, format.length - str.length) + str;
|
|
13
13
|
}
|
|
14
|
+
// So we don't need lodash
|
|
14
15
|
export function maxBy(array, predicate) {
|
|
15
16
|
if (array.length === 0) {
|
|
16
17
|
return null;
|
|
@@ -48,4 +49,17 @@ export function countBy(array, predicate) {
|
|
|
48
49
|
return prev;
|
|
49
50
|
}, {});
|
|
50
51
|
}
|
|
52
|
+
export function groupBy(array, predicate) {
|
|
53
|
+
return array.reduce((prev, newVal) => {
|
|
54
|
+
const val = predicate(newVal);
|
|
55
|
+
if (val === undefined) {
|
|
56
|
+
return prev;
|
|
57
|
+
}
|
|
58
|
+
if (!prev.hasOwnProperty(val)) {
|
|
59
|
+
prev[val] = [];
|
|
60
|
+
}
|
|
61
|
+
prev[val].push(newVal);
|
|
62
|
+
return prev;
|
|
63
|
+
}, {});
|
|
64
|
+
}
|
|
51
65
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/bot/logic/common/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/bot/logic/common/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,8 @@ export var AttackFailReason;
|
|
|
9
9
|
AttackFailReason[AttackFailReason["NoTargets"] = 0] = "NoTargets";
|
|
10
10
|
AttackFailReason[AttackFailReason["DefenceTooStrong"] = 1] = "DefenceTooStrong";
|
|
11
11
|
})(AttackFailReason || (AttackFailReason = {}));
|
|
12
|
-
const
|
|
12
|
+
const NO_TARGET_RETARGET_TICKS = 450;
|
|
13
|
+
const NO_TARGET_IDLE_TIMEOUT_TICKS = 900;
|
|
13
14
|
/**
|
|
14
15
|
* A mission that tries to attack a certain area.
|
|
15
16
|
*/
|
|
@@ -20,10 +21,12 @@ export class AttackMission extends Mission {
|
|
|
20
21
|
this.attackArea = attackArea;
|
|
21
22
|
this.radius = radius;
|
|
22
23
|
this.lastTargetSeenAt = 0;
|
|
24
|
+
this.hasPickedNewTarget = false;
|
|
23
25
|
}
|
|
24
26
|
onAiUpdate(gameApi, playerData, matchAwareness) {
|
|
25
27
|
if (this.getSquad() === null) {
|
|
26
|
-
|
|
28
|
+
this.behaviour = new CombatSquad(this.rallyArea, this.attackArea, this.radius);
|
|
29
|
+
return this.setSquad(new Squad(this.getUniqueName(), this.behaviour, this));
|
|
27
30
|
}
|
|
28
31
|
else {
|
|
29
32
|
// Dispatch missions.
|
|
@@ -33,15 +36,23 @@ export class AttackMission extends Mission {
|
|
|
33
36
|
const foundTargets = matchAwareness.getHostilesNearPoint2d(this.attackArea, this.radius);
|
|
34
37
|
if (foundTargets.length > 0) {
|
|
35
38
|
this.lastTargetSeenAt = gameApi.getCurrentTick();
|
|
39
|
+
this.hasPickedNewTarget = false;
|
|
36
40
|
}
|
|
37
41
|
else if (gameApi.getCurrentTick() > this.lastTargetSeenAt + NO_TARGET_IDLE_TIMEOUT_TICKS) {
|
|
38
42
|
return disbandMission(AttackFailReason.NoTargets);
|
|
39
43
|
}
|
|
44
|
+
else if (!this.hasPickedNewTarget &&
|
|
45
|
+
gameApi.getCurrentTick() > this.lastTargetSeenAt + NO_TARGET_RETARGET_TICKS) {
|
|
46
|
+
const newTarget = generateTarget(gameApi, playerData, matchAwareness);
|
|
47
|
+
if (newTarget) {
|
|
48
|
+
this.behaviour?.setAttackArea(newTarget);
|
|
49
|
+
this.hasPickedNewTarget = true;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
40
52
|
}
|
|
41
53
|
return noop();
|
|
42
54
|
}
|
|
43
55
|
}
|
|
44
|
-
const ATTACK_COOLDOWN_TICKS = 120;
|
|
45
56
|
// Calculates the weight for initiating an attack on the position of a unit or building.
|
|
46
57
|
// This is separate from unit micro; the squad will be ordered to attack in the vicinity of the point.
|
|
47
58
|
const getTargetWeight = (unitData, tryFocusHarvester) => {
|
|
@@ -55,43 +66,65 @@ const getTargetWeight = (unitData, tryFocusHarvester) => {
|
|
|
55
66
|
return unitData.maxHitPoints;
|
|
56
67
|
}
|
|
57
68
|
};
|
|
69
|
+
function generateTarget(gameApi, playerData, matchAwareness, includeBaseLocations = false) {
|
|
70
|
+
// Randomly decide between harvester and base.
|
|
71
|
+
try {
|
|
72
|
+
const tryFocusHarvester = gameApi.generateRandomInt(0, 1) === 0;
|
|
73
|
+
const enemyUnits = gameApi
|
|
74
|
+
.getVisibleUnits(playerData.name, "hostile")
|
|
75
|
+
.map((unitId) => gameApi.getUnitData(unitId))
|
|
76
|
+
.filter((u) => !!u && gameApi.getPlayerData(u.owner).isCombatant);
|
|
77
|
+
const maxUnit = maxBy(enemyUnits, (u) => getTargetWeight(u, tryFocusHarvester));
|
|
78
|
+
if (maxUnit) {
|
|
79
|
+
return new Vector2(maxUnit.tile.rx, maxUnit.tile.ry);
|
|
80
|
+
}
|
|
81
|
+
if (includeBaseLocations) {
|
|
82
|
+
const mapApi = gameApi.mapApi;
|
|
83
|
+
const enemyPlayers = gameApi
|
|
84
|
+
.getPlayers()
|
|
85
|
+
.map(gameApi.getPlayerData)
|
|
86
|
+
.filter((otherPlayer) => !gameApi.areAlliedPlayers(playerData.name, otherPlayer.name));
|
|
87
|
+
const unexploredEnemyLocations = enemyPlayers.filter((otherPlayer) => {
|
|
88
|
+
const tile = mapApi.getTile(otherPlayer.startLocation.x, otherPlayer.startLocation.y);
|
|
89
|
+
if (!tile) {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
return !mapApi.isVisibleTile(tile, playerData.name);
|
|
93
|
+
});
|
|
94
|
+
if (unexploredEnemyLocations.length > 0) {
|
|
95
|
+
const idx = gameApi.generateRandomInt(0, unexploredEnemyLocations.length - 1);
|
|
96
|
+
return unexploredEnemyLocations[idx].startLocation;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
catch (err) {
|
|
101
|
+
// There's a crash here when accessing a building that got destroyed. Will catch and ignore or now.
|
|
102
|
+
return null;
|
|
103
|
+
}
|
|
104
|
+
return null;
|
|
105
|
+
}
|
|
106
|
+
// Number of ticks between attacking visible targets.
|
|
107
|
+
const VISIBLE_TARGET_ATTACK_COOLDOWN_TICKS = 120;
|
|
108
|
+
// Number of ticks between attacking "bases" (enemy starting locations).
|
|
109
|
+
const BASE_ATTACK_COOLDOWN_TICKS = 1800;
|
|
58
110
|
export class AttackMissionFactory {
|
|
59
|
-
constructor(lastAttackAt = -
|
|
111
|
+
constructor(lastAttackAt = -VISIBLE_TARGET_ATTACK_COOLDOWN_TICKS) {
|
|
60
112
|
this.lastAttackAt = lastAttackAt;
|
|
61
113
|
}
|
|
62
114
|
getName() {
|
|
63
115
|
return "AttackMissionFactory";
|
|
64
116
|
}
|
|
65
|
-
generateTarget(gameApi, playerData, matchAwareness) {
|
|
66
|
-
// Randomly decide between harvester and base.
|
|
67
|
-
try {
|
|
68
|
-
const tryFocusHarvester = gameApi.generateRandomInt(0, 1) === 0;
|
|
69
|
-
const enemyUnits = gameApi
|
|
70
|
-
.getVisibleUnits(playerData.name, "hostile")
|
|
71
|
-
.map((unitId) => gameApi.getUnitData(unitId))
|
|
72
|
-
.filter((u) => !!u && gameApi.getPlayerData(u.owner).isCombatant);
|
|
73
|
-
const maxUnit = maxBy(enemyUnits, (u) => getTargetWeight(u, tryFocusHarvester));
|
|
74
|
-
if (maxUnit) {
|
|
75
|
-
return new Vector2(maxUnit.tile.rx, maxUnit.tile.ry);
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
catch (err) {
|
|
79
|
-
// There's a crash here when accessing a building that got destroyed. Will catch and ignore or now.
|
|
80
|
-
return null;
|
|
81
|
-
}
|
|
82
|
-
return null;
|
|
83
|
-
}
|
|
84
117
|
maybeCreateMissions(gameApi, playerData, matchAwareness, missionController, logger) {
|
|
85
118
|
if (!matchAwareness.shouldAttack()) {
|
|
86
119
|
return;
|
|
87
120
|
}
|
|
88
|
-
if (gameApi.getCurrentTick() < this.lastAttackAt +
|
|
121
|
+
if (gameApi.getCurrentTick() < this.lastAttackAt + VISIBLE_TARGET_ATTACK_COOLDOWN_TICKS) {
|
|
89
122
|
return;
|
|
90
123
|
}
|
|
91
124
|
const attackRadius = 15;
|
|
92
|
-
const
|
|
125
|
+
const includeEnemyBases = gameApi.getCurrentTick() > this.lastAttackAt + BASE_ATTACK_COOLDOWN_TICKS;
|
|
126
|
+
const attackArea = generateTarget(gameApi, playerData, matchAwareness, includeEnemyBases);
|
|
93
127
|
if (!attackArea) {
|
|
94
|
-
// Nothing to attack.
|
|
95
128
|
return;
|
|
96
129
|
}
|
|
97
130
|
// TODO: not using a fixed value here. But performance slows to a crawl when this is unique.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attackMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/attackMission.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"attackMission.js","sourceRoot":"","sources":["../../../../../src/bot/logic/mission/missions/attackMission.ts"],"names":[],"mappings":"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"}
|