From be51735fdf5301a224d656fffe60ef1e6473e583 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 9 Aug 2020 21:37:09 +0300
Subject: [PATCH] Fixed broken tests

---
 .../assets/jsons/Civ V - Vanilla/TileImprovements.json   | 2 +-
 core/src/com/unciv/ui/utils/ImageGetter.kt               | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/android/assets/jsons/Civ V - Vanilla/TileImprovements.json b/android/assets/jsons/Civ V - Vanilla/TileImprovements.json
index e7f01e8780..7907c00d70 100644
--- a/android/assets/jsons/Civ V - Vanilla/TileImprovements.json	
+++ b/android/assets/jsons/Civ V - Vanilla/TileImprovements.json	
@@ -88,7 +88,7 @@
 		"terrainsCanBeBuiltOn": ["Plains","Grassland","Desert","Hill","Tundra","Snow"],
 		"turnsToBuild": 6,
 		"techRequired": "Engineering",
-		"uniques": ["Gives a defensive bonus of [50]%", "Can be built outside your borders"]]
+		"uniques": ["Gives a defensive bonus of [50]%", "Can be built outside your borders"]
 	},
 
 	// Transportation
diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt
index ddea4bfa71..43c3b27f20 100644
--- a/core/src/com/unciv/ui/utils/ImageGetter.kt
+++ b/core/src/com/unciv/ui/utils/ImageGetter.kt
@@ -197,11 +197,12 @@ object ImageGetter {
 
     fun getResourceImage(resourceName: String, size:Float): Actor {
         val iconGroup = getImage("ResourceIcons/$resourceName").surroundWithCircle(size)
-        val resource = ruleset.tileResources[resourceName]!!
+        val resource = ruleset.tileResources[resourceName]
+        if(resource==null) throw Exception("No resource $resourceName found in ruleset!")
         when {
-            resource.food>0 -> iconGroup.circle.color= foodCircleColor
-            resource.production>0 -> iconGroup.circle.color= productionCircleColor
-            resource.gold>0 -> iconGroup.circle.color= goldCircleColor
+            resource.food > 0 -> iconGroup.circle.color = foodCircleColor
+            resource.production > 0 -> iconGroup.circle.color = productionCircleColor
+            resource.gold > 0 -> iconGroup.circle.color = goldCircleColor
         }
 
         if(resource.resourceType==ResourceType.Luxury){