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

Resolved #6164 - transported units reveal tiles as if they passed through the path of the transporting unit

Browse Source
This commit is contained in:
Yair Morgenstern 2022-02-15 10:47:47 +02:00
parent 1e44b1a235
commit 48bbed9fad
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,7 +403,6 @@ class MapUnit {
viewableTiles = if (hasUnique(UniqueType.SixTilesAlwaysVisible)) viewableTiles = if (hasUnique(UniqueType.SixTilesAlwaysVisible))
getTile().getTilesInDistance(6).toHashSet() // it's that simple getTile().getTilesInDistance(6).toHashSet() // it's that simple
else HashSet(0) // bomber units don't do recon else HashSet(0) // bomber units don't do recon
return
} else { } else {
viewableTiles = getTile().getViewableTilesList(getVisibilityRange()).toHashSet() viewableTiles = getTile().getViewableTilesList(getVisibilityRange()).toHashSet()
} }

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

@ -485,6 +485,8 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
break break
} }
} }
val finalTileReached = lastReachedEnterableTile
// Silly floats which are almost zero // Silly floats which are almost zero
if (unit.currentMovement < Constants.minimumMovementEpsilon) if (unit.currentMovement < Constants.minimumMovementEpsilon)
@ -492,20 +494,24 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
if (!unit.isDestroyed) if (!unit.isDestroyed)
unit.putInTile(lastReachedEnterableTile) unit.putInTile(finalTileReached)
// The .toList() here is because we have a sequence that's running on the units in the tile, // 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 // 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 for (payload in origin.getUnits().filter { it.isTransported && unit.canTransport(it) }.toList()) { // bring along the payloads
payload.removeFromTile() payload.removeFromTile()
payload.putInTile(lastReachableTile) 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 cit
payload.mostRecentMoveType = UnitMovementMemoryType.UnitMoved payload.mostRecentMoveType = UnitMovementMemoryType.UnitMoved
} }
// Unit maintenance changed // Unit maintenance changed
if (unit.canGarrison() if (unit.canGarrison()
&& (origin.isCityCenter() || lastReachableTile.isCityCenter()) && (origin.isCityCenter() || finalTileReached.isCityCenter())
&& unit.civInfo.hasUnique(UniqueType.UnitsInCitiesNoMaintenance) && unit.civInfo.hasUnique(UniqueType.UnitsInCitiesNoMaintenance)
) unit.civInfo.updateStatsForNextTurn() ) unit.civInfo.updateStatsForNextTurn()
if (needToFindNewRoute) moveToTile(destination, considerZoneOfControl) if (needToFindNewRoute) moveToTile(destination, considerZoneOfControl)