wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enemy civs now pick technologies and advance!

Browse source 
Fixed bug where workers would try to move and improve unreachable tiles, crashing the game
This commit is contained in:
Yair Morgenstern 2018-04-24 23:00:58 +03:00
parent c6136acbec
commit 9d7399dd48
8 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
core/src/com/unciv/logic/Automation.kt
View file

@ -8,6 +8,7 @@ import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.UnitMovementAlgorithms
import com.unciv.logic.map.UnitType
import com.unciv.models.gamebasics.Building
import com.unciv.models.gamebasics.GameBasics
@ -24,6 +25,8 @@ class Automation {
&& it.improvement == null
&& (it.getCity()==null || it.getCity()!!.civInfo == civInfo) // don't work tiles belonging to another civ
&& it.canBuildImprovement(chooseImprovement(it), civInfo)
&& UnitMovementAlgorithms(currentTile.tileMap) // the tile is actually reachable - more difficult than it seems!
.getShortestPath(currentTile.position, it.position, 2f, 2, civInfo).isNotEmpty()
}
.maxBy { getPriority(it, civInfo) }
if (selectedTile != null && getPriority(selectedTile, civInfo) > 1) return selectedTile
@ -129,24 +132,7 @@ class Automation {
fun automateUnitMoves(unit: MapUnit) {
if (unit.name == "Settler") {
val tileMap = unit.civInfo.gameInfo.tileMap
// find best city location within 5 tiles
val bestCityLocation = tileMap.getTilesInDistance(unit.getTile().position, 5)
.filterNot { it.isCityCenter || it.neighbors.any { it.isCityCenter } }
.sortedByDescending { rankTileAsCityCenter(it, unit.civInfo) }
.first()
if(unit.getTile() == bestCityLocation)
UnitActions().getUnitActions(unit, UnCivGame.Current.worldScreen!!).first { it.name == "Found city" }.action()
else {
unit.headTowards(bestCityLocation.position)
if(unit.currentMovement>0 && unit.getTile()==bestCityLocation)
UnitActions().getUnitActions(unit, UnCivGame.Current.worldScreen!!).first { it.name == "Found city" }.action()
}
automateSettlerActions(unit)
return
}
@ -235,6 +221,24 @@ class Automation {
unit.moveToTile(distanceToTiles.keys.filter { it.unit == null }.toList().getRandom())
}
private fun automateSettlerActions(unit: MapUnit) {
val tileMap = unit.civInfo.gameInfo.tileMap
// find best city location within 5 tiles
val bestCityLocation = tileMap.getTilesInDistance(unit.getTile().position, 7)
.filterNot { tileMap.getTilesInDistance(it.position,2).any { tid -> tid.isCityCenter } }
.sortedByDescending { rankTileAsCityCenter(it, unit.civInfo) }
.first()
if (unit.getTile() == bestCityLocation)
UnitActions().getUnitActions(unit, UnCivGame.Current.worldScreen!!).first { it.name == "Found city" }.action()
else {
unit.headTowards(bestCityLocation.position)
if (unit.currentMovement > 0 && unit.getTile() == bestCityLocation)
UnitActions().getUnitActions(unit, UnCivGame.Current.worldScreen!!).first { it.name == "Found city" }.action()
}
}
fun chooseNextConstruction(cityConstructions: CityConstructions) {
cityConstructions.run {

12
core/src/com/unciv/logic/GameInfo.kt
View file

@ -3,6 +3,7 @@ package com.unciv.logic
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.Notification
import com.unciv.logic.map.TileMap
import com.unciv.models.gamebasics.GameBasics
import com.unciv.ui.utils.getRandom
class GameInfo {
@ -21,7 +22,16 @@ class GameInfo {
fun nextTurn() {
notifications.clear()
for (civInfo in civilizations) civInfo.nextTurn()
for (civInfo in civilizations){
if(civInfo.tech.techsToResearch.isEmpty()){
val researchableTechs = GameBasics.Technologies.values
.filter { !civInfo.tech.isResearched(it.name) && civInfo.tech.canBeResearched(it.name) }
civInfo.tech.techsToResearch.add(researchableTechs.minBy { it.cost }!!.name)
}
}
for (civInfo in civilizations)
civInfo.nextTurn()
tileMap.values.filter { it.unit!=null }.map { it.unit!! }.forEach { it.nextTurn() }

4
core/src/com/unciv/logic/battle/MapUnitCombatant.kt
View file

@ -38,4 +38,8 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant {
else -> throw Exception("Should never get here!")
}
}
override fun toString(): String {
return unit.name+" of "+unit.civInfo.civName
}
}

2
core/src/com/unciv/logic/city/CityInfo.kt
View file

@ -131,4 +131,6 @@ class CityInfo {
internal fun getMaxHealth(): Int {
return 200 // add more later when walls citadl etc.
}
override fun toString(): String {return name} // for debug
}

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View file

@ -180,4 +180,6 @@ class CivilizationInfo {
if(isPlayerCivilization())
gameInfo.notifications.add(Notification(text, location))
}
override fun toString(): String {return civName} // for debug
}

3
core/src/com/unciv/logic/map/TileMap.kt
View file

@ -47,7 +47,8 @@ class TileMap {
unit.owner = civInfo.civName
unit.civInfo = civInfo
val tilesInDistance = getTilesInDistance(position, 2)
tilesInDistance.first { it.unit == null }.unit = unit // And if there's none, then kill me.
val unitToPlaceTile = tilesInDistance.firstOrNull { it.unit == null }
if(unitToPlaceTile!=null) unitToPlaceTile.unit = unit // And if there's none, then kill me.
}
fun getViewableTiles(position: Vector2, sightDistance: Int): MutableList<TileInfo> {

2
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View file

@ -77,6 +77,8 @@ class UnitMovementAlgorithms(val tileMap: TileMap){
return path.reversed() // and reverse in order to get the list in chronological order
}
if(newTilesToCheck.isEmpty()) return emptyList() // there is NO PATH (eg blocked by enemy units)
tilesToCheck = newTilesToCheck
distance++
}

4
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View file

@ -53,8 +53,8 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
open fun update(isViewable: Boolean) {
if (!tileInfo.explored) {
hexagon.color = Color.BLACK
return
//hexagon.color = Color.BLACK
//return
}
updateTerrainFeatureImage()