From e01859f6b9ffc5fa5b7e15eb79c54538877d76fd Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 14 Apr 2021 18:22:50 +0300 Subject: [PATCH] Added "Friendly Land" and "Foreign Land" as tile filter options, instead of limiting them to unit bonuses --- core/src/com/unciv/logic/battle/BattleDamage.kt | 6 ++---- core/src/com/unciv/logic/map/TileInfo.kt | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 6d0b2c07e7..beead94539 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -201,13 +201,11 @@ object BattleDamage { private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): Counter { val modifiers = Counter() - for (unique in unit.unit.getMatchingUniques("+[]% combat bonus in []") + + unit.unit.getMatchingUniques("+[]% Strength in []") + unit.getCivInfo().getMatchingUniques("+[]% combat bonus for units fighting in []")) { val filter = unique.params[1] - if (filter == tile.getLastTerrain().name - || filter == "Foreign Land" && !tile.isFriendlyTerritory(unit.getCivInfo()) - || filter == "Friendly Land" && tile.isFriendlyTerritory(unit.getCivInfo())) + if (tile.matchesUniqueFilter(filter, unit.getCivInfo())) modifiers.add(filter, unique.params[0].toInt()) } diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 3a1b1fee6f..9497c6e1bb 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -385,6 +385,8 @@ open class TileInfo { || filter == "Water" && isWater || filter == "Land" && isLand || filter == naturalWonder + || filter == "Foreign Land" && civInfo!=null && !isFriendlyTerritory(civInfo) + || filter == "Friendly Land" && civInfo!=null && isFriendlyTerritory(civInfo) } fun hasImprovementInProgress() = improvementInProgress != null