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

Merge pull request #356 from ninjatao/auto_railroad

Browse Source 
Auto build railroad.
This commit is contained in:
yairm210
2018-12-18 20:22:38 +02:00
committed by GitHub
parent e3926764f2 f717645019
commit 0491b21956
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/logic/automation/WorkerAutomation.kt
View File

@ -43,19 +43,24 @@ class WorkerAutomation(val unit: MapUnit) {
fun tryConnectingCities():Boolean{ // returns whether we actually did anything fun tryConnectingCities():Boolean{ // returns whether we actually did anything
val techEnablingRailroad = GameBasics.TileImprovements["Railroad"]!!.techRequired!!
val canBuildRailroad = unit.civInfo.tech.isResearched(techEnablingRailroad)
val targetRoadName = if (canBuildRailroad) "Railroad" else "Road"
val targetStatus = if (canBuildRailroad) RoadStatus.Railroad else RoadStatus.Road
val citiesThatNeedConnecting = unit.civInfo.cities val citiesThatNeedConnecting = unit.civInfo.cities
.filter { it.population.population>3 && !it.isCapital() .filter { it.population.population>3 && !it.isCapital()
&& !it.cityStats.isConnectedToCapital(RoadStatus.Road) } && !it.cityStats.isConnectedToCapital(targetStatus) }
if(citiesThatNeedConnecting.isEmpty()) return false // do nothing. if(citiesThatNeedConnecting.isEmpty()) return false // do nothing.
val citiesThatNeedConnectingBfs = citiesThatNeedConnecting val citiesThatNeedConnectingBfs = citiesThatNeedConnecting
.map { city -> BFS(city.getCenterTile()){it.isLand() && unit.canPassThrough(it)} } .map { city -> BFS(city.getCenterTile()){it.isLand() && unit.canPassThrough(it)} }
.toMutableList() .toMutableList()
val connectedCities = unit.civInfo.cities.filter { it.isCapital() || it.cityStats.isConnectedToCapital(RoadStatus.Road) } val connectedCities = unit.civInfo.cities.filter { it.isCapital() || it.cityStats.isConnectedToCapital(targetStatus) }
.map { it.getCenterTile() } .map { it.getCenterTile() }
while(citiesThatNeedConnectingBfs.any()){ while(citiesThatNeedConnectingBfs.any()){
for(bfs in citiesThatNeedConnectingBfs.toList()){ for(bfs in citiesThatNeedConnectingBfs.toList()){
bfs.nextStep() bfs.nextStep()
@ -66,7 +71,7 @@ class WorkerAutomation(val unit: MapUnit) {
for(city in connectedCities) for(city in connectedCities)
if(bfs.tilesToCheck.contains(city)) { // we have a winner! if(bfs.tilesToCheck.contains(city)) { // we have a winner!
val pathToCity = bfs.getPathTo(city) val pathToCity = bfs.getPathTo(city)
val roadableTiles = pathToCity.filter { it.roadStatus==RoadStatus.None } val roadableTiles = pathToCity.filter { it.roadStatus < targetStatus }
val tileToConstructRoadOn :TileInfo val tileToConstructRoadOn :TileInfo
if(unit.currentTile in roadableTiles) tileToConstructRoadOn = unit.currentTile if(unit.currentTile in roadableTiles) tileToConstructRoadOn = unit.currentTile
else{ else{
@ -76,8 +81,8 @@ class WorkerAutomation(val unit: MapUnit) {
unit.movementAlgs().headTowards(tileToConstructRoadOn) unit.movementAlgs().headTowards(tileToConstructRoadOn)
} }
if(unit.currentMovement>0 && unit.currentTile==tileToConstructRoadOn if(unit.currentMovement>0 && unit.currentTile==tileToConstructRoadOn
&& unit.currentTile.improvementInProgress!="Road") && unit.currentTile.improvementInProgress!=targetRoadName)
tileToConstructRoadOn.startWorkingOnImprovement(GameBasics.TileImprovements["Road"]!!,unit.civInfo) tileToConstructRoadOn.startWorkingOnImprovement(GameBasics.TileImprovements[targetRoadName]!!,unit.civInfo)
return true return true
} }
} }