diff --git a/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Deer.png b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Deer.png new file mode 100644 index 0000000000..08ccb72fd4 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Deer.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Furs.png b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Furs.png new file mode 100644 index 0000000000..aafd2f3675 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Furs.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Hill+Camp.png b/android/Images/TileSets/FantasyHex/Tiles/Hill+Camp.png deleted file mode 100644 index 1e2f62a4db..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Hill+Camp.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Deer.png b/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Deer.png new file mode 100644 index 0000000000..7db83ea969 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Deer.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Furs.png b/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Furs.png new file mode 100644 index 0000000000..25b15c0535 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Furs.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer.png b/android/Images/TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer.png new file mode 100644 index 0000000000..054c36edbe Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs.png b/android/Images/TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs.png new file mode 100644 index 0000000000..0a625a8eed Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Tundra+Camp.png b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Camp.png deleted file mode 100644 index aa9ba10332..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Tundra+Camp.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer.png b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer.png new file mode 100644 index 0000000000..2cb41079ba Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs.png b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs.png new file mode 100644 index 0000000000..7073e9eb86 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 26a7cac47c..951f76140e 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -3370,646 +3370,688 @@ TileSets/FantasyHex/Tiles/Grassland+Forest+Camp orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Coal +TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Deer rotate: false xy: 1506, 197 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Gold +TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Furs rotate: false xy: 1506, 164 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Iron +TileSets/FantasyHex/Tiles/Grassland+Forest+Coal rotate: false xy: 1368, 107 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill +TileSets/FantasyHex/Tiles/Grassland+Forest+Gold rotate: false xy: 1368, 74 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Silver +TileSets/FantasyHex/Tiles/Grassland+Forest+Iron rotate: false xy: 1366, 41 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 +TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill + rotate: false + xy: 1402, 107 + size: 32, 31 + orig: 32, 31 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Grassland+Forest+Silver + rotate: false + xy: 1402, 74 + size: 32, 31 + orig: 32, 31 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false - xy: 1402, 104 + xy: 1400, 38 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Camp rotate: false - xy: 1402, 68 + xy: 1524, 312 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1400, 32 + xy: 1558, 312 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1366, 10 + xy: 1592, 319 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 1400, 2 + xy: 1626, 320 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1558, 318 + xy: 1400, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1728, 314 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/Hill+Camp - rotate: false - xy: 1540, 284 + xy: 1574, 278 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Fallout rotate: false - xy: 1540, 250 + xy: 1574, 244 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest rotate: false - xy: 1540, 203 + xy: 1574, 197 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp rotate: false - xy: 1540, 156 + xy: 1574, 150 + size: 32, 45 + orig: 32, 45 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Deer + rotate: false + xy: 1608, 272 + size: 32, 45 + orig: 32, 45 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Furs + rotate: false + xy: 1608, 225 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill rotate: false - xy: 1574, 271 + xy: 1608, 178 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 1574, 237 + xy: 1608, 144 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 1574, 203 + xy: 1642, 286 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Terrace Farm rotate: false - xy: 1574, 169 + xy: 1642, 252 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 1608, 230 + xy: 1642, 162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 1608, 170 + xy: 1420, 156 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 1574, 139 + xy: 1950, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 1642, 288 + xy: 2008, 452 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 1676, 223 + xy: 1984, 255 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1642, 170 + xy: 1676, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1676, 163 + xy: 1744, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1710, 129 + xy: 1744, 281 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1744, 254 + xy: 1710, 200 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1744, 166 + xy: 1710, 170 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1778, 291 + xy: 1744, 190 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1778, 227 + xy: 1744, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1778, 189 + xy: 1778, 284 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1812, 193 + xy: 1812, 281 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1812, 163 + xy: 1812, 251 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1778, 129 + xy: 1812, 221 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1812, 129 + xy: 1812, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1812, 99 + xy: 1846, 197 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Cattle rotate: false - xy: 1984, 286 + xy: 1880, 220 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Horses rotate: false - xy: 2008, 448 + xy: 1914, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Sheep rotate: false - xy: 2008, 414 + xy: 1914, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture2 rotate: false - xy: 1950, 288 + xy: 1880, 254 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1608, 112 + xy: 1948, 228 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1710, 99 + xy: 1914, 185 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 1744, 71 + xy: 1948, 191 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Fallout rotate: false - xy: 1778, 69 + xy: 1982, 195 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1812, 69 + xy: 1812, 157 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 1882, 279 + xy: 1846, 162 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1916, 276 + xy: 1880, 155 + size: 32, 33 + orig: 32, 33 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer + rotate: false + xy: 1914, 150 + size: 32, 33 + orig: 32, 33 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs + rotate: false + xy: 1948, 156 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1848, 278 + xy: 1982, 160 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 1846, 241 + xy: 1778, 129 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1846, 204 + xy: 1744, 119 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 1846, 174 + xy: 1812, 127 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1846, 144 + xy: 1846, 132 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 1846, 114 + xy: 1880, 125 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1846, 84 + xy: 1914, 120 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Dyes rotate: false - xy: 1846, 54 + xy: 1948, 126 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Incense rotate: false - xy: 1950, 258 + xy: 1982, 130 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Silk rotate: false - xy: 1984, 256 + xy: 1778, 99 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Spices rotate: false - xy: 1882, 249 + xy: 1812, 97 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Sugar rotate: false - xy: 1916, 246 + xy: 1846, 102 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Wine rotate: false - xy: 1880, 219 + xy: 1880, 95 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 1880, 189 + xy: 1914, 90 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1880, 159 + xy: 1948, 96 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1880, 129 + xy: 1982, 100 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1880, 99 + xy: 1846, 72 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1914, 214 + xy: 1914, 58 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 1914, 182 + xy: 1948, 64 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 1914, 150 + xy: 1982, 68 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 1914, 118 + xy: 1676, 108 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 1914, 86 + xy: 1710, 108 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 1914, 54 + xy: 1744, 87 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1880, 35 + xy: 1778, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1984, 226 + xy: 1880, 35 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 1948, 170 + xy: 1914, 28 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1948, 140 + xy: 1948, 34 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 1982, 196 + xy: 1948, 4 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1982, 166 + xy: 1982, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 1982, 136 + xy: 1436, 115 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1436, 85 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/Tundra+Camp - rotate: false - xy: 1436, 55 + xy: 1468, 25 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 1434, 18 + xy: 1504, 127 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Fallout rotate: false - xy: 1470, 113 + xy: 1504, 97 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 1470, 79 + xy: 1504, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1470, 45 + xy: 1538, 128 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer + rotate: false + xy: 1538, 94 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs + rotate: false + xy: 1572, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1468, 11 + xy: 1538, 60 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 1504, 134 + xy: 1572, 86 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1504, 76 + xy: 1606, 86 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 1538, 70 + xy: 1640, 72 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 1572, 109 + xy: 1674, 78 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1572, 79 + xy: 1708, 78 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1982, 16 + xy: 1436, 55 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -4219,406 +4261,406 @@ TileSets/FantasyHex/Units/Machine Gun index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1524, 318 + xy: 1366, 11 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1592, 320 + xy: 1540, 282 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1592, 320 + xy: 1540, 282 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1626, 320 + xy: 1540, 252 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1420, 156 + xy: 1540, 222 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1420, 156 + xy: 1540, 222 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1660, 318 + xy: 1540, 192 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1694, 318 + xy: 1540, 162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1694, 318 + xy: 1540, 162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1608, 290 + xy: 1642, 222 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1608, 260 + xy: 1642, 192 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1608, 200 + xy: 1642, 132 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1608, 142 + xy: 1984, 292 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1642, 258 + xy: 2008, 422 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1676, 288 + xy: 1882, 284 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1642, 230 + xy: 1916, 283 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1676, 260 + xy: 1848, 285 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1642, 200 + xy: 1950, 258 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1676, 193 + xy: 1710, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1642, 140 + xy: 1676, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1642, 140 + xy: 1676, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1676, 133 + xy: 1676, 258 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1710, 284 + xy: 1676, 228 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1710, 254 + xy: 1710, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1710, 224 + xy: 1676, 198 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1710, 194 + xy: 1710, 258 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1710, 166 + xy: 1710, 230 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1744, 284 + xy: 1676, 168 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1744, 224 + xy: 1744, 251 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1744, 196 + xy: 1676, 140 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1744, 136 + xy: 1744, 221 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1778, 261 + xy: 1710, 140 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1778, 159 + xy: 1778, 254 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1812, 281 + xy: 1778, 224 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1812, 253 + xy: 1778, 196 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1812, 223 + xy: 1778, 166 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1744, 108 + xy: 1846, 257 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1778, 99 + xy: 1846, 227 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1642, 110 + xy: 1880, 190 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1676, 103 + xy: 1982, 225 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1880, 69 + xy: 1880, 65 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1914, 24 + xy: 1812, 67 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1950, 228 + xy: 1846, 42 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1948, 200 + xy: 1812, 39 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1948, 112 + xy: 1982, 40 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1948, 82 + xy: 1846, 12 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1948, 52 + xy: 1880, 5 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1948, 24 + xy: 1454, 145 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1982, 106 + xy: 1436, 85 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1982, 76 + xy: 1470, 115 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1982, 46 + xy: 1470, 85 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1454, 143 + xy: 1470, 55 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1436, 115 + xy: 1434, 27 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1504, 106 + xy: 1606, 116 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1504, 46 + xy: 1640, 102 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1538, 128 + xy: 1572, 58 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1538, 100 + xy: 1606, 58 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1606, 84 + xy: 1640, 44 size: 32, 26 orig: 32, 26 offset: 0, 0 diff --git a/android/assets/game2.png b/android/assets/game2.png index 54231d001e..fe7bc6e6da 100644 Binary files a/android/assets/game2.png and b/android/assets/game2.png differ diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 8d88964660..805d383bef 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -160,6 +160,13 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) if (tileInfo.terrainFeature != null) { // e.g. Grassland+Forest val baseTerrainAndFeatureTileLocation = "$baseTerrainTileLocation+${tileInfo.terrainFeature}" + if(shouldShowImprovement && shouldShowResource){ + // e.g. Grassland+Forest+Deer+Camp + val baseFeatureImprovementAndResourceLocation = + "$baseTerrainAndFeatureTileLocation+${tileInfo.improvement}+${tileInfo.resource}" + if (ImageGetter.imageExists(baseFeatureImprovementAndResourceLocation)) + return listOf(baseFeatureImprovementAndResourceLocation) + } if(shouldShowImprovement){ // e.g. Grassland+Forest+Lumber mill val baseFeatureAndImprovementTileLocation = "$baseTerrainAndFeatureTileLocation+${tileInfo.improvement}"