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

Solved bug where AI work boats would try to create Fishing Boats on Oil in coast (thanks Pierre Wall!)

Browse Source
This commit is contained in:
Yair Morgenstern 2018-11-21 15:33:12 +02:00
parent 1929118732
commit 9590d9890b
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -6,6 +6,7 @@ import com.unciv.logic.battle.Battle
import com.unciv.logic.battle.BattleDamage import com.unciv.logic.battle.BattleDamage
import com.unciv.logic.battle.MapUnitCombatant import com.unciv.logic.battle.MapUnitCombatant
import com.unciv.logic.city.CityInfo import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.DiplomaticStatus import com.unciv.logic.civilization.DiplomaticStatus
import com.unciv.logic.map.MapUnit import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
@ -80,24 +81,28 @@ class UnitAutomation{
// if both failed, then... there aren't any reachable tiles. Which is possible. // if both failed, then... there aren't any reachable tiles. Which is possible.
} }
private fun hasWorkableSeaResource(tileInfo: TileInfo): Boolean { private fun hasWorkableSeaResource(tileInfo: TileInfo, civInfo: CivilizationInfo): Boolean {
return tileInfo.resource!=null && tileInfo.isWater() && tileInfo.improvement==null return tileInfo.hasViewableResource(civInfo) && tileInfo.isWater() && tileInfo.improvement==null
} }
private fun automateWorkBoats(unit: MapUnit) { private fun automateWorkBoats(unit: MapUnit) {
val seaResourcesInCities = unit.civInfo.cities.flatMap { it.getTilesInRange() } val seaResourcesInCities = unit.civInfo.cities.flatMap { it.getTilesInRange() }.asSequence()
.filter { hasWorkableSeaResource(it) && (unit.canMoveTo(it) || unit.currentTile==it) } .filter { hasWorkableSeaResource(it, unit.civInfo) && (unit.canMoveTo(it) || unit.currentTile == it) }
if (seaResourcesInCities.any()) { val closestReachableResource = seaResourcesInCities.sortedBy { it.arialDistanceTo(unit.currentTile) }
val reachableResource = seaResourcesInCities.asSequence().sortedBy { it.arialDistanceTo(unit.currentTile) }
.firstOrNull { unit.movementAlgs().canReach(it) } .firstOrNull { unit.movementAlgs().canReach(it) }
if (reachableResource != null) {
unit.movementAlgs().headTowards(reachableResource) if (closestReachableResource != null) {
if(unit.currentMovement>0 && hasWorkableSeaResource(unit.currentTile)) unit.movementAlgs().headTowards(closestReachableResource)
UnitActions().getUnitActions(unit,UnCivGame.Current.worldScreen) if (unit.currentMovement > 0 && unit.currentTile == closestReachableResource) {
.first { it.name=="Create Fishing Boats" }.action() val createImprovementAction = UnitActions().getUnitActions(unit, UnCivGame.Current.worldScreen)
.firstOrNull { it.name.startsWith("Create") } // could be either fishing boats or oil well
if (createImprovementAction != null) {
createImprovementAction.action()
return // unit is already gone, can't "explore"
} }
} }
explore(unit, unit.getDistanceToTiles()) }
else explore(unit, unit.getDistanceToTiles())
} }
fun rankTileForHealing(tileInfo: TileInfo, unit: MapUnit): Int { fun rankTileForHealing(tileInfo: TileInfo, unit: MapUnit): Int {