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

chore: Early exit moveToNewEra

Browse Source
This commit is contained in:
yairm210 2025-01-02 20:47:15 +02:00
parent 9fca320574
commit ced36b8e8a
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/civilization/managers/TechManager.kt
View File

@ -417,7 +417,8 @@ class TechManager : IsPartOfGameInfoSerialization {
val previousEra = civInfo.getEra()
updateEra()
val currentEra = civInfo.getEra()
if (previousEra != currentEra) {
if (previousEra == currentEra) return
if (showNotification) {
if (!civInfo.isSpectator())
civInfo.addNotification(
@ -433,6 +434,7 @@ class TechManager : IsPartOfGameInfoSerialization {
)
}
}
for (policyBranch in getRuleset().policyBranches.values.filter {
it.era == currentEra.name && civInfo.policies.isAdoptable(it)
}) {
@ -450,7 +452,6 @@ class TechManager : IsPartOfGameInfoSerialization {
.filter { it.eraNumber > previousEra.eraNumber && it.eraNumber <= currentEra.eraNumber }
.sortedBy { it.eraNumber }
for (era in erasPassed)
for (unique in era.uniqueObjects)
if (!unique.hasTriggerConditional() && unique.conditionalsApply(civInfo.state))
@ -477,7 +478,6 @@ class TechManager : IsPartOfGameInfoSerialization {
civInfo,
triggerNotificationText = "due to entering the [${currentEra.name}]")
}
}
private fun updateEra() {
val ruleset = civInfo.gameInfo.ruleset