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

improve AttackExecution perf

Browse Source
This commit is contained in:
evanpelle
2024-09-01 19:18:38 -07:00
parent 804bc8746d
commit c1dc6217a5
5 changed files with 66 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/configuration/DefaultConfig.ts
+2 -2
View File
@@ -48,9 +48,9 @@ export class DefaultConfig implements Config {
attackTilesPerTick(attacker: Player, defender: Player | TerraNullius, numAdjacentTilesWithEnemy: number): number {
if (defender.isPlayer()) {
return within(attacker.numTilesOwned() / defender.numTilesOwned() * 2, .01, .5) * numAdjacentTilesWithEnemy * 2
return within(attacker.numTilesOwned() / defender.numTilesOwned() * 2, .01, .5) * numAdjacentTilesWithEnemy * 2 / 25
} else {
return numAdjacentTilesWithEnemy * 2
return numAdjacentTilesWithEnemy * 2 / 25
}
}
src/core/configuration/DevConfig.ts
+1 -1
View File
@@ -16,7 +16,7 @@ export const devConfig = new class extends DefaultConfig {
}
numBots(): number {
return 250
return 350
}
startTroops(playerInfo: PlayerInfo): number {
src/core/execution/AttackExecution.ts
+61 -70
View File
@@ -14,7 +14,6 @@ export class AttackExecution implements Execution {
private mg: MutableGame
private numTilesWithEnemy = 0
private borderTiles: Set<Tile> = new Set()
constructor(
private troops: number,
@@ -60,14 +59,21 @@ export class AttackExecution implements Execution {
// Existing attack on same target, add troops
if (otherAttack._owner == this._owner && otherAttack.targetID == this.targetID) {
otherAttack.troops += this.troops
otherAttack.calculateToConquer()
otherAttack.refreshToConquer()
this.active = false
return
}
}
}
this.calculateToConquer()
this.refreshToConquer()
}
private refreshToConquer() {
this.toConquer.clear()
for (const tile of this._owner.borderTiles()) {
this.addNeighbors(tile)
}
}
tick(ticks: number) {
@@ -79,40 +85,31 @@ export class AttackExecution implements Execution {
}
let numTilesPerTick = this.mg.config().attackTilesPerTick(this._owner, this.target, this.numTilesWithEnemy + this.random.nextInt(0, 5))
if (this.targetCell != null) {
numTilesPerTick /= 2
}
let badTiles = 0
let tries = 0
while (numTilesPerTick > 0) {
if (this.troops < 1) {
this.active = false
return
}
if (this.toConquer.size() < this.numTilesWithEnemy / 1.2) {
this.calculateToConquer()
}
if (badTiles > 1000) {
console.log('bad tiles')
this.borderTiles.clear()
this.calculateToConquer()
badTiles = 0
continue
}
if (this.toConquer.size() == 0) {
badTiles = 0
this.active = false
this._owner.addTroops(this.troops)
return
this.refreshToConquer()
if (this.toConquer.size() == 0) {
this.active = false
this._owner.addTroops(this.troops)
return
}
}
const toConquerContainer = this.toConquer.dequeue()
const tileToConquer: Tile = toConquerContainer.tile
const tileToConquer = this.toConquer.dequeue().tile
const onBorder = tileToConquer.neighbors().filter(t => t.owner() == this._owner).length > 0
if (tileToConquer.owner() != this.target || !onBorder) {
badTiles++
continue
}
this.addNeighbors(tileToConquer)
const {attackerTroopLoss, defenderTroopLoss, tilesPerTickUsed} = this.mg.config().attackLogic(this._owner, this.target, tileToConquer)
numTilesPerTick -= tilesPerTickUsed
this.troops -= attackerTroopLoss
@@ -120,18 +117,46 @@ export class AttackExecution implements Execution {
this.target.removeTroops(defenderTroopLoss)
}
this._owner.conquer(tileToConquer)
if (this.target.isPlayer() && this.target.numTilesOwned() < 100) {
for (let i = 0; i < 10; i++) {
for (const tile of this.target.tiles()) {
if (tile.borders(this._owner)) {
this._owner.conquer(tile)
} else {
for (const neighbor of tile.neighbors()) {
const no = neighbor.owner()
if (no.isPlayer() && no != this.target) {
this.mg.player(no.id()).conquer(tile)
break
}
this.checkDefenderDead()
}
}
private addNeighbors(tile: Tile) {
for (const neighbor of tile.neighbors()) {
if (neighbor.isWater() || neighbor.owner() != this.target) {
continue
}
this.numTilesWithEnemy += 1
let numOwnedByMe = neighbor.neighbors()
.filter(t => t.isLand())
.filter(t => t.owner() == this._owner)
.length
let dist = 0
if (this.targetCell != null) {
dist = manhattanDist(tile.cell(), this.targetCell)
}
if (numOwnedByMe > 2) {
numOwnedByMe = 10
}
this.toConquer.enqueue(new TileContainer(
neighbor,
this.random.nextInt(0, 2) - numOwnedByMe + Math.floor(tile.magnitude() / 10),
))
}
}
private checkDefenderDead() {
if (this.target.isPlayer() && this.target.numTilesOwned() < 100) {
for (let i = 0; i < 10; i++) {
for (const tile of this.target.tiles()) {
if (tile.borders(this._owner)) {
this._owner.conquer(tile)
} else {
for (const neighbor of tile.neighbors()) {
const no = neighbor.owner()
if (no.isPlayer() && no != this.target) {
this.mg.player(no.id()).conquer(tile)
break
}
}
}
@@ -140,40 +165,6 @@ export class AttackExecution implements Execution {
}
}
private calculateToConquer() {
this.numTilesWithEnemy = 0
this.toConquer.clear()
const newBorder: Set<Tile> = new Set()
// TODO: figure out existing border
let existingBorder: ReadonlySet<Tile> = new Set<Tile>()
if (existingBorder.size == 0) {
existingBorder = this._owner.borderTiles()
}
for (const tile of existingBorder) {
for (const neighbor of tile.neighbors()) {
if (neighbor.isWater() || neighbor.owner() != this.target) {
continue
}
newBorder.add(neighbor)
this.numTilesWithEnemy += 1
let numOwnedByMe = neighbor.neighbors()
.filter(t => t.isLand())
.filter(t => t.owner() == this._owner)
.length
let dist = 0
if (this.targetCell != null) {
dist = manhattanDist(tile.cell(), this.targetCell)
}
// if (numOwnedByMe > 3) {
// numOwnedByMe = 1000
// }
this.toConquer.enqueue(new TileContainer(neighbor, this.random.nextInt(0, 4) - numOwnedByMe + tile.magnitude() / 5))
}
}
this.borderTiles = newBorder
}
owner(): MutablePlayer {
return this._owner
}
src/core/execution/BotSpawner.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export class BotSpawner {
return null
}
for (const spawn of this.bots) {
if (manhattanDist(new Cell(spawn.x, spawn.y), tile.cell()) < 70) {
if (manhattanDist(new Cell(spawn.x, spawn.y), tile.cell()) < 30) {
return null
}
}