alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-07-21 16:55:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed sharesborderwith cache

Browse Source
This commit is contained in:
evanpelle
2024-08-10 12:29:35 -07:00
parent ca5cc49763
commit 5efd9f4779
7 changed files with 69 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execution/AttackExecution.ts
+28 -26
View File
@@ -43,14 +43,14 @@ export class AttackExecution implements Execution {
// }
let numTilesPerTick = this._owner.borderTilesWith(this.target).size
let numTilesPerTick = this._owner.borderTiles().size / 2
while (numTilesPerTick > 0) {
if (this.troops < 1) {
this.active = false
return
}
if (this.toConquer.size() < this._owner.borderTilesWith(this.target).size / 1.5) {
if (this.toConquer.size() < 10) {
this.calculateToConquer()
}
if (this.toConquer.size() == 0) {
@@ -74,8 +74,6 @@ export class AttackExecution implements Execution {
private calculateToConquer() {
// console.profile('calc_to_conquer')
const enemyBorder = this.target.borderTilesWith(this._owner)
// let closestTile: Tile;
@@ -106,32 +104,36 @@ export class AttackExecution implements Execution {
this.toConquer.clear()
if (this.targetCell != null) {
let tiles = Array.from(enemyBorder)
tiles = tiles.slice().sort((a, b) => manhattanDist(a.cell(), this.targetCell) - manhattanDist(b.cell(), this.targetCell))
for (let i = 0; i < tiles.length; i++) {
const numOwnedByMe = tiles[i].neighbors()
.filter(t => t.terrain() == TerrainTypes.Land)
.filter(t => t.owner() == this._owner)
.length
// if (this.targetCell != null) {
// let tiles = Array.from(enemyBorder)
// tiles = tiles.slice().sort((a, b) => manhattanDist(a.cell(), this.targetCell) - manhattanDist(b.cell(), this.targetCell))
// for (let i = 0; i < tiles.length; i++) {
// const numOwnedByMe = tiles[i].neighbors()
// .filter(t => t.terrain() == TerrainTypes.Land)
// .filter(t => t.owner() == this._owner)
// .length
let distModifer = 0
if (this.targetCell != null) {
distModifer = i / tiles.length * 2
// let distModifer = 0
// if (this.targetCell != null) {
// distModifer = i / tiles.length * 2
// }
// this.toConquer.add(new TileContainer(tiles[i], distModifer - numOwnedByMe + this.random.nextInt(0, 2)))
// // this.toConquer.add(new TileContainer(tiles[i], i))
// }
// } else {
for (const tile of this._owner.borderTiles()) {
for (const neighbor of tile.neighbors()) {
if (neighbor.terrain() == TerrainTypes.Water || neighbor.owner() != this.target) {
continue
}
this.toConquer.add(new TileContainer(tiles[i], distModifer - numOwnedByMe + this.random.nextInt(0, 2)))
// this.toConquer.add(new TileContainer(tiles[i], i))
}
} else {
for (const tile of enemyBorder) {
const numOwnedByMe = tile.neighbors()
.filter(t => t.terrain() == TerrainTypes.Land)
.filter(t => t.owner() == this._owner)
.length
this.toConquer.add(new TileContainer(tile, - numOwnedByMe + this.random.nextInt(0, 2)))
// const numOwnedByMe = tile.neighbors()
// .filter(t => t.terrain() == TerrainTypes.Land)
// .filter(t => t.owner() == this._owner)
// .length
this.toConquer.add(new TileContainer(neighbor, + this.random.nextInt(0, 4)))
}
}
// }
// console.profileEnd('calc_to_conquer')
src/core/execution/BotExecution.ts
+1 -1
View File
@@ -35,7 +35,7 @@ export class BotExecution implements Execution {
const toAttack = ns[this.random.nextInt(0, ns.length)]
this.gs.addExecution(new AttackExecution(
this.bot.troops() / 15,
this.bot.troops() / 5,
this.bot.id(),
toAttack.isPlayer() ? toAttack.id() : null,
null