From 072f08d44058a2a87757ee2493b263752d6712d3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 29 Jan 2023 18:26:30 +0200 Subject: [PATCH] Allow unique ruins stat gain notifications --- .../ruleset/unique/UniqueTriggerActivation.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt index ad3f7a249c..1275f1774e 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt @@ -359,10 +359,15 @@ object UniqueTriggerActivation { || unique.params[0].toIntOrNull() == null ) return false - val stats = Stats().add(stat, unique.params[0].toFloat()) + val statAmount = unique.params[0].toInt() + val stats = Stats().add(stat, statAmount.toFloat()) civInfo.addStats(stats) - val notificationText = getNotificationText(notification, triggerNotificationText, + val filledNotification = if(notification!=null && notification.hasPlaceholderParameters()) + notification.fillPlaceholders(statAmount.toString()) + else notification + + val notificationText = getNotificationText(filledNotification, triggerNotificationText, "Gained [$stats]") ?: return true @@ -383,7 +388,11 @@ object UniqueTriggerActivation { val stats = Stats().add(stat, finalStatAmount) civInfo.addStats(stats) - val notificationText = getNotificationText(notification, triggerNotificationText, + val filledNotification = if (notification!=null && notification.hasPlaceholderParameters()) + notification.fillPlaceholders(finalStatAmount.toString()) + else notification + + val notificationText = getNotificationText(filledNotification, triggerNotificationText, "Gained [$stats]") ?: return true