mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-10 15:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Allow settlers to be captured when worker replacements exist

Browse Source
This commit is contained in:
Yair Morgenstern
2023-02-19 08:11:34 +02:00
parent 13be70615d
commit e40ab3e9da
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -631,7 +631,12 @@ object Battle {
// This is so that future checks which check if a unit has been captured are caught give the right answer // This is so that future checks which check if a unit has been captured are caught give the right answer
// For example, in postBattleMoveToAttackedTile // For example, in postBattleMoveToAttackedTile
capturedUnit.civ = attacker.getCivInfo() capturedUnit.civ = attacker.getCivInfo()
attacker.getCivInfo().units.placeUnitNearTile(capturedUnitTile.position, Constants.worker)
val workerTypeUnit = attacker.getCivInfo().gameInfo.ruleset.units.values
.firstOrNull { it.isCivilian() && it.getMatchingUniques(UniqueType.BuildImprovements).any { it.params[0] == "Land" } }
if (workerTypeUnit != null)
attacker.getCivInfo().units.placeUnitNearTile(capturedUnitTile.position, workerTypeUnit.name)
} }
else -> capturedUnit.capturedBy(attacker.getCivInfo()) else -> capturedUnit.capturedBy(attacker.getCivInfo())
} }