Not all Natural Wonders look good enough to enter the game as-of-now.

android/assets/game.atlas

@@ -788,6 +788,20 @@ ImprovementIcons/Quarry
   orig: 100, 100
   offset: 0, 0
   index: -1
+ImprovementIcons/Railroad
+  rotate: false
+  xy: 206, 238
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Default/Railroad
+  rotate: false
+  xy: 206, 238
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 ImprovementIcons/Road
   rotate: false
   xy: 1736, 170
@@ -1707,7 +1721,7 @@ TechIcons/Radio
   index: -1
 TechIcons/Railroad
   rotate: false
-  xy: 206, 238
+  xy: 308, 238
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1789,6 +1803,20 @@ TileSets/Default/CityOverlay
   orig: 100, 100
   offset: 0, 0
   index: -1
+TileSets/Default/CrosshatchHexagon
+  rotate: false
+  xy: 583, 1800
+  size: 273, 236
+  orig: 273, 236
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/CrosshatchHexagon
+  rotate: false
+  xy: 583, 1800
+  size: 273, 236
+  orig: 273, 236
+  offset: 0, 0
+  index: -1
 TileSets/Default/FalloutOverlay
   rotate: false
   xy: 308, 1054
@@ -1859,37 +1887,9 @@ TileSets/Default/OasisOverlay
   orig: 100, 100
   offset: 0, 0
   index: -1
-TileSets/Default/Railroad
-  rotate: false
-  xy: 2, 226
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-ImprovementIcons/Railroad
-  rotate: false
-  xy: 2, 226
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/CrosshatchHexagon
-  rotate: false
-  xy: 583, 1800
-  size: 273, 236
-  orig: 273, 236
-  offset: 0, 0
-  index: -1
-TileSets/Default/CrosshatchHexagon
-  rotate: false
-  xy: 583, 1800
-  size: 273, 236
-  orig: 273, 236
-  offset: 0, 0
-  index: -1
 TileSets/FantasyHex/Railroad
   rotate: false
-  xy: 308, 238
+  xy: 2, 226
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -2950,6 +2950,20 @@ TechIcons/Writing
   orig: 100, 100
   offset: 0, 0
   index: -1
+TileSets/Default/road
+  rotate: false
+  xy: 410, 32
+  size: 61, 11
+  orig: 61, 11
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/road
+  rotate: false
+  xy: 410, 32
+  size: 61, 11
+  orig: 61, 11
+  offset: 0, 0
+  index: -1
 TileSets/FantasyHex/Tiles/Academy
   rotate: false
   xy: 476, 64
@@ -4203,20 +4217,6 @@ TileSets/FantasyHex/Units/Work Boats
   orig: 32, 26
   offset: 0, 0
   index: -1
-TileSets/FantasyHex/road
-  rotate: false
-  xy: 410, 32
-  size: 61, 11
-  orig: 61, 11
-  offset: 0, 0
-  index: -1
-TileSets/Default/road
-  rotate: false
-  xy: 410, 32
-  size: 61, 11
-  orig: 61, 11
-  offset: 0, 0
-  index: -1
 UnitIcons/Submarine
   rotate: false
   xy: 206, 410

android/assets/jsons/Terrains.json

@@ -139,8 +139,51 @@
 		defenceBonus: -0.1,
 		occursOn:["Desert"]
 	},
-
+ 
 	// Natural Wonders
+	{
+		name: "Great Barrier Reef",
+		type: "NaturalWonder",
+		food: 2,
+		production: 1,
+		gold: 1,
+		science: 2,
+		occursOn: ["Coast"],
+		impassable: true,
+		unbuildable: true,
+		weight: 10
+	},
+	/** Yukky tile images
+	{
+		name: "Krakatoa",
+		type: "NaturalWonder",
+		science: 5,
+		occursOn: ["Ocean"],
+		impassable: true,
+		unbuildable: true,
+		weight: 10
+	},
+	{
+		name: "Mount Fuji",
+		type: "NaturalWonder",
+		gold: 1,
+		culture: 5,
+		occursOn: ["Grassland","Plains"],
+		impassable: true,
+		unbuildable: true,
+		weight: 10
+	},
+	{
+		name: "Rock of Gibraltar",
+		type: "NaturalWonder",
+		food: 2,
+		gold: 5,
+		occursOn: ["Grassland"],
+		impassable: true,
+		unbuildable: true,
+		weight: 10
+	},
+	*/
 	{
 		name: "Barringer Crater",
 		type: "NaturalWonder",
@@ -161,37 +204,6 @@
 		unbuildable: true,
 		weight: 10
 	},
-	{
-		name: "Great Barrier Reef",
-		type: "NaturalWonder",
-		food: 2,
-		production: 1,
-		gold: 1,
-		science: 2,
-		occursOn: ["Coast"],
-		impassable: true,
-		unbuildable: true,
-		weight: 10
-	},
-	{
-		name: "Krakatoa",
-		type: "NaturalWonder",
-		science: 5,
-		occursOn: ["Ocean"],
-		impassable: true,
-		unbuildable: true,
-		weight: 10
-	},
-	{
-		name: "Mount Fuji",
-		type: "NaturalWonder",
-		gold: 1,
-		culture: 5,
-		occursOn: ["Grassland","Plains"],
-		impassable: true,
-		unbuildable: true,
-		weight: 10
-	},
 	{
 		name: "Old Faithful",
 		type: "NaturalWonder",
@@ -202,16 +214,6 @@
 		unbuildable: true,
 		weight: 10
 	},
-	{
-		name: "Rock of Gibraltar",
-		type: "NaturalWonder",
-		food: 2,
-		gold: 5,
-		occursOn: ["Grassland"],
-		impassable: true,
-		unbuildable: true,
-		weight: 10
-	},
 	{
 		name: "Cerro de Potosi",
 		type: "NaturalWonder",

core/src/com/unciv/logic/civilization/TechManager.kt

@@ -154,7 +154,10 @@ class TechManager {
 
     fun limitOverflowScience(overflowscience: Int): Int {
         // http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976
-        return min(overflowscience, max(civInfo.statsForNextTurn.science.toInt() * 5, costOfTech(currentTechnologyName()!!)))
+        // Apparently yes, we care about the absolute tech cost, not the actual calculated-for-this-player tech cost,
+        //  so don't change to costOfTech()
+        return min(overflowscience, max(civInfo.statsForNextTurn.science.toInt() * 5,
+                getRuleset().Technologies[currentTechnologyName()]!!.cost))
     }
 
     fun nextTurn(scienceForNewTurn: Int) {

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

@@ -343,7 +343,7 @@ class MapGenerator {
         val wonder = ruleset.Terrains[Constants.GreatBarrierReef]!!
         val suitableLocations = mapToReturn.values.filter { it.resource == null && it.improvement == null
                 && wonder.occursOn!!.contains(it.getLastTerrain().name)
-                && it.neighbors.none{ neighbor -> neighbor.getBaseTerrain().name != Constants.tundra}
+                && it.neighbors.none{ neighbor -> neighbor.getBaseTerrain().name == Constants.tundra }
                 && it.neighbors.any { neighbor -> neighbor.getBaseTerrain().name != Constants.ocean
                                                 && neighbor.getBaseTerrain().name != Constants.coast }
                 && it.neighbors.any { neighbor -> neighbor.getBaseTerrain().name == Constants.coast