mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 17:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3475 - capturing settlers moves us to the captured units' tile

Browse Source
This commit is contained in:
Yair Morgenstern
2020-12-30 21:38:36 +02:00
parent 5b25ec0495
commit e7fb183b85
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,10 +77,10 @@ object Battle {
// or any enemy military unit with Sacrificial captives unique (can be either attacker or defender!) // or any enemy military unit with Sacrificial captives unique (can be either attacker or defender!)
if (defender.isDefeated() && defender is MapUnitCombatant && !defender.getUnitType().isCivilian()) { if (defender.isDefeated() && defender is MapUnitCombatant && !defender.getUnitType().isCivilian()) {
tryEarnFromKilling(attacker, defender) tryEarnFromKilling(attacker, defender)
tryHealAfterKilling(attacker, defender) tryHealAfterKilling(attacker)
} else if (attacker.isDefeated() && attacker is MapUnitCombatant && !attacker.getUnitType().isCivilian()) { } else if (attacker.isDefeated() && attacker is MapUnitCombatant && !attacker.getUnitType().isCivilian()) {
tryEarnFromKilling(defender, attacker) tryEarnFromKilling(defender, attacker)
tryHealAfterKilling(defender, attacker) tryHealAfterKilling(defender)
} }
if (attacker is MapUnitCombatant) { if (attacker is MapUnitCombatant) {
@ -98,7 +98,7 @@ object Battle {
var goldReward = 0 var goldReward = 0
var cultureReward = 0 var cultureReward = 0
var bonusUniques = ArrayList<Unique>() val bonusUniques = ArrayList<Unique>()
bonusUniques.addAll(civUnit.getCivInfo().getMatchingUniques(bonusUniquePlaceholderText)) bonusUniques.addAll(civUnit.getCivInfo().getMatchingUniques(bonusUniquePlaceholderText))
@ -177,7 +177,7 @@ object Battle {
} }
} }
private fun tryHealAfterKilling(attacker: ICombatant, defender: ICombatant) { private fun tryHealAfterKilling(attacker: ICombatant) {
if (attacker is MapUnitCombatant) if (attacker is MapUnitCombatant)
for (unique in attacker.unit.getMatchingUniques("Heals [] damage if it kills a unit")) { for (unique in attacker.unit.getMatchingUniques("Heals [] damage if it kills a unit")) {
val amountToHeal = unique.params[0].toInt() val amountToHeal = unique.params[0].toInt()
@ -321,7 +321,7 @@ object Battle {
private fun captureCivilianUnit(attacker: ICombatant, defender: MapUnitCombatant) { private fun captureCivilianUnit(attacker: ICombatant, defender: MapUnitCombatant) {
// barbarians don't capture civilians // barbarians don't capture civilians
if (attacker.getCivInfo().isBarbarian() if (attacker.getCivInfo().isBarbarian()
|| (defender as MapUnitCombatant).unit.hasUnique("Uncapturable")) { || defender.unit.hasUnique("Uncapturable")) {
defender.takeDamage(100) defender.takeDamage(100)
return return
} }
@ -337,6 +337,9 @@ object Battle {
if (capturedUnit.name == Constants.settler) { if (capturedUnit.name == Constants.settler) {
val tile = capturedUnit.getTile() val tile = capturedUnit.getTile()
capturedUnit.destroy() capturedUnit.destroy()
// This is so that future checks which check if a unit has been caatured are caught give the right answer
// For example, in postBattleMoveToAttackedTile
capturedUnit.civInfo = attacker.getCivInfo()
attacker.getCivInfo().placeUnitNearTile(tile.position, Constants.worker) attacker.getCivInfo().placeUnitNearTile(tile.position, Constants.worker)
} else { } else {
capturedUnit.civInfo.removeUnit(capturedUnit) capturedUnit.civInfo.removeUnit(capturedUnit)