AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 11:34:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

CityCombatant.matchesFilter contains multifilter and civ filter

Browse Source
This commit is contained in:
Yair Morgenstern 2024-01-25 00:12:40 +02:00
parent 414a11a2d6
commit 21581b43a0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package com.unciv.logic.battle package com.unciv.logic.battle
import com.unciv.logic.MultiFilter
import com.unciv.logic.city.City import com.unciv.logic.city.City
import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.Civilization
import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.tile.Tile
@ -23,7 +24,7 @@ class CityCombatant(val city: City) : ICombatant {
override fun isDefeated(): Boolean = city.health == 1 override fun isDefeated(): Boolean = city.health == 1
override fun isInvisible(to: Civilization): Boolean = false override fun isInvisible(to: Civilization): Boolean = false
override fun canAttack(): Boolean = city.canBombard() override fun canAttack(): Boolean = city.canBombard()
override fun matchesFilter(filter: String) = filter == "City" || filter == "All" override fun matchesFilter(filter: String) = MultiFilter.multiFilter(filter, {it == "City" || it == "All" || city.civ.matchesFilter(it)})
override fun getAttackSound() = UncivSound.Bombard override fun getAttackSound() = UncivSound.Bombard
override fun takeDamage(damage: Int) { override fun takeDamage(damage: Int) {