For cached stored in LocalUniqueCache, don't apply multiplication when storing, only when retrieving

Author: yairm210

Diff for: core/src/com/unciv/models/ruleset/unique/StateForConditionals.kt

@@ -93,6 +93,9 @@ data class StateForConditionals(
     companion object {
         val IgnoreConditionals = StateForConditionals(ignoreConditionals = true)
         val EmptyState = StateForConditionals()
+        /** When caching uniques, we need to cache them unmultiplied, and apply multiplication only on retrieval from cache
+         * This state lets the multiplication function know that it's always 1:1 */
+        val IgnoreMultiplicationForCaching = StateForConditionals(ignoreConditionals = true)
     }
 
     /**  Used ONLY for stateBasedRandom in [Conditionals.conditionalApplies] to prevent save scumming on [UniqueType.ConditionalChance] */

Diff for: core/src/com/unciv/models/ruleset/unique/Unique.kt

@@ -92,6 +92,8 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
     }
 
     private fun getUniqueMultiplier(stateForConditionals: StateForConditionals): Int {
+        if (stateForConditionals == StateForConditionals.IgnoreMultiplicationForCaching)
+            return 1
 
         var amount = 1
 
@@ -235,8 +237,9 @@ class LocalUniqueCache(val cache: Boolean = true) {
 
         val citySpecificUniques = get(
             "city-${city.id}-${uniqueType.name}",
-            city.getLocalMatchingUniques(uniqueType, StateForConditionals.IgnoreConditionals)
+            city.getLocalMatchingUniques(uniqueType, StateForConditionals.IgnoreMultiplicationForCaching)
         ).filter { it.conditionalsApply(stateForConditionals) }
+            .flatMap { it.getMultiplied(stateForConditionals) }
 
         val civUniques = forCivGetMatchingUniques(city.civ, uniqueType, stateForConditionals)
 
@@ -248,7 +251,7 @@ class LocalUniqueCache(val cache: Boolean = true) {
         uniqueType: UniqueType,
         stateForConditionals: StateForConditionals = civ.state
     ): Sequence<Unique> {
-        val sequence = civ.getMatchingUniques(uniqueType, StateForConditionals.IgnoreConditionals)
+        val sequence = civ.getMatchingUniques(uniqueType, StateForConditionals.IgnoreMultiplicationForCaching)
         // The uniques CACHED are ALL civ uniques, regardless of conditional matching.
         // The uniques RETURNED are uniques AFTER conditional matching.
         // This allows reuse of the cached values, between runs with different conditionals -
@@ -258,6 +261,7 @@ class LocalUniqueCache(val cache: Boolean = true) {
             "civ-${civ.civName}-${uniqueType.name}",
             sequence
         ).filter { it.conditionalsApply(stateForConditionals) }
+            .flatMap { it.getMultiplied(stateForConditionals) }
     }
 
     /** Get cached results as a sequence */