Natural wonders are standalone tiles in new layering

android/assets/game.atlas

@@ -2069,7 +2069,7 @@ TileSets/FantasyHex/Tiles/Barringer Crater
   orig: 32, 28
   offset: 0, 0
   index: -1
-TileSets/FantasyHex-New/Tiles/Mountain+Barringer Crater
+TileSets/FantasyHex-New/Tiles/Barringer Crater
   rotate: false
   xy: 2013, 1592
   size: 32, 28
@@ -2181,7 +2181,7 @@ TileSets/FantasyHex/Tiles/Cerro de Potosi
   orig: 32, 28
   offset: 0, 0
   index: -1
-TileSets/FantasyHex-New/Tiles/Mountain+Cerro de Potosi
+TileSets/FantasyHex-New/Tiles/Cerro de Potosi
   rotate: false
   xy: 1584, 542
   size: 32, 28
@@ -3343,7 +3343,7 @@ TileSets/FantasyHex/Tiles/Krakatoa
   orig: 32, 30
   offset: 0, 0
   index: -1
-TileSets/FantasyHex-New/Tiles/Mountain+Krakatoa
+TileSets/FantasyHex-New/Tiles/Krakatoa
   rotate: false
   xy: 1704, 745
   size: 32, 30
@@ -3441,7 +3441,7 @@ TileSets/FantasyHex/Tiles/Mount Fuji
   orig: 32, 30
   offset: 0, 0
   index: -1
-TileSets/FantasyHex-New/Tiles/Mountain+Mount Fuji
+TileSets/FantasyHex-New/Tiles/Mount Fuji
   rotate: false
   xy: 1806, 837
   size: 32, 30

core/src/com/unciv/ui/tilegroups/TileGroup.kt

@@ -85,11 +85,11 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
     val icons = TileGroupIcons(this)
 
     class UnitLayerGroupClass:Group(){
-        override fun draw(batch: Batch?, parentAlpha: Float) { super.draw(batch, parentAlpha) }
+        override fun draw(batch: Batch?, parentAlpha: Float) = super.draw(batch, parentAlpha)
     }
 
     class UnitImageLayerGroupClass:ActionlessGroup(){
-        override fun draw(batch: Batch?, parentAlpha: Float) { super.draw(batch, parentAlpha) }
+        override fun draw(batch: Batch?, parentAlpha: Float) = super.draw(batch, parentAlpha)
     }
     // We separate the units from the units' backgrounds, because all the background elements are in the same texture, and the units' aren't
     val unitLayerGroup = UnitLayerGroupClass().apply { isTransform = false; setSize(groupSize, groupSize);touchable = Touchable.disabled }
@@ -169,11 +169,11 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
 
     fun getTileBaseImageLocationsNew(viewingCiv: CivilizationInfo?): List<String> {
         if (viewingCiv == null && !showEntireMap) return listOf(tileSetStrings.hexagon)
+        if (tileInfo.naturalWonder != null) return listOf(tileInfo.naturalWonder!!)
 
         val shouldShowImprovement = tileInfo.improvement != null && UncivGame.Current.settings.showPixelImprovements
 
-        val shouldShowResource = UncivGame.Current.settings.showPixelImprovements
+        val shouldShowResource = UncivGame.Current.settings.showPixelImprovements && tileInfo.resource != null &&
-                && tileInfo.resource != null &&
                 (showEntireMap || viewingCiv == null || tileInfo.hasViewableResource(viewingCiv))
 
         var resourceAndImprovementSequence = sequenceOf<String?>()
@@ -181,7 +181,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
         if (shouldShowImprovement) resourceAndImprovementSequence += sequenceOf(tileInfo.improvement)
         resourceAndImprovementSequence = resourceAndImprovementSequence.filterNotNull()
 
-        val terrainImages = (sequenceOf(tileInfo.baseTerrain) + tileInfo.terrainFeatures.asSequence() + sequenceOf(tileInfo.naturalWonder)).filterNotNull()
+        val terrainImages = (sequenceOf(tileInfo.baseTerrain) + tileInfo.terrainFeatures.asSequence()).filterNotNull()
         val allTogether = (terrainImages + resourceAndImprovementSequence).joinToString("+").let { tileSetStrings.getTile(it) }
 
         if (ImageGetter.imageExists(allTogether)) return listOf(allTogether)