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

Fix: Moai being buildable on forests, etc. (#1896)

Browse Source 
* Moved terrain.unbuildable check above moai coastal tile check

* Refactor
This commit is contained in:
lyrjie
2020-02-10 12:32:59 +03:00
committed by GitHub
parent 6d2cf860a7
commit 14f89b6799
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,23 +235,23 @@ open class TileInfo {
return stats
}
/** Returns true if the [improvement] can be built on this [TileInfo] */
fun canBuildImprovement(improvement: TileImprovement, civInfo: CivilizationInfo): Boolean {
if (isCityCenter() || improvement.name == this.improvement) return false
if(improvement.uniqueTo!=null && improvement.uniqueTo!=civInfo.civName) return false
if (improvement.techRequired != null && !civInfo.tech.isResearched(improvement.techRequired!!)) return false
val topTerrain = getLastTerrain()
if (improvement.terrainsCanBeBuiltOn.contains(topTerrain.name)) return true
if (improvement.name == "Road" && this.roadStatus === RoadStatus.None) return true
if (improvement.name == "Railroad" && this.roadStatus !== RoadStatus.Railroad) return true
if(improvement.name == "Remove Road" && this.roadStatus===RoadStatus.Road) return true
if(improvement.name == "Remove Railroad" && this.roadStatus===RoadStatus.Railroad) return true
if("Can only be built on Coastal tiles" in improvement.uniques && isCoastalTile()) return true
if (topTerrain.unbuildable && !(topTerrain.name==Constants.forest && improvement.name=="Camp")) return false
return hasViewableResource(civInfo) && getTileResource().improvement == improvement.name
return when {
isCityCenter() -> false
improvement.name == this.improvement -> false
improvement.uniqueTo?.equals(civInfo) == false -> false
improvement.techRequired?.let { civInfo.tech.isResearched(it) } == false -> false
improvement.terrainsCanBeBuiltOn.contains(topTerrain.name) -> true
improvement.name == "Road" && roadStatus == RoadStatus.None -> true
improvement.name == "Railroad" && this.roadStatus != RoadStatus.Railroad -> true
improvement.name == "Remove Road" && this.roadStatus == RoadStatus.Road -> true
improvement.name == "Remove Railroad" && this.roadStatus == RoadStatus.Railroad -> true
topTerrain.unbuildable && !(topTerrain.name == Constants.forest && improvement.name == "Camp") -> false
"Can only be built on Coastal tiles" in improvement.uniques && isCoastalTile() -> true
else -> hasViewableResource(civInfo) && getTileResource().improvement == improvement.name
}
}
fun hasImprovementInProgress() = improvementInProgress!=null