From 4e338ae4f372d7907007b32ceca2a81c6bb696a6 Mon Sep 17 00:00:00 2001 From: itanasi <44038014+itanasi@users.noreply.github.com> Date: Fri, 18 Feb 2022 04:15:35 -0800 Subject: [PATCH] Embarking penalty logic fix (#6181) * Fox naval unit Landind penalty is for attacking on to land * Only Land unit should have Boarding penalty * Unbreak logic Co-authored-by: itanasi --- core/src/com/unciv/logic/battle/BattleDamage.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 1277a00c90..5dba7d3c26 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -136,7 +136,7 @@ object BattleDamage { modifiers["Landing"] = -50 // Land Melee Unit attacking to Water - if (!attacker.unit.isEmbarked() && attacker.isMelee() && defender.getTile().isWater + if (attacker.unit.type.isLandUnit() && !attacker.unit.isEmbarked() && attacker.isMelee() && defender.getTile().isWater && !attacker.unit.hasUnique(UniqueType.AttackAcrossCoast)) modifiers["Boarding"] = -50 // Naval Unit Melee attacking to Land (not City) unit