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

Avoid destroying all onboard units after player upgrade Air Carrier unit. (#8129)

Browse Source
This commit is contained in:
nacro711072
2022-12-14 23:30:10 +08:00
committed by GitHub
parent ed83cc9954
commit 7af63dd8b1
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -916,17 +916,19 @@ class MapUnit : IsPartOfGameInfoSerialization {
attacksSinceTurnStart.clear() attacksSinceTurnStart.clear()
} }
fun destroy() { fun destroy(destroyTransportedUnit: Boolean = true) {
val currentPosition = Vector2(getTile().position) val currentPosition = Vector2(getTile().position)
civInfo.attacksSinceTurnStart.addAll(attacksSinceTurnStart.asSequence().map { CivilizationInfo.HistoricalAttackMemory(this.name, currentPosition, it) }) civInfo.attacksSinceTurnStart.addAll(attacksSinceTurnStart.asSequence().map { CivilizationInfo.HistoricalAttackMemory(this.name, currentPosition, it) })
currentMovement = 0f currentMovement = 0f
removeFromTile() removeFromTile()
civInfo.removeUnit(this) civInfo.removeUnit(this)
civInfo.updateViewableTiles() civInfo.updateViewableTiles()
if (destroyTransportedUnit) {
// all transported units should be destroyed as well // all transported units should be destroyed as well
currentTile.getUnits().filter { it.isTransported && isTransportTypeOf(it) } currentTile.getUnits().filter { it.isTransported && isTransportTypeOf(it) }
.toList() // because we're changing the list .toList() // because we're changing the list
.forEach { unit -> unit.destroy() } .forEach { unit -> unit.destroy() }
}
isDestroyed = true isDestroyed = true
} }

2
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -446,7 +446,7 @@ object UnitActions {
return UnitAction(UnitActionType.Upgrade, return UnitAction(UnitActionType.Upgrade,
title = title, title = title,
action = { action = {
unit.destroy() unit.destroy(destroyTransportedUnit = false)
val newUnit = civInfo.placeUnitNearTile(unitTile.position, upgradedUnit.name) val newUnit = civInfo.placeUnitNearTile(unitTile.position, upgradedUnit.name)
/** We were UNABLE to place the new unit, which means that the unit failed to upgrade! /** We were UNABLE to place the new unit, which means that the unit failed to upgrade!