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

Correct swap of the full-loaded carriers (#6634)

Browse Source 
* Correct swap of the full-loaded carriers

* Code comments
This commit is contained in:
Jack Rainy 2022-04-28 14:31:46 +03:00 committed by GitHub
parent 2b9b68488d
commit 487ad69d28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -501,14 +501,16 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
// The .toList() here is because we have a sequence that's running on the units in the tile,
// then if we move one of the units we'll get a ConcurrentModificationException, se we save them all to a list
for (payload in origin.getUnits().filter { it.isTransported && unit.canTransport(it) }.toList()) { // bring along the payloads
val payloadUnits = origin.getUnits().filter { it.isTransported && unit.canTransport(it) }.toList()
// bring along the payloads
for (payload in payloadUnits) {
payload.removeFromTile()
for (tile in pathToLastReachableTile){
payload.moveThroughTile(tile)
if (tile == finalTileReached) break // this is the final tile the transport reached
}
payload.putInTile(finalTileReached)
payload.isTransported = true // restore the flag to not leave the payload in the cit
payload.isTransported = true // restore the flag to not leave the payload in the city
payload.mostRecentMoveType = UnitMovementMemoryType.UnitMoved
}
@ -530,13 +532,13 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
destination.civilianUnit
else
destination.militaryUnit
)!! // The precondition guarantees that there is an eligible same-type unit at the destination
)?: return // The precondition guarantees that there is an eligible same-type unit at the destination
val ourOldPosition = unit.getTile()
val theirOldPosition = otherUnit.getTile()
val ourPayload = ourOldPosition.getUnits().filter { it.isTransported && unit.canTransport(it) }.toList()
val theirPayload = theirOldPosition.getUnits().filter { it.isTransported && otherUnit.canTransport(it) }.toList()
val ourPayload = ourOldPosition.getUnits().filter { it.isTransported }.toList()
val theirPayload = theirOldPosition.getUnits().filter { it.isTransported }.toList()
// Swap the units
// Step 1: Release the destination tile
@ -549,15 +551,20 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
unit.removeFromTile()
for (payload in ourPayload)
payload.removeFromTile()
// Step 4: Perform the another movement
// Step 4: Restore the initial position after step 1
otherUnit.putInTile(theirOldPosition)
for (payload in theirPayload)
for (payload in theirPayload) {
payload.putInTile(theirOldPosition)
payload.isTransported = true // restore the flag to not leave the payload in the city
}
// Step 5: Perform the another movement
otherUnit.movement.moveToTile(ourOldPosition)
// Step 5: Restore the position in the new tile
// Step 6: Restore the position in the new tile after step 3
unit.putInTile(theirOldPosition)
for (payload in ourPayload)
for (payload in ourPayload) {
payload.putInTile(theirOldPosition)
payload.isTransported = true // restore the flag to not leave the payload in the city
}
// Step 6: Update states
otherUnit.mostRecentMoveType = UnitMovementMemoryType.UnitMoved
unit.mostRecentMoveType = UnitMovementMemoryType.UnitMoved