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

Researching all of the techs in the previous era now also puts you in the next era (#5451)

Browse Source
This commit is contained in:
Xander Lenstra 2021-10-10 16:14:30 +02:00 committed by GitHub
parent 2bd8132b8d
commit 9fab1f6ee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -531,14 +531,25 @@ class CivilizationInfo {
} }
fun getEra(): Era { fun getEra(): Era {
if (gameInfo.ruleSet.technologies.isEmpty() || tech.researchedTechnologies.isEmpty()) if (gameInfo.ruleSet.technologies.isEmpty() || tech.researchedTechnologies.isEmpty())
return Era() return Era()
val eraName = tech.researchedTechnologies val maxEraName = tech.researchedTechnologies
.asSequence() .asSequence()
.map { it.column!! } .map { it.column!! }
.maxByOrNull { it.columnNumber }!! .maxByOrNull { it.columnNumber }!!
.era .era
return gameInfo.ruleSet.eras[eraName]!! val maxEra = gameInfo.ruleSet.eras[maxEraName]!!
val minEraName = gameInfo.ruleSet.technologies.values
.asSequence()
.filter { it !in tech.researchedTechnologies }
.map { it.column!! }
.minByOrNull { it.columnNumber }!!
.era
val minEra = gameInfo.ruleSet.eras[minEraName]!!
return if (minEra.eraNumber > maxEra.eraNumber) minEra
else maxEra
} }
fun getEraNumber(): Int = getEra().eraNumber fun getEraNumber(): Int = getEra().eraNumber