mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 08:49:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #9178 - 'unit gain from defeating unit' takes attacking/defending units into account for randomness

Browse Source
This commit is contained in:
Yair Morgenstern
2023-04-13 16:50:24 +03:00
parent 28f5043fcb
commit ebfda6ffc0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -298,8 +298,8 @@ object Battle {
fun unitGainFromDefeatingUnit(): Boolean { fun unitGainFromDefeatingUnit(): Boolean {
if (!attacker.isMelee()) return false if (!attacker.isMelee()) return false
var unitCaptured = false var unitCaptured = false
for (unique in attacker.getCivInfo() val state = StateForConditionals(attacker.getCivInfo(), ourCombatant = attacker, theirCombatant = defender)
.getMatchingUniques(UniqueType.GainFromDefeatingUnit)) { for (unique in attacker.getMatchingUniques(UniqueType.GainFromDefeatingUnit, state, true)) {
if (defender.unit.matchesFilter(unique.params[0])) { if (defender.unit.matchesFilter(unique.params[0])) {
attacker.getCivInfo().addGold(unique.params[1].toInt()) attacker.getCivInfo().addGold(unique.params[1].toInt())
unitCaptured = true unitCaptured = true