From 97b2b56956ea847a8570cdd7581324aa3ce18f63 Mon Sep 17 00:00:00 2001 From: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:22:50 -0400 Subject: [PATCH] Fix amphibious promotion (#7070) --- core/src/com/unciv/logic/battle/BattleDamage.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 1ae1881cdb..f15d6ff561 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -112,10 +112,8 @@ object BattleDamage { if (attacker is MapUnitCombatant) { modifiers.add(getTileSpecificModifiers(attacker, defender.getTile())) - // Depreciated Version - if (attacker.unit.isEmbarked() && !attacker.unit.hasUnique(UniqueType.AttackFromSea)) - modifiers["Landing"] = -50 - if (attacker.unit.isEmbarked() && !attacker.unit.hasUnique(UniqueType.AttackAcrossCoast)) + if (attacker.unit.isEmbarked() + && !(attacker.unit.hasUnique(UniqueType.AttackAcrossCoast)) || attacker.unit.hasUnique(UniqueType.AttackFromSea)) modifiers["Landing"] = -50 // Land Melee Unit attacking to Water