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

AIs don't make water military units in areas where they can't fight anyone

Browse Source
This commit is contained in:
Yair Morgenstern
2019-06-13 14:37:04 +03:00
parent b0ef219c84
commit b8e5b34489
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/logic/automation/Automation.kt
View File

@ -8,6 +8,7 @@ import com.unciv.logic.city.CityInfo
import com.unciv.logic.city.SpecialConstruction import com.unciv.logic.city.SpecialConstruction
import com.unciv.logic.civilization.CityAction import com.unciv.logic.civilization.CityAction
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.BFS
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.gamebasics.Building import com.unciv.models.gamebasics.Building
import com.unciv.models.gamebasics.VictoryType import com.unciv.models.gamebasics.VictoryType
@ -57,9 +58,18 @@ class Automation {
} }
fun chooseMilitaryUnit(city: CityInfo) : String { fun chooseMilitaryUnit(city: CityInfo) : String {
val militaryUnits = city.cityConstructions.getConstructableUnits().filter { !it.unitType.isCivilian() } var militaryUnits = city.cityConstructions.getConstructableUnits().filter { !it.unitType.isCivilian() }
if (militaryUnits.map { it.name }.contains(city.cityConstructions.currentConstruction)) if (militaryUnits.map { it.name }.contains(city.cityConstructions.currentConstruction))
return city.cityConstructions.currentConstruction return city.cityConstructions.currentConstruction
val findWaterConnectedCitiesAndEnemies = BFS(city.getCenterTile()){it.isWater || it.isCityCenter()}
findWaterConnectedCitiesAndEnemies.stepToEnd()
if(findWaterConnectedCitiesAndEnemies.tilesReached.keys.none {
(it.isCityCenter() && it.getOwner() != city.civInfo)
|| (it.militaryUnit != null && it.militaryUnit!!.civInfo != city.civInfo)
}) // there is absolutely no reason for you to make water units on this body of water.
militaryUnits = militaryUnits.filter { it.unitType.isLandUnit() }
val chosenUnit: BaseUnit val chosenUnit: BaseUnit
if(!city.civInfo.isAtWar() && city.civInfo.cities.any { it.getCenterTile().militaryUnit==null} if(!city.civInfo.isAtWar() && city.civInfo.cities.any { it.getCenterTile().militaryUnit==null}
&& militaryUnits.any { it.unitType== UnitType.Ranged }) // this is for city defence so get an archery unit if we can && militaryUnits.any { it.unitType== UnitType.Ranged }) // this is for city defence so get an archery unit if we can
@ -149,7 +159,7 @@ class Automation {
//War buildings //War buildings
val wartimeBuilding = buildableNotWonders.filter { it.xpForNewUnits>0 || it.cityStrength>0 } val wartimeBuilding = buildableNotWonders.filter { it.xpForNewUnits>0 || it.cityStrength>0 }
.minBy { it.cost } .minBy { it.cost }
if (wartimeBuilding!=null) { if (wartimeBuilding!=null && (preferredVictoryType!=VictoryType.Cultural || isAtWar)) {
var modifier = 0.5f var modifier = 0.5f
if(isAtWar) modifier = 1f if(isAtWar) modifier = 1f
if(preferredVictoryType==VictoryType.Domination) if(preferredVictoryType==VictoryType.Domination)