mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-11 00:08:58 +07:00
Added "Friendly Land" and "Foreign Land" as tile filter options, instead of limiting them to unit bonuses
This commit is contained in:
@ -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())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Reference in New Issue
Block a user