From ae7cbcb3c9b0eea626cb93f74014b22c313da454 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 9 Feb 2019 23:06:13 +0200 Subject: [PATCH] Embarked units now have era-based defensive strength (like in original civ) --- core/src/com/unciv/logic/battle/BattleDamage.kt | 4 ++++ core/src/com/unciv/logic/battle/MapUnitCombatant.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 621415d178..7408f5064d 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -133,7 +133,11 @@ class BattleDamage{ } fun getDefenceModifiers(attacker: ICombatant, defender: MapUnitCombatant): HashMap { + if(defender.unit.isEmbarked()) // embarked units get no defensive modifiers + return HashMap() + val modifiers = getGeneralModifiers(defender, attacker) + if (!(defender.unit.hasUnique("No defensive terrain bonus"))) { val tileDefenceBonus = defender.getTile().getDefensiveBonus() if (tileDefenceBonus > 0) modifiers["Terrain"] = tileDefenceBonus diff --git a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt index a510f0153e..23bcf13a34 100644 --- a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt +++ b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt @@ -26,7 +26,7 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant { } override fun getDefendingStrength(): Int { - if(unit.isEmbarked()) return 0 + if(unit.isEmbarked()) return 5 * getCivInfo().getEra().ordinal return unit.baseUnit().strength }