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

Cache getDistanceToTilesWithinTurn by removing tilesToIgnore from the call and doing that filtering later. Also simplify caller side with some transformations around differences for the first iteration and subsequent iterations.

Browse Source
This commit is contained in:
WhoIsJohannes 2023-04-27 15:35:25 +02:00
parent f894fd2d3d
commit f75ce00d83
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/com/unciv/logic/map/mapunit/UnitMovement.kt
View File

@ -157,7 +157,6 @@ class UnitMovement(val unit: MapUnit) {
origin: Vector2,
unitMovement: Float,
considerZoneOfControl: Boolean = true,
tilesToIgnore: HashSet<Tile>? = null,
passThroughCache: HashMap<Tile, Boolean> = HashMap(),
movementCostCache: HashMap<Pair<Tile, Tile>, Float> = HashMap()
): PathsToTilesWithinTurn {
@ -174,7 +173,6 @@ class UnitMovement(val unit: MapUnit) {
val updatedTiles = ArrayList<Tile>()
for (tileToCheck in tilesToCheck)
for (neighbor in tileToCheck.neighbors) {
if (tilesToIgnore?.contains(neighbor) == true) continue // ignore this tile
var totalDistanceToTile: Float = when {
!unit.civ.hasExplored(neighbor) ->
distanceToTiles[tileToCheck]!!.totalDistance + 1f // If we don't know then we just guess it to be 1.
@ -243,44 +241,41 @@ class UnitMovement(val unit: MapUnit) {
val movementTreeParents = HashMap<Tile, Tile?>() // contains a map of "you can get from X to Y in that turn"
movementTreeParents[currentTile] = null
var movementThisTurn = unit.currentMovement
var distance = 1
val newTilesToCheck = ArrayList<Tile>()
var considerZoneOfControl = true // only for first distance!
val visitedTiles: HashSet<Tile> = hashSetOf(currentTile)
val civilization = unit.civ
val unitMaxMovement = unit.getMaxMovement().toFloat()
val passThroughCache = HashMap<Tile, Boolean>()
val movementCostCache = HashMap<Pair<Tile, Tile>, Float>()
val canMoveToCache = HashMap<Tile, Boolean>()
val distanceToTilesWithinTurnCache = HashMap<Vector2, PathsToTilesWithinTurn>()
while (true) {
if (distance == 2) { // only set this once after distance > 1
movementThisTurn = unit.getMaxMovement().toFloat()
considerZoneOfControl = false // by then units would have moved around, we don't need to consider untenable futures when it harms performance!
}
newTilesToCheck.clear()
var tilesByPreference = tilesToCheck.sortedBy { it.aerialDistanceTo(destination) }
// Avoid embarkation when possible
if (unit.type.isLandUnit()) tilesByPreference = tilesByPreference.sortedByDescending { it.isLand }
for (tileToCheck in tilesByPreference) {
val distanceToTilesThisTurn = if (distance == 1) {
getDistanceToTiles(considerZoneOfControl, passThroughCache, movementCostCache) // check cache
getDistanceToTiles(true, passThroughCache, movementCostCache) // check cache
}
else {
getDistanceToTilesWithinTurn(
tileToCheck.position,
movementThisTurn,
considerZoneOfControl,
visitedTiles,
passThroughCache,
movementCostCache
)
distanceToTilesWithinTurnCache.getOrPut(tileToCheck.position) {
getDistanceToTilesWithinTurn(
tileToCheck.position,
unitMaxMovement,
false,
passThroughCache,
movementCostCache
)
}
}
for (reachableTile in distanceToTilesThisTurn.keys) {
if (visitedTiles.contains(reachableTile)) continue
// Avoid damaging terrain on first pass
if (avoidDamagingTerrain && unit.getDamageFromTerrain(reachableTile) > 0)
continue
@ -788,7 +783,6 @@ class UnitMovement(val unit: MapUnit) {
unit.currentTile.position,
unit.currentMovement,
considerZoneOfControl,
null,
passThroughCache,
movementCostCache
)