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

Civs should not go all-out war if they're weaker than barbs (#9267)

Browse Source
This commit is contained in:
WhoIsJohannes 2023-04-24 13:58:01 +02:00 committed by GitHub
parent a6f8f57860
commit 2f7fa6ba5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
View File

@ -985,8 +985,10 @@ object NextTurnAutomation {
private fun automateCities(civInfo: Civilization) { private fun automateCities(civInfo: Civilization) {
val ownMilitaryStrength = civInfo.getStatForRanking(RankingType.Force) val ownMilitaryStrength = civInfo.getStatForRanking(RankingType.Force)
val sumOfEnemiesMilitaryStrength = civInfo.gameInfo.civilizations.filter { it != civInfo } val sumOfEnemiesMilitaryStrength =
.filter { civInfo.isAtWarWith(it) }.sumOf { it.getStatForRanking(RankingType.Force) } civInfo.gameInfo.civilizations
.filter { it != civInfo && !it.isBarbarian() && civInfo.isAtWarWith(it) }
.sumOf { it.getStatForRanking(RankingType.Force) }
val civHasSignificantlyWeakerMilitaryThanEnemies = val civHasSignificantlyWeakerMilitaryThanEnemies =
ownMilitaryStrength < sumOfEnemiesMilitaryStrength * 0.66f ownMilitaryStrength < sumOfEnemiesMilitaryStrength * 0.66f
for (city in civInfo.cities) { for (city in civInfo.cities) {