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

Allow free unit triggers for any location (#9870)

Browse Source 
* Allow free unit triggers for any location

* Almost forgot this was broken

* Fix situation when tile is null, but therebis a city to place at
This commit is contained in:
SeventhM 2023-08-03 01:38:14 -07:00 committed by GitHub
parent fdc891dada
commit 0fe584700b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,8 @@ 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 (unit.matchesFilter(unique.params[0])) if (unique.conditionals.any { it.isOfType(UniqueType.TriggerUponGainingUnit) &&
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())
civInfo.cache.updateCivResources() civInfo.cache.updateCivResources()

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

@ -53,7 +53,7 @@ object UniqueTriggerActivation {
UniqueType.OneTimeFreeUnit -> { UniqueType.OneTimeFreeUnit -> {
val unitName = unique.params[0] val unitName = unique.params[0]
val unit = ruleSet.units[unitName] val unit = ruleSet.units[unitName]
if (chosenCity == null if ((chosenCity == null && tile == null)
|| unit == null || unit == null
|| unit.hasUnique(UniqueType.FoundCity) && civInfo.isOneCityChallenger()) || unit.hasUnique(UniqueType.FoundCity) && civInfo.isOneCityChallenger())
return false return false
@ -63,7 +63,9 @@ 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 = civInfo.units.addUnit(unitName, chosenCity) ?: return false val placedUnit = if (city != null || tile == null)
civInfo.units.addUnit(unitName, chosenCity) ?: return false
else civInfo.units.placeUnitNearTile(tile!!.position, unitName) ?: return false
val notificationText = getNotificationText(notification, triggerNotificationText, val notificationText = getNotificationText(notification, triggerNotificationText,
"Gained [1] [$unitName] unit(s)") "Gained [1] [$unitName] unit(s)")
@ -80,7 +82,7 @@ object UniqueTriggerActivation {
UniqueType.OneTimeAmountFreeUnits -> { UniqueType.OneTimeAmountFreeUnits -> {
val unitName = unique.params[1] val unitName = unique.params[1]
val unit = ruleSet.units[unitName] val unit = ruleSet.units[unitName]
if (chosenCity == null || unit == null || (unit.hasUnique(UniqueType.FoundCity) && civInfo.isOneCityChallenger())) if ((chosenCity == null && tile == null) || unit == null || (unit.hasUnique(UniqueType.FoundCity) && civInfo.isOneCityChallenger()))
return false return false
val limit = unit.getMatchingUniques(UniqueType.MaxNumberBuildable) val limit = unit.getMatchingUniques(UniqueType.MaxNumberBuildable)
@ -94,7 +96,8 @@ object UniqueTriggerActivation {
val tilesUnitsWerePlacedOn: MutableList<Vector2> = mutableListOf() val tilesUnitsWerePlacedOn: MutableList<Vector2> = mutableListOf()
repeat(actualAmount) { repeat(actualAmount) {
val placedUnit = civInfo.units.addUnit(unitName, chosenCity) val placedUnit = if (city != null || tile == null) civInfo.units.addUnit(unitName, chosenCity)
else civInfo.units.placeUnitNearTile(tile!!.position, unitName)
if (placedUnit != null) if (placedUnit != null)
tilesUnitsWerePlacedOn.add(placedUnit.getTile().position) tilesUnitsWerePlacedOn.add(placedUnit.getTile().position)
} }