mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-06 00:09:23 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Workers try to build roads utilizing existing roads, and railroads overriding existing roads"

Browse Source 
This reverts commit e558ebcc59.
This commit is contained in:
Yair Morgenstern
2023-06-18 01:01:12 +03:00
parent 291c546dec
commit 298771a72b
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
View File

@ -221,15 +221,13 @@ class WorkerAutomation(
if (candidateCities.none()) return false // do nothing.
val isCandidateTilePredicate: (Tile) -> Boolean = { it.isLand && unit.movement.canPassThrough(it) }
val getTilePriority: (Tile) -> Int = { it.roadStatus.ordinal }
val currentTile = unit.getTile()
val cityTilesToSeek = ArrayList(tilesOfConnectedCities.sortedBy { it.aerialDistanceTo(currentTile) })
for (toConnectCity in candidateCities) {
val toConnectTile = toConnectCity.getCenterTile()
val bfs: BFS = bfsCache[toConnectTile.position] ?:
BFS(toConnectTile, getTilePriority, isCandidateTilePredicate).apply {
BFS(toConnectTile, isCandidateTilePredicate).apply {
maxSize = HexMath.getNumberOfTilesInHexagon(
WorkerAutomationConst.maxBfsReachPadding +
tilesOfConnectedCities.minOf { it.aerialDistanceTo(toConnectTile) }
@ -240,7 +238,6 @@ class WorkerAutomation(
while (true) {
for (cityTile in cityTilesToSeek.toList()) { // copy since we change while running
if (!bfs.hasReachedTile(cityTile)) continue
// we have a winner!
val pathToCity = bfs.getPathTo(cityTile)
val roadableTiles = pathToCity.filter { it.getUnpillagedRoad() < bestRoadAvailable }

11
core/src/com/unciv/logic/map/BFS.kt
View File

@ -1,15 +1,14 @@
package com.unciv.logic.map
import com.unciv.logic.map.tile.Tile
import kotlin.collections.ArrayDeque
/**
* Defines intermediate steps of a breadth-first search, for use in either get shortest path or get connected tiles.
*/
class BFS(
val startingPoint: Tile,
/** The *higher* the number, the *greater* the priority */
private val priorityFunction: ((Tile) -> Int)? = null,
private val predicate : (Tile) -> Boolean,
private val predicate : (Tile) -> Boolean
) {
/** Maximum number of tiles to search */
var maxSize = Int.MAX_VALUE
@ -51,11 +50,7 @@ class BFS(
fun nextStep() {
if (tilesReached.size >= maxSize) { tilesToCheck.clear(); return }
val current = tilesToCheck.removeFirstOrNull() ?: return
val sortedNeighbors = if (priorityFunction==null) current.neighbors
else current.neighbors.sortedByDescending(priorityFunction)
for (neighbor in sortedNeighbors) {
for (neighbor in current.neighbors) {
if (neighbor !in tilesReached && predicate(neighbor)) {
tilesReached[neighbor] = current
tilesToCheck.add(neighbor)