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

AI uses great generals. I hope.

Browse Source
This commit is contained in:
Duan Tao
2018-12-26 23:30:21 +08:00
parent 60f59fe2aa
commit ae1629fcb0
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,9 @@ class UnitAutomation{
return SpecificUnitAutomation().automateWorkBoats(unit) return SpecificUnitAutomation().automateWorkBoats(unit)
} }
if(unit.name.startsWith("Great") if (unit.name == "Great General") {
return SpecificUnitAutomation().automateGeneral(unit)
} else if(unit.name.startsWith("Great")
&& unit.name in GreatPersonManager().statToGreatPersonMapping.values){ // So "Great War Infantry" isn't caught here && unit.name in GreatPersonManager().statToGreatPersonMapping.values){ // So "Great War Infantry" isn't caught here
return SpecificUnitAutomation().automateGreatPerson(unit)// I don't know what to do with you yet. return SpecificUnitAutomation().automateGreatPerson(unit)// I don't know what to do with you yet.
} }
@ -397,6 +399,24 @@ class SpecificUnitAutomation{
else UnitAutomation().explore(unit, unit.getDistanceToTiles()) else UnitAutomation().explore(unit, unit.getDistanceToTiles())
} }
fun automateGeneral(unit: MapUnit){
val militantToCompany = unit.civInfo.getCivUnits()
.firstOrNull { val tile = it.currentTile
it.type.isLandUnit() && it.getMaxMovement() <= 2.0f && tile.civilianUnit==null
&& unit.canMoveTo(tile) && unit.movementAlgs().canReach(tile) }
if(militantToCompany!=null) {
unit.movementAlgs().headTowards(militantToCompany.currentTile)
return
}
val cityToGarison = unit.civInfo.cities.filter {it.getCenterTile().civilianUnit == null}
.minBy { it.getCenterTile().arialDistanceTo(unit.currentTile) }
if (cityToGarison != null) {
unit.movementAlgs().headTowards(cityToGarison.getCenterTile())
return
}
return
}
fun rankTileAsCityCenter(tileInfo: TileInfo, nearbyTileRankings: Map<TileInfo, Float>): Float { fun rankTileAsCityCenter(tileInfo: TileInfo, nearbyTileRankings: Map<TileInfo, Float>): Float {
val bestTilesFromOuterLayer = tileInfo.getTilesAtDistance(2) val bestTilesFromOuterLayer = tileInfo.getTilesAtDistance(2)

2
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -162,7 +162,7 @@ class UnitActions {
}.sound("chimes") }.sound("chimes")
} }
if (unit.name == "Great Artist" && !unit.isEmbarked()) { if ((unit.name == "Great Artist" || unit.name == "Great General") && !unit.isEmbarked()) {
actionList += UnitAction( "Start Golden Age",unit.currentMovement != 0f actionList += UnitAction( "Start Golden Age",unit.currentMovement != 0f
) { ) {
unit.civInfo.goldenAges.enterGoldenAge() unit.civInfo.goldenAges.enterGoldenAge()