AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
yairm210 2024-05-27 21:21:08 +03:00
parent b9fd1c501a
commit 07d1f1ead4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/trade/TradeEvaluation.kt
View File

@ -126,8 +126,7 @@ class TradeEvaluation {
civInfo.getHappiness() < 10 -> 350 civInfo.getHappiness() < 10 -> 350
else -> 300 // Higher than corresponding sell cost since a trade is mutually beneficial! else -> 300 // Higher than corresponding sell cost since a trade is mutually beneficial!
} }
} else } else 0
0
} }
TradeType.Strategic_Resource -> { TradeType.Strategic_Resource -> {

2
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -77,7 +77,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
val multiplier = Countables.getCountableAmount(conditional.params[0], stateForConditionals) val multiplier = Countables.getCountableAmount(conditional.params[0], stateForConditionals)
if (multiplier != null) amount *= multiplier 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 multiplier = Countables.getCountableAmount(conditional.params[1], stateForConditionals)
val perEvery = conditional.params[0].toInt() val perEvery = conditional.params[0].toInt()
if (multiplier != null) amount *= multiplier / perEvery if (multiplier != null) amount *= multiplier / perEvery