From ebfda6ffc0b194de75b1ceb0e062c837041be2cb Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 13 Apr 2023 16:50:24 +0300 Subject: [PATCH] Resolved #9178 - 'unit gain from defeating unit' takes attacking/defending units into account for randomness --- core/src/com/unciv/logic/battle/Battle.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index e17e70ab49..8accaa025c 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -298,8 +298,8 @@ object Battle { fun unitGainFromDefeatingUnit(): Boolean { if (!attacker.isMelee()) return false var unitCaptured = false - for (unique in attacker.getCivInfo() - .getMatchingUniques(UniqueType.GainFromDefeatingUnit)) { + val state = StateForConditionals(attacker.getCivInfo(), ourCombatant = attacker, theirCombatant = defender) + for (unique in attacker.getMatchingUniques(UniqueType.GainFromDefeatingUnit, state, true)) { if (defender.unit.matchesFilter(unique.params[0])) { attacker.getCivInfo().addGold(unique.params[1].toInt()) unitCaptured = true