diff --git a/core/src/com/unciv/logic/map/tile/Tile.kt b/core/src/com/unciv/logic/map/tile/Tile.kt index 7b45623d3c..c920fffd69 100644 --- a/core/src/com/unciv/logic/map/tile/Tile.kt +++ b/core/src/com/unciv/logic/map/tile/Tile.kt @@ -480,6 +480,8 @@ class Tile : IsPartOfGameInfoSerialization, Json.Serializable { if (matchesSingleTerrainFilter(filter, civInfo)) return true if ((improvement == null || improvementIsPillaged) && filter == "unimproved") return true if (improvement != null && !improvementIsPillaged && filter == "improved") return true + if (isPillaged() && filter == "pillaged") return true + if (filter == "worked" && isWorked()) return true if (getUnpillagedTileImprovement()?.matchesFilter(filter, stateThisTile, false) == true) return true return getUnpillagedRoadImprovement()?.matchesFilter(filter, stateThisTile, false) == true } diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index cbf441578d..1e00e5b902 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -352,7 +352,7 @@ enum class UniqueParameterType( /** Implemented by [Tile.matchesFilter][com.unciv.logic.map.tile.Tile.matchesFilter] */ TileFilter("tileFilter", "Farm", "Anything that can be used either in an improvementFilter or in a terrainFilter can be used here, plus 'unimproved'", "Tile Filters") { - override val staticKnownValues = setOf("unimproved", "improved", "All Road", "Great Improvement") + override val staticKnownValues = setOf("unimproved", "improved", "worked", "pillaged", "All Road", "Great Improvement") override fun getErrorSeverity(parameterText: String, ruleset: Ruleset) = getErrorSeverityForFilter(parameterText, ruleset) diff --git a/docs/Modders/Unique-parameters.md b/docs/Modders/Unique-parameters.md index c7ca2b70e3..03a2f9f497 100644 --- a/docs/Modders/Unique-parameters.md +++ b/docs/Modders/Unique-parameters.md @@ -299,6 +299,8 @@ Allowed values: - [improvementFilter](#improvementfilter) for this tile - `Improvement` or `improved` for tiles with any improvements - `unimproved` for tiles with no improvement +- `pillaged` for pillaged tiles +- `worked` for tiles worked by a city You can check this in-game using the console with the `tile checkfilter ` command