@supalosa/chronodivide-bot 0.2.2-b → 0.3.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/TODO.md +0 -2
- package/dist/bot/bot.js +2 -2
- package/dist/bot/bot.js.map +1 -1
- package/dist/bot/logic/awareness.js +7 -6
- package/dist/bot/logic/awareness.js.map +1 -1
- package/dist/bot/logic/building/ArtilleryUnit.js +6 -5
- package/dist/bot/logic/building/antiGroundStaticDefence.js.map +1 -1
- package/dist/bot/logic/building/artilleryUnit.js.map +1 -1
- package/dist/bot/logic/building/basicAirUnit.js +2 -1
- package/dist/bot/logic/building/basicAirUnit.js.map +1 -1
- package/dist/bot/logic/building/basicGroundUnit.js +3 -2
- package/dist/bot/logic/building/basicGroundUnit.js.map +1 -1
- package/dist/bot/logic/building/buildingRules.js +4 -10
- package/dist/bot/logic/building/buildingRules.js.map +1 -1
- package/dist/bot/logic/building/harvester.js.map +1 -1
- package/dist/bot/logic/building/resourceCollectionBuilding.js +5 -3
- package/dist/bot/logic/building/resourceCollectionBuilding.js.map +1 -1
- package/dist/bot/logic/common/scout.js +49 -32
- package/dist/bot/logic/common/scout.js.map +1 -1
- package/dist/bot/logic/map/map.js +17 -19
- package/dist/bot/logic/map/map.js.map +1 -1
- package/dist/bot/logic/map/sector.js +10 -13
- package/dist/bot/logic/map/sector.js.map +1 -1
- package/dist/bot/logic/mission/missions/attackMission.js +2 -2
- package/dist/bot/logic/mission/missions/attackMission.js.map +1 -1
- package/dist/bot/logic/mission/missions/defenceMission.js +2 -1
- package/dist/bot/logic/mission/missions/defenceMission.js.map +1 -1
- package/dist/bot/logic/mission/missions/retreatMission.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/combatSquad.js +3 -3
- package/dist/bot/logic/squad/behaviours/combatSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/common.js +2 -2
- package/dist/bot/logic/squad/behaviours/common.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/retreatSquad.js.map +1 -1
- package/dist/bot/logic/squad/behaviours/scoutingSquad.js +21 -17
- package/dist/bot/logic/squad/behaviours/scoutingSquad.js.map +1 -1
- package/dist/bot/logic/squad/squad.js +4 -6
- 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 +35 -23
- package/dist/bot/logic/squad/squadController.js.map +1 -1
- package/dist/bot/logic/threat/threatCalculator.js +4 -3
- package/dist/bot/logic/threat/threatCalculator.js.map +1 -1
- package/dist/exampleBot.js +1 -1
- package/package.json +3 -3
- package/src/bot/bot.ts +4 -5
- package/src/bot/logic/awareness.ts +12 -12
- package/src/bot/logic/building/antiGroundStaticDefence.ts +11 -7
- package/src/bot/logic/building/artilleryUnit.ts +14 -17
- package/src/bot/logic/building/basicAirUnit.ts +9 -7
- package/src/bot/logic/building/basicGroundUnit.ts +3 -3
- package/src/bot/logic/building/buildingRules.ts +11 -13
- package/src/bot/logic/building/harvester.ts +7 -4
- package/src/bot/logic/building/resourceCollectionBuilding.ts +8 -12
- package/src/bot/logic/common/scout.ts +83 -38
- package/src/bot/logic/map/map.ts +26 -30
- package/src/bot/logic/map/sector.ts +17 -21
- package/src/bot/logic/mission/missions/attackMission.ts +5 -5
- package/src/bot/logic/mission/missions/defenceMission.ts +3 -3
- package/src/bot/logic/mission/missions/retreatMission.ts +2 -2
- package/src/bot/logic/squad/behaviours/combatSquad.ts +6 -6
- package/src/bot/logic/squad/behaviours/common.ts +3 -3
- package/src/bot/logic/squad/behaviours/retreatSquad.ts +2 -2
- package/src/bot/logic/squad/behaviours/scoutingSquad.ts +25 -22
- package/src/bot/logic/squad/squad.ts +6 -10
- package/src/bot/logic/squad/squadBehaviour.ts +9 -10
- package/src/bot/logic/squad/squadController.ts +0 -1
- package/src/bot/logic/threat/threatCalculator.ts +100 -99
- package/src/exampleBot.ts +1 -1
package/TODO.md
CHANGED
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
Urgent
|
|
4
4
|
|
|
5
|
-
- remove lodash usage
|
|
6
|
-
- make scouts more resilient, i.e. bot doesn't become idle if it can't find your base after 5 attempts
|
|
7
5
|
- maybe not spam move commands for scouting and attacking missions
|
|
8
6
|
- don't spam repair
|
|
9
7
|
- handle multiple opponents or allies
|
package/dist/bot/bot.js
CHANGED
|
@@ -9,7 +9,7 @@ import { formatTimeDuration } from "./logic/common/utils.js";
|
|
|
9
9
|
const DEBUG_TIMESTAMP_OUTPUT_INTERVAL_SECONDS = 60;
|
|
10
10
|
// Number of ticks per second at the base speed.
|
|
11
11
|
const NATURAL_TICK_RATE = 15;
|
|
12
|
-
const BOT_AUTO_SURRENDER_TIME_SECONDS = 7200; // 7200
|
|
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
14
|
constructor(name, country, enableLogging = true) {
|
|
15
15
|
super(name, country);
|
|
@@ -29,7 +29,7 @@ export class SupalosaBot extends Bot {
|
|
|
29
29
|
const myPlayer = game.getPlayerData(this.name);
|
|
30
30
|
this.matchAwareness = new MatchAwarenessImpl(null, new SectorCache(game.mapApi, this.knownMapBounds), myPlayer.startLocation, (message, sayInGame) => this.logBotStatus(message, sayInGame));
|
|
31
31
|
this.matchAwareness.onGameStart(game, myPlayer);
|
|
32
|
-
this.logBotStatus(`Map bounds: ${this.knownMapBounds.
|
|
32
|
+
this.logBotStatus(`Map bounds: ${this.knownMapBounds.width}, ${this.knownMapBounds.height}`);
|
|
33
33
|
}
|
|
34
34
|
onGameTick(game) {
|
|
35
35
|
if (!this.matchAwareness) {
|
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,
|
|
1
|
+
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../../src/bot/bot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { Vector2 } from "@chronodivide/game-api";
|
|
1
2
|
import { calculateGlobalThreat } from "./threat/threatCalculator.js";
|
|
2
3
|
import { getDistanceBetweenPoints, getPointTowardsOtherPoint } from "./map/map.js";
|
|
3
4
|
import { Circle, Quadtree } from "@timohausmann/quadtree-ts";
|
|
4
5
|
import { ScoutingManager } from "./common/scout.js";
|
|
5
6
|
const SECTORS_TO_UPDATE_PER_CYCLE = 8;
|
|
6
|
-
const RALLY_POINT_UPDATE_INTERVAL_TICKS =
|
|
7
|
+
const RALLY_POINT_UPDATE_INTERVAL_TICKS = 90;
|
|
7
8
|
const THREAT_UPDATE_INTERVAL_TICKS = 30;
|
|
8
9
|
const rebuildQuadtree = (quadtree, units) => {
|
|
9
10
|
quadtree.clear();
|
|
@@ -18,7 +19,7 @@ export class MatchAwarenessImpl {
|
|
|
18
19
|
this.mainRallyPoint = mainRallyPoint;
|
|
19
20
|
this.logger = logger;
|
|
20
21
|
this._shouldAttack = false;
|
|
21
|
-
const {
|
|
22
|
+
const { width, height } = sectorCache.getMapBounds();
|
|
22
23
|
this.hostileQuadTree = new Quadtree({ width, height });
|
|
23
24
|
this.scoutingManager = new ScoutingManager(logger);
|
|
24
25
|
}
|
|
@@ -29,7 +30,7 @@ export class MatchAwarenessImpl {
|
|
|
29
30
|
const intersections = this.hostileQuadTree.retrieve(new Circle({ x: searchX, y: searchY, r: radius }));
|
|
30
31
|
return intersections
|
|
31
32
|
.map(({ x, y, data: unitId }) => ({ x, y, unitId: unitId }))
|
|
32
|
-
.filter(({ x, y }) => getDistanceBetweenPoints(
|
|
33
|
+
.filter(({ x, y }) => getDistanceBetweenPoints(new Vector2(x, y), new Vector2(searchX, searchY)) <= radius)
|
|
33
34
|
.filter(({ unitId }) => !!unitId);
|
|
34
35
|
}
|
|
35
36
|
getThreatCache() {
|
|
@@ -48,9 +49,9 @@ export class MatchAwarenessImpl {
|
|
|
48
49
|
return this._shouldAttack;
|
|
49
50
|
}
|
|
50
51
|
checkShouldAttack(threatCache, threatFactor) {
|
|
51
|
-
let scaledGroundPower =
|
|
52
|
+
let scaledGroundPower = threatCache.totalAvailableAntiGroundFirepower * 1.1;
|
|
52
53
|
let scaledGroundThreat = (threatFactor * threatCache.totalOffensiveLandThreat + threatCache.totalDefensiveThreat) * 1.1;
|
|
53
|
-
let scaledAirPower =
|
|
54
|
+
let scaledAirPower = threatCache.totalAvailableAirPower * 1.1;
|
|
54
55
|
let scaledAirThreat = (threatFactor * threatCache.totalOffensiveAntiAirThreat + threatCache.totalDefensiveThreat) * 1.1;
|
|
55
56
|
return scaledGroundPower > scaledGroundThreat || scaledAirPower > scaledAirThreat;
|
|
56
57
|
}
|
|
@@ -66,7 +67,7 @@ export class MatchAwarenessImpl {
|
|
|
66
67
|
onAiUpdate(game, playerData) {
|
|
67
68
|
const sectorCache = this.sectorCache;
|
|
68
69
|
sectorCache.updateSectors(game.getCurrentTick(), SECTORS_TO_UPDATE_PER_CYCLE, game.mapApi, playerData);
|
|
69
|
-
this.scoutingManager.onAiUpdate(game, playerData);
|
|
70
|
+
this.scoutingManager.onAiUpdate(game, playerData, sectorCache);
|
|
70
71
|
let updateRatio = sectorCache?.getSectorUpdateRatio(game.getCurrentTick() - game.getTickRate() * 60);
|
|
71
72
|
if (updateRatio && updateRatio < 1.0) {
|
|
72
73
|
this.logger(`${updateRatio * 100.0}% of sectors updated in last 60 seconds.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"awareness.js","sourceRoot":"","sources":["../../../src/bot/logic/awareness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"awareness.js","sourceRoot":"","sources":["../../../src/bot/logic/awareness.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GameMath } from "@chronodivide/game-api";
|
|
1
2
|
import { numBuildingsOwnedOfType } from "./buildingRules.js";
|
|
2
3
|
export class ArtilleryUnit {
|
|
3
4
|
constructor(basePriority, artilleryPower, antiGroundPower, baseAmount) {
|
|
@@ -14,8 +15,9 @@ export class ArtilleryUnit {
|
|
|
14
15
|
let priority = this.basePriority;
|
|
15
16
|
// If the enemy's defensive power is increasing we will start to build these.
|
|
16
17
|
if (threatCache && threatCache.totalDefensivePower > threatCache.totalAvailableAntiGroundFirepower) {
|
|
17
|
-
priority +=
|
|
18
|
-
|
|
18
|
+
priority +=
|
|
19
|
+
this.artilleryPower *
|
|
20
|
+
(threatCache.totalAvailableAntiGroundFirepower / Math.max(1, threatCache.totalDefensivePower));
|
|
19
21
|
}
|
|
20
22
|
if (threatCache && this.antiGroundPower > 0) {
|
|
21
23
|
// If the enemy's power is increasing we should try to keep up.
|
|
@@ -23,15 +25,14 @@ export class ArtilleryUnit {
|
|
|
23
25
|
priority +=
|
|
24
26
|
this.antiGroundPower *
|
|
25
27
|
this.basePriority *
|
|
26
|
-
(threatCache.totalOffensiveLandThreat /
|
|
27
|
-
Math.max(1, threatCache.totalAvailableAntiGroundFirepower));
|
|
28
|
+
(threatCache.totalOffensiveLandThreat / Math.max(1, threatCache.totalAvailableAntiGroundFirepower));
|
|
28
29
|
}
|
|
29
30
|
else {
|
|
30
31
|
// But also, if our power dwarfs the enemy, keep pressing the advantage.
|
|
31
32
|
priority +=
|
|
32
33
|
(this.antiGroundPower *
|
|
33
34
|
this.basePriority *
|
|
34
|
-
|
|
35
|
+
GameMath.sqrt(threatCache.totalAvailableAntiGroundFirepower /
|
|
35
36
|
Math.max(1, threatCache.totalOffensiveLandThreat + threatCache.totalDefensiveThreat))) /
|
|
36
37
|
(numOwned + 1);
|
|
37
38
|
}
|
|
@@ -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,
|
|
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;IAC3F,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artilleryUnit.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/artilleryUnit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"artilleryUnit.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/artilleryUnit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAA2B,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAmB,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,OAAO,aAAa;IACtB,YACY,YAAoB,EACpB,cAAsB,EACtB,eAAuB,EACvB,UAAkB;QAHlB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,mBAAc,GAAd,cAAc,CAAQ;QACtB,oBAAe,GAAf,eAAe,CAAQ;QACvB,eAAU,GAAV,UAAU,CAAQ;IAC3B,CAAC;IAEJ,oBAAoB,CAChB,IAAa,EACb,UAAsB,EACtB,WAAwB;QAExB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACxE,IAAI,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC;QACjC,6EAA6E;QAC7E,IAAI,WAAW,IAAI,WAAW,CAAC,mBAAmB,GAAG,WAAW,CAAC,iCAAiC,EAAE;YAChG,QAAQ;gBACJ,IAAI,CAAC,cAAc;oBACnB,CAAC,WAAW,CAAC,iCAAiC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;SACtG;QACD,IAAI,WAAW,IAAI,IAAI,CAAC,eAAe,GAAG,CAAC,EAAE;YACzC,+DAA+D;YAC/D,IAAI,WAAW,CAAC,wBAAwB,GAAG,WAAW,CAAC,iCAAiC,EAAE;gBACtF,QAAQ;oBACJ,IAAI,CAAC,eAAe;wBACpB,IAAI,CAAC,YAAY;wBACjB,CAAC,WAAW,CAAC,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,iCAAiC,CAAC,CAAC,CAAC;aAC3G;iBAAM;gBACH,wEAAwE;gBACxE,QAAQ;oBACJ,CAAC,IAAI,CAAC,eAAe;wBACjB,IAAI,CAAC,YAAY;wBACjB,QAAQ,CAAC,IAAI,CACT,WAAW,CAAC,iCAAiC;4BACzC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,wBAAwB,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAC3F,CAAC;wBACN,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GameMath } from "@chronodivide/game-api";
|
|
1
2
|
import { numBuildingsOwnedOfType } from "./buildingRules.js";
|
|
2
3
|
export class BasicAirUnit {
|
|
3
4
|
constructor(basePriority, baseAmount, antiGroundPower = 1, // boolean for now, but will eventually be used in weighting.
|
|
@@ -27,7 +28,7 @@ export class BasicAirUnit {
|
|
|
27
28
|
(threatCache.totalOffensiveAirThreat / Math.max(1, threatCache.totalAvailableAntiAirFirepower));
|
|
28
29
|
}
|
|
29
30
|
// sqrt so we don't build too much of one unit type.
|
|
30
|
-
priority += Math.min(1.0, Math.max(1,
|
|
31
|
+
priority += Math.min(1.0, Math.max(1, GameMath.sqrt(threatCache.totalAvailableAirPower / Math.max(1, threatCache.totalOffensiveAntiAirThreat))));
|
|
31
32
|
return this.baseAmount * priority;
|
|
32
33
|
}
|
|
33
34
|
const numOwned = numBuildingsOwnedOfType(game, playerData, technoRules);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basicAirUnit.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/basicAirUnit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"basicAirUnit.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/basicAirUnit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAA2B,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAgD,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE3G,MAAM,OAAO,YAAY;IACrB,YACY,YAAoB,EACpB,UAAkB,EAClB,kBAA0B,CAAC,EAAE,6DAA6D;IAC1F,eAAuB,CAAC;QAHxB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,eAAU,GAAV,UAAU,CAAQ;QAClB,oBAAe,GAAf,eAAe,CAAY;QAC3B,iBAAY,GAAZ,YAAY,CAAY;IACjC,CAAC;IAEJ,oBAAoB,CAChB,IAAa,EACb,UAAsB,EACtB,WAAwB;QAExB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,4DAA4D;QAC5D,IAAI,WAAW,EAAE;YACb,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,IACI,IAAI,CAAC,eAAe,GAAG,CAAC;gBACxB,WAAW,CAAC,wBAAwB,GAAG,WAAW,CAAC,iCAAiC,EACtF;gBACE,QAAQ;oBACJ,IAAI,CAAC,YAAY;wBACjB,CAAC,WAAW,CAAC,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,iCAAiC,CAAC,CAAC,CAAC;aAC3G;YACD,IACI,IAAI,CAAC,YAAY,GAAG,CAAC;gBACrB,WAAW,CAAC,uBAAuB,GAAG,WAAW,CAAC,8BAA8B,EAClF;gBACE,QAAQ;oBACJ,IAAI,CAAC,YAAY;wBACjB,CAAC,WAAW,CAAC,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,8BAA8B,CAAC,CAAC,CAAC;aACvG;YACD,oDAAoD;YACpD,QAAQ,IAAI,IAAI,CAAC,GAAG,CAChB,GAAG,EACH,IAAI,CAAC,GAAG,CACJ,CAAC,EACD,QAAQ,CAAC,IAAI,CACT,WAAW,CAAC,sBAAsB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,2BAA2B,CAAC,CAC5F,CACJ,CACJ,CAAC;YACF,OAAO,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;SACrC;QACD,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,CAAC;IAClE,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GameMath } from "@chronodivide/game-api";
|
|
1
2
|
import { numBuildingsOwnedOfType } from "./buildingRules.js";
|
|
2
3
|
export class BasicGroundUnit {
|
|
3
4
|
constructor(basePriority, baseAmount, antiGroundPower = 1, // boolean for now, but will eventually be used in weighting.
|
|
@@ -28,7 +29,7 @@ export class BasicGroundUnit {
|
|
|
28
29
|
priority +=
|
|
29
30
|
(this.antiGroundPower *
|
|
30
31
|
this.basePriority *
|
|
31
|
-
|
|
32
|
+
GameMath.sqrt(threatCache.totalAvailableAntiGroundFirepower /
|
|
32
33
|
Math.max(1, threatCache.totalOffensiveLandThreat + threatCache.totalDefensiveThreat))) /
|
|
33
34
|
(numOwned + 1);
|
|
34
35
|
}
|
|
@@ -44,7 +45,7 @@ export class BasicGroundUnit {
|
|
|
44
45
|
priority +=
|
|
45
46
|
(this.antiAirPower *
|
|
46
47
|
this.basePriority *
|
|
47
|
-
|
|
48
|
+
GameMath.sqrt(threatCache.totalAvailableAntiAirFirepower /
|
|
48
49
|
Math.max(1, threatCache.totalOffensiveAirThreat + threatCache.totalDefensiveThreat))) /
|
|
49
50
|
(numOwned + 1);
|
|
50
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basicGroundUnit.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/basicGroundUnit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"basicGroundUnit.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/basicGroundUnit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAA2B,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAgD,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE3G,MAAM,OAAO,eAAe;IACxB,YACc,YAAoB,EACpB,UAAkB,EAClB,kBAA0B,CAAC,EAAE,6DAA6D;IAC1F,eAAuB,CAAC;QAHxB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,eAAU,GAAV,UAAU,CAAQ;QAClB,oBAAe,GAAf,eAAe,CAAY;QAC3B,iBAAY,GAAZ,YAAY,CAAY;IACnC,CAAC;IAEJ,oBAAoB,CAChB,IAAa,EACb,UAAsB,EACtB,WAAwB;QAExB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACxE,IAAI,WAAW,EAAE;YACb,IAAI,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC;YACjC,IAAI,IAAI,CAAC,eAAe,GAAG,CAAC,EAAE;gBAC1B,+DAA+D;gBAC/D,IAAI,WAAW,CAAC,wBAAwB,GAAG,WAAW,CAAC,iCAAiC,EAAE;oBACtF,QAAQ;wBACJ,IAAI,CAAC,eAAe;4BACpB,IAAI,CAAC,YAAY;4BACjB,CAAC,WAAW,CAAC,wBAAwB;gCACjC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,iCAAiC,CAAC,CAAC,CAAC;iBACvE;qBAAM;oBACH,wEAAwE;oBACxE,QAAQ;wBACJ,CAAC,IAAI,CAAC,eAAe;4BACjB,IAAI,CAAC,YAAY;4BACjB,QAAQ,CAAC,IAAI,CACT,WAAW,CAAC,iCAAiC;gCACzC,IAAI,CAAC,GAAG,CACJ,CAAC,EACD,WAAW,CAAC,wBAAwB,GAAG,WAAW,CAAC,oBAAoB,CAC1E,CACR,CAAC;4BACN,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;iBACtB;aACJ;YACD,IAAI,IAAI,CAAC,YAAY,GAAG,CAAC,EAAE;gBACvB,IAAI,WAAW,CAAC,uBAAuB,GAAG,WAAW,CAAC,8BAA8B,EAAE;oBAClF,QAAQ;wBACJ,IAAI,CAAC,YAAY;4BACjB,IAAI,CAAC,YAAY;4BACjB,CAAC,WAAW,CAAC,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,8BAA8B,CAAC,CAAC,CAAC;iBACvG;qBAAM;oBACH,QAAQ;wBACJ,CAAC,IAAI,CAAC,YAAY;4BACd,IAAI,CAAC,YAAY;4BACjB,QAAQ,CAAC,IAAI,CACT,WAAW,CAAC,8BAA8B;gCACtC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,uBAAuB,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAC1F,CAAC;4BACN,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;iBACtB;aACJ;YACD,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,GAAG,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAED,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ObjectType, } from "@chronodivide/game-api";
|
|
1
|
+
import { GameMath, 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";
|
|
@@ -42,10 +42,7 @@ export function getAdjacencyTiles(game, playerData, technoRules, minimumSpace) {
|
|
|
42
42
|
const building = game.getUnitData(buildingId);
|
|
43
43
|
if (building?.rules?.baseNormal) {
|
|
44
44
|
const { foundation, tile } = building;
|
|
45
|
-
const buildingBase =
|
|
46
|
-
x: tile.rx,
|
|
47
|
-
y: tile.ry,
|
|
48
|
-
};
|
|
45
|
+
const buildingBase = new Vector2(tile.rx, tile.ry);
|
|
49
46
|
const buildingSize = {
|
|
50
47
|
width: foundation?.width,
|
|
51
48
|
height: foundation?.height,
|
|
@@ -61,10 +58,7 @@ export function getAdjacencyTiles(game, playerData, technoRules, minimumSpace) {
|
|
|
61
58
|
});
|
|
62
59
|
tiles.push(...adjacentTiles);
|
|
63
60
|
// Prevent placing the new building on tiles that would cause it to overlap with this building.
|
|
64
|
-
const modifiedBase =
|
|
65
|
-
x: buildingBase.x - (newBuildingWidth - 1),
|
|
66
|
-
y: buildingBase.y - (newBuildingHeight - 1),
|
|
67
|
-
};
|
|
61
|
+
const modifiedBase = new Vector2(buildingBase.x - (newBuildingWidth - 1), buildingBase.y - (newBuildingHeight - 1));
|
|
68
62
|
const modifiedSize = {
|
|
69
63
|
width: buildingSize.width + (newBuildingWidth - 1),
|
|
70
64
|
height: buildingSize.height + (newBuildingHeight - 1),
|
|
@@ -101,7 +95,7 @@ function distance(x1, y1, x2, y2) {
|
|
|
101
95
|
if (0 === tmp) {
|
|
102
96
|
return 0;
|
|
103
97
|
}
|
|
104
|
-
return
|
|
98
|
+
return GameMath.sqrt(tmp);
|
|
105
99
|
}
|
|
106
100
|
export function getDefaultPlacementLocation(game, playerData, startPoint, technoRules, minSpace = 1) {
|
|
107
101
|
// Random location, preferably near start location.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildingRules.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/buildingRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,UAAU,
|
|
1
|
+
{"version":3,"file":"buildingRules.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/buildingRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harvester.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/harvester.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"harvester.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/harvester.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAExC,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC1C,YACI,YAAoB,EACpB,UAAkB,EACV,SAAiB;QAEzB,KAAK,CAAC,YAAY,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAF9B,cAAS,GAAT,SAAS,CAAQ;IAG7B,CAAC;IAED,iEAAiE;IACjE,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QAC3F,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QAE5F,MAAM,KAAK,GAAG,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,OAAO,IAAI,CAAC,YAAY,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,6BAA6B,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;IAC9G,CAAC;CACJ"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { GameMath } from "@chronodivide/game-api";
|
|
1
2
|
import { BasicBuilding } from "./basicBuilding.js";
|
|
2
|
-
import { getDefaultPlacementLocation
|
|
3
|
+
import { getDefaultPlacementLocation } from "./buildingRules.js";
|
|
4
|
+
import { Vector2 } from "three";
|
|
3
5
|
export class ResourceCollectionBuilding extends BasicBuilding {
|
|
4
6
|
constructor(basePriority, maxNeeded, onlyBuildWhenFloatingCreditsAmount) {
|
|
5
7
|
super(basePriority, maxNeeded, onlyBuildWhenFloatingCreditsAmount);
|
|
@@ -13,7 +15,7 @@ export class ResourceCollectionBuilding extends BasicBuilding {
|
|
|
13
15
|
for (let i = 0; i < allTileResourceData.length; ++i) {
|
|
14
16
|
let tileResourceData = allTileResourceData[i];
|
|
15
17
|
if (tileResourceData.spawnsOre) {
|
|
16
|
-
let dist =
|
|
18
|
+
let dist = GameMath.sqrt((selectedLocation.x - tileResourceData.tile.rx) ** 2 +
|
|
17
19
|
(selectedLocation.y - tileResourceData.tile.ry) ** 2);
|
|
18
20
|
if (closeOreDist == undefined || dist < closeOreDist) {
|
|
19
21
|
closeOreDist = dist;
|
|
@@ -22,7 +24,7 @@ export class ResourceCollectionBuilding extends BasicBuilding {
|
|
|
22
24
|
}
|
|
23
25
|
}
|
|
24
26
|
if (closeOre) {
|
|
25
|
-
selectedLocation =
|
|
27
|
+
selectedLocation = new Vector2(closeOre.rx, closeOre.ry);
|
|
26
28
|
}
|
|
27
29
|
return getDefaultPlacementLocation(game, playerData, selectedLocation, technoRules);
|
|
28
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resourceCollectionBuilding.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/resourceCollectionBuilding.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resourceCollectionBuilding.js","sourceRoot":"","sources":["../../../../src/bot/logic/building/resourceCollectionBuilding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAiC,MAAM,wBAAwB,CAAC;AAE1F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,MAAM,OAAO,0BAA2B,SAAQ,aAAa;IACzD,YAAY,YAAoB,EAAE,SAAiB,EAAE,kCAA2C;QAC5F,KAAK,CAAC,YAAY,EAAE,SAAS,EAAE,kCAAkC,CAAC,CAAC;IACvE,CAAC;IAED,oBAAoB,CAChB,IAAa,EACb,UAAsB,EACtB,WAAwB;QAExB,gCAAgC;QAChC,IAAI,gBAAgB,GAAG,UAAU,CAAC,aAAa,CAAC;QAEhD,IAAI,QAA0B,CAAC;QAC/B,IAAI,YAAgC,CAAC;QACrC,IAAI,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;QAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YACjD,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,gBAAgB,CAAC,SAAS,EAAE;gBAC5B,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,CACpB,CAAC,gBAAgB,CAAC,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;oBAChD,CAAC,gBAAgB,CAAC,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAC3D,CAAC;gBACF,IAAI,YAAY,IAAI,SAAS,IAAI,IAAI,GAAG,YAAY,EAAE;oBAClD,YAAY,GAAG,IAAI,CAAC;oBACpB,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC;iBACpC;aACJ;SACJ;QACD,IAAI,QAAQ,EAAE;YACV,gBAAgB,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;SAC5D;QACD,OAAO,2BAA2B,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;IACxF,CAAC;IAED,kEAAkE;IAClE,WAAW,CACP,IAAa,EACb,UAAsB,EACtB,WAAwB,EACxB,WAAgC;QAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QAC5F,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;IACvC,CAAC;CACJ"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GameMath } from "@chronodivide/game-api";
|
|
1
2
|
import { PriorityQueue } from "@datastructures-js/priority-queue";
|
|
2
3
|
export const getUnseenStartingLocations = (gameApi, playerData) => {
|
|
3
4
|
const unseenStartingLocations = gameApi.mapApi.getStartingLocations().filter((startingLocation) => {
|
|
@@ -9,10 +10,11 @@ export const getUnseenStartingLocations = (gameApi, playerData) => {
|
|
|
9
10
|
});
|
|
10
11
|
return unseenStartingLocations;
|
|
11
12
|
};
|
|
12
|
-
class PrioritisedScoutTarget {
|
|
13
|
-
constructor(priority, target) {
|
|
13
|
+
export class PrioritisedScoutTarget {
|
|
14
|
+
constructor(priority, target, permanent = false) {
|
|
15
|
+
this.permanent = permanent;
|
|
14
16
|
if (target.hasOwnProperty("x") && target.hasOwnProperty("y")) {
|
|
15
|
-
this.
|
|
17
|
+
this._targetPoint = target;
|
|
16
18
|
}
|
|
17
19
|
else if (target.hasOwnProperty("sectorStartPoint")) {
|
|
18
20
|
this._targetSector = target;
|
|
@@ -25,57 +27,47 @@ class PrioritisedScoutTarget {
|
|
|
25
27
|
get priority() {
|
|
26
28
|
return this._priority;
|
|
27
29
|
}
|
|
28
|
-
|
|
29
|
-
return this.
|
|
30
|
+
asVector2() {
|
|
31
|
+
return this._targetPoint ?? this._targetSector?.sectorStartPoint ?? null;
|
|
30
32
|
}
|
|
31
33
|
get targetSector() {
|
|
32
34
|
return this._targetSector;
|
|
33
35
|
}
|
|
36
|
+
get isPermanent() {
|
|
37
|
+
return this.permanent;
|
|
38
|
+
}
|
|
34
39
|
}
|
|
35
40
|
const ENEMY_SPAWN_POINT_PRIORITY = 100;
|
|
36
41
|
// Amount of sectors around the starting sector to try to scout.
|
|
37
|
-
const
|
|
42
|
+
const NEARBY_SECTOR_STARTING_RADIUS = 2;
|
|
38
43
|
const NEARBY_SECTOR_BASE_PRIORITY = 1000;
|
|
44
|
+
// Amount of ticks per 'radius' to expand for scouting.
|
|
45
|
+
const SCOUTING_RADIUS_EXPANSION_TICKS = 9000; // 10 minutes
|
|
39
46
|
export class ScoutingManager {
|
|
40
47
|
constructor(logger) {
|
|
41
48
|
this.logger = logger;
|
|
49
|
+
this.queuedRadius = NEARBY_SECTOR_STARTING_RADIUS;
|
|
42
50
|
// Order by descending priority.
|
|
43
51
|
this.scoutingQueue = new PriorityQueue((a, b) => b.priority - a.priority);
|
|
44
52
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
.getStartingLocations()
|
|
49
|
-
.filter((startingLocation) => {
|
|
50
|
-
if (startingLocation == playerData.startLocation) {
|
|
51
|
-
return false;
|
|
52
|
-
}
|
|
53
|
-
let tile = gameApi.mapApi.getTile(startingLocation.x, startingLocation.y);
|
|
54
|
-
return tile ? !gameApi.mapApi.isVisibleTile(tile, playerData.name) : false;
|
|
55
|
-
})
|
|
56
|
-
.map((tile) => new PrioritisedScoutTarget(ENEMY_SPAWN_POINT_PRIORITY, tile))
|
|
57
|
-
.forEach((target) => {
|
|
58
|
-
this.logger(`Adding ${target.asPoint2D()?.x},${target.asPoint2D()?.y} to initial scouting queue`);
|
|
59
|
-
this.scoutingQueue.enqueue(target);
|
|
60
|
-
});
|
|
61
|
-
// Queue nearby sectors.
|
|
62
|
-
const { x: startX, y: startY } = playerData.startLocation;
|
|
63
|
-
const { x: sectorsX, y: sectorsY } = sectorCache.getSectorBounds();
|
|
53
|
+
addRadiusToScout(gameApi, centerPoint, sectorCache, radius, startingPriority) {
|
|
54
|
+
const { x: startX, y: startY } = centerPoint;
|
|
55
|
+
const { width: sectorsX, height: sectorsY } = sectorCache.getSectorBounds();
|
|
64
56
|
const startingSector = sectorCache.getSectorCoordinatesForWorldPosition(startX, startY);
|
|
65
57
|
if (!startingSector) {
|
|
66
58
|
return;
|
|
67
59
|
}
|
|
68
|
-
for (let x = Math.max(0, startingSector.sectorX -
|
|
69
|
-
for (let y = Math.max(0, startingSector.sectorY -
|
|
60
|
+
for (let x = Math.max(0, startingSector.sectorX - radius); x < Math.min(sectorsX, startingSector.sectorX + radius); ++x) {
|
|
61
|
+
for (let y = Math.max(0, startingSector.sectorY - radius); y < Math.min(sectorsY, startingSector.sectorY + radius); ++y) {
|
|
70
62
|
if (x === startingSector?.sectorX && y === startingSector?.sectorY) {
|
|
71
63
|
continue;
|
|
72
64
|
}
|
|
73
65
|
// Make it scout closer sectors first.
|
|
74
|
-
const distanceFactor =
|
|
66
|
+
const distanceFactor = GameMath.pow(x - startingSector.sectorX, 2) + GameMath.pow(y - startingSector.sectorY, 2);
|
|
75
67
|
const sector = sectorCache.getSector(x, y);
|
|
76
68
|
if (sector) {
|
|
77
|
-
const maybeTarget = new PrioritisedScoutTarget(
|
|
78
|
-
const maybePoint = maybeTarget.
|
|
69
|
+
const maybeTarget = new PrioritisedScoutTarget(startingPriority - distanceFactor, sector);
|
|
70
|
+
const maybePoint = maybeTarget.asVector2();
|
|
79
71
|
if (maybePoint && gameApi.mapApi.getTile(maybePoint.x, maybePoint.y)) {
|
|
80
72
|
this.scoutingQueue.enqueue(maybeTarget);
|
|
81
73
|
}
|
|
@@ -83,12 +75,31 @@ export class ScoutingManager {
|
|
|
83
75
|
}
|
|
84
76
|
}
|
|
85
77
|
}
|
|
86
|
-
|
|
78
|
+
onGameStart(gameApi, playerData, sectorCache) {
|
|
79
|
+
// Queue hostile starting locations with high priority and as permanent scouting candidates.
|
|
80
|
+
gameApi.mapApi
|
|
81
|
+
.getStartingLocations()
|
|
82
|
+
.filter((startingLocation) => {
|
|
83
|
+
if (startingLocation == playerData.startLocation) {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
let tile = gameApi.mapApi.getTile(startingLocation.x, startingLocation.y);
|
|
87
|
+
return tile ? !gameApi.mapApi.isVisibleTile(tile, playerData.name) : false;
|
|
88
|
+
})
|
|
89
|
+
.map((tile) => new PrioritisedScoutTarget(ENEMY_SPAWN_POINT_PRIORITY, tile, true))
|
|
90
|
+
.forEach((target) => {
|
|
91
|
+
this.logger(`Adding ${target.asVector2()?.x},${target.asVector2()?.y} to initial scouting queue`);
|
|
92
|
+
this.scoutingQueue.enqueue(target);
|
|
93
|
+
});
|
|
94
|
+
// Queue sectors near the spawn point.
|
|
95
|
+
this.addRadiusToScout(gameApi, playerData.startLocation, sectorCache, NEARBY_SECTOR_STARTING_RADIUS, NEARBY_SECTOR_BASE_PRIORITY);
|
|
96
|
+
}
|
|
97
|
+
onAiUpdate(gameApi, playerData, sectorCache) {
|
|
87
98
|
const currentHead = this.scoutingQueue.front();
|
|
88
99
|
if (!currentHead) {
|
|
89
100
|
return;
|
|
90
101
|
}
|
|
91
|
-
const head = currentHead.
|
|
102
|
+
const head = currentHead.asVector2();
|
|
92
103
|
if (!head) {
|
|
93
104
|
this.scoutingQueue.dequeue();
|
|
94
105
|
return;
|
|
@@ -99,6 +110,12 @@ export class ScoutingManager {
|
|
|
99
110
|
this.logger(`head point is visible, dequeueing`);
|
|
100
111
|
this.scoutingQueue.dequeue();
|
|
101
112
|
}
|
|
113
|
+
const requiredRadius = Math.floor(gameApi.getCurrentTick() / SCOUTING_RADIUS_EXPANSION_TICKS);
|
|
114
|
+
if (requiredRadius > this.queuedRadius) {
|
|
115
|
+
this.logger(`expanding scouting radius from ${this.queuedRadius} to ${requiredRadius}`);
|
|
116
|
+
this.addRadiusToScout(gameApi, playerData.startLocation, sectorCache, requiredRadius, NEARBY_SECTOR_BASE_PRIORITY);
|
|
117
|
+
this.queuedRadius = requiredRadius;
|
|
118
|
+
}
|
|
102
119
|
}
|
|
103
120
|
getNewScoutTarget() {
|
|
104
121
|
return this.scoutingQueue.dequeue();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scout.js","sourceRoot":"","sources":["../../../../src/bot/logic/common/scout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scout.js","sourceRoot":"","sources":["../../../../src/bot/logic/common/scout.ts"],"names":[],"mappings":"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"}
|