mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-26 23:58:43 +07:00
Resolved #12422 - Comment text is displayed on event choices
This commit is contained in:
@ -6,6 +6,7 @@ import com.unciv.logic.map.mapunit.MapUnit
|
|||||||
import com.unciv.models.ruleset.Event
|
import com.unciv.models.ruleset.Event
|
||||||
import com.unciv.models.ruleset.EventChoice
|
import com.unciv.models.ruleset.EventChoice
|
||||||
import com.unciv.models.ruleset.unique.StateForConditionals
|
import com.unciv.models.ruleset.unique.StateForConditionals
|
||||||
|
import com.unciv.models.ruleset.unique.UniqueType
|
||||||
import com.unciv.ui.components.UncivTooltip.Companion.addTooltip
|
import com.unciv.ui.components.UncivTooltip.Companion.addTooltip
|
||||||
import com.unciv.ui.components.extensions.addSeparator
|
import com.unciv.ui.components.extensions.addSeparator
|
||||||
import com.unciv.ui.components.extensions.toTextButton
|
import com.unciv.ui.components.extensions.toTextButton
|
||||||
@ -69,7 +70,7 @@ class RenderEvent(
|
|||||||
|
|
||||||
val lines = (
|
val lines = (
|
||||||
choice.civilopediaText.asSequence()
|
choice.civilopediaText.asSequence()
|
||||||
+ choice.uniqueObjects.filter { it.isTriggerable }
|
+ choice.uniqueObjects.filter { it.isTriggerable || it.type == UniqueType.Comment }
|
||||||
.filterNot { it.isHiddenToUsers() }
|
.filterNot { it.isHiddenToUsers() }
|
||||||
.map { FormattedLine(it) }
|
.map { FormattedLine(it) }
|
||||||
).asIterable()
|
).asIterable()
|
||||||
|
Reference in New Issue
Block a user