mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-24 14:49:23 +07:00
Added 'City-State' as value for nationFilter
This commit is contained in:
@ -267,8 +267,7 @@ class Nation : RulesetObject() {
|
|||||||
in Constants.all -> true
|
in Constants.all -> true
|
||||||
name -> true
|
name -> true
|
||||||
"Major" -> isMajorCiv
|
"Major" -> isMajorCiv
|
||||||
// "CityState" to be deprecated, replaced by "City-States"
|
Constants.cityStates, "City-State" -> isCityState
|
||||||
"CityState", Constants.cityStates -> isCityState
|
|
||||||
else -> uniques.contains(filter)
|
else -> uniques.contains(filter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -230,7 +230,7 @@ enum class UniqueParameterType(
|
|||||||
|
|
||||||
/** Implemented by [Nation.matchesFilter][com.unciv.models.ruleset.nation.Nation.matchesFilter] */
|
/** Implemented by [Nation.matchesFilter][com.unciv.models.ruleset.nation.Nation.matchesFilter] */
|
||||||
NationFilter("nationFilter", Constants.cityStates) {
|
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)
|
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset) = getErrorSeverityForFilter(parameterText, ruleset)
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ Allows filtering for specific nations. Used by [ModOptions.nationsToRemove](Mod-
|
|||||||
Allowed values:
|
Allowed values:
|
||||||
|
|
||||||
- `All`
|
- `All`
|
||||||
- `City-states`
|
- `City-States`, `City-State`
|
||||||
- `Major`
|
- `Major`
|
||||||
- Nation name
|
- Nation name
|
||||||
- A unique a Nation has (verbatim, no placeholders)
|
- A unique a Nation has (verbatim, no placeholders)
|
||||||
@ -309,6 +309,7 @@ Allowed values:
|
|||||||
|
|
||||||
- `year`, `turns`
|
- `year`, `turns`
|
||||||
- `Cities`, `[cityFilter] Cities`
|
- `Cities`, `[cityFilter] Cities`
|
||||||
|
- `City-States` - counts all undefeated city-states
|
||||||
- `Units`, `[mapUnitFilter] Units`
|
- `Units`, `[mapUnitFilter] Units`
|
||||||
- `[buildingFilter] Buildings`
|
- `[buildingFilter] Buildings`
|
||||||
- Stat name - gets the stat *reserve*, not the amount per turn (can be city stats or civilization stats, depending on where the unique is used)
|
- Stat name - gets the stat *reserve*, not the amount per turn (can be city stats or civilization stats, depending on where the unique is used)
|
||||||
|
Reference in New Issue
Block a user