From 1c1756721a47ce4cff5512885d0baeee7c068d19 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 3 Feb 2018 22:06:55 +0200
Subject: [PATCH] - Slightly improved tile ranking when determining next tile -
 Now does not display unexplored tiles in city screen - cleaner view

---
 core/src/com/unciv/logic/city/CityExpansionManager.java | 1 -
 core/src/com/unciv/logic/city/CityInfo.java             | 5 +++--
 core/src/com/unciv/ui/cityscreen/CityScreen.java        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.java b/core/src/com/unciv/logic/city/CityExpansionManager.java
index 543ba0e352..88d7ee79a3 100644
--- a/core/src/com/unciv/logic/city/CityExpansionManager.java
+++ b/core/src/com/unciv/logic/city/CityExpansionManager.java
@@ -16,7 +16,6 @@ public class CityExpansionManager{
     private void addNewTile(){
         cultureStored -= getCultureToNextTile();
         tilesClaimed++;
-        Linq<Vector2> possibleNewTileVectors = new Linq<Vector2>();
 
         for (int i = 2; i <4 ; i++) {
             Linq<TileInfo> tiles = CivilizationInfo.current().tileMap.getTilesInDistance(cityInfo.cityLocation,i);
diff --git a/core/src/com/unciv/logic/city/CityInfo.java b/core/src/com/unciv/logic/city/CityInfo.java
index 6269543f83..e54d39c154 100644
--- a/core/src/com/unciv/logic/city/CityInfo.java
+++ b/core/src/com/unciv/logic/city/CityInfo.java
@@ -109,13 +109,14 @@ public class CityInfo {
     double rankTile(TileInfo tile){
         FullStats stats = tile.getTileStats(this);
         double rank=0;
-        if(stats.food <2) rank+=stats.food;
+        if(stats.food <= 2) rank+=stats.food;
         else rank += 2 + (stats.food -2)/2; // 1 point for each food up to 2, from there on half a point
         rank+=stats.gold /2;
         rank+=stats.production;
         rank+=stats.science;
         rank+=stats.culture;
-        if(tile.improvement ==null) rank+=0.5; // improvement potential!
+        if(tile.improvement == null) rank+=0.5; // improvement potential!
+        if(tile.resource!=null) rank+=1;
         return rank;
     }
 
diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.java b/core/src/com/unciv/ui/cityscreen/CityScreen.java
index 4dbdaba486..dfb416429f 100644
--- a/core/src/com/unciv/ui/cityscreen/CityScreen.java
+++ b/core/src/com/unciv/ui/cityscreen/CityScreen.java
@@ -174,6 +174,7 @@ public class CityScreen extends CameraStageBaseScreen {
         Group allTiles = new Group();
 
         for(final TileInfo tileInfo : game.civInfo.tileMap.getTilesInDistance(cityInfo.cityLocation,5)){
+            if(!tileInfo.explored) continue; // Don't even bother to display it.
             CityTileGroup group = new CityTileGroup(cityInfo, tileInfo);
             group.addListener(new ClickListener(){
                 @Override