mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-22 16:54:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Allow combatantFilter for cities to use cityFilter

Browse Source
This commit is contained in:
Yair Morgenstern 2024-02-09 12:44:56 +02:00
parent eb984f06dc
commit a9c367907d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/battle/CityCombatant.kt
View File

@ -24,7 +24,7 @@ class CityCombatant(val city: City) : ICombatant {
override fun isDefeated(): Boolean = city.health == 1
override fun isInvisible(to: Civilization): Boolean = false
override fun canAttack(): Boolean = city.canBombard()
override fun matchesFilter(filter: String) = MultiFilter.multiFilter(filter, {it == "City" || it == "All" || city.civ.matchesFilter(it)})
override fun matchesFilter(filter: String) = MultiFilter.multiFilter(filter, {it == "City" || it == "All" || city.matchesFilter(it)})
override fun getAttackSound() = UncivSound.Bombard
override fun takeDamage(damage: Int) {

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

@ -86,8 +86,9 @@ enum class UniqueParameterType(
UniqueType.UniqueParameterErrorSeverity? = getErrorSeverityForFilter(parameterText, ruleset)
override fun isKnownValue(parameterText: String, ruleset: Ruleset): Boolean {
if (parameterText == "City") return true // MapUnitFilter covers CivFilter
if (parameterText == "City") return true
if (MapUnitFilter.isKnownValue(parameterText, ruleset)) return true
if (CityFilter.isKnownValue(parameterText, ruleset)) return true
return false
}
},