From d7a08cfc0148004647c61f15596bf82b36615709 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 9 Sep 2018 13:29:30 +0300
Subject: [PATCH] Eiffel tower special now no longer overrides happiness from
 other policies Minimum distance between cities increased

---
 core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 6 ++++--
 core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index fd18b8076c..782cb4f74e 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -159,8 +159,10 @@ class CivilizationInfo {
             }
         }
 
-        if (getBuildingUniques().contains("Provides 1 happiness per social policy"))
-            statMap["Policies"] = policies.getAdoptedPolicies().count { !it.endsWith("Complete") }.toFloat()
+        if (getBuildingUniques().contains("Provides 1 happiness per social policy")) {
+            if(!statMap.containsKey("Policies")) statMap["Policies"]=0f
+            statMap["Policies"] = statMap["Policies"]!! + policies.getAdoptedPolicies().count { !it.endsWith("Complete") }.toFloat()
+        }
 
         return statMap
     }
diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
index dfb1555656..dd8fbf3ba3 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@@ -99,7 +99,7 @@ class UnitActions {
                         unit.destroy()
                     },
                     unit.currentMovement != 0f &&
-                            !tile.getTilesInDistance(2).any { it.isCityCenter() })
+                            !tile.getTilesInDistance(3).any { it.isCityCenter() })
         }
         
         if (unit.name == "Worker") {