AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing to also capture Civilian Unit when capturing during battle (#6114)

Browse Source 
Co-authored-by: temurakami <spellman23@gmail.com>
This commit is contained in:
itanasi 2022-02-07 00:45:53 -08:00 committed by GitHub
parent aa11602c9a
commit 77dd9f63f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -214,6 +214,10 @@ object Battle {
"Your [${attacker.getName()}] captured an enemy [$defenderName]", "Your [${attacker.getName()}] captured an enemy [$defenderName]",
newUnit.getTile().position, attacker.getName(), NotificationIcon.War, 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.currentMovement = 0f
newUnit.health = 50 newUnit.health = 50
return true return true
@ -339,6 +343,9 @@ object Battle {
attacker.getCivInfo().placeUnitNearTile(attackedTile.position, defender.getName()) attacker.getCivInfo().placeUnitNearTile(attackedTile.position, defender.getName())
attacker.getCivInfo().addGold(25) attacker.getCivInfo().addGold(25)
attacker.getCivInfo().addNotification("A barbarian [${defender.getName()}] has joined us!", attackedTile.position, defender.getName()) 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!!))
} }
} }