From 384194c531308c615f312de80e7117a23a87a923 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 18 Oct 2019 17:39:13 +0300
Subject: [PATCH] Desert now a constant

---
 core/src/com/unciv/Constants.kt                         | 3 +++
 core/src/com/unciv/logic/automation/WorkerAutomation.kt | 2 +-
 core/src/com/unciv/logic/map/RandomMapGenerator.kt      | 6 +++---
 core/src/com/unciv/models/gamebasics/Building.kt        | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/src/com/unciv/Constants.kt b/core/src/com/unciv/Constants.kt
index a12b2f9426..883c53090d 100644
--- a/core/src/com/unciv/Constants.kt
+++ b/core/src/com/unciv/Constants.kt
@@ -13,6 +13,9 @@ class Constants{
         const val coast = "Coast"
         const val plains = "Plains"
         const val lakes = "Lakes"
+        const val desert = "Desert"
+
+
         const val barbarianEncampment = "Barbarian encampment"
         const val ancientRuins = "Ancient ruins"
 
diff --git a/core/src/com/unciv/logic/automation/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/WorkerAutomation.kt
index 65a3cfc85f..d0761e7ef8 100644
--- a/core/src/com/unciv/logic/automation/WorkerAutomation.kt
+++ b/core/src/com/unciv/logic/automation/WorkerAutomation.kt
@@ -188,7 +188,7 @@ class WorkerAutomation(val unit: MapUnit) {
             tile.terrainFeature == "Marsh" -> "Remove Marsh"
             tile.terrainFeature == Constants.forest -> "Lumber mill"
             tile.baseTerrain == Constants.hill -> "Mine"
-            tile.baseTerrain in listOf("Grassland","Desert",Constants.plains) -> "Farm"
+            tile.baseTerrain in listOf("Grassland",Constants.desert,Constants.plains) -> "Farm"
             tile.baseTerrain == "Tundra" -> "Trading post"
             else -> throw Exception("No improvement found for "+tile.baseTerrain)
         }
diff --git a/core/src/com/unciv/logic/map/RandomMapGenerator.kt b/core/src/com/unciv/logic/map/RandomMapGenerator.kt
index 6a79412246..7ad25e3dfe 100644
--- a/core/src/com/unciv/logic/map/RandomMapGenerator.kt
+++ b/core/src/com/unciv/logic/map/RandomMapGenerator.kt
@@ -201,14 +201,14 @@ class CelluarAutomataRandomMapGenerator(): SeedRandomMapGenerator() {
                 //change grassland to desert or tundra based on y
                 if (abs(getLatitude(tile.position)) < maxLatitude * 0.1) {
                     if (terrain == "Grassland" || terrain == "Tundra")
-                        terrain = "Desert"
+                        terrain = Constants.desert
                 } else if (abs(getLatitude(tile.position)) > maxLatitude * 0.7) {
-                    if (terrain == "Grassland" || terrain == Constants.plains || terrain == "Desert" || terrain == Constants.ocean) {
+                    if (terrain == "Grassland" || terrain == Constants.plains || terrain == Constants.desert || terrain == Constants.ocean) {
                         terrain = "Tundra"
                     }
                 } else {
                     if (terrain == "Tundra") terrain = Constants.plains
-                    else if (terrain == "Desert") terrain = "Grassland"
+                    else if (terrain == Constants.desert) terrain = "Grassland"
                 }
 
                 val area = Area(terrain)
diff --git a/core/src/com/unciv/models/gamebasics/Building.kt b/core/src/com/unciv/models/gamebasics/Building.kt
index eea546b936..29cfe858ce 100644
--- a/core/src/com/unciv/models/gamebasics/Building.kt
+++ b/core/src/com/unciv/models/gamebasics/Building.kt
@@ -229,7 +229,7 @@ class Building : NamedStats(), IConstruction{
         if (construction.isBuilt(name)) return "Already built"
 
         if ("Must be next to desert" in uniques
-                && !construction.cityInfo.getCenterTile().getTilesInDistance(1).any { it.baseTerrain == "Desert" })
+                && !construction.cityInfo.getCenterTile().getTilesInDistance(1).any { it.baseTerrain == Constants.desert })
             return "Must be next to desert"
 
         if ("Must be next to mountain" in uniques