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

can remove fallout on oases (#5640)

Browse Source 
* can remove fallout on oases

* remove matchesfilter
This commit is contained in:
SimonCeder
2021-11-07 17:25:27 +01:00
committed by GitHub
parent 74d1d0451c
commit 73d9179f09
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,8 +472,9 @@ open class TileInfo {
RoadStatus.values().none { it.name == improvement.name || it.removeAction == improvement.name } RoadStatus.values().none { it.name == improvement.name || it.removeAction == improvement.name }
&& getTileImprovement().let { it != null && it.hasUnique("Irremovable") } -> false && getTileImprovement().let { it != null && it.hasUnique("Irremovable") } -> false
// Terrain blocks most improvements // Terrain blocks BUILDING improvements - removing things (such as fallout) is fine
getAllTerrains().any { it.getMatchingUniques(UniqueType.RestrictedBuildableImprovements) !improvement.name.startsWith("Remove ") &&
getAllTerrains().any { it.getMatchingUniques(UniqueType.RestrictedBuildableImprovements)
.any { unique -> !improvement.matchesFilter(unique.params[0]) } } -> false .any { unique -> !improvement.matchesFilter(unique.params[0]) } } -> false
// Decide cancelImprovementOrder earlier, otherwise next check breaks it // Decide cancelImprovementOrder earlier, otherwise next check breaks it