From 6889a60605bd3d57b891eb8f7d3a031e87182a6c Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Fri, 22 Jan 2021 02:17:01 +0800 Subject: [PATCH] Fixed : great people could not build improvement. (#3553) * Fixed : great people could not build improvement. * Better check for buildable. * Revert "Better check for buildable." This reverts commit b9fa0efbae0398a6965167e0ce72846ed242395e. * Better check for buildable. --- core/src/com/unciv/logic/map/TileInfo.kt | 1 + core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 576aa1d5d8..438e6cea2f 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -316,6 +316,7 @@ open class TileInfo { isCityCenter() -> false "Cannot be built on bonus resource" in improvement.uniques && resource != null && getTileResource().resourceType == ResourceType.Bonus -> false + improvement.uniques.contains("Great Improvement") && isLand -> true improvement.terrainsCanBeBuiltOn.contains(topTerrain.name) -> true improvement.uniqueObjects.filter { it.placeholderText == "Must be next to []" }.any { val filter = it.params[0] diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt index 4378b21652..2693816213 100644 --- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt @@ -48,6 +48,7 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) : regularImprovements.defaults().pad(5f) for (improvement in tileInfo.tileMap.gameInfo.ruleSet.tileImprovements.values) { + if (improvement.hasUnique("Unbuildable")) continue if (!tileInfo.canBuildImprovement(improvement, currentPlayerCiv)) continue if (improvement.name == tileInfo.improvement) continue