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

Modded water units with worker unique can no longer build roads in water

Browse Source
This commit is contained in:
Yair Morgenstern 2020-12-26 19:50:29 +02:00
parent 099ee879cc
commit b77fa8d67d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,8 +319,8 @@ open class TileInfo {
if (filter == "River") return@any !isAdjacentToRiver() if (filter == "River") return@any !isAdjacentToRiver()
else return@any !neighbors.any { it.matchesUniqueFilter(filter) } else return@any !neighbors.any { it.matchesUniqueFilter(filter) }
} -> false } -> false
improvement.name == "Road" && roadStatus == RoadStatus.None -> true improvement.name == "Road" && roadStatus == RoadStatus.None && !isWater -> true
improvement.name == "Railroad" && this.roadStatus != RoadStatus.Railroad -> true improvement.name == "Railroad" && this.roadStatus != RoadStatus.Railroad && !isWater -> true
improvement.name == "Remove Road" && this.roadStatus == RoadStatus.Road -> true improvement.name == "Remove Road" && this.roadStatus == RoadStatus.Road -> true
improvement.name == "Remove Railroad" && this.roadStatus == RoadStatus.Railroad -> true improvement.name == "Remove Railroad" && this.roadStatus == RoadStatus.Railroad -> true
improvement.name == Constants.cancelImprovementOrder && this.improvementInProgress != null -> true improvement.name == Constants.cancelImprovementOrder && this.improvementInProgress != null -> true

2
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -188,7 +188,7 @@ class Building : NamedStats(), IConstruction {
} }
override fun canBePurchased(): Boolean { override fun canBePurchased(): Boolean {
return !isWonder && !isNationalWonder && ("Cannot be purchased" !in uniques) return !isWonder && !isNationalWonder && "Cannot be purchased" !in uniques
} }