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

Assume the relevant city for triggered uniques (#10979)

Browse Source 
* Assume the relevant city for triggered uniques

* whoops

* whoops 2

* Missing bracket

* whoops 3. A PR I was planning on doint but will wait on
This commit is contained in:
SeventhM
2024-01-21 09:13:31 -08:00
committed by GitHub
parent bb969efc12
commit b43fe8cdf8
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,16 +41,20 @@ object UniqueTriggerActivation {
notification: String? = null, notification: String? = null,
triggerNotificationText: String? = null triggerNotificationText: String? = null
): Boolean { ): Boolean {
val relevantCity by lazy {
city?: tile?.getCity()
}
val timingConditional = unique.conditionals.firstOrNull { it.type == UniqueType.ConditionalTimedUnique } val timingConditional = unique.conditionals.firstOrNull { it.type == UniqueType.ConditionalTimedUnique }
if (timingConditional != null) { if (timingConditional != null) {
civInfo.temporaryUniques.add(TemporaryUnique(unique, timingConditional.params[0].toInt())) civInfo.temporaryUniques.add(TemporaryUnique(unique, timingConditional.params[0].toInt()))
return true return true
} }
if (!unique.conditionalsApply(civInfo, city)) return false if (!unique.conditionalsApply(civInfo, relevantCity)) return false
val chosenCity = city ?: val chosenCity = relevantCity ?:
tile?.getCity() ?:
civInfo.cities.firstOrNull { it.isCapital() } civInfo.cities.firstOrNull { it.isCapital() }
val tileBasedRandom = val tileBasedRandom =
@ -71,11 +75,13 @@ object UniqueTriggerActivation {
if (limit != null && limit <= civInfo.units.getCivUnits().count { it.name == unit.name }) if (limit != null && limit <= civInfo.units.getCivUnits().count { it.name == unit.name })
return false return false
// 4 situations: If city ->
val placedUnit = when { val placedUnit = when {
city != null || (tile == null && civInfo.cities.isNotEmpty()) -> // Set unit at city if there's an explict city or if there's no tile to set at
relevantCity != null || (tile == null && civInfo.cities.isNotEmpty()) ->
civInfo.units.addUnit(unit, chosenCity) ?: return false civInfo.units.addUnit(unit, chosenCity) ?: return false
// Else set the unit at the given tile
tile != null -> civInfo.units.placeUnitNearTile(tile.position, unit) ?: return false tile != null -> civInfo.units.placeUnitNearTile(tile.position, unit) ?: return false
// Else set unit unit near other units if we have no cities
civInfo.units.getCivUnits().any() -> civInfo.units.getCivUnits().any() ->
civInfo.units.placeUnitNearTile(civInfo.units.getCivUnits().first().currentTile.position, unit) ?: return false civInfo.units.placeUnitNearTile(civInfo.units.getCivUnits().first().currentTile.position, unit) ?: return false
else -> return false else -> return false
@ -94,9 +100,7 @@ object UniqueTriggerActivation {
} }
UniqueType.OneTimeAmountFreeUnits -> { UniqueType.OneTimeAmountFreeUnits -> {
val unitName = unique.params[1] val unitName = unique.params[1]
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
@ -115,12 +119,21 @@ object UniqueTriggerActivation {
val tilesUnitsWerePlacedOn: MutableList<Vector2> = mutableListOf() val tilesUnitsWerePlacedOn: MutableList<Vector2> = mutableListOf()
repeat(actualAmount) { repeat(actualAmount) {
val placedUnit = if (city != null || tile == null) civInfo.units.addUnit(unit, chosenCity) val placedUnit = when {
else civInfo.units.placeUnitNearTile(tile.position, unit) // Set unit at city if there's an explict city or if there's no tile to set at
relevantCity != null || (tile == null && civInfo.cities.isNotEmpty()) ->
civInfo.units.addUnit(unit, chosenCity)
// Else set the unit at the given tile
tile != null -> civInfo.units.placeUnitNearTile(tile.position, unit)
// Else set unit unit near other units if we have no cities
civInfo.units.getCivUnits().any() ->
civInfo.units.placeUnitNearTile(civInfo.units.getCivUnits().first().currentTile.position, unit)
else -> null
}
if (placedUnit != null) if (placedUnit != null)
tilesUnitsWerePlacedOn.add(placedUnit.getTile().position) tilesUnitsWerePlacedOn.add(placedUnit.getTile().position)
} }
if (tilesUnitsWerePlacedOn.isEmpty()) return true if (tilesUnitsWerePlacedOn.isEmpty()) return false
val notificationText = getNotificationText(notification, triggerNotificationText, val notificationText = getNotificationText(notification, triggerNotificationText,
"Gained [${tilesUnitsWerePlacedOn.size}] [${unit.name}] unit(s)") "Gained [${tilesUnitsWerePlacedOn.size}] [${unit.name}] unit(s)")
@ -257,7 +270,7 @@ object UniqueTriggerActivation {
UniqueType.OneTimeGainPopulation -> { UniqueType.OneTimeGainPopulation -> {
val applicableCities = val applicableCities =
if (unique.params[1] == "in this city") sequenceOf(city!!) if (unique.params[1] == "in this city") sequenceOf(relevantCity!!)
else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) } else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
for (applicableCity in applicableCities) { for (applicableCity in applicableCities) {
applicableCity.population.addPopulation(unique.params[0].toInt()) applicableCity.population.addPopulation(unique.params[0].toInt())
@ -686,7 +699,7 @@ object UniqueTriggerActivation {
UniqueType.GainFreeBuildings -> { UniqueType.GainFreeBuildings -> {
val freeBuilding = civInfo.getEquivalentBuilding(unique.params[0]) val freeBuilding = civInfo.getEquivalentBuilding(unique.params[0])
val applicableCities = val applicableCities =
if (unique.params[1] == "in this city") sequenceOf(city!!) if (unique.params[1] == "in this city") sequenceOf(relevantCity!!)
else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) } else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
for (applicableCity in applicableCities) { for (applicableCity in applicableCities) {
applicableCity.cityConstructions.freeBuildingsProvidedFromThisCity.addToMapOfSets(applicableCity.id, freeBuilding.name) applicableCity.cityConstructions.freeBuildingsProvidedFromThisCity.addToMapOfSets(applicableCity.id, freeBuilding.name)
@ -709,9 +722,9 @@ object UniqueTriggerActivation {
UniqueType.RemoveBuilding -> { UniqueType.RemoveBuilding -> {
val applicableCities = civInfo.cities.asSequence().filter { val applicableCities =
it.matchesFilter(unique.params[1]) if (unique.params[1] == "in this city") sequenceOf(relevantCity!!)
} else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
for (applicableCity in applicableCities) { for (applicableCity in applicableCities) {
val buildingsToRemove = applicableCity.cityConstructions.getBuiltBuildings().filter { val buildingsToRemove = applicableCity.cityConstructions.getBuiltBuildings().filter {
@ -726,9 +739,9 @@ object UniqueTriggerActivation {
UniqueType.SellBuilding -> { UniqueType.SellBuilding -> {
val applicableCities = civInfo.cities.asSequence().filter { val applicableCities =
it.matchesFilter(unique.params[1]) if (unique.params[1] == "in this city") sequenceOf(relevantCity!!)
} else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
for (applicableCity in applicableCities) { for (applicableCity in applicableCities) {
val buildingsToSell = applicableCity.cityConstructions.getBuiltBuildings().filter { val buildingsToSell = applicableCity.cityConstructions.getBuiltBuildings().filter {