From f3b4c2fa6fafd20f81c66083a2551b4c12c88546 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Tue, 28 Dec 2021 22:43:23 +0200 Subject: [PATCH] AI peace evaluation no longer hardocded - resolves first point of #5490 --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 2 +- core/src/com/unciv/logic/trade/TradeEvaluation.kt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 71863b2e99..5eb4e0f24e 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -663,7 +663,7 @@ class CivilizationInfo { } private fun calculateMilitaryMight(): Int { - var sum = 0 + var sum = 1 // minimum value, so we never end up with 0 for (unit in units) { sum += if (unit.baseUnit.isWaterUnit()) unit.getForceEvaluation() / 2 // Really don't value water units highly diff --git a/core/src/com/unciv/logic/trade/TradeEvaluation.kt b/core/src/com/unciv/logic/trade/TradeEvaluation.kt index 52448a454a..194222fb85 100644 --- a/core/src/com/unciv/logic/trade/TradeEvaluation.kt +++ b/core/src/com/unciv/logic/trade/TradeEvaluation.kt @@ -266,8 +266,6 @@ class TradeEvaluation { val theirCombatStrength = otherCivilization.getStatForRanking(RankingType.Force) if (ourCombatStrength * 1.5f >= theirCombatStrength && theirCombatStrength * 1.5f >= ourCombatStrength) return 0 // we're roughly equal, there's no huge power imbalance - if (ourCombatStrength == 0) return -1000 - if (theirCombatStrength == 0) return 1000 // Chumps got no combat units if (ourCombatStrength > theirCombatStrength) { val absoluteAdvantage = ourCombatStrength - theirCombatStrength val percentageAdvantage = absoluteAdvantage / theirCombatStrength.toFloat()