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

Fixed uniqueTo check in nation unique units display (#12128)

Browse Source
This commit is contained in:
Yair Morgenstern
2024-08-18 09:02:55 +03:00
committed by GitHub
parent fde781d9bb
commit 854812358e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/models/ruleset/nation/Nation.kt
View File

@ -213,7 +213,7 @@ class Nation : RulesetObject() {
private fun getUniqueUnitsText(ruleset: Ruleset) = sequence { private fun getUniqueUnitsText(ruleset: Ruleset) = sequence {
for (unit in ruleset.units.values) { for (unit in ruleset.units.values) {
if (unit.isHiddenFromCivilopedia(ruleset)) continue if (unit.isHiddenFromCivilopedia(ruleset)) continue
if (unit.uniqueTo != null && !matchesFilter(unit.uniqueTo!!)) continue if (unit.uniqueTo == null || !matchesFilter(unit.uniqueTo!!)) continue
yield(FormattedLine(separator = true)) yield(FormattedLine(separator = true))
yield(FormattedLine("{${unit.name}} -", link = "Unit/${unit.name}")) yield(FormattedLine("{${unit.name}} -", link = "Unit/${unit.name}"))
if (unit.replaces != null && ruleset.units.containsKey(unit.replaces!!)) { if (unit.replaces != null && ruleset.units.containsKey(unit.replaces!!)) {
@ -239,7 +239,8 @@ class Nation : RulesetObject() {
private fun getUniqueImprovementsText(ruleset: Ruleset) = sequence { private fun getUniqueImprovementsText(ruleset: Ruleset) = sequence {
for (improvement in ruleset.tileImprovements.values) { for (improvement in ruleset.tileImprovements.values) {
if (improvement.uniqueTo != name || improvement.isHiddenFromCivilopedia(ruleset)) continue if (improvement.isHiddenFromCivilopedia(ruleset)) continue
if (improvement.uniqueTo == null || !matchesFilter(improvement.uniqueTo!!)) continue
yield(FormattedLine(separator = true)) yield(FormattedLine(separator = true))
yield(FormattedLine(improvement.name, link = "Improvement/${improvement.name}")) yield(FormattedLine(improvement.name, link = "Improvement/${improvement.name}"))