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

AI automation: Don't nuke cities that we're already winning against

Browse Source
This commit is contained in:
Yair Morgenstern 2023-01-28 20:27:23 +02:00
parent 544cc0b17d
commit 3119bdb005
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt
View File

@ -484,7 +484,10 @@ object SpecificUnitAutomation {
val tilesInRange = unit.currentTile.getTilesInDistance(unit.getRange())
for (tile in tilesInRange) {
// For now AI will only use nukes against cities because in all honesty that's the best use for them.
if (tile.isCityCenter() && tile.getOwner()!!.isAtWarWith(unit.civInfo) && Battle.mayUseNuke(MapUnitCombatant(unit), tile)) {
if (tile.isCityCenter()
&& tile.getOwner()!!.isAtWarWith(unit.civInfo)
&& tile.getCity()!!.health > tile.getCity()!!.getMaxHealth() / 2
&& Battle.mayUseNuke(MapUnitCombatant(unit), tile)) {
val blastRadius = unit.getMatchingUniques(UniqueType.BlastRadius)
.firstOrNull()?.params?.get(0)?.toInt() ?: 2
val tilesInBlastRadius = tile.getTilesInDistance(blastRadius)

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

@ -171,7 +171,7 @@ object UnitAutomation {
// Accompany settlers
if (tryAccompanySettlerOrGreatPerson(unit)) return
if (tryHeadTowardsSiegedCity(unit)) return
if (tryHeadTowardsOurSiegedCity(unit)) return
if (unit.health < 50 && tryHealUnit(unit)) return // do nothing but heal
@ -436,7 +436,7 @@ object UnitAutomation {
return true
}
private fun tryHeadTowardsSiegedCity(unit: MapUnit): Boolean {
private fun tryHeadTowardsOurSiegedCity(unit: MapUnit): Boolean {
val siegedCities = unit.civInfo.cities
.asSequence()
.filter {
@ -520,11 +520,14 @@ object UnitAutomation {
val city = closestReachableEnemyCity.getCity()!!
val cityCombatant = CityCombatant(city)
val expectedDamagePerTurn = ourUnitsAroundEnemyCity
.map { BattleDamage.calculateDamageToDefender(MapUnitCombatant(it), cityCombatant) }
.sum() - 20 // City heals 20 per turn
.sum() // City heals 20 per turn
if (expectedDamagePerTurn < city.health && // If we can take immediately, go for it
(expectedDamagePerTurn < 20 || city.health / (expectedDamagePerTurn-20) > 5)){ // otherwise check if we can take within a couple of turns
if (expectedDamagePerTurn < 1 || city.health / expectedDamagePerTurn > 5){
// We won't be able to take this even with 5 turns of continuous damage!
// don't head straight to the city, try to head to landing grounds -
// this is against tha AI's brilliant plan of having everyone embarked and attacking via sea when unnecessary.