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

terrainFilter now accommodates nationFilter for owner

Browse Source
This commit is contained in:
Yair Morgenstern
2023-04-25 17:35:08 +03:00
parent 2b57bd44ab
commit 079c237547
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,9 +535,11 @@ open class Tile : IsPartOfGameInfoSerialization {
"Natural Wonder" -> naturalWonder != null
"Featureless" -> terrainFeatures.isEmpty()
Constants.freshWaterFilter -> isAdjacentTo(Constants.freshWater)
in terrainFeatures -> true
else -> {
if (terrainFeatures.contains(filter)) return true
if (terrainUniqueMap.getUniques(filter).any()) return true
if (getOwner()?.nation?.matchesFilter(filter) == true) return true
// Resource type check is last - cannot succeed if no resource here
if (resource == null) return false