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

Try to fix bug I introduced (#2009)

Browse Source 
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Try to fix bug I introduced
This commit is contained in:
Kentalot 2020-02-24 09:24:14 -08:00 committed by GitHub
parent 55a8211be0
commit 7b13a48d74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/map/TileMap.kt
View File

@ -139,7 +139,7 @@ class TileMap {
else -> tileInfo.isLand
}
val viableTilesToPlaceUnitInAtDistance1 = getTilesAtDistance(position, 1)
val viableTilesToPlaceUnitInAtDistance1 = getTilesInDistance(position, 1)
.filter { isTileMovePotential(it) }.toSet()
// This is so that units don't skip over non-potential tiles to go elsewhere -
// e.g. a city 2 tiles away from a lake could spawn water units in the lake...Or spawn beyond a mountain range...
@ -147,11 +147,12 @@ class TileMap {
.filter {
isTileMovePotential(it)
&& it.neighbors.any { n -> n in viableTilesToPlaceUnitInAtDistance1 }
} + viableTilesToPlaceUnitInAtDistance1
}
unit.assignOwner(civInfo, false) // both the civ name and actual civ need to be in here in order to calculate the canMoveTo...Darn
val unitToPlaceTile = viableTilesToPlaceUnitIn.firstOrNull { unit.movement.canMoveTo(it) }
val unitToPlaceTile = viableTilesToPlaceUnitInAtDistance1
.firstOrNull { unit.movement.canMoveTo(it) }
?: viableTilesToPlaceUnitIn.firstOrNull { unit.movement.canMoveTo(it) }
if (unitToPlaceTile == null) {
civInfo.removeUnit(unit) // since we added it to the civ units in the previous assignOwner