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

Added deprecations to deprecated choice fields

Browse Source
This commit is contained in:
yairm210
2024-09-05 21:17:08 +03:00
parent 08646a6aeb
commit cb432bbb67
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/models/ruleset/Event.kt
View File

@ -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. */ /** Keyboard support - not user-rebindable, mod control only. Will be [parsed][KeyCharAndCode.parse], so Gdx key names will work. */
val keyShortcut = "" val keyShortcut = ""
@Deprecated("as of 4.13.4", ReplaceWith("uniques"))
var triggeredUniques = ArrayList<String>() var triggeredUniques = ArrayList<String>()
@Deprecated("as of 4.13.4", ReplaceWith("uniqueObjects"))
val triggeredUniqueObjects by lazy { triggeredUniques.map { Unique(it) } } val triggeredUniqueObjects by lazy { triggeredUniques.map { Unique(it) } }
@Deprecated("as of 4.13.4", ReplaceWith("uniques"))
var conditions = ArrayList<String>() var conditions = ArrayList<String>()
@Deprecated("as of 4.13.4", ReplaceWith("uniqueObjects"))
val conditionObjects by lazy { conditions.map { Unique(it) } } val conditionObjects by lazy { conditions.map { Unique(it) } }
fun matchesConditions(stateForConditionals: StateForConditionals): Boolean { fun matchesConditions(stateForConditionals: StateForConditionals): Boolean {

7
core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt
View File

@ -70,8 +70,11 @@ class RenderEvent(
val lines = ( val lines = (
choice.civilopediaText.asSequence() choice.civilopediaText.asSequence()
+ choice.triggeredUniqueObjects.asSequence() + choice.triggeredUniqueObjects.asSequence()
.filterNot { it.isHiddenToUsers() } .filterNot { it.isHiddenToUsers() }
.map { FormattedLine(it) } .map { FormattedLine(it) }
+ choice.uniqueObjects.filter { it.isTriggerable }
.filterNot { it.isHiddenToUsers() }
.map { FormattedLine(it) }
).asIterable() ).asIterable()
add(MarkupRenderer.render(lines, stageWidth * 0.5f, linkAction = ::openCivilopedia)).row() add(MarkupRenderer.render(lines, stageWidth * 0.5f, linkAction = ::openCivilopedia)).row()
} }