AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Free water units are always added to coastal cities

Browse Source
This commit is contained in:
Yair Morgenstern 2023-08-24 10:07:33 +03:00
parent 3d8af531c5
commit 2ce258b281
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/civilization/managers/UnitManager.kt
View File

@ -31,8 +31,13 @@ class UnitManager(val civInfo:Civilization) {
if (civInfo.cities.isEmpty()) return null if (civInfo.cities.isEmpty()) return null
if (!civInfo.gameInfo.ruleset.units.containsKey(unitName)) return null if (!civInfo.gameInfo.ruleset.units.containsKey(unitName)) return null
val cityToAddTo = city ?: civInfo.cities.random()
val unit = civInfo.getEquivalentUnit(unitName) val unit = civInfo.getEquivalentUnit(unitName)
val cityToAddTo = when {
unit.isWaterUnit() && (city==null || !city.isCoastal()) ->
civInfo.cities.filter { it.isCoastal() }.randomOrNull()
city != null -> city
else -> civInfo.cities.random()
} ?: return null // If we got a free water unit with no coastal city to place it in
val placedUnit = placeUnitNearTile(cityToAddTo.location, unit.name) val placedUnit = placeUnitNearTile(cityToAddTo.location, unit.name)
// silently bail if no tile to place the unit is found // silently bail if no tile to place the unit is found
?: return null ?: return null
@ -76,7 +81,7 @@ class UnitManager(val civInfo:Civilization) {
if (!unique.hasTriggerConditional()) if (!unique.hasTriggerConditional())
UniqueTriggerActivation.triggerUnitwideUnique(unique, unit, triggerNotificationText = triggerNotificationText) UniqueTriggerActivation.triggerUnitwideUnique(unique, unit, triggerNotificationText = triggerNotificationText)
for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponGainingUnit)) for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponGainingUnit))
if (unique.conditionals.any { it.isOfType(UniqueType.TriggerUponGainingUnit) && if (unique.conditionals.any { it.isOfType(UniqueType.TriggerUponGainingUnit) &&
unit.matchesFilter(unique.params[0]) }) unit.matchesFilter(unique.params[0]) })
UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo, triggerNotificationText = triggerNotificationText) UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo, triggerNotificationText = triggerNotificationText)
if (unit.baseUnit.getResourceRequirementsPerTurn().isNotEmpty()) if (unit.baseUnit.getResourceRequirementsPerTurn().isNotEmpty())