Update CityLocationTileRanker and Automation.kt

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

@@ -85,12 +85,15 @@ object Automation {
             // NoFocus or Food/Growth Focus.
             if (surplusFood < 0)
                 yieldStats.food *= 8 // Starving, need Food, get to 0
-            else if (city.civ.getHappiness() > -1)
+            else if (city.civ.getHappiness() > 0)
                 yieldStats.food *= 2 //1.5f is preferred, but 2 provides more protection against badly configured personalities
-            else if (city.civ.getHappiness() < 0) {
+            else if (city.civ.getHappiness() < 9)
+                // Going below -10 happiness yields very severe penalties, let's try to avoid it
+                yieldStats.food *= 0
+            else if (city.civ.getHappiness() < 1)
                 // 75% of excess food is wasted when in negative happiness
+                // 0 Happiness is positive happiness, but let's keep a 1-Happiness margin to account for e.g. Rationalism opener
                 yieldStats.food /= 4
-            }
         }
 
         if (city.population.population < 10) {
@@ -104,8 +107,16 @@ object Automation {
             yieldStats.gold *= 2
         }
 
-        if (city.civ.getHappiness() < 0) {
-            yieldStats.happiness *= 2
+        if (city.civ.getHappiness() < 10) { 
+            //We've got an severe problem, try to get happiness by any means 
+            yieldStats.happiness *= 8 }
+        else if (city.civ.getHappiness() < 0) {
+            yieldStats.happiness *= 3 
+        }
+
+        if (city.civ.getHappiness() < 10) { 
+            //Base game and most mods apply a -50% production penalty when in negative happiness 
+            yieldStats.production /= 2
         }
 
         if (allTechsAreResearched) {

core/src/com/unciv/logic/automation/city/ConstructionAutomation.kt

@@ -331,7 +331,7 @@ class ConstructionAutomation(val cityConstructions: CityConstructions) {
         val surplusFood = city.cityStats.currentCityStats[Stat.Food]
         if (surplusFood < 0) {
             buildingStats.food *= 8 // Starving, need Food, get to 0
-        } else buildingStats.food *= 3
+        } else buildingStats.food *= 2
 
         if (civInfo.stats.statsForNextTurn.gold < 10) {
             buildingStats.gold *= 2 // We have a gold problem and need to adjust build queue accordingly
@@ -375,9 +375,19 @@ class ConstructionAutomation(val cityConstructions: CityConstructions) {
         for (unique in building.getMatchingUniques(UniqueType.CarryOverFood, cityState)) {
             if (city.matchesFilter(unique.params[1]) && unique.params[0].toInt() != 0) {
                 val foodGain = cityStats.currentCityStats.food + buildingStats.food
-                val relativeAmount = unique.params[0].toFloat() / 100f
-                buildingStats[Stat.Food] += foodGain * relativeAmount // Essentialy gives us the food per turn this unique saves us
+                val relativeAmount = 1 / ( 1 - unique.params[0].toFloat() / 100f) - 1 
+                buildingStats[Stat.Food] += foodGain * relativeAmount // Essentialy gives us the food per turn this unique gives us
             }
         }
+        for (unique in building.getMatchingUniques(UniqueType.CreatesOneImprovement)) {
+            val tileImprovementValue = 5f
+            // Placeholder, let's for now assume the tile improvement yields 5 science, to let the AI in Civ6 mod build Campuses etc.
+            buildingStats[Stat.Science] += tileImprovementValue
+        }
+        for (unique in building.getMatchingUniques(UniqueType.StatsFromTiles)) {
+            val extraTileYields = 2f
+            // Placeholder, let's for now assume it yields 2 food, to let the AI build Lighthouses
+            buildingStats[Stat.Food] += extraTileYields
+        }
     }
 }

core/src/com/unciv/logic/automation/unit/CityLocationTileRanker.kt

@@ -89,6 +89,9 @@ object CityLocationTileRanker {
 
         val onCoast = newCityTile.isCoastalTile()
         val onHill = newCityTile.isHill()
+        val onGrassland = !onHill && newCityTile.baseTerrain == "Grassland"
+        val onPlainsOrHill = onHill || newCityTile.baseTerrain == "Plains" // Also Mycelium in AF
+        val onSnowOrDesert = !onHill && (newCityTile.baseTerrain == "Snow" || newCityTile.baseTerrain == "Desert")
         val isNextToMountain = newCityTile.isAdjacentTo("Mountain")
         // Only count a luxary resource that we don't have yet as unique once
         val newUniqueLuxuryResources = HashSet<String>()
@@ -100,13 +103,20 @@ object CityLocationTileRanker {
         if (isNextToMountain) tileValue += 5
         // This bonus for settling on river is a bit outsized for the importance, but otherwise they have a habit of settling 1 tile away
         if (newCityTile.isAdjacentToRiver()) tileValue += 20
-        // We want to found the city on an oasis because it can't be improved otherwise
-        if (newCityTile.terrainHasUnique(UniqueType.Unbuildable)) tileValue += 3
-        // If we build the city on a resource tile, then we can't build any special improvements on it
-        if (newCityTile.resource != null) tileValue -= 4
-        if (newCityTile.resource != null && newCityTile.tileResource.resourceType == ResourceType.Bonus) tileValue -= 8
-        // Settling on bonus resources tends to waste a food
-        // Settling on luxuries generally speeds up our game, and settling on strategics as well, as the AI cheats and can see them.
+        // A city centre is the only good tile improvement on these tiles
+        if (onSnowOrDesert) tileValue += 4
+        if (newCityTile.resource != null) {
+            tileValue -= 10
+            // Applying a penalty, so we don't overvalue settling on resources by too much
+            if (newCityTile.tileResource.resourceType == ResourceType.Bonus && onGrassland) tileValue += 7
+            // Food resources on grassland increase our city centre yields
+            // Not as much in Rekmod, however...
+            if (newCityTile.tileResource.resourceType == ResourceType.Strategic && !onPlainsOrHill) tileValue -= 10
+            // Production resources on hills/plains increase or city centre yields
+            if (newCityTile.tileResource.resourceType == ResourceType.Luxury && newCityTile.tileResource.matchesFilter("Salt")) tileValue -= 30
+            // Players don't like seeing the AI build cities on Salt in G&K
+            // Settling on other generally is generally good (arguably also on Salt if BNW unhappiness penalties would apply) 
+        }
 
         var tiles = 0
         for (i in 0..3) {

core/src/com/unciv/logic/trade/TradeEvaluation.kt

@@ -247,10 +247,10 @@ class TradeEvaluation {
             TradeOfferType.Luxury_Resource -> {
                 return when {
                     civInfo.getResourceAmount(offer.name) > 1 -> 250 // fair price
-                    civInfo.hasUnique(UniqueType.RetainHappinessFromLuxury) -> // If we retain 50% happiness, value at 375
-                        750 - (civInfo.getMatchingUniques(UniqueType.RetainHappinessFromLuxury)
-                            .first().params[0].toPercent() * 250).toInt()
-                    else -> 500 // you want to take away our last lux of this type?!
+                    civInfo.hasUnique(UniqueType.RetainHappinessFromLuxury) -> // If we retain 100% happiness, value it as a duplicate lux
+                        600 - (civInfo.getMatchingUniques(UniqueType.RetainHappinessFromLuxury)
+                            .first().params[0].toPercent() * 350).toInt()
+                    else -> 600 // you want to take away our last lux of this type?!
                 }
             }
             TradeOfferType.Strategic_Resource -> {