AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 15:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Civilopedia quickie: Units show other direction of upgrade path (#5209)

Browse Source 
* Civilopedia quickie: Units show other direction of upgrade path

* Civilopedia quickie: Units show other direction of upgrade path - spacing
This commit is contained in:
SomeTroglodyte 2021-09-14 23:34:20 +02:00 committed by GitHub
parent fe60c100fa
commit 86bbf54cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/translations/template.properties
View File

@ -953,6 +953,8 @@ Tutorials =
Cost = Cost =
May contain [listOfResources] = May contain [listOfResources] =
May contain: = May contain: =
Can upgrade from [unit] =
Can upgrade from: =
Upgrades to [upgradedUnit] = Upgrades to [upgradedUnit] =
Obsolete with [obsoleteTech] = Obsolete with [obsoleteTech] =
Occurs on [listOfTerrains] = Occurs on [listOfTerrains] =

18
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -154,6 +154,24 @@ class BaseUnit : INamed, INonPerpetualConstruction, ICivilopediaText {
if (requiredTech != null || upgradesTo != null || obsoleteTech != null) textList += FormattedLine() if (requiredTech != null || upgradesTo != null || obsoleteTech != null) textList += FormattedLine()
if (requiredTech != null) textList += FormattedLine("Required tech: [$requiredTech]", link="Technology/$requiredTech") if (requiredTech != null) textList += FormattedLine("Required tech: [$requiredTech]", link="Technology/$requiredTech")
val canUpgradeFrom = ruleset.units
.filterValues {
(it.upgradesTo == name || it.upgradesTo != null && it.upgradesTo == replaces)
&& (it.uniqueTo == uniqueTo || it.uniqueTo == null)
}.keys
if (canUpgradeFrom.isNotEmpty()) {
if (canUpgradeFrom.size == 1)
textList += FormattedLine("Can upgrade from [${canUpgradeFrom.first()}]", link = "Unit/${canUpgradeFrom.first()}")
else {
textList += FormattedLine()
textList += FormattedLine("Can upgrade from:")
for (unitName in canUpgradeFrom.sorted())
textList += FormattedLine(unitName, indent = 2, link = "Unit/$unitName")
textList += FormattedLine()
}
}
if (upgradesTo != null) textList += FormattedLine("Upgrades to [$upgradesTo]", link="Unit/$upgradesTo") if (upgradesTo != null) textList += FormattedLine("Upgrades to [$upgradesTo]", link="Unit/$upgradesTo")
if (obsoleteTech != null) textList += FormattedLine("Obsolete with [$obsoleteTech]", link="Technology/$obsoleteTech") if (obsoleteTech != null) textList += FormattedLine("Obsolete with [$obsoleteTech]", link="Technology/$obsoleteTech")