From d8d74b687390783e65698f390a25eccf4033b8ca Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 12 Mar 2020 21:03:36 +0200
Subject: [PATCH] Resolved #2137 - Fixed worker automation for snow tiles, AND
 settler automation fix

---
 build.gradle                                            | 4 ++--
 core/src/com/unciv/logic/automation/WorkerAutomation.kt | 2 +-
 core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 83c5042c72..bac960b055 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ allprojects {
     version = '1.0.1'
     ext {
         appName = "Unciv"
-        appCodeNumber = 393
-        appVersion = "3.6.7"
+        appCodeNumber = 394
+        appVersion = "3.6.7-patch1"
 
         gdxVersion = '1.9.10'
         roboVMVersion = '2.3.1'
diff --git a/core/src/com/unciv/logic/automation/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/WorkerAutomation.kt
index 47398c8e61..07cb1643bd 100644
--- a/core/src/com/unciv/logic/automation/WorkerAutomation.kt
+++ b/core/src/com/unciv/logic/automation/WorkerAutomation.kt
@@ -202,7 +202,7 @@ class WorkerAutomation(val unit: MapUnit) {
             tile.baseTerrain == Constants.hill -> "Mine"
             tile.baseTerrain in listOf(Constants.grassland,Constants.desert,Constants.plains) -> "Farm"
             tile.baseTerrain == Constants.tundra -> "Trading post"
-            else -> throw Exception("No improvement found for "+tile.baseTerrain)
+            else -> null
         }
         if (improvementString == null) return null
         return unit.civInfo.gameInfo.ruleSet.tileImprovements[improvementString]!!
diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
index 618dc8e72f..09ee5c10ab 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@@ -122,7 +122,7 @@ object UnitActions {
     }
 
     fun getFoundCityAction(unit:MapUnit, tile: TileInfo): UnitAction? {
-        if (!unit.hasUnique("Founds a new city") || unit.isEmbarked()) return null
+        if (!unit.hasUnique("Founds a new city") || tile.isWater) return null
         return UnitAction(
                 type = UnitActionType.FoundCity,
                 uncivSound = UncivSound.Chimes,