Rebalance Food Weights

core/src/com/unciv/logic/automation/Automation.kt

@@ -46,7 +46,36 @@ object Automation {
         return rank
     }
 
-
+    // More complicated logic to properly weigh Food vs other Stats (esp Production)
+    private fun getFoodModWeight(city: City, surplusFood: Float): Float {
+        var foodModWeight = 1f
+
+        // Zero out Growth if close to Unhappiness limit
+        if (city.civ.getHappiness() < -8) {
+            foodModWeight = 0f
+        } else if (city.civ.isAI()) {
+            // When Happy, 2 production is better than 1 growth,
+            // but setting such by default worsens AI civ citizen assignment,
+            // probably due to badly configured personalities not properly weighing food vs non-food yields
+            if (city.population.population < 5)
+                foodModWeight = 2f
+            else if (surplusFood > city.population.getFoodToNextPopulation() / 10)
+                foodModWeight = 0.75f // get Growth just under Production
+            else
+                foodModWeight = 1.5f
+        } else {
+            // Human weights. May be different since AI Happiness is always "easier"
+            // Only apply these for Default to not interfere with Focus weights
+            if (city.getCityFocus() == CityFocus.NoFocus) {
+                if (city.population.population < 5)
+                    foodModWeight = 2f
+                else if (surplusFood > city.population.getFoodToNextPopulation() / 10)
+                    foodModWeight = 0.75f // get Growth just under Production
+            }
+        }
+        return foodModWeight
+    }
+
     fun rankStatsForCityWork(stats: Stats, city: City, areWeRankingSpecialist: Boolean, localUniqueCache: LocalUniqueCache): Float {
         val cityAIFocus = city.getCityFocus()
         val yieldStats = stats.clone()
@@ -116,16 +145,8 @@ object Automation {
                 newGrowthFood += growthFood / 4
             }
             newGrowthFood = newGrowthFood.coerceAtLeast(0f) // floor to 0 for safety
-
-            // When Happy, 2 production is better than 1 growth,
-            // but setting such by default worsens AI civ citizen assignment,
-            // probably due to badly configured personalities not properly weighing food vs non-food yields
-
-            // Zero out Growth if close to Unhappiness limit as well
-            val baseFocusWeight = if (city.civ.getHappiness() < -8) 0 else {
-                if (cityAIFocus in CityFocus.zeroFoodFocuses) 1 else 2
-            }
-            yieldStats.food += newGrowthFood * foodBaseWeight * baseFocusWeight
+
+            yieldStats.food += newGrowthFood * foodBaseWeight * getFoodModWeight(city, surplusFood)
         }
 
         if (city.population.population < 10) {

core/src/com/unciv/logic/city/CityFocus.kt

@@ -41,13 +41,15 @@ enum class CityFocus(
     FaithFocus("${Stat.Faith.character}", true, Stat.Faith),
     GoldGrowthFocus("${Stat.Gold.character} ${Stat.Food.character}", true) {
         override fun getStatMultiplier(stat: Stat) = when (stat) {
-            Stat.Gold, Stat.Food -> 2f
+            Stat.Gold -> 2f
+            Stat.Food -> 1.5f
             else -> 1f
         }
     },
     ProductionGrowthFocus("${Stat.Production.character} ${Stat.Food.character}", true) {
         override fun getStatMultiplier(stat: Stat) = when (stat) {
-            Stat.Production, Stat.Food -> 2f
+            Stat.Production -> 2f
+            Stat.Food -> 1.5f
             else -> 1f
         }
     },

core/src/com/unciv/logic/simulation/Simulation.kt

@@ -29,6 +29,7 @@ class Simulation(
     var steps = ArrayList<SimulationStep>()
     var numWins = mutableMapOf<String, MutableInt>()
     private var winRateByVictory = HashMap<String, MutableMap<String, MutableInt>>()
+    private var winTurnByVictory = HashMap<String, MutableMap<String, MutableInt>>()
     private var avgSpeed = 0f
     private var avgDuration: Duration = Duration.ZERO
     private var totalTurns = 0
@@ -42,6 +43,9 @@ class Simulation(
             winRateByVictory[civ] = mutableMapOf()
             for (victory in UncivGame.Current.gameInfo!!.ruleset.victories.keys)
                 winRateByVictory[civ]!![victory] = MutableInt(0)
+            winTurnByVictory[civ] = mutableMapOf()
+            for (victory in UncivGame.Current.gameInfo!!.ruleset.victories.keys)
+                winTurnByVictory[civ]!![victory] = MutableInt(0)
         }
     }
 
@@ -98,10 +102,12 @@ class Simulation(
         // win Rate
         numWins.values.forEach { it.value = 0 }
         winRateByVictory.flatMap { it.value.values }.forEach { it.value = 0 }
+        winTurnByVictory.flatMap { it.value.values }.forEach { it.value = 0 }
         steps.forEach {
             if (it.winner != null) {
                 numWins[it.winner!!]!!.inc()
                 winRateByVictory[it.winner!!]!![it.victoryType]!!.inc()
+                winTurnByVictory[it.winner!!]!![it.victoryType]!!.set(winTurnByVictory[it.winner!!]!![it.victoryType]!!.get() + it.turns)
             }
         }
         totalTurns = steps.sumOf { it.turns }
@@ -137,6 +143,12 @@ class Simulation(
                 outString += "$victory: $winsVictory%    "
             }
             outString += "\n"
+            for (victory in UncivGame.Current.gameInfo!!.ruleset.victories.keys) {
+                val winsTurns =
+                    winTurnByVictory[civ]!![victory]!!.value / max(winRateByVictory[civ]!![victory]!!.value, 1)
+                outString += "$victory: $winsTurns    "
+            }
+            outString += "avg turns\n"
         }
         outString += "\nAverage speed: %.1f turns/s \n".format(avgSpeed)
         outString += "Average game duration: $avgDuration\n"

desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt

@@ -57,7 +57,7 @@ internal object ConsoleLauncher {
         UncivGame.Current.gameInfo = newGame
 
 
-        val simulation = Simulation(newGame, 50, 8)
+        val simulation = Simulation(newGame, 50, 20)
         //Unless the effect size is very large, you'll typically need a large number of games to get a statistically significant result
 
         simulation.start()