diff --git a/core/src/com/unciv/models/ruleset/Event.kt b/core/src/com/unciv/models/ruleset/Event.kt index d19770d7a9..19930b72ba 100644 --- a/core/src/com/unciv/models/ruleset/Event.kt +++ b/core/src/com/unciv/models/ruleset/Event.kt @@ -41,10 +41,14 @@ class EventChoice : ICivilopediaText, RulesetObject() { /** Keyboard support - not user-rebindable, mod control only. Will be [parsed][KeyCharAndCode.parse], so Gdx key names will work. */ val keyShortcut = "" + @Deprecated("as of 4.13.4", ReplaceWith("uniques")) var triggeredUniques = ArrayList() + @Deprecated("as of 4.13.4", ReplaceWith("uniqueObjects")) val triggeredUniqueObjects by lazy { triggeredUniques.map { Unique(it) } } + @Deprecated("as of 4.13.4", ReplaceWith("uniques")) var conditions = ArrayList() + @Deprecated("as of 4.13.4", ReplaceWith("uniqueObjects")) val conditionObjects by lazy { conditions.map { Unique(it) } } fun matchesConditions(stateForConditionals: StateForConditionals): Boolean { diff --git a/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt b/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt index e9a63fe723..be7191fa49 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt @@ -70,8 +70,11 @@ class RenderEvent( val lines = ( choice.civilopediaText.asSequence() + choice.triggeredUniqueObjects.asSequence() - .filterNot { it.isHiddenToUsers() } - .map { FormattedLine(it) } + .filterNot { it.isHiddenToUsers() } + .map { FormattedLine(it) } + + choice.uniqueObjects.filter { it.isTriggerable } + .filterNot { it.isHiddenToUsers() } + .map { FormattedLine(it) } ).asIterable() add(MarkupRenderer.render(lines, stageWidth * 0.5f, linkAction = ::openCivilopedia)).row() }