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

Fix combat conditionals not working correctly (#13796)

Browse Source 
* Fix combat conditionals not working correctly

* cleanup RuinsManager because why not
This commit is contained in:
SeventhM 2025-08-11 12:56:05 -07:00 committed by GitHub
parent a06c5c96e3
commit 2fe9bd2f6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/civilization/managers/RuinsManager.kt
View File

@ -60,8 +60,9 @@ class RuinsManager(
var atLeastOneUniqueHadEffect = false
for (unique in possibleReward.uniqueObjects) {
atLeastOneUniqueHadEffect =
atLeastOneUniqueHadEffect
|| UniqueTriggerActivation.triggerUnique(unique, triggeringUnit, notification = possibleReward.notification, triggerNotificationText = "from the ruins")
unique.conditionalsApply(triggeringUnit.cache.state) &&
UniqueTriggerActivation.triggerUnique(unique, triggeringUnit, notification = possibleReward.notification, triggerNotificationText = "from the ruins")
if (atLeastOneUniqueHadEffect) break
}
if (atLeastOneUniqueHadEffect) {
rememberReward(possibleReward.name)

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

@ -109,8 +109,6 @@ object UniqueTriggerActivation {
val gameContext = GameContext(civInfo, city, unit, tile)
if (!unique.conditionalsApply(gameContext)) return null
val chosenCity = relevantCity ?:
civInfo.cities.firstOrNull { it.isCapital() }