mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 16:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

More simplification of motivationToAttack

Browse Source
This commit is contained in:
Yair Morgenstern
2023-11-19 15:56:21 +02:00
parent 13d0ea51d5
commit e6bb9d4d9a
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/src/com/unciv/logic/automation/civilization/MotivationToAttackAutomation.kt
View File

@ -19,20 +19,12 @@ object MotivationToAttackAutomation {
/** Will return the motivation to attack, but might short circuit if the value is guaranteed to /** Will return the motivation to attack, but might short circuit if the value is guaranteed to
* be lower than `atLeast`. So any values below `atLeast` should not be used for comparison. */ * be lower than `atLeast`. So any values below `atLeast` should not be used for comparison. */
public fun hasAtLeastMotivationToAttack(civInfo: Civilization, otherCiv: Civilization, atLeast: Int): Int { fun hasAtLeastMotivationToAttack(civInfo: Civilization, otherCiv: Civilization, atLeast: Int): Int {
val closestCities = NextTurnAutomation.getClosestCities(civInfo, otherCiv) ?: return 0 val closestCities = NextTurnAutomation.getClosestCities(civInfo, otherCiv) ?: return 0
val baseForce = 30f val baseForce = 30f
var ourCombatStrength = civInfo.getStatForRanking(RankingType.Force).toFloat() + baseForce val ourCombatStrength = calculateSelfCombatStrength(civInfo, baseForce)
if (civInfo.getCapital() != null) ourCombatStrength += CityCombatant(civInfo.getCapital()!!).getCityStrength() val theirCombatStrength = calculateCombatStrengthWithProtectors(otherCiv, baseForce, civInfo)
var theirCombatStrength = otherCiv.getStatForRanking(RankingType.Force).toFloat() + baseForce
if(otherCiv.getCapital() != null) theirCombatStrength += CityCombatant(otherCiv.getCapital()!!).getCityStrength()
//for city-states, also consider their protectors
if (otherCiv.isCityState() and otherCiv.cityStateFunctions.getProtectorCivs().isNotEmpty()) {
theirCombatStrength += otherCiv.cityStateFunctions.getProtectorCivs().filterNot { it == civInfo }
.sumOf { it.getStatForRanking(RankingType.Force) }
}
if (theirCombatStrength > ourCombatStrength) return 0 if (theirCombatStrength > ourCombatStrength) return 0
@ -98,12 +90,8 @@ object MotivationToAttackAutomation {
var motivationSoFar = modifierMap.values.sum() var motivationSoFar = modifierMap.values.sum()
// We don't need to execute the expensive BFSs below if we're below the threshold here // Short-circuit to avoid expensive BFS
// anyways, since it won't get better from those, only worse. if (motivationSoFar < atLeast) return motivationSoFar
if (motivationSoFar < atLeast) {
return motivationSoFar
}
val landPathBFS = BFS(ourCity.getCenterTile()) { val landPathBFS = BFS(ourCity.getCenterTile()) {
it.isLand && isTileCanMoveThrough(it) it.isLand && isTileCanMoveThrough(it)
@ -113,11 +101,8 @@ object MotivationToAttackAutomation {
if (!landPathBFS.hasReachedTile(theirCity.getCenterTile())) if (!landPathBFS.hasReachedTile(theirCity.getCenterTile()))
motivationSoFar -= -10 motivationSoFar -= -10
// We don't need to execute the expensive BFSs below if we're below the threshold here // Short-circuit to avoid expensive BFS
// anyways, since it won't get better from those, only worse. if (motivationSoFar < atLeast) return motivationSoFar
if (motivationSoFar < atLeast) {
return motivationSoFar
}
val reachableEnemyCitiesBfs = BFS(civInfo.getCapital(true)!!.getCenterTile()) { isTileCanMoveThrough(it) } val reachableEnemyCitiesBfs = BFS(civInfo.getCapital(true)!!.getCenterTile()) { isTileCanMoveThrough(it) }
reachableEnemyCitiesBfs.stepToEnd() reachableEnemyCitiesBfs.stepToEnd()
@ -127,6 +112,23 @@ object MotivationToAttackAutomation {
return motivationSoFar return motivationSoFar
} }
private fun calculateCombatStrengthWithProtectors(otherCiv: Civilization, baseForce: Float, civInfo: Civilization): Float {
var theirCombatStrength = calculateSelfCombatStrength(otherCiv, baseForce)
//for city-states, also consider their protectors
if (otherCiv.isCityState() and otherCiv.cityStateFunctions.getProtectorCivs().isNotEmpty()) {
theirCombatStrength += otherCiv.cityStateFunctions.getProtectorCivs().filterNot { it == civInfo }
.sumOf { it.getStatForRanking(RankingType.Force) }
}
return theirCombatStrength
}
private fun calculateSelfCombatStrength(civInfo: Civilization, baseForce: Float): Float {
var ourCombatStrength = civInfo.getStatForRanking(RankingType.Force).toFloat() + baseForce
if (civInfo.getCapital() != null) ourCombatStrength += CityCombatant(civInfo.getCapital()!!).getCityStrength()
return ourCombatStrength
}
private fun addWonderBasedMotivations(otherCiv: Civilization, modifierMap: HashMap<String, Int>) { private fun addWonderBasedMotivations(otherCiv: Civilization, modifierMap: HashMap<String, Int>) {
var wonderCount = 0 var wonderCount = 0
for (city in otherCiv.cities) { for (city in otherCiv.cities) {