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

More city filters (#11253)

Browse Source
This commit is contained in:
SomeTroglodyte 2024-03-05 22:05:31 +01:00 committed by GitHub
parent 60d93e5ff9
commit 06a675c44f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/City.kt
View File

@ -432,6 +432,8 @@ class City : IsPartOfGameInfoSerialization {
"in foreign cities", "Foreign" -> viewingCiv != null && viewingCiv != civ
"in annexed cities", "Annexed" -> foundingCiv != civ.civName && !isPuppet
"in puppeted cities", "Puppeted" -> isPuppet
"in resisting cities", "Resisting" -> isInResistance()
"in cities being razed", "Razing" -> isBeingRazed
"in holy cities", "Holy" -> isHolyCity()
"in City-State cities" -> civ.isCityState()
// This is only used in communication to the user indicating that only in cities with this

4
core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt
View File

@ -255,6 +255,8 @@ enum class UniqueParameterType(
"in foreign cities", "Foreign",
"in annexed cities", "Annexed",
"in puppeted cities", "Puppeted",
"in resisting cities", "Resisting",
"in cities being razed", "Razing",
"in holy cities", "Holy",
"in City-State cities",
"in cities following this religion",
@ -394,7 +396,7 @@ enum class UniqueParameterType(
/** Used for region definitions, can be a terrain type with region unique, or "Hybrid"
*
* See also: [UniqueType.ConditionalInRegionOfType], [UniqueType.ConditionalInRegionExceptOfType], [MapRegions][com.unciv.logic.map.mapgenerator.MapRegions] */
* See also: [UniqueType.ConditionalInRegionOfType], [UniqueType.ConditionalInRegionExceptOfType], [MapRegions][com.unciv.logic.map.mapgenerator.mapregions.MapRegions] */
RegionType("regionType", "Hybrid", null, "Region Types") {
private val knownValues = setOf("Hybrid")
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):