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

Fix automated road connections going through impassible tiles

Browse Source
This commit is contained in:
yairm210 2025-02-13 12:13:35 +02:00
parent 97d7152a5d
commit 48e121a2a8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/com/unciv/logic/map/MapPathing.kt
View File

@ -2,7 +2,6 @@ package com.unciv.logic.map
import com.unciv.logic.civilization.Civilization
import com.unciv.logic.map.mapunit.MapUnit
import com.unciv.logic.map.tile.RoadStatus
import com.unciv.logic.map.tile.Tile
import com.unciv.utils.Log
@ -27,13 +26,15 @@ object MapPathing {
fun isValidRoadPathTile(unit: MapUnit, tile: Tile): Boolean {
val roadImprovement = tile.ruleset.roadImprovement ?: return false
val railRoadImprovement = tile.ruleset.railroadImprovement ?: return false
return tile.isLand
&& !tile.isImpassible()
&& unit.civ.hasExplored(tile)
&& tile.canCivPassThrough(unit.civ)
&& (tile.hasRoadConnection(unit.civ, false)
if (tile.isWater) return false
if (tile.isImpassible()) return false
if (!unit.civ.hasExplored(tile)) return false
if (!tile.canCivPassThrough(unit.civ)) return false
return tile.hasRoadConnection(unit.civ, false)
|| tile.hasRailroadConnection(false)
|| tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ))
|| tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ)
|| tile.improvementFunctions.canBuildImprovement(railRoadImprovement, unit.civ)
}