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

Resolved #10011 - Teleport units away from city center when liberating

Browse Source
This commit is contained in:
Yair Morgenstern 2023-09-04 14:58:48 +03:00
parent 1037b3d240
commit 06691d429e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/map/mapunit/UnitMovement.kt
View File

@ -488,7 +488,9 @@ class UnitMovement(val unit: MapUnit) {
var distance = 0 var distance = 0
// When we didn't limit the allowed distance the game would sometimes spend a whole minute looking for a suitable tile. // When we didn't limit the allowed distance the game would sometimes spend a whole minute looking for a suitable tile.
if (canPassThrough(unit.getTile())) return // This unit can stay here - e.g. it has "May enter foreign tiles without open borders" if (canPassThrough(unit.getTile())
&& !isCityCenterCannotEnter(unit.getTile()))
return // This unit can stay here - e.g. it has "May enter foreign tiles without open borders"
while (allowedTile == null && distance < 5) { while (allowedTile == null && distance < 5) {
distance++ distance++
allowedTile = unit.getTile().getTilesAtDistance(distance) allowedTile = unit.getTile().getTilesAtDistance(distance)
@ -698,6 +700,10 @@ class UnitMovement(val unit: MapUnit) {
unit.mostRecentMoveType = UnitMovementMemoryType.UnitMoved unit.mostRecentMoveType = UnitMovementMemoryType.UnitMoved
} }
private fun isCityCenterCannotEnter(tile: Tile) = tile.isCityCenter()
&& tile.getOwner() != unit.civ
&& !tile.getCity()!!.hasJustBeenConquered
/** /**
* Designates whether we can enter the tile - without attacking * Designates whether we can enter the tile - without attacking
* DOES NOT designate whether we can reach that tile in the current turn * DOES NOT designate whether we can reach that tile in the current turn
@ -710,7 +716,7 @@ class UnitMovement(val unit: MapUnit) {
return false return false
// even if they'll let us pass through, we can't enter their city - unless we just captured it // even if they'll let us pass through, we can't enter their city - unless we just captured it
if (tile.isCityCenter() && tile.getOwner() != unit.civ && !tile.getCity()!!.hasJustBeenConquered) if (isCityCenterCannotEnter(tile))
return false return false
return if (unit.isCivilian()) return if (unit.isCivilian())