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

Simplified temporary uniques

Browse Source
This commit is contained in:
Yair Morgenstern
2022-12-11 13:57:06 +02:00
parent aaaa84a00f
commit 66c0f269d2
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/UncivGame.kt
View File

@ -485,6 +485,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
) : IsPartOfGameInfoSerialization {
@Suppress("unused") // used by json serialization
constructor() : this("", -1)
fun toNiceString() = "$text (Build $number)"
}
}

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

@ -32,7 +32,7 @@ import com.unciv.models.ruleset.tile.ResourceSupplyList
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.ruleset.tile.TileResource
import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.models.ruleset.unique.TemporaryUnique
import com.unciv.models.ruleset.unique.TemporaryUniques
import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.ruleset.unit.BaseUnit
@ -66,9 +66,7 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
fun getWorkerAutomation(): WorkerAutomation {
val currentTurn = if (UncivGame.Current.isInitialized && UncivGame.Current.gameInfo != null) {
UncivGame.Current.gameInfo!!.turns
} else {
0
}
} else 0
if (workerAutomationCache == null || workerAutomationCache!!.cachedForTurn != currentTurn)
workerAutomationCache = WorkerAutomation(this, currentTurn)
return workerAutomationCache!!
@ -186,7 +184,7 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
* We don't use pairs, as these cannot be serialized due to having no no-arg constructor
* This can also contain NON-temporary uniques but I can't be bothered to do the deprecation dance with this one
*/
val temporaryUniques = ArrayList<TemporaryUnique>()
val temporaryUniques = TemporaryUniques()
// if we only use lists, and change the list each time the cities are changed,
// we won't get concurrent modification exceptions.
@ -457,11 +455,7 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
)
yieldAll(policies.policyUniques.getMatchingUniques(uniqueType, stateForConditionals))
yieldAll(tech.techUniques.getMatchingUniques(uniqueType, stateForConditionals))
if (temporaryUniques.isNotEmpty())
yieldAll(temporaryUniques.asSequence()
.map { it.uniqueObject }
.filter { it.isOfType(uniqueType) && it.conditionalsApply(stateForConditionals) }
)
yieldAll(temporaryUniques.getMatchingUniques(uniqueType, stateForConditionals))
yieldAll(getEra().getMatchingUniques(uniqueType, stateForConditionals))
yieldAll(cityStateFunctions.getUniquesProvidedByCityStates(uniqueType, stateForConditionals))
if (religionManager.religion != null)
@ -998,12 +992,7 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
city.endTurn()
}
// Update turn counter for temporary uniques
for (unique in temporaryUniques) {
if (unique.turnsLeft >= 0)
unique.turnsLeft -= 1
}
temporaryUniques.removeAll { it.turnsLeft == 0 }
temporaryUniques.endTurn()
goldenAges.endTurn(getHappiness())
getCivUnits().forEach { it.endTurn() } // This is the most expensive part of endTurn

16
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -342,3 +342,19 @@ class TemporaryUnique() : IsPartOfGameInfoSerialization {
var turnsLeft: Int = 0
}
class TemporaryUniques:ArrayList<TemporaryUnique>(){
fun endTurn() {
for (unique in this) {
if (unique.turnsLeft >= 0)
unique.turnsLeft -= 1
}
removeAll { it.turnsLeft == 0 }
}
fun getMatchingUniques(uniqueType: UniqueType, stateForConditionals: StateForConditionals): Sequence<Unique> {
return this.asSequence()
.map { it.uniqueObject }
.filter { it.isOfType(uniqueType) && it.conditionalsApply(stateForConditionals) }
}
}

2
core/src/com/unciv/ui/utils/extensions/FormattingExtensions.kt
View File

@ -1,6 +1,5 @@
package com.unciv.ui.utils.extensions
import com.unciv.UncivGame
import com.unciv.models.translations.tr
import java.text.SimpleDateFormat
import java.time.Duration
@ -96,4 +95,3 @@ fun <T> String.filterCompositeLogic(predicate: (String) -> T?, operation: (T, T)
fun String.filterAndLogic(predicate: (String) -> Boolean): Boolean? =
if (contains('{')) filterCompositeLogic(predicate) { a, b -> a && b } else null
fun UncivGame.Version.toNiceString() = "$text (Build $number)"