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

Fix not getting unique unit from tile based free unit trigger (#10665)

Browse Source
This commit is contained in:
SeventhM
2023-12-07 00:09:11 -08:00
committed by GitHub
parent 085bd8cf26
commit d15c3da0e0
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,10 +57,11 @@ object UniqueTriggerActivation {
when (unique.type) {
UniqueType.OneTimeFreeUnit -> {
val unitName = unique.params[0]
val unit = ruleSet.units[unitName]
if ((chosenCity == null && tile == null)
|| unit == null
|| unit.isCityFounder() && civInfo.isOneCityChallenger())
val baseUnit = ruleSet.units[unitName]
if ((chosenCity == null && tile == null) || baseUnit == null)
return false
val unit = civInfo.getEquivalentUnit(baseUnit)
if (unit.isCityFounder() && civInfo.isOneCityChallenger())
return false
val limit = unit.getMatchingUniques(UniqueType.MaxNumberBuildable)
@ -86,8 +87,11 @@ object UniqueTriggerActivation {
}
UniqueType.OneTimeAmountFreeUnits -> {
val unitName = unique.params[1]
val unit = ruleSet.units[unitName]
if ((chosenCity == null && tile == null) || unit == null || (unit.isCityFounder() && civInfo.isOneCityChallenger()))
val baseUnit = ruleSet.units[unitName]
if ((chosenCity == null && tile == null) || baseUnit == null)
return false
val unit = civInfo.getEquivalentUnit(baseUnit)
if (unit.isCityFounder() && civInfo.isOneCityChallenger())
return false
val limit = unit.getMatchingUniques(UniqueType.MaxNumberBuildable)