From 29624bfa1274a94f13ae98db1881dd6a3cd72bb0 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 29 Mar 2020 01:48:15 +0300 Subject: [PATCH] Revealed resources generate notifications even if they're outside of your current city borders (but close enough) --- core/src/com/unciv/logic/civilization/TechManager.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index 06ce7219a0..96925992c0 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -239,9 +239,12 @@ class TechManager { } for(revealedResource in getRuleset().tileResources.values.filter{ techName == it.revealedBy }){ - for (tileInfo in civInfo.gameInfo.tileMap.values - .filter { it.resource == revealedResource.name && civInfo == it.getOwner() }) { + val resourcesCloseToCities = civInfo.cities.asSequence() + .flatMap { it.getCenterTile().getTilesInDistance(3) + it.getTiles() } + .filter { it.resource==revealedResource.name && (it.getOwner()==civInfo || it.getOwner()==null) } + .distinct() + for (tileInfo in resourcesCloseToCities) { val closestCityTile = tileInfo.getTilesInDistance(4) .firstOrNull { it.isCityCenter() } if (closestCityTile != null) {