mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-20 04:38:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where auto-assigned population in cities could work tiles outside of 3-tile range

Browse Source
This commit is contained in:
Yair Morgenstern
2018-11-21 16:31:14 +02:00
parent fad7df055b
commit 2ab4e406aa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ class PopulationManager {
internal fun autoAssignPopulation() { internal fun autoAssignPopulation() {
if(getFreePopulation()==0) return if(getFreePopulation()==0) return
val toWork: TileInfo? = cityInfo.getTiles() val toWork: TileInfo? = cityInfo.getTiles()
.filter { it.arialDistanceTo(cityInfo.getCenterTile()) <= 3 }
.filterNot { cityInfo.workedTiles.contains(it.position) || cityInfo.location==it.position} .filterNot { cityInfo.workedTiles.contains(it.position) || cityInfo.location==it.position}
.maxBy { Automation().rankTile(it,cityInfo.civInfo) } .maxBy { Automation().rankTile(it,cityInfo.civInfo) }
if (toWork != null) // This is when we've run out of tiles! if (toWork != null) // This is when we've run out of tiles!
@ -85,9 +86,12 @@ class PopulationManager {
} }
fun unassignExtraPopulation() { fun unassignExtraPopulation() {
for(tile in cityInfo.workedTiles.map { cityInfo.tileMap[it] }) for(tile in cityInfo.workedTiles.map { cityInfo.tileMap[it] }) {
if (tile.getCity() != cityInfo) if (tile.getCity() != cityInfo)
cityInfo.workedTiles.remove(tile.position) cityInfo.workedTiles.remove(tile.position)
if(tile.arialDistanceTo(cityInfo.getCenterTile()) > 3) // AutoAssignPopulation used to assign pop outside of allowed range, fixed as of 2.10.4
cityInfo.workedTiles.remove(tile.position)
}
while (cityInfo.workedTiles.size > population) { while (cityInfo.workedTiles.size > population) {
val lowestRankedWorkedTile = cityInfo.workedTiles val lowestRankedWorkedTile = cityInfo.workedTiles