From 66fa8db51c8f783a67b66b50cbfca14227d84009 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Tue, 28 Dec 2021 22:36:30 +0200 Subject: [PATCH] Resolved #5469 - 'tile to expand to' choice incorporates city-specific bonuses --- core/src/com/unciv/logic/automation/Automation.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/com/unciv/logic/automation/Automation.kt b/core/src/com/unciv/logic/automation/Automation.kt index 1514c7be57..9d30a07078 100644 --- a/core/src/com/unciv/logic/automation/Automation.kt +++ b/core/src/com/unciv/logic/automation/Automation.kt @@ -283,7 +283,6 @@ object Automation { if (tile.hasViewableResource(cityInfo.civInfo)) { if (tile.tileResource.resourceType != ResourceType.Bonus) score -= 105 else if (distance <= 3) score -= 104 - } else { // Water tiles without resources aren't great if (tile.isWater) score += 25 @@ -296,13 +295,10 @@ object Automation { tile.getImprovementStats(tile.getTileImprovement()!!, cityInfo.civInfo, cityInfo).values.sum() > 0f ) score -= 5 - // The original checks if the tile has a road, but adds a score of 0 if it does. - // Therefore, this check is removed here. - if (tile.naturalWonder != null) score -= 105 // Straight up take the sum of all yields - score -= tile.getTileStats(null, cityInfo.civInfo).values.sum().toInt() + score -= tile.getTileStats(cityInfo, cityInfo.civInfo).values.sum().toInt() // Check if we get access to better tiles from this tile var adjacentNaturalWonder = false