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

Resolved #10676 - Citezenship policy grants worker even without having cities

Browse Source
This commit is contained in:
Yair Morgenstern
2023-12-10 22:37:35 +02:00
parent d213c3d78f
commit 200b764b05
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
View File

@ -57,9 +57,7 @@ object UniqueTriggerActivation {
when (unique.type) { when (unique.type) {
UniqueType.OneTimeFreeUnit -> { UniqueType.OneTimeFreeUnit -> {
val unitName = unique.params[0] val unitName = unique.params[0]
val baseUnit = ruleSet.units[unitName] val baseUnit = ruleSet.units[unitName] ?: return false
if ((chosenCity == null && tile == null) || baseUnit == null)
return false
val unit = civInfo.getEquivalentUnit(baseUnit) val unit = civInfo.getEquivalentUnit(baseUnit)
if (unit.isCityFounder() && civInfo.isOneCityChallenger()) if (unit.isCityFounder() && civInfo.isOneCityChallenger())
return false return false
@ -69,10 +67,15 @@ object UniqueTriggerActivation {
if (limit != null && limit <= civInfo.units.getCivUnits().count { it.name == unitName }) if (limit != null && limit <= civInfo.units.getCivUnits().count { it.name == unitName })
return false return false
val placedUnit = if (city != null || tile == null) // 4 situations: If city ->
civInfo.units.addUnit(unitName, chosenCity) ?: return false val placedUnit = when {
else civInfo.units.placeUnitNearTile(tile.position, unitName) ?: return false city != null || (tile == null && civInfo.cities.isNotEmpty()) ->
civInfo.units.addUnit(unitName, chosenCity) ?: return false
tile != null -> civInfo.units.placeUnitNearTile(tile.position, unitName) ?: return false
civInfo.units.getCivUnits().any() ->
civInfo.units.placeUnitNearTile(civInfo.units.getCivUnits().first().currentTile.position, unitName) ?: return false
else -> return false
}
val notificationText = getNotificationText(notification, triggerNotificationText, val notificationText = getNotificationText(notification, triggerNotificationText,
"Gained [1] [$unitName] unit(s)") "Gained [1] [$unitName] unit(s)")
?: return true ?: return true