Fix tests

yairm210 · May 27, 2024 · 07d1f1e · 07d1f1e
1 parent b9fd1c5
commit 07d1f1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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