From 122b815fc0068d27bba25e06828e6542b02619ec Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 19 Apr 2020 22:55:48 +0300 Subject: [PATCH] small minimap fix --- core/src/com/unciv/logic/city/CityStats.kt | 2 +- core/src/com/unciv/ui/worldscreen/Minimap.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 65dbd2320f..2b7df57a9d 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -480,7 +480,7 @@ class CityStats { if (cityInfo.cityConstructions.currentConstructionFromQueue == Constants.settler && totalFood > 0) { newFinalStatList["Excess food to production"] = - Stats().apply { production=totalFood; food=-totalFood } + Stats().apply { production = totalFood; food = -totalFood } } if (cityInfo.isInResistance()) diff --git a/core/src/com/unciv/ui/worldscreen/Minimap.kt b/core/src/com/unciv/ui/worldscreen/Minimap.kt index fd427555e6..0a264c38da 100644 --- a/core/src/com/unciv/ui/worldscreen/Minimap.kt +++ b/core/src/com/unciv/ui/worldscreen/Minimap.kt @@ -135,8 +135,8 @@ class MinimapHolder(mapHolder: WorldMapHolder): Table(){ } toggleIconTable.add(populationImage).row() - val resourceImage = ImageGetter.getImage("ResourceImages/Cattle").surroundWithCircle(40f) - resourceImage.circle.color = Color.BLACK + val resourceImage = ImageGetter.getImage("ResourceIcons/Cattle").surroundWithCircle(40f) +// resourceImage.circle.color = Color.BLACK resourceImage.actor.color.a = if(settings.showResourcesAndImprovements) 1f else 0.5f resourceImage.onClick { settings.showResourcesAndImprovements = !settings.showResourcesAndImprovements