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

Water units can enter cities

Browse Source
This commit is contained in:
Yair Morgenstern 2018-12-19 19:36:18 +02:00
parent f19750409d
commit a677850084
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -192,6 +192,12 @@ class CityInfo {
}
fun destroyCity() {
// Edge case! What if a water unit is in a city, and you raze the city?
// Well, the water unit has to return to the water!
for(unit in getCenterTile().getUnits())
if(!unit.canPassThrough(getCenterTile()))
unit.movementAlgs().teleportToClosestMoveableTile()
civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) }
getTiles().forEach { expansion.relinquishOwnership(it) }
getCenterTile().improvement="City ruins"

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

@ -134,7 +134,7 @@ class MapUnit {
val tileOwner = tile.getOwner()
if(tile.getBaseTerrain().impassable) return false
if(tile.isLand() && type.isWaterUnit())
if(tile.isLand() && type.isWaterUnit() && !tile.isCityCenter())
return false
val isOcean = tile.baseTerrain == "Ocean"

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

@ -7,8 +7,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
private fun getMovementCostBetweenAdjacentTiles(from: TileInfo, to: TileInfo): Float {
if(from.isLand() && to.isWater()
|| from.isWater() && to.isLand())
if(unit.type.isLandUnit() && (from.isLand() != to.isLand()))
return 100f // this is embarkment or disembarkment, and will take the entire turn
if (from.roadStatus === RoadStatus.Railroad && to.roadStatus === RoadStatus.Railroad)