AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 10:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where cities would not "recognize" tiles on the first turn - for realz this time

Browse Source
This commit is contained in:
Yair Morgenstern 2018-05-06 11:24:39 +03:00
parent c6e344b16e
commit 5d4003ecbf
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ class CityInfo {
fun getCenterTile(): TileInfo = tileMap[location] fun getCenterTile(): TileInfo = tileMap[location]
fun getTiles(): List<TileInfo> = tiles.map { tileMap[it] } fun getTiles(): List<TileInfo> = tiles.map { tileMap[it] }
fun getTilesInRange(): List<TileInfo> = getCenterTile().getTilesInDistance( 3).filter { civInfo == it.getOwner() } fun getTilesInRange(): List<TileInfo> = getCenterTile().getTilesInDistance( 3)
// Remove resources required by buildings // Remove resources required by buildings
@ -92,6 +92,7 @@ class CityInfo {
} }
expansion.reset() expansion.reset()
civInfo.gameInfo.updateTilesToCities()
val tile = getCenterTile() val tile = getCenterTile()
tile.roadStatus = RoadStatus.Railroad tile.roadStatus = RoadStatus.Railroad

4
core/src/com/unciv/models/gamebasics/Building.kt
View File

@ -151,10 +151,10 @@ class Building : NamedStats(), IConstruction, ICivilopedia {
if (requiredNearbyImprovedResources != null) { if (requiredNearbyImprovedResources != null) {
val containsResourceWithImprovement = construction.cityInfo.getTilesInRange() val containsResourceWithImprovement = construction.cityInfo.getTilesInRange()
.any { .any {
it.resource != null it.resource != null
&& requiredNearbyImprovedResources!!.contains(it.resource!!) && requiredNearbyImprovedResources!!.contains(it.resource!!)
&& it.tileResource.improvement == it.improvement && it.tileResource.improvement == it.improvement
&& it.getOwner() == civInfo && it.getOwner() == civInfo
} }
if (!containsResourceWithImprovement) return false if (!containsResourceWithImprovement) return false
} }

1
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -62,7 +62,6 @@ class UnitActions {
unit.civInfo.addCity(tile.position) unit.civInfo.addCity(tile.position)
unitTable.currentlyExecutingAction = null // In case the settler was in the middle of doing something and we then founded a city with it unitTable.currentlyExecutingAction = null // In case the settler was in the middle of doing something and we then founded a city with it
tile.unit = null // Remove settler! tile.unit = null // Remove settler!
unit.civInfo.gameInfo.updateTilesToCities()
}, },
unit.currentMovement != 0f && unit.currentMovement != 0f &&
!tile.getTilesInDistance(2).any { it.isCityCenter() }) !tile.getTilesInDistance(2).any { it.isCityCenter() })