mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 05:09:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Melee units are now more likely to attack cities (#10363)

Browse Source
This commit is contained in:
Oskar Niesen
2023-10-29 11:59:47 -05:00
committed by GitHub
parent f27fa7bab6
commit e214aa78d4
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/logic/automation/unit/BattleHelper.kt
View File

@ -90,8 +90,19 @@ object BattleHelper {
return if (attacker.baseUnit.isMelee()) 10000 // Capture the city immediatly! return if (attacker.baseUnit.isMelee()) 10000 // Capture the city immediatly!
else 0 // Don't attack the city anymore since we are a ranged unit else 0 // Don't attack the city anymore since we are a ranged unit
if (attacker.baseUnit.isMelee() && attacker.health - BattleDamage.calculateDamageToAttacker(attackerUnit, cityUnit) * 2 <= 0) if (attacker.baseUnit.isMelee()) {
return 0 // We'll probably die next turn if we attack the city val battleDamage = BattleDamage.calculateDamageToAttacker(attackerUnit, cityUnit)
if (attacker.health - battleDamage * 2 <= 0) {
// The more fiendly units around the city, the more willing we should be to just attack the city
val friendlyUnitsAroundCity = city.getCenterTile().getTilesInDistance(3).count { it.militaryUnit?.civ == attacker.civ }
// If we have more than 4 other units around the city, go for it
if (friendlyUnitsAroundCity < 5) {
val attackerHealthModifier = 1.0 + 1.0 / friendlyUnitsAroundCity
if (attacker.health - battleDamage * attackerHealthModifier <= 0)
return 0 // We'll probably die next turn if we attack the city
}
}
}
var attackValue = 100 var attackValue = 100
// Siege units should really only attack the city // Siege units should really only attack the city
@ -103,7 +114,7 @@ object BattleHelper {
// Add value based on number of units around the city // Add value based on number of units around the city
val defendingCityCiv = city.civ val defendingCityCiv = city.civ
city.getCenterTile().neighbors.forEach { city.getCenterTile().getTilesInDistance(2).forEach {
if (it.militaryUnit != null) { if (it.militaryUnit != null) {
if (it.militaryUnit!!.civ.isAtWarWith(attacker.civ)) if (it.militaryUnit!!.civ.isAtWarWith(attacker.civ))
attackValue -= 5 attackValue -= 5