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

Improved "rank city center" by also considering resources that the civ has in its borders but has not yet improved

Browse Source
This commit is contained in:
Yair Morgenstern 2019-08-27 15:09:54 +03:00
parent 8ef09a816a
commit 834290001b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt
View File

@ -9,6 +9,7 @@ import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
import com.unciv.logic.map.MapUnit import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.gamebasics.tile.ResourceType import com.unciv.models.gamebasics.tile.ResourceType
import com.unciv.models.gamebasics.tile.TileResource
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
import com.unciv.ui.worldscreen.unit.UnitActions import com.unciv.ui.worldscreen.unit.UnitActions
@ -65,7 +66,8 @@ class SpecificUnitAutomation{
} }
} }
fun rankTileAsCityCenter(tileInfo: TileInfo, nearbyTileRankings: Map<TileInfo, Float>, civInfo: CivilizationInfo): Float { fun rankTileAsCityCenter(tileInfo: TileInfo, nearbyTileRankings: Map<TileInfo, Float>,
luxuryResourcesInCivArea: Sequence<TileResource>): Float {
val bestTilesFromOuterLayer = tileInfo.getTilesAtDistance(2) val bestTilesFromOuterLayer = tileInfo.getTilesAtDistance(2)
.asSequence() .asSequence()
.sortedByDescending { nearbyTileRankings[it] }.take(2) .sortedByDescending { nearbyTileRankings[it] }.take(2)
@ -78,9 +80,11 @@ class SpecificUnitAutomation{
var rank = top5Tiles.asSequence().map { nearbyTileRankings[it]!! }.sum() var rank = top5Tiles.asSequence().map { nearbyTileRankings[it]!! }.sum()
if (tileInfo.neighbors.any { it.baseTerrain == Constants.coast }) rank += 5 if (tileInfo.neighbors.any { it.baseTerrain == Constants.coast }) rank += 5
val luxuryResources = tileInfo.getTilesAtDistance(2).filter { it.resource!=null } val luxuryResourcesInCityArea = tileInfo.getTilesAtDistance(2).filter { it.resource!=null }
.map { it.getTileResource() }.filter { it.resourceType==ResourceType.Luxury }.distinct() .map { it.getTileResource() }.filter { it.resourceType==ResourceType.Luxury }.distinct()
val luxuryResourcesNotYetInCiv = luxuryResources.count { !civInfo.hasResource(it.name) } val luxuryResourcesAlreadyInCivArea = luxuryResourcesInCivArea.map { it.name }.toHashSet()
val luxuryResourcesNotYetInCiv = luxuryResourcesInCityArea
.count { !luxuryResourcesAlreadyInCivArea.contains(it.name) }
rank += luxuryResourcesNotYetInCiv*10 rank += luxuryResourcesNotYetInCiv*10
return rank return rank
@ -112,9 +116,13 @@ class SpecificUnitAutomation{
(unit.movement.canMoveTo(it) || unit.currentTile==it) (unit.movement.canMoveTo(it) || unit.currentTile==it)
&& it !in tilesNearCities && it.isLand } && it !in tilesNearCities && it.isLand }
val luxuryResourcesInCivArea = unit.civInfo.cities.asSequence()
.flatMap { it.getTiles().asSequence() }.filter { it.resource!=null }
.map { it.getTileResource() }.filter { it.resourceType==ResourceType.Luxury }
.distinct()
val bestCityLocation: TileInfo? = possibleCityLocations val bestCityLocation: TileInfo? = possibleCityLocations
.asSequence() .asSequence()
.sortedByDescending { rankTileAsCityCenter(it, nearbyTileRankings, unit.civInfo) } .sortedByDescending { rankTileAsCityCenter(it, nearbyTileRankings, luxuryResourcesInCivArea) }
.firstOrNull { unit.movement.canReach(it) } .firstOrNull { unit.movement.canReach(it) }
if(bestCityLocation==null) { // We got a badass over here, all tiles within 5 are taken? Screw it, random walk. if(bestCityLocation==null) { // We got a badass over here, all tiles within 5 are taken? Screw it, random walk.