Add game progress modifier (yairm210#13095)

* Add game progress modifier

* Update

* Update Unique.kt

* Update Unique.kt

* Update Unique.kt

* Update Unique.kt

Author: EmperorPinguin

Diff for: core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt

@@ -316,9 +316,12 @@ class TileImprovementFunctions(val tile: Tile) {
         if (distance > 5) return
         var stats = Stats()
         for (unique in tile.getTerrainMatchingUniques(UniqueType.ProductionBonusWhenRemoved)) {
+            var statsToAdd = unique.stats
             if (unique.isModifiedByGameSpeed())
-                stats.add(unique.stats * civ.gameInfo.speed.modifier)
-            else stats.add(unique.stats)
+                statsToAdd *= civ.gameInfo.speed.modifier
+            if (unique.isModifiedByGameProgress())
+                statsToAdd *= unique.getGameProgressModifier(civ)
+            stats.add(statsToAdd)
         }
         if (stats.isEmpty()) return
         if (distance != 1) stats *= (6 - distance) / 4f

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

@@ -13,6 +13,7 @@ import com.unciv.models.translations.getPlaceholderParameters
 import com.unciv.models.translations.getPlaceholderText
 import com.unciv.models.translations.removeConditionals
 import java.util.EnumMap
+import kotlin.math.max
 
 
 class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val sourceObjectName: String? = null) {
@@ -50,6 +51,21 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
     fun getModifiers(type: UniqueType) = modifiersMap[type] ?: emptyList()
     fun hasModifier(type: UniqueType) = modifiersMap.containsKey(type)
     fun isModifiedByGameSpeed() = hasModifier(UniqueType.ModifiedByGameSpeed)
+    fun isModifiedByGameProgress() = hasModifier(UniqueType.ModifiedByGameProgress)
+    fun getGameProgressModifier(civ: Civilization): Float {
+        //According to: https://www.reddit.com/r/civ/comments/gvx44v/comment/fsrifc2/
+        var modifier = 1f
+        val ruleset = civ.gameInfo.ruleset
+        val techComplete = if (ruleset.technologies.isNotEmpty()) 
+            civ.tech.researchedTechnologies.size.toFloat() / ruleset.technologies.size else 0f
+        val policyComplete = if (ruleset.policies.isNotEmpty()) 
+            civ.policies.adoptedPolicies.size.toFloat() / ruleset.policies.size else 0f
+        val gameProgess = max(techComplete, policyComplete)   
+        for (unique in getModifiers(UniqueType.ModifiedByGameProgress))
+            modifier *= 1 + (unique.params[0].toFloat()/100 - 1) * gameProgess
+            //Mod creators likely expect this to stack multiplicatively, otherwise they'd use a single modifier 
+        return modifier
+    }
     fun hasTriggerConditional(): Boolean {
         if (modifiers.none()) return false
         return modifiers.any { conditional ->

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

@@ -5,7 +5,8 @@ import java.util.EnumSet
 enum class UniqueFlag {
     HiddenToUsers,
     NoConditionals,
-    AcceptsSpeedModifier
+    AcceptsSpeedModifier,
+    AcceptsGameProgressModifier
     ;
     companion object {
         val setOfHiddenToUsers: EnumSet<UniqueFlag> = EnumSet.of(HiddenToUsers)

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

@@ -562,7 +562,7 @@ enum class UniqueType(
     DamagesContainingUnits("Units ending their turn on this terrain take [amount] damage", UniqueTarget.Terrain),
     TerrainGrantsPromotion("Grants [promotion] ([comment]) to adjacent [mapUnitFilter] units for the rest of the game", UniqueTarget.Terrain),
     GrantsCityStrength("[amount] Strength for cities built on this terrain", UniqueTarget.Terrain),
-    ProductionBonusWhenRemoved("Provides a one-time bonus of [stats] to the closest city when cut down", UniqueTarget.Terrain, flags = setOf(UniqueFlag.AcceptsSpeedModifier)),
+    ProductionBonusWhenRemoved("Provides a one-time bonus of [stats] to the closest city when cut down", UniqueTarget.Terrain, flags = setOf(UniqueFlag.AcceptsSpeedModifier, UniqueFlag.AcceptsGameProgressModifier)),
     Vegetation("Vegetation", UniqueTarget.Terrain, UniqueTarget.Improvement, flags = UniqueFlag.setOfHiddenToUsers),  // Improvement included because use as tileFilter works
 
 
@@ -949,6 +949,8 @@ enum class UniqueType(
 
     ModifiedByGameSpeed("(modified by game speed)", UniqueTarget.MetaModifier,
         docDescription = "Can only be applied to certain uniques, see details of each unique for specifics"),
+    ModifiedByGameProgress("(modified by game progress up to [relativeAmount]%)", UniqueTarget.MetaModifier,
+        docDescription = "Can only be applied to certain uniques, see details of each unique for specifics"),
     Comment("Comment [comment]", *UniqueTarget.Displayable,
         docDescription = "Allows displaying arbitrary text in a Unique listing. Only the text within the '[]' brackets will be displayed, the rest serves to allow Ruleset validation to recognize the intent."),
 

Diff for: desktop/src/com/unciv/app/desktop/UniqueDocsWriter.kt

@@ -87,6 +87,8 @@ class UniqueDocsWriter {
                 }
                 if (uniqueType.flags.contains(UniqueFlag.AcceptsSpeedModifier))
                     lines += "\tThis unique's effect can be modified with <${UniqueType.ModifiedByGameSpeed.text}>"
+                if (uniqueType.flags.contains(UniqueFlag.AcceptsGameProgressModifier))
+                    lines += "\tThis unique's effect can be modified with <${UniqueType.ModifiedByGameProgress.text}>"
                 if (uniqueType in MapUnitCache.UnitMovementUniques) {
                     lines += "\tDue to performance considerations, this unique is cached, thus conditionals that may change within a turn may not work."
                 }