Removed legacy tileset code (#7658)

* Removed legacy tileset code

which was only used for the "Default" tileset

* Updated "Default" tileset to support new rendering

* Updated docs

* Fixed fogOfWar coloring bug

* Removed cityImage variable completely

* Renamed variable out to baseHexagon

* Moved color lerp out of for loop

* Renamed "Default" tileset to "Minimal"

* Made "HexaRealm" the games fallback tileset

* Implemented requested changes

* Readded accidentally removed variable

* Reverted updateTileImage back to foreach loop

Since indices are not needed anymore

* Regenerated game.atlas and game.png

android/assets/game.atlas

@@ -104,7 +104,7 @@ ImprovementIcons/City center
   index: -1
 ImprovementIcons/City ruins
   rotate: false
-  xy: 4, 182
+  xy: 1470, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -228,7 +228,7 @@ ImprovementIcons/Railroad
   orig: 100, 100
   offset: 0, 0
   index: -1
-TileSets/Default/Railroad
+TileSets/Minimal/Railroad
   rotate: false
   xy: 1149, 1404
   size: 100, 100
@@ -396,14 +396,14 @@ OtherIcons/Hexagon
   orig: 277, 240
   offset: 0, 0
   index: -1
-TileSets/Default/Hexagon
+TileSets/FantasyHex/Hexagon
   rotate: false
   xy: 4, 1584
   size: 277, 240
   orig: 277, 240
   offset: 0, 0
   index: -1
-TileSets/FantasyHex/Hexagon
+TileSets/Minimal/Hexagon
   rotate: false
   xy: 4, 1584
   size: 277, 240
@@ -986,7 +986,7 @@ StatIcons/Acquire
   index: -1
 StatIcons/CityConnection
   rotate: false
-  xy: 1470, 1944
+  xy: 4, 74
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1103,34 +1103,6 @@ StatIcons/Strength
   orig: 50, 50
   offset: 0, 0
   index: -1
-TileSets/Default/Arrows/CityHasAttacked
-  rotate: false
-  xy: 482, 1876
-  size: 100, 60
-  orig: 100, 60
-  offset: 0, 0
-  index: -1
-TileSets/Default/Arrows/UnitHasAttacked
-  rotate: false
-  xy: 482, 1876
-  size: 100, 60
-  orig: 100, 60
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/Arrows/UnitHasAttacked
-  rotate: false
-  xy: 482, 1876
-  size: 100, 60
-  orig: 100, 60
-  offset: 0, 0
-  index: -1
-TileSets/Default/Arrows/Generic
-  rotate: false
-  xy: 4, 6
-  size: 100, 60
-  orig: 100, 60
-  offset: 0, 0
-  index: -1
 TileSets/FantasyHex/Arrows/Generic
   rotate: false
   xy: 4, 6
@@ -1138,9 +1110,9 @@ TileSets/FantasyHex/Arrows/Generic
   orig: 100, 60
   offset: 0, 0
   index: -1
-TileSets/Default/Arrows/UnitAttacked
+TileSets/Minimal/Arrows/Generic
   rotate: false
-  xy: 190, 1164
+  xy: 4, 6
   size: 100, 60
   orig: 100, 60
   offset: 0, 0
@@ -1152,9 +1124,9 @@ TileSets/FantasyHex/Arrows/UnitAttacked
   orig: 100, 60
   offset: 0, 0
   index: -1
-TileSets/Default/Arrows/UnitMoved
+TileSets/Minimal/Arrows/UnitAttacked
   rotate: false
-  xy: 298, 1150
+  xy: 190, 1164
   size: 100, 60
   orig: 100, 60
   offset: 0, 0
@@ -1166,9 +1138,9 @@ TileSets/FantasyHex/Arrows/UnitMoved
   orig: 100, 60
   offset: 0, 0
   index: -1
-TileSets/Default/Arrows/UnitMoving
+TileSets/Minimal/Arrows/UnitMoved
   rotate: false
-  xy: 112, 6
+  xy: 298, 1150
   size: 100, 60
   orig: 100, 60
   offset: 0, 0
@@ -1180,9 +1152,9 @@ TileSets/FantasyHex/Arrows/UnitMoving
   orig: 100, 60
   offset: 0, 0
   index: -1
-TileSets/Default/Arrows/UnitTeleported
+TileSets/Minimal/Arrows/UnitMoving
   rotate: false
-  xy: 1270, 1228
+  xy: 112, 6
   size: 100, 60
   orig: 100, 60
   offset: 0, 0
@@ -1194,9 +1166,9 @@ TileSets/FantasyHex/Arrows/UnitTeleported
   orig: 100, 60
   offset: 0, 0
   index: -1
-TileSets/Default/Arrows/UnitWithdrew
+TileSets/Minimal/Arrows/UnitTeleported
   rotate: false
-  xy: 1378, 1228
+  xy: 1270, 1228
   size: 100, 60
   orig: 100, 60
   offset: 0, 0
@@ -1208,18 +1180,11 @@ TileSets/FantasyHex/Arrows/UnitWithdrew
   orig: 100, 60
   offset: 0, 0
   index: -1
-TileSets/Default/AtollOverlay
+TileSets/Minimal/Arrows/UnitWithdrew
   rotate: false
-  xy: 822, 1944
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/Borders/ConcaveConvexInner
-  rotate: false
-  xy: 406, 1411
-  size: 81, 15
-  orig: 81, 15
+  xy: 1378, 1228
+  size: 100, 60
+  orig: 100, 60
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Borders/ConcaveConvexInner
@@ -1229,9 +1194,9 @@ TileSets/FantasyHex/Borders/ConcaveConvexInner
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/Borders/ConcaveConvexOuter
+TileSets/Minimal/Borders/ConcaveConvexInner
   rotate: false
-  xy: 406, 1165
+  xy: 406, 1411
   size: 81, 15
   orig: 81, 15
   offset: 0, 0
@@ -1243,9 +1208,9 @@ TileSets/FantasyHex/Borders/ConcaveConvexOuter
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/Borders/ConcaveInner
+TileSets/Minimal/Borders/ConcaveConvexOuter
   rotate: false
-  xy: 1378, 1205
+  xy: 406, 1165
   size: 81, 15
   orig: 81, 15
   offset: 0, 0
@@ -1257,9 +1222,9 @@ TileSets/FantasyHex/Borders/ConcaveInner
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/Borders/ConcaveOuter
+TileSets/Minimal/Borders/ConcaveInner
   rotate: false
-  xy: 495, 1165
+  xy: 1378, 1205
   size: 81, 15
   orig: 81, 15
   offset: 0, 0
@@ -1271,9 +1236,9 @@ TileSets/FantasyHex/Borders/ConcaveOuter
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/Borders/ConvexConcaveInner
+TileSets/Minimal/Borders/ConcaveOuter
   rotate: false
-  xy: 1378, 1182
+  xy: 495, 1165
   size: 81, 15
   orig: 81, 15
   offset: 0, 0
@@ -1285,9 +1250,9 @@ TileSets/FantasyHex/Borders/ConvexConcaveInner
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/Borders/ConvexConcaveOuter
+TileSets/Minimal/Borders/ConvexConcaveInner
   rotate: false
-  xy: 584, 1165
+  xy: 1378, 1182
   size: 81, 15
   orig: 81, 15
   offset: 0, 0
@@ -1299,9 +1264,9 @@ TileSets/FantasyHex/Borders/ConvexConcaveOuter
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/Borders/ConvexInner
+TileSets/Minimal/Borders/ConvexConcaveOuter
   rotate: false
-  xy: 1378, 1159
+  xy: 584, 1165
   size: 81, 15
   orig: 81, 15
   offset: 0, 0
@@ -1313,9 +1278,9 @@ TileSets/FantasyHex/Borders/ConvexInner
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/Borders/ConvexOuter
+TileSets/Minimal/Borders/ConvexInner
   rotate: false
-  xy: 673, 1165
+  xy: 1378, 1159
   size: 81, 15
   orig: 81, 15
   offset: 0, 0
@@ -1327,18 +1292,11 @@ TileSets/FantasyHex/Borders/ConvexOuter
   orig: 81, 15
   offset: 0, 0
   index: -1
-TileSets/Default/CityOverlay
+TileSets/Minimal/Borders/ConvexOuter
   rotate: false
-  xy: 4, 74
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/Crosshair
-  rotate: false
-  xy: 482, 1944
-  size: 116, 100
-  orig: 116, 100
+  xy: 673, 1165
+  size: 81, 15
+  orig: 81, 15
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Crosshair
@@ -1348,11 +1306,11 @@ TileSets/FantasyHex/Crosshair
   orig: 116, 100
   offset: 0, 0
   index: -1
-TileSets/Default/CrosshatchHexagon
+TileSets/Minimal/Crosshair
   rotate: false
-  xy: 4, 1340
-  size: 273, 236
-  orig: 273, 236
+  xy: 482, 1944
+  size: 116, 100
+  orig: 116, 100
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/CrosshatchHexagon
@@ -1362,32 +1320,11 @@ TileSets/FantasyHex/CrosshatchHexagon
   orig: 273, 236
   offset: 0, 0
   index: -1
-TileSets/Default/FalloutOverlay
+TileSets/Minimal/CrosshatchHexagon
   rotate: false
-  xy: 698, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/Flood plainsOverlay
-  rotate: false
-  xy: 1238, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/ForestOverlay
-  rotate: false
-  xy: 1454, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/Highlight
-  rotate: false
-  xy: 4, 1832
-  size: 284, 212
-  orig: 284, 212
+  xy: 4, 1340
+  size: 273, 236
+  orig: 273, 236
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Highlight
@@ -1397,88 +1334,11 @@ TileSets/FantasyHex/Highlight
   orig: 284, 212
   offset: 0, 0
   index: -1
-TileSets/Default/HillOverlay
+TileSets/Minimal/Highlight
   rotate: false
-  xy: 698, 1728
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/IceOverlay
-  rotate: false
-  xy: 1022, 1728
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/JungleOverlay
-  rotate: false
-  xy: 1562, 1728
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/LakesOverlay
-  rotate: false
-  xy: 1670, 1728
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/MarshOverlay
-  rotate: false
-  xy: 613, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/MountainOverlay
-  rotate: false
-  xy: 1369, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/NaturalWonderOverlay
-  rotate: false
-  xy: 1585, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/OasisOverlay
-  rotate: false
-  xy: 1909, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/Default/Road
-  rotate: false
-  xy: 404, 1775
-  size: 61, 11
-  orig: 61, 11
-  offset: 0, 0
-  index: -1
-TileSets/Default/Tiles/River-Bottom
-  rotate: false
-  xy: 1550, 1008
-  size: 32, 28
-  orig: 32, 28
-  offset: 0, 0
-  index: -1
-TileSets/Default/Tiles/River-BottomLeft
-  rotate: false
-  xy: 1550, 972
-  size: 32, 28
-  orig: 32, 28
-  offset: 0, 0
-  index: -1
-TileSets/Default/Tiles/River-BottomRight
-  rotate: false
-  xy: 1590, 972
-  size: 32, 28
-  orig: 32, 28
+  xy: 4, 1832
+  size: 284, 212
+  orig: 284, 212
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Railroad
@@ -2358,21 +2218,21 @@ TileSets/FantasyHex/Tiles/Quarry+Stone
   index: -1
 TileSets/FantasyHex/Tiles/River-Bottom
   rotate: false
-  xy: 1590, 1008
+  xy: 1550, 1008
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-BottomLeft
   rotate: false
-  xy: 1550, 936
+  xy: 1550, 972
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-BottomRight
   rotate: false
-  xy: 1550, 900
+  xy: 1590, 972
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -5513,3 +5373,143 @@ TileSets/HexaRealm/Tiles/Wine+Plantation
   orig: 64, 56
   offset: 0, 0
   index: -1
+TileSets/Minimal/Arrows/CityHasAttacked
+  rotate: false
+  xy: 482, 1876
+  size: 100, 60
+  orig: 100, 60
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/Arrows/UnitHasAttacked
+  rotate: false
+  xy: 482, 1876
+  size: 100, 60
+  orig: 100, 60
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Arrows/UnitHasAttacked
+  rotate: false
+  xy: 482, 1876
+  size: 100, 60
+  orig: 100, 60
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Road
+  rotate: false
+  xy: 404, 1775
+  size: 61, 11
+  orig: 61, 11
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Atoll
+  rotate: false
+  xy: 822, 1944
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/City center
+  rotate: false
+  xy: 4, 182
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Fallout
+  rotate: false
+  xy: 698, 1836
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Flood plains
+  rotate: false
+  xy: 1238, 1836
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Forest
+  rotate: false
+  xy: 1454, 1836
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Hill
+  rotate: false
+  xy: 698, 1728
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Ice
+  rotate: false
+  xy: 1022, 1728
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Jungle
+  rotate: false
+  xy: 1562, 1728
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Lakes
+  rotate: false
+  xy: 1670, 1728
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Marsh
+  rotate: false
+  xy: 613, 1620
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Mountain
+  rotate: false
+  xy: 1369, 1620
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/NaturalWonder
+  rotate: false
+  xy: 1585, 1620
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/Oasis
+  rotate: false
+  xy: 1909, 1620
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/River-Bottom
+  rotate: false
+  xy: 1590, 1008
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/River-BottomLeft
+  rotate: false
+  xy: 1550, 936
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
+TileSets/Minimal/Tiles/River-BottomRight
+  rotate: false
+  xy: 1550, 900
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1

android/assets/jsons/TileSets/Default.json

@@ -1,3 +0,0 @@
-{
-    "fallbackTileSet": null,
-}

android/assets/jsons/TileSets/Minimal.json

@@ -0,0 +1,20 @@
+{
+    "useColorAsBaseTerrain": "true",
+    "useSummaryImages": "true",
+    "fallbackTileSet": null,
+    "tileScales": {
+        "Atoll":0.35,
+        "City center":0.7,
+        "Faulout":0.35,
+        "Flood plains":0.35,
+        "Forest":0.35,
+        "Hill":0.35,
+        "Ice":0.35,
+        "Jungle":0.35,
+        "Lakes":0.35,
+        "Marsh":0.35,
+        "Mountain":0.5,
+        "NaturalWonder":0.5,
+        "Oasis":0.35
+    }
+}