Added "Friendly Land" and "Foreign Land" as tile filter options, instead of limiting them to unit bonuses

This commit is contained in:
Yair Morgenstern
2021-04-14 18:22:50 +03:00
parent 5750476cac
commit e01859f6b9
2 changed files with 4 additions and 4 deletions

View File

@ -201,13 +201,11 @@ object BattleDamage {
private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): Counter<String> { private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): Counter<String> {
val modifiers = Counter<String>() val modifiers = Counter<String>()
for (unique in unit.unit.getMatchingUniques("+[]% combat bonus in []") for (unique in unit.unit.getMatchingUniques("+[]% combat bonus in []")
+ unit.unit.getMatchingUniques("+[]% Strength in []")
+ unit.getCivInfo().getMatchingUniques("+[]% combat bonus for units fighting in []")) { + unit.getCivInfo().getMatchingUniques("+[]% combat bonus for units fighting in []")) {
val filter = unique.params[1] val filter = unique.params[1]
if (filter == tile.getLastTerrain().name if (tile.matchesUniqueFilter(filter, unit.getCivInfo()))
|| filter == "Foreign Land" && !tile.isFriendlyTerritory(unit.getCivInfo())
|| filter == "Friendly Land" && tile.isFriendlyTerritory(unit.getCivInfo()))
modifiers.add(filter, unique.params[0].toInt()) modifiers.add(filter, unique.params[0].toInt())
} }

View File

@ -385,6 +385,8 @@ open class TileInfo {
|| filter == "Water" && isWater || filter == "Water" && isWater
|| filter == "Land" && isLand || filter == "Land" && isLand
|| filter == naturalWonder || filter == naturalWonder
|| filter == "Foreign Land" && civInfo!=null && !isFriendlyTerritory(civInfo)
|| filter == "Friendly Land" && civInfo!=null && isFriendlyTerritory(civInfo)
} }
fun hasImprovementInProgress() = improvementInProgress != null fun hasImprovementInProgress() = improvementInProgress != null