Added Colossus wonder - #245

android/assets/jsons/Buildings.json

@@ -109,6 +109,15 @@
 		maintenance:1,
 		requiredTech:"Bronze Working"
 	},
+	{
+		name:"Colossus",
+		culture:1,
+		gold:5,
+		greatPersonPoints:{gold:1},
+		isWonder:true,
+		uniques:["Can only be built in coastal cities", "+1 gold from worked water tiles in city"],
+		requiredTech:"Mathematics"
+	},
 	{
 		name:"Krepost",
 		replaces:"Barracks",

android/assets/jsons/Translations.json

@@ -5236,6 +5236,9 @@
 		French:"Cout d'acquisition en or et en culture de nouvelle cases réduit de 25% dans cette ville"
 	}
 	
+	"Colossus":{}
+	"+1 gold from worked water tiles in city":{}
+	
 	"Temple":{	
 		Italian:"Tempio"
 		Russian:"Храм"
@@ -5557,6 +5560,9 @@
 		Portuguese:"40% da comida é mantida depois de um novo cidadão nascer"
 	}
 	
+	"Great Wall":{}
+	"Enemy land units must spend 1 extra movement point when inside your territory (obsolete upon Dynamite)":{}
+	
 	"Workshop":{	
 		Italian:"Bottega"
 		Russian:"Мастерская"

core/src/com/unciv/logic/map/TileInfo.kt

@@ -175,6 +175,9 @@ open class TileInfo {
                 stats.add(improvement) // again, for the double effect
         }
 
+        if(city!=null && isWater() && city.getBuildingUniques().contains("+1 gold from worked water tiles in city"))
+            stats.gold += 1
+
         if (isCityCenter()) {
             if (stats.food < 2) stats.food = 2f
             if (stats.production < 1) stats.production = 1f

core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt

@@ -10,7 +10,8 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
         var cost = getMovementCostBetweenAdjacentTiles(from,to)
 
         val toOwner = to.getOwner()
-        if(toOwner!=null && civInfo.isAtWarWith(toOwner) && toOwner.hasActiveGreatWall) cost += 1
+        if(toOwner!=null &&  to.isLand() && civInfo.isAtWarWith(toOwner) && toOwner.hasActiveGreatWall)
+            cost += 1
         return cost
     }