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

use TileRef instead of tile

Browse Source
This commit is contained in:
evanpelle
2025-02-01 12:05:11 -08:00
committed by Evan
parent 2068e42982
commit a17ae48cd3
13 changed files with 149 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execution/AttackExecution.ts
+4 -3
View File
@@ -4,6 +4,7 @@ import { PseudoRandom } from "../PseudoRandom";
import { manhattanDist } from "../Util";
import { MessageType } from '../game/Game';
import { renderNumber } from "../../client/Utils";
import { TileRef } from "../game/GameMap";
export class AttackExecution implements Execution {
private breakAlliance = false
@@ -25,7 +26,7 @@ export class AttackExecution implements Execution {
private mg: MutableGame
private border = new Set<Tile>()
private border = new Set<TileRef>()
constructor(
private troops: number | null,
@@ -153,7 +154,7 @@ export class AttackExecution implements Execution {
}
const tileToConquer = this.toConquer.dequeue().tile
this.border.delete(tileToConquer)
this.border.delete(tileToConquer.ref())
const onBorder = tileToConquer.neighbors().filter(t => t.owner() == this._owner).length > 0
if (tileToConquer.owner() != this.target || !onBorder) {
@@ -176,7 +177,7 @@ export class AttackExecution implements Execution {
if (neighbor.terrain().isWater() || neighbor.owner() != this.target) {
continue
}
this.border.add(neighbor)
this.border.add(neighbor.ref())
let numOwnedByMe = neighbor.neighbors()
.filter(t => t.terrain().isLand())
.filter(t => t.owner() == this._owner)
src/core/execution/BotExecution.ts
+4 -4
View File
@@ -1,7 +1,7 @@
import {Cell, Execution, MutableGame, MutablePlayer, Player, PlayerID, PlayerInfo, PlayerType, TerraNullius} from "../game/Game"
import {PseudoRandom} from "../PseudoRandom"
import {simpleHash} from "../Util";
import {AttackExecution} from "./AttackExecution";
import { Cell, Execution, MutableGame, MutablePlayer, Player, PlayerID, PlayerInfo, PlayerType, TerraNullius } from "../game/Game"
import { PseudoRandom } from "../PseudoRandom"
import { simpleHash } from "../Util";
import { AttackExecution } from "./AttackExecution";
export class BotExecution implements Execution {
src/core/execution/FakeHumanExecution.ts
+1 -1
View File
@@ -400,7 +400,7 @@ export class FakeHumanExecution implements Execution {
}
if (oceanShore == null) {
oceanShore = Array.from(this.player.borderTiles()).filter(t => t.terrain().isOceanShore())
oceanShore = Array.from(this.player.borderTileRefs()).filter(t => this.mg.M.isOceanShore(t)).map(tr => this.mg.fromRef(tr))
}
if (oceanShore.length == 0) {
return
src/core/execution/PlayerExecution.ts
+43 -41
View File
@@ -3,6 +3,7 @@ import { Execution, MutableGame, MutablePlayer, Player, PlayerID, TerraNullius,
import { bfs, calculateBoundingBox, getMode, inscribed, simpleHash } from "../Util"
import { GameImpl } from "../game/GameImpl"
import { consolex } from "../Consolex"
import { TileRef } from "../game/GameMap"
export class PlayerExecution implements Execution {
@@ -79,7 +80,8 @@ export class PlayerExecution implements Execution {
if (this.player.lastTileChange() > this.lastCalc) {
this.lastCalc = ticks
const start = performance.now()
this.removeClusters()
// TODO
// this.removeClusters()
const end = performance.now()
if (end - start > 1000) {
consolex.log(`player ${this.player.name()}, took ${end - start}ms`)
@@ -109,15 +111,15 @@ export class PlayerExecution implements Execution {
}
}
private surroundedBySamePlayer(cluster: Set<Tile>): false | Player {
const enemies = new Set<Player>()
for (const tile of cluster) {
if (tile.terrain().isOceanShore() || tile.neighbors().find(n => !n.hasOwner())) {
private surroundedBySamePlayer(cluster: Set<TileRef>): false | Player {
const enemies = new Set<number>()
for (const ref of cluster) {
if (this.mg.M.isOceanShore(ref) || this.mg.M.neighbors(ref).some(n => !this.mg.M.hasOwner(n))) {
return false
}
tile.neighbors()
.filter(n => n.hasOwner() && n.owner() != this.player)
.forEach(p => enemies.add(p.owner() as Player))
this.mg.M.neighbors(ref)
.filter(n => this.mg.M.ownerID(n) != this.player.smallID())
.forEach(p => enemies.add(this.mg.M.ownerID(p)))
if (enemies.size != 1) {
return false
}
@@ -125,63 +127,63 @@ export class PlayerExecution implements Execution {
if (enemies.size != 1) {
return false
}
return Array.from(enemies)[0]
return this.mg.playerBySmallID(Array.from(enemies)[0]) as Player
}
private isSurrounded(cluster: Set<Tile>): boolean {
let enemyTiles = new Set<Tile>()
for (const tile of cluster) {
if (tile.terrain().isOceanShore()) {
private isSurrounded(cluster: Set<TileRef>): boolean {
let enemyTiles = new Set<TileRef>()
for (const tr of cluster) {
if (this.mg.M.isOceanShore(tr)) {
return false
}
tile.neighbors()
.filter(n => n.hasOwner() && n.owner() != this.player)
this.mg.M.neighbors(tr)
.filter(n => this.mg.M.ownerID(n) != this.player.smallID())
.forEach(n => enemyTiles.add(n))
}
if (enemyTiles.size == 0) {
return false
}
const enemyBox = calculateBoundingBox(enemyTiles)
const clusterBox = calculateBoundingBox(cluster)
const enemyBox = calculateBoundingBox(new Set(Array.from(enemyTiles).map(tr => this.mg.fromRef(tr))))
const clusterBox = calculateBoundingBox(new Set(Array.from(cluster).map(tr => this.mg.fromRef(tr))))
return inscribed(enemyBox, clusterBox)
}
private removeCluster(cluster: Set<Tile>) {
private removeCluster(cluster: Set<TileRef>) {
const arr = Array.from(cluster)
if (arr.some(t => t.owner() != this.player)) {
// Other removeCluster operations could change tile owners,
// so double check.
return
}
const mode = getMode(arr.flatMap(t => t.neighbors()).filter(t => t.hasOwner() && t.owner() != this.player).map(t => t.owner().id()))
if (!this.mg.hasPlayer(mode)) {
const mode = getMode(
arr.
flatMap(t => this.mg.M.neighbors(t))
.filter(t => this.mg.M.ownerID(t) != this.player.smallID())
.map(t => this.mg.M.ownerID(t))
)
if (!this.mg.playerBySmallID(mode).isPlayer()) {
consolex.warn('mode is not found')
return
}
const firstTile = arr[0]
const filter = (n: Tile): boolean => n.owner() == firstTile.owner()
const tiles = bfs(firstTile, filter)
const filter = (n: Tile): boolean => n.owner().smallID() == this.mg.M.ownerID(firstTile)
const tiles = bfs(this.mg.fromRef(firstTile), filter)
const modePlayer = this.mg.player(mode)
if (modePlayer == null) {
const modePlayer = this.mg.playerBySmallID(mode)
if (!modePlayer.isPlayer()) {
consolex.warn('mode player is null')
}
for (const tile of tiles) {
modePlayer.conquer(tile)
(modePlayer as MutablePlayer).conquer(tile)
}
}
private calculateClusters(): Set<Tile>[] {
const seen = new Set<Tile>()
const border = this.player.borderTiles()
const clusters: Set<Tile>[] = []
private calculateClusters(): Set<TileRef>[] {
const seen = new Set<TileRef>()
const border = this.player.borderTileRefs()
const clusters: Set<TileRef>[] = []
for (const tile of border) {
if (seen.has(tile)) {
continue
}
const cluster = new Set<Tile>()
const queue: Tile[] = [tile]
const cluster = new Set<TileRef>()
const queue: TileRef[] = [tile]
seen.add(tile)
let loops = 0;
while (queue.length > 0) {
@@ -189,12 +191,12 @@ export class PlayerExecution implements Execution {
const curr = queue.shift()
cluster.add(curr)
const neighbors = (this.mg as GameImpl).neighborsWithDiag(curr)
const neighbors = (this.mg as GameImpl).neighborsWithDiag(this.mg.fromRef(curr))
for (const neighbor of neighbors) {
if (neighbor.isBorder() && border.has(neighbor)) {
if (!seen.has(neighbor)) {
queue.push(neighbor)
seen.add(neighbor)
if (neighbor.isBorder() && border.has(neighbor.ref())) {
if (!seen.has(neighbor.ref())) {
queue.push(neighbor.ref())
seen.add(neighbor.ref())
}
}
}