From 77dd9f63f600bd20868f849427625edc155aa654 Mon Sep 17 00:00:00 2001 From: itanasi <44038014+itanasi@users.noreply.github.com> Date: Mon, 7 Feb 2022 00:45:53 -0800 Subject: [PATCH] Fixing to also capture Civilian Unit when capturing during battle (#6114) Co-authored-by: temurakami --- core/src/com/unciv/logic/battle/Battle.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index acd50e9b3d..fac937fe33 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -214,6 +214,10 @@ object Battle { "Your [${attacker.getName()}] captured an enemy [$defenderName]", newUnit.getTile().position, attacker.getName(), NotificationIcon.War, defenderName ) + // Also capture any civilians on the same tile + if (newUnit.currentTile.civilianUnit != null) + captureCivilianUnit(attacker, MapUnitCombatant(newUnit.currentTile.civilianUnit!!)) + newUnit.currentMovement = 0f newUnit.health = 50 return true @@ -339,6 +343,9 @@ object Battle { attacker.getCivInfo().placeUnitNearTile(attackedTile.position, defender.getName()) attacker.getCivInfo().addGold(25) attacker.getCivInfo().addNotification("A barbarian [${defender.getName()}] has joined us!", attackedTile.position, defender.getName()) + // Also capture any civilians on the same tile + if (attackedTile.civilianUnit != null) + captureCivilianUnit(attacker, MapUnitCombatant(attackedTile.civilianUnit!!)) } }