Converted all GameBasics to Kotlin

Ranbut · Feb 24, 2018 · 18be9e3 · 18be9e3
1 parent 49c0707
commit 18be9e3
Show file tree

Hide file tree

Showing 38 changed files with 577 additions and 655 deletions.
diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json
diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json
@@ -4,44 +4,38 @@
 		name:"Grassland",
 		type:"BaseTerrain",
 		food:2,
-		movementCost:1,
-		rgb:"0,255,0"
+		movementCost:1
 	},
 	{
 		name:"Plains",
 		type:"BaseTerrain",
 		food:1,
 		production:1,
-		movementCost:1,
-		rgb:"240,180,135"
+		movementCost:1
 	},
 	{
 		name:"Tundra",
 		type:"BaseTerrain",
 		food:1,
-		movementCost:1,
-		rgb:"130,137,121"
+		movementCost:1
 	},
 	{
 		name:"Desert",
 		type:"BaseTerrain",
-		movementCost:1,
-		rgb:"237,201,175"
+		movementCost:1
 	},
 	{
 		name:"Lakes",
 		type:"BaseTerrain",
 		food:1,
-		gold:1,
-		rgb:"104,120,201",
+		gold:1
 		canHaveOverlay:false
 	},
 	{
 		name:"Hill",
 		type:"BaseTerrain",
 		production:2,
-		movementCost:2,
-		rgb:"116,88,62"
+		movementCost:2
 	},
 
 	// Terrain features

diff --git a/core/src/com/unciv/logic/city/CityConstructions.java b/core/src/com/unciv/logic/city/CityConstructions.java
@@ -87,6 +87,7 @@ public boolean evaluate(String arg0) {
         });
         if (currentConstruction == null) currentConstruction = Worker;
 
+        GameBasics.TileImprovements.keySet().contains("fds");
         cityInfo.civInfo.gameInfo.addNotification("Work has started on "+ currentConstruction,cityInfo.cityLocation);
     }
 
@@ -122,7 +123,7 @@ public boolean evaluate(String arg0) {
 
     public int getMaintainanceCosts(){
         int maintainanceTotal = 0;
-        for( Building building : getBuiltBuildings()) maintainanceTotal+=building.maintainance;
+        for( Building building : getBuiltBuildings()) maintainanceTotal+=building.maintenance;
         return maintainanceTotal;
     }
 

diff --git a/core/src/com/unciv/logic/city/IConstruction.java b/core/src/com/unciv/logic/city/IConstruction.java
diff --git a/core/src/com/unciv/logic/city/IConstruction.kt b/core/src/com/unciv/logic/city/IConstruction.kt
@@ -0,0 +1,11 @@
+package com.unciv.logic.city
+
+import com.unciv.models.linq.Linq
+import com.unciv.models.stats.INamed
+
+interface IConstruction : INamed {
+    fun getProductionCost(adoptedPolicies: Linq<String>): Int
+    fun getGoldCost(adoptedPolicies: Linq<String>): Int
+    fun isBuildable(construction: CityConstructions): Boolean
+    fun postBuildEvent(construction: CityConstructions)  // Yes I'm hilarious.
+}
diff --git a/core/src/com/unciv/models/gamebasics/BasicHelp.java b/core/src/com/unciv/models/gamebasics/BasicHelp.java
diff --git a/core/src/com/unciv/models/gamebasics/BasicHelp.kt b/core/src/com/unciv/models/gamebasics/BasicHelp.kt
@@ -0,0 +1,8 @@
+package com.unciv.models.gamebasics
+
+import com.unciv.models.stats.INamed
+
+class BasicHelp : ICivilopedia, INamed {
+    override lateinit var name: String
+    override val description: String = ""
+}
diff --git a/core/src/com/unciv/models/gamebasics/Building.java b/core/src/com/unciv/models/gamebasics/Building.java