Revert "Added enumset to uniquemap to speed up getTriggeredUniques calls - should make iterating on all units and getting all unit triggers, viable :D"

This reverts commit b7a5274.

Author: yairm210

core/src/com/unciv/models/ruleset/unique/UniqueMap.kt

@@ -10,12 +10,6 @@ open class UniqueMap() {
     // 750 including deprecated, and EnumMap creates a N-sized array where N is the number of objects in the enum
     private val typedUniqueMap = EnumMap<UniqueType, ArrayList<Unique>>(UniqueType::class.java)
 
-    // Another memory-speed tradeoff - enumset is super fast and also super cheap, but it's not nothing
-    // This is used to speed up triggered uniques - in other words, when we want to find all uniques with a certain modifier.
-    // Rather than mapping all uniques thus triggered, this just stores whether any unique has that trigger - 
-    //   because most of the time is spent iterating on uniques, in uniquemaps that have no such trigger in the first place!
-    private val triggerEnumSet = EnumSet.noneOf(UniqueType::class.java)
-
     constructor(uniques: Sequence<Unique>) : this() {
         addUniques(uniques.asIterable())
     }
@@ -27,11 +21,10 @@ open class UniqueMap() {
         val existingArrayList = innerUniqueMap[unique.placeholderText]
         if (existingArrayList != null) existingArrayList.add(unique)
         else innerUniqueMap[unique.placeholderText] = arrayListOf(unique)
-
+        
         if (unique.type == null) return
         if (typedUniqueMap[unique.type] != null) return
         typedUniqueMap[unique.type] = innerUniqueMap[unique.placeholderText]
-        triggerEnumSet.add(unique.type)
     }
 
     /** Calls [addUnique] on each item from [uniques] */
@@ -43,20 +36,20 @@ open class UniqueMap() {
         val existingArrayList = innerUniqueMap[unique.placeholderText]
         existingArrayList?.remove(unique)
     }
-
+    
     fun clear() {
         innerUniqueMap.clear()
         typedUniqueMap.clear()
     }
-
+    
     // Pure functions
-
+    
     fun hasUnique(uniqueType: UniqueType, state: StateForConditionals = StateForConditionals.EmptyState) =
         getUniques(uniqueType).any { it.conditionalsApply(state) && !it.isTimedTriggerable }
 
     fun hasUnique(uniqueTag: String, state: StateForConditionals = StateForConditionals.EmptyState) =
         getUniques(uniqueTag).any { it.conditionalsApply(state) && !it.isTimedTriggerable }
-
+    
     fun hasTagUnique(tagUnique: String) =
         innerUniqueMap.containsKey(tagUnique)
 
@@ -69,7 +62,7 @@ open class UniqueMap() {
         ?.asSequence()
         ?: emptySequence()
 
-    fun getMatchingUniques(uniqueType: UniqueType, state: StateForConditionals = StateForConditionals.EmptyState) =
+    fun getMatchingUniques(uniqueType: UniqueType, state: StateForConditionals = StateForConditionals.EmptyState) = 
         getUniques(uniqueType)
             // Same as .filter | .flatMap, but more cpu/mem performant (7.7 GB vs ?? for test)
             .flatMap {
@@ -90,8 +83,8 @@ open class UniqueMap() {
                     else -> it.getMultiplied(state)
                 }
             }
-
-    fun hasMatchingUnique(uniqueType: UniqueType, state: StateForConditionals = StateForConditionals.EmptyState) =
+    
+    fun hasMatchingUnique(uniqueType: UniqueType, state: StateForConditionals = StateForConditionals.EmptyState) = 
         getUniques(uniqueType).any { it.conditionalsApply(state) }
 
     fun hasMatchingUnique(uniqueTag: String, state: StateForConditionals = StateForConditionals.EmptyState) =
@@ -102,12 +95,11 @@ open class UniqueMap() {
 
     fun getTriggeredUniques(trigger: UniqueType, stateForConditionals: StateForConditionals,
                             triggerFilter: (Unique) -> Boolean = { true }): Sequence<Unique> {
-        if (!triggerEnumSet.contains(trigger)) return emptySequence() // Common case - no such unique exists
         return getAllUniques().filter { unique ->
             unique.getModifiers(trigger).any(triggerFilter) && unique.conditionalsApply(stateForConditionals)
         }.flatMap { it.getMultiplied(stateForConditionals) }
     }
-
+    
     companion object{
         val EMPTY = UniqueMap()
     }