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

Resolved #13451 - 'connect road' works when railroads don't exist in the ruleset

Browse Source
This commit is contained in:
yairm210 2025-06-17 16:09:13 +03:00
parent b01e1df24d
commit 3515445bf8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,8 @@ object MapPathing {
} }
fun isValidRoadPathTile(unit: MapUnit, tile: Tile): Boolean { fun isValidRoadPathTile(unit: MapUnit, tile: Tile): Boolean {
val roadImprovement = tile.ruleset.roadImprovement ?: return false val roadImprovement = tile.ruleset.roadImprovement
val railRoadImprovement = tile.ruleset.railroadImprovement ?: return false val railRoadImprovement = tile.ruleset.railroadImprovement
if (tile.isWater) return false if (tile.isWater) return false
if (tile.isImpassible()) return false if (tile.isImpassible()) return false
@ -34,8 +34,8 @@ object MapPathing {
return tile.hasRoadConnection(unit.civ, false) return tile.hasRoadConnection(unit.civ, false)
|| tile.hasRailroadConnection(false) || tile.hasRailroadConnection(false)
|| tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ) || roadImprovement != null && tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ)
|| tile.improvementFunctions.canBuildImprovement(railRoadImprovement, unit.civ) || railRoadImprovement != null && tile.improvementFunctions.canBuildImprovement(railRoadImprovement, unit.civ)
} }
/** /**

4
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -141,8 +141,8 @@ class Ruleset {
}.toSet() }.toSet()
} }
val roadImprovement by lazy { RoadStatus.Road.improvement(this) } val roadImprovement: TileImprovement? by lazy { RoadStatus.Road.improvement(this) }
val railroadImprovement by lazy { RoadStatus.Railroad.improvement(this) } val railroadImprovement: TileImprovement? by lazy { RoadStatus.Railroad.improvement(this) }
//endregion //endregion
fun clone(): Ruleset { fun clone(): Ruleset {