AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 11:34:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: More renames

Browse Source
This commit is contained in:
yairm210 2025-09-08 16:26:14 +03:00
parent c2aff15894
commit 263760f153
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/models/ruleset/unique/UniqueMap.kt
View File

@ -4,7 +4,7 @@ import yairm210.purity.annotations.Readonly
import java.util.* import java.util.*
open class UniqueMap() { open class UniqueMap() {
private val innerUniqueMap = HashMap<String, ArrayList<Unique>>() private val tagUniqueMap = HashMap<String, ArrayList<Unique>>()
// *shares* the list of uniques with the other map, to save on memory and allocations // *shares* the list of uniques with the other map, to save on memory and allocations
// This is a memory/speed tradeoff, since there are *600 unique types*, // This is a memory/speed tradeoff, since there are *600 unique types*,
@ -17,13 +17,13 @@ open class UniqueMap() {
/** Adds one [unique] unless it has a ConditionalTimedUnique conditional */ /** Adds one [unique] unless it has a ConditionalTimedUnique conditional */
open fun addUnique(unique: Unique) { open fun addUnique(unique: Unique) {
val existingArrayList = innerUniqueMap[unique.placeholderText] val existingArrayList = tagUniqueMap[unique.placeholderText]
if (existingArrayList != null) existingArrayList.add(unique) if (existingArrayList != null) existingArrayList.add(unique)
else innerUniqueMap[unique.placeholderText] = arrayListOf(unique) else tagUniqueMap[unique.placeholderText] = arrayListOf(unique)
if (unique.type == null) return if (unique.type == null) return
if (typedUniqueMap[unique.type] != null) return if (typedUniqueMap[unique.type] != null) return
typedUniqueMap[unique.type] = innerUniqueMap[unique.placeholderText] typedUniqueMap[unique.type] = tagUniqueMap[unique.placeholderText]
} }
/** Calls [addUnique] on each item from [uniques] */ /** Calls [addUnique] on each item from [uniques] */
@ -32,17 +32,17 @@ open class UniqueMap() {
} }
fun removeUnique(unique: Unique) { fun removeUnique(unique: Unique) {
val existingArrayList = innerUniqueMap[unique.placeholderText] val existingArrayList = tagUniqueMap[unique.placeholderText]
existingArrayList?.remove(unique) existingArrayList?.remove(unique)
} }
fun clear() { fun clear() {
innerUniqueMap.clear() tagUniqueMap.clear()
typedUniqueMap.clear() typedUniqueMap.clear()
} }
@Readonly @Readonly
fun isEmpty(): Boolean = innerUniqueMap.isEmpty() fun isEmpty(): Boolean = tagUniqueMap.isEmpty()
@Readonly @Readonly
fun hasUnique(uniqueType: UniqueType, state: GameContext = GameContext.EmptyState) = fun hasUnique(uniqueType: UniqueType, state: GameContext = GameContext.EmptyState) =
@ -54,7 +54,7 @@ open class UniqueMap() {
@Readonly @Readonly
fun hasTagUnique(tagUnique: String) = fun hasTagUnique(tagUnique: String) =
innerUniqueMap.containsKey(tagUnique) tagUniqueMap.containsKey(tagUnique)
// 160ms vs 1000-1250ms/30s // 160ms vs 1000-1250ms/30s
@Readonly @Readonly
@ -63,7 +63,7 @@ open class UniqueMap() {
?: emptySequence() ?: emptySequence()
@Readonly @Readonly
fun getTagUniques(uniqueTag: String) = innerUniqueMap[uniqueTag] fun getTagUniques(uniqueTag: String) = tagUniqueMap[uniqueTag]
?.asSequence() ?.asSequence()
?: emptySequence() ?: emptySequence()
@ -101,7 +101,7 @@ open class UniqueMap() {
.any { it.conditionalsApply(state) } .any { it.conditionalsApply(state) }
@Readonly @Readonly
fun getAllUniques() = innerUniqueMap.values.asSequence().flatten() fun getAllUniques() = tagUniqueMap.values.asSequence().flatten()
@Readonly @Readonly
fun getTriggeredUniques(trigger: UniqueType, gameContext: GameContext, fun getTriggeredUniques(trigger: UniqueType, gameContext: GameContext,