diff --git a/android/Images/TileSets/FantasyHex/Tiles/Fur.png b/android/Images/TileSets/FantasyHex/Tiles/Fur.png new file mode 100644 index 0000000000..a5cc06a71e Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Fur.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index f10c0456d5..c3377e9f14 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -788,6 +788,20 @@ ImprovementIcons/Quarry orig: 100, 100 offset: 0, 0 index: -1 +ImprovementIcons/Railroad + rotate: false + xy: 818, 206 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/Railroad + rotate: false + xy: 818, 206 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 ImprovementIcons/Road rotate: false xy: 1430, 148 @@ -1721,7 +1735,7 @@ TechIcons/Radio index: -1 TechIcons/Railroad rotate: false - xy: 818, 206 + xy: 920, 206 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: 614, 1030 @@ -1859,37 +1887,9 @@ TileSets/Default/OasisOverlay orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/Railroad - rotate: false - xy: 1022, 206 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 1022, 206 - 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: 920, 206 + xy: 1022, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2609,7 +2609,7 @@ OtherIcons/Up index: -1 OtherIcons/whiteDot rotate: false - xy: 1124, 45 + xy: 954, 19 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -2999,6 +2999,20 @@ TechIcons/Writing orig: 100, 100 offset: 0, 0 index: -1 +TileSets/Default/road + rotate: false + xy: 614, 90 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/road + rotate: false + xy: 614, 90 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Academy rotate: false xy: 920, 13 @@ -3216,142 +3230,149 @@ TileSets/FantasyHex/Tiles/Fountain of Youth orig: 32, 32 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Gems +TileSets/FantasyHex/Tiles/Fur rotate: false - xy: 1968, 261 + xy: 1866, 259 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Gold +TileSets/FantasyHex/Tiles/Gems rotate: false xy: 1178, 192 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 +TileSets/FantasyHex/Tiles/Gold + rotate: false + xy: 1212, 192 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 1212, 188 + xy: 1246, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 1246, 194 + xy: 1280, 194 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Fallout rotate: false - xy: 1280, 194 + xy: 1314, 194 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 1314, 194 + xy: 1348, 194 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false - xy: 1348, 191 + xy: 1382, 189 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Aluminum rotate: false - xy: 1382, 189 + xy: 1416, 189 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 1416, 189 + xy: 1450, 189 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Coal rotate: false - xy: 1450, 189 + xy: 1484, 189 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Gold rotate: false - xy: 1484, 189 + xy: 1518, 189 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Iron rotate: false - xy: 1518, 189 + xy: 1552, 189 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 1552, 189 + xy: 648, 5 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Silver rotate: false - xy: 648, 5 + xy: 682, 70 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false - xy: 682, 67 + xy: 682, 34 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Camp rotate: false - xy: 682, 31 + xy: 1128, 136 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1128, 136 + xy: 1128, 100 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1128, 105 + xy: 682, 3 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 1128, 75 + xy: 1128, 70 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1124, 15 + xy: 1124, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3407,7 +3428,7 @@ TileSets/FantasyHex/Tiles/Hill+Mine index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 1866, 227 + xy: 1866, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3435,14 +3456,14 @@ TileSets/FantasyHex/Tiles/Iron index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 1722, 172 + xy: 1756, 166 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 1934, 199 + xy: 1790, 160 size: 32, 35 orig: 32, 35 offset: 0, 0 @@ -3456,322 +3477,322 @@ TileSets/FantasyHex/Tiles/Lakes index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1934, 169 + xy: 1790, 130 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1280, 157 + xy: 1858, 130 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1348, 161 + xy: 1858, 100 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1450, 159 + xy: 1892, 116 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1518, 159 + xy: 1892, 86 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1586, 155 + xy: 1926, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1620, 151 + xy: 1158, 2 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1756, 136 + xy: 2008, 394 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1790, 139 + xy: 2008, 364 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1688, 112 + xy: 2008, 334 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1722, 110 + xy: 2002, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1314, 134 + xy: 2002, 212 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture2 rotate: false - xy: 1348, 131 + xy: 2002, 182 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1450, 129 + xy: 2002, 92 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 1484, 122 + xy: 1280, 157 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Fallout rotate: false - xy: 1518, 129 + xy: 1314, 164 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1552, 129 + xy: 1348, 164 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 1586, 120 + xy: 1382, 154 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1620, 116 + xy: 1416, 154 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1654, 94 + xy: 1450, 154 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 1688, 75 + xy: 1484, 152 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1722, 73 + xy: 1518, 152 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 1756, 78 + xy: 1552, 159 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1790, 79 + xy: 1586, 159 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 1518, 99 + xy: 1620, 159 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1552, 99 + xy: 1654, 159 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1620, 84 + xy: 1722, 112 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 1654, 62 + xy: 1756, 104 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 1688, 43 + xy: 1790, 98 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 1722, 41 + xy: 1824, 82 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 1756, 46 + xy: 1858, 68 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 1790, 47 + xy: 1892, 54 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1824, 165 + xy: 1926, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1824, 75 + xy: 1994, 32 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1858, 169 + xy: 1192, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1858, 51 + xy: 1226, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1926, 51 + xy: 1430, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Camp rotate: false - xy: 1892, 26 + xy: 1464, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 1858, 14 + xy: 1416, 117 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Fallout rotate: false - xy: 1926, 21 + xy: 1450, 124 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 1960, 135 + xy: 1484, 118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1960, 101 + xy: 1518, 118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1960, 67 + xy: 1552, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 1960, 37 + xy: 1498, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 2008, 332 + xy: 1532, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1926, 139 + xy: 1362, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3953,35 +3974,35 @@ TileSets/FantasyHex/Units/Frigate index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 1866, 261 + xy: 1900, 268 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 1900, 268 + xy: 1934, 268 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 1934, 266 + xy: 1968, 261 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1934, 266 + xy: 1968, 261 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1128, 45 + xy: 1128, 40 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -4044,7 +4065,7 @@ TileSets/FantasyHex/Units/Infantry index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1934, 236 + xy: 1934, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -4065,340 +4086,326 @@ TileSets/FantasyHex/Units/Hwach'a index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 682, 3 + xy: 1722, 174 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1756, 166 + xy: 1832, 202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1832, 202 + xy: 1798, 197 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1798, 199 + xy: 1866, 197 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1866, 199 + xy: 1900, 206 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1900, 204 + xy: 1934, 208 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1790, 169 + xy: 1722, 144 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1900, 174 + xy: 1756, 136 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1900, 174 + xy: 1756, 136 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1968, 171 + xy: 1832, 172 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 2008, 452 + xy: 1866, 167 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 2008, 422 + xy: 1900, 176 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 2008, 392 + xy: 1934, 178 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 2008, 362 + xy: 1968, 171 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1246, 166 + xy: 1824, 144 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1314, 164 + xy: 1824, 114 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1382, 159 + xy: 1900, 146 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1416, 161 + xy: 1934, 150 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1484, 159 + xy: 1968, 141 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1552, 159 + xy: 1934, 120 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1654, 159 + xy: 1968, 111 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1688, 142 + xy: 1960, 81 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1722, 144 + xy: 2008, 454 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1654, 129 + xy: 2008, 424 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1756, 108 + xy: 2002, 272 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1790, 109 + xy: 2002, 242 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1382, 129 + xy: 2002, 152 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1416, 131 + xy: 2002, 122 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1586, 90 + xy: 1688, 142 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1824, 135 + xy: 1960, 51 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1824, 105 + xy: 1994, 62 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1824, 47 + xy: 1162, 40 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1858, 141 + xy: 1314, 136 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1858, 111 + xy: 1348, 134 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1858, 81 + xy: 1162, 68 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1892, 146 + xy: 1382, 126 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1892, 116 + xy: 1260, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1892, 86 + xy: 1294, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1892, 56 + xy: 1328, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1926, 109 + xy: 1396, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1926, 81 + xy: 1162, 98 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1960, 9 + xy: 1586, 131 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 2002, 302 + xy: 1566, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 2002, 274 + xy: 1620, 131 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 2002, 246 + xy: 1654, 131 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 2002, 218 + xy: 1688, 114 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 -TileSets/FantasyHex/road - rotate: false - xy: 614, 90 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 -TileSets/Default/road - rotate: false - xy: 614, 90 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 UnitIcons/Stealth Bomber rotate: false xy: 104, 410 diff --git a/android/assets/game.png b/android/assets/game.png index e4373eca8b..e9b0cbf13c 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/game2.png b/android/assets/game2.png index 3e91d255f1..bc8249f641 100644 Binary files a/android/assets/game2.png and b/android/assets/game2.png differ diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index a5a4ed4570..d275cc4af0 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -469,8 +469,10 @@ class CivilizationInfo { fun destroy(){ + val destructionText = if(isMajorCiv()) "The civilization of [$civName] has been destroyed!" + else "The City-State of [$civName] has been destroyed!" for(civ in gameInfo.civilizations) - civ.addNotification("The civilization of [$civName] has been destroyed!", null, Color.RED) + civ.addNotification(destructionText, null, Color.RED) getCivUnits().forEach { it.destroy() } tradeRequests.clear() // if we don't do this then there could be resources taken by "pending" trades forever for(diplomacyManager in diplomacy.values){