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

Revert "-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)" (#3301)

Browse Source 
This reverts commit 49cdf09b44.
This commit is contained in:
Yair Morgenstern
2020-10-27 00:22:02 +02:00
committed by GitHub
parent 49cdf09b44
commit 247350d6a1
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,9 +86,7 @@ class Technology {
fun getEnabledBuildings(civInfo: CivilizationInfo): List<Building> {
var enabledBuildings = civInfo.gameInfo.ruleSet.buildings.values.filter {
it.requiredTech == name &&
(it.uniqueTo == null || it.uniqueTo == civInfo.civName) &&
"Unbuildable" !in it.uniques
(it.uniqueTo == null || it.uniqueTo == civInfo.civName)
}
val replacedBuildings = enabledBuildings.mapNotNull { it.replaces }
enabledBuildings = enabledBuildings.filter { it.name !in replacedBuildings }
@ -108,8 +106,7 @@ class Technology {
fun getEnabledUnits(civInfo: CivilizationInfo): List<BaseUnit> {
var enabledUnits = civInfo.gameInfo.ruleSet.units.values.filter {
it.requiredTech == name &&
(it.uniqueTo == null || it.uniqueTo == civInfo.civName) &&
"Unbuildable" !in it.uniques
(it.uniqueTo == null || it.uniqueTo == civInfo.civName)
}
val replacedUnits = civInfo.gameInfo.ruleSet.units.values.filter { it.uniqueTo == civInfo.civName }
.mapNotNull { it.replaces }