From 07d1f1ead48cf4a70ef208aa656742bc684c9aeb Mon Sep 17 00:00:00 2001 From: yairm210 Date: Mon, 27 May 2024 21:21:08 +0300 Subject: [PATCH] Fix tests --- core/src/com/unciv/logic/trade/TradeEvaluation.kt | 3 +-- core/src/com/unciv/models/ruleset/unique/Unique.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/trade/TradeEvaluation.kt b/core/src/com/unciv/logic/trade/TradeEvaluation.kt index 87b2020c9626b..7ab3b439c3848 100644 --- a/core/src/com/unciv/logic/trade/TradeEvaluation.kt +++ b/core/src/com/unciv/logic/trade/TradeEvaluation.kt @@ -126,8 +126,7 @@ class TradeEvaluation { civInfo.getHappiness() < 10 -> 350 else -> 300 // Higher than corresponding sell cost since a trade is mutually beneficial! } - } else - 0 + } else 0 } TradeType.Strategic_Resource -> { diff --git a/core/src/com/unciv/models/ruleset/unique/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt index 6f656cf62436b..9be7bb498e97e 100644 --- a/core/src/com/unciv/models/ruleset/unique/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -77,7 +77,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s val multiplier = Countables.getCountableAmount(conditional.params[0], stateForConditionals) if (multiplier != null) amount *= multiplier } - for (conditional in forEveryConditionals) { // multiple multipliers DO multiply. + for (conditional in forEveryAmountConditionals) { // multiple multipliers DO multiply. val multiplier = Countables.getCountableAmount(conditional.params[1], stateForConditionals) val perEvery = conditional.params[0].toInt() if (multiplier != null) amount *= multiplier / perEvery