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

Units/buildings with "Will not be displayed in Civilopedia" now will not show in tech tree (#3359)

Browse Source 
* adds unique "Will not be displayed in Tech Tree"

* Changed "Will not be displayed in Tech Tree" to "Will not be displayed in Civilopedia", avoiding bloat
This commit is contained in:
9kgsofrice 2020-11-22 18:52:50 +00:00 committed by GitHub
parent 072226ff9a
commit 038ac1e48b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/models/ruleset/tech/Technology.kt
View File

@ -49,7 +49,8 @@ class Technology {
val enabledUnits = getEnabledUnits(viewingCiv)
if (enabledUnits.isNotEmpty()) {
lineList += "{Units enabled}: "
for (unit in enabledUnits)
for (unit in enabledUnits
.filter { "Will not be displayed in Civilopedia" !in it.uniques})
lineList += " * " + unit.name.tr() + " (" + unit.getShortDescription() + ")"
}
@ -58,7 +59,8 @@ class Technology {
val regularBuildings = enabledBuildings.filter { !it.isWonder && !it.isNationalWonder }
if (regularBuildings.isNotEmpty()) {
lineList += "{Buildings enabled}: "
for (building in regularBuildings)
for (building in regularBuildings
.filter { "Will not be displayed in Civilopedia" !in it.uniques})
lineList += "* " + building.name.tr() + " (" + building.getShortDescription(ruleset) + ")"
}

6
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View File

@ -45,10 +45,12 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
val tech = ruleset.technologies[techName]!!
for (unit in tech.getEnabledUnits(techManager.civInfo))
for (unit in tech.getEnabledUnits(techManager.civInfo)
.filter { "Will not be displayed in Civilopedia" !in it.uniques})
techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(techIconSize))
for (building in tech.getEnabledBuildings(techManager.civInfo))
for (building in tech.getEnabledBuildings(techManager.civInfo)
.filter { "Will not be displayed in Civilopedia" !in it.uniques})
techEnabledIcons.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(techIconSize))
for(building in tech.getObsoletedBuildings(techManager.civInfo) )