AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

River adjacency and 'is land unit' saved in lazies for another pathfinding performance boost

Browse Source
This commit is contained in:
Yair Morgenstern 2022-02-10 14:57:34 +02:00
parent 8ee2a34a4d
commit 505a78182c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -663,7 +663,8 @@ open class TileInfo {
} }
} }
fun isAdjacentToRiver() = neighbors.any { isConnectedByRiver(it) } private val isAdjacentToRiverLazy by lazy { neighbors.any { isConnectedByRiver(it) } }
fun isAdjacentToRiver() = isAdjacentToRiverLazy
/** /**
* @returns whether units of [civInfo] can pass through this tile, considering only civ-wide filters. * @returns whether units of [civInfo] can pass through this tile, considering only civ-wide filters.

2
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -40,7 +40,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
return RoadStatus.Railroad.movement + extraCost return RoadStatus.Railroad.movement + extraCost
val areConnectedByRoad = from.hasConnection(civInfo) && to.hasConnection(civInfo) val areConnectedByRoad = from.hasConnection(civInfo) && to.hasConnection(civInfo)
val areConnectedByRiver = from.isConnectedByRiver(to) val areConnectedByRiver = from.isAdjacentToRiver() && to.isAdjacentToRiver() && from.isConnectedByRiver(to)
if (areConnectedByRoad && (!areConnectedByRiver || civInfo.tech.roadsConnectAcrossRivers)) if (areConnectedByRoad && (!areConnectedByRiver || civInfo.tech.roadsConnectAcrossRivers))
return unit.civInfo.tech.movementSpeedOnRoads + extraCost return unit.civInfo.tech.movementSpeedOnRoads + extraCost

3
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -577,7 +577,8 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
fun isMilitary() = isRanged() || isMelee() fun isMilitary() = isRanged() || isMelee()
fun isCivilian() = !isMilitary() fun isCivilian() = !isMilitary()
fun isLandUnit() = getType().isLandUnit() val isLandUnitInternal by lazy { getType().isLandUnit() }
fun isLandUnit() = isLandUnitInternal
fun isWaterUnit() = getType().isWaterUnit() fun isWaterUnit() = getType().isWaterUnit()
fun isAirUnit() = getType().isAirUnit() fun isAirUnit() = getType().isAirUnit()