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

Added 'City-State' as value for nationFilter

Browse Source
This commit is contained in:
yairm210
2024-10-10 22:57:19 +03:00
parent e4ed06abd0
commit feae93b799
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/models/ruleset/nation/Nation.kt
View File

@ -267,8 +267,7 @@ class Nation : RulesetObject() {
in Constants.all -> true
name -> true
"Major" -> isMajorCiv
// "CityState" to be deprecated, replaced by "City-States"
"CityState", Constants.cityStates -> isCityState
Constants.cityStates, "City-State" -> isCityState
else -> uniques.contains(filter)
}
}

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

@ -230,7 +230,7 @@ enum class UniqueParameterType(
/** Implemented by [Nation.matchesFilter][com.unciv.models.ruleset.nation.Nation.matchesFilter] */
NationFilter("nationFilter", Constants.cityStates) {
override val staticKnownValues = setOf(Constants.cityStates, "Major") + Constants.all
override val staticKnownValues = setOf(Constants.cityStates, "City-State", "Major") + Constants.all
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset) = getErrorSeverityForFilter(parameterText, ruleset)