From c9945ca7ba834bc09ab1a0df97ea20f486591025 Mon Sep 17 00:00:00 2001 From: itanasi <44038014+itanasi@users.noreply.github.com> Date: Tue, 22 Feb 2022 01:27:58 -0800 Subject: [PATCH] Make multiple tile defense bonuses stack (#6193) * Make multiple defense bonuses stack * Switch to check base terrin and Natural Wonders using getAllTerrains() Co-authored-by: itanasi --- core/src/com/unciv/logic/map/TileInfo.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 567f0e8806..aeed256973 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -611,7 +611,8 @@ open class TileInfo { tileMap.getTilesAtDistance(position, distance) fun getDefensiveBonus(): Float { - var bonus = getLastTerrain().defenceBonus + var bonus = 0F + getAllTerrains().forEach{bonus += it.defenceBonus} val tileImprovement = getTileImprovement() if (tileImprovement != null) { for (unique in tileImprovement.getMatchingUniques(UniqueType.DefensiveBonus, StateForConditionals(tile = this)))