From 835c0832e2c141631723146484776847a6daa415 Mon Sep 17 00:00:00 2001 From: lyrjie Date: Sat, 20 Jun 2020 23:09:15 +0300 Subject: [PATCH] Fixed strategic resources generation (#2745) * Fixed strategic resources generation * Removed the already PR'd part --- core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt index 8625624591..4335451c4a 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt @@ -133,8 +133,7 @@ class MapGenerator(val ruleset: Ruleset) { // remove the tiles where previous resources have been placed val suitableTiles = candidateTiles .filter { it.resource == null - && resource.terrainsCanBeFoundOn.contains(it.getBaseTerrain().name) - && (it.terrainFeature==null || ruleset.tileImprovements.containsKey("Remove "+it.terrainFeature)) } + && resource.terrainsCanBeFoundOn.contains(it.getLastTerrain().name) } val locations = randomness.chooseSpreadOutLocations(resourcesPerType, suitableTiles, distance)