diff --git a/android/Images/TileSets/FantasyHex/Units/Battleship.png b/android/Images/TileSets/FantasyHex/Units/Battleship.png new file mode 100644 index 0000000000..773fb00670 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Units/Battleship.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index fce5487e7f..5ab4b1afcb 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -2456,7 +2456,7 @@ TileSets/FantasyHex/Tiles/Barbarian encampment index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 1350, 33 + xy: 1384, 33 size: 32, 33 orig: 32, 33 offset: 0, 0 @@ -2484,84 +2484,84 @@ TileSets/FantasyHex/Tiles/Hill+City index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1384, 38 + xy: 1418, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 1452, 38 + xy: 1486, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1622, 38 + xy: 1656, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+City rotate: false - xy: 1656, 33 + xy: 1690, 33 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Customs house rotate: false - xy: 1690, 38 + xy: 1724, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1724, 38 + xy: 1758, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains rotate: false - xy: 1758, 38 + xy: 1792, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Customs house rotate: false - xy: 1792, 38 + xy: 1826, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1826, 38 + xy: 1860, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Trading post rotate: false - xy: 1860, 38 + xy: 1894, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Oasis rotate: false - xy: 1894, 38 + xy: 1928, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Trading post rotate: false - xy: 1928, 38 + xy: 1962, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2582,182 +2582,182 @@ TileSets/FantasyHex/Tiles/Fort index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 742, 2 + xy: 2424, 1212 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Customs house rotate: false - xy: 776, 2 + xy: 2424, 1182 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 810, 2 + xy: 2424, 1152 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false - xy: 844, 7 + xy: 2424, 1119 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false - xy: 1248, 2 + xy: 1418, 2 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1282, 2 + xy: 1452, 2 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1316, 7 + xy: 2424, 1088 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 878, 10 + xy: 1486, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1116, 6 + xy: 2428, 1024 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Customs house rotate: false - xy: 1150, 6 + xy: 2428, 990 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest rotate: false - xy: 2424, 1195 + xy: 2428, 943 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 2424, 1161 + xy: 2428, 909 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 2424, 1127 + xy: 2428, 875 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 2426, 863 + xy: 2428, 581 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 2426, 773 + xy: 2428, 491 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 2426, 558 + xy: 2428, 276 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 2428, 438 + xy: 1690, 3 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 2428, 378 + xy: 1758, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 2428, 310 + xy: 742, 2 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1350, 3 + xy: 1962, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1384, 8 + xy: 1996, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1486, 10 + xy: 2427, 1926 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1588, 8 + xy: 810, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 440, 1227 + xy: 844, 3 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Customs house rotate: false - xy: 1622, 8 + xy: 878, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1656, 3 + xy: 912, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2771,147 +2771,147 @@ TileSets/FantasyHex/Tiles/Plains+Forest index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 2416, 1906 + xy: 946, 3 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 2423, 1817 + xy: 980, 3 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 1690, 8 + xy: 2132, 7 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 2132, 7 + xy: 1014, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 2423, 1787 + xy: 1048, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1724, 8 + xy: 1082, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 2423, 1725 + xy: 1150, 8 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 2423, 1693 + xy: 1184, 2 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 2423, 1661 + xy: 1218, 2 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 2423, 1629 + xy: 1252, 6 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 2423, 1597 + xy: 1286, 6 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 2423, 1565 + xy: 1320, 6 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Terrace Farm rotate: false - xy: 2419, 1501 + xy: 2423, 1554 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 2344, 146 + xy: 2362, 176 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Camp rotate: false - xy: 2344, 116 + xy: 2344, 146 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 2344, 79 + xy: 2344, 109 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Customs house rotate: false - xy: 2344, 49 + xy: 2344, 79 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 2344, 15 + xy: 2344, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 2378, 142 + xy: 2344, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 2378, 112 + xy: 2378, 146 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 2419, 1471 + xy: 2423, 1524 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2951,6 +2951,20 @@ TileSets/FantasyHex/Units/Ballista orig: 32, 28 offset: 0, 0 index: -1 +TileSets/FantasyHex/Units/Battleship + rotate: false + xy: 1344, 1826 + size: 32, 26 + orig: 32, 26 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Units/Destroyer + rotate: false + xy: 1344, 1826 + size: 32, 26 + orig: 32, 26 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Units/Berserker rotate: false xy: 572, 10 @@ -2988,88 +3002,81 @@ TileSets/FantasyHex/Units/Cannon index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 1344, 1826 + xy: 1214, 34 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 1344, 1826 + xy: 1214, 34 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Catapult rotate: false - xy: 1214, 32 + xy: 1248, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cavalry rotate: false - xy: 1248, 38 + xy: 1282, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chariot Archer rotate: false - xy: 1282, 38 + xy: 1316, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 1316, 38 + xy: 1350, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 1418, 38 + xy: 1452, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 1486, 40 + xy: 1520, 40 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1520, 40 + xy: 1554, 40 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1554, 38 + xy: 1588, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1588, 38 + xy: 1622, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Units/Destroyer - rotate: false - xy: 1962, 40 - size: 32, 26 - orig: 32, 26 - offset: 0, 0 - index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false xy: 2030, 35 @@ -3107,406 +3114,406 @@ TileSets/FantasyHex/Units/Machine Gun index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 912, 10 + xy: 1520, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 946, 10 + xy: 1554, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 946, 10 + xy: 1554, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 980, 10 + xy: 2424, 1058 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1014, 10 + xy: 1588, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1014, 10 + xy: 1588, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1048, 10 + xy: 1622, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1082, 10 + xy: 1656, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1082, 10 + xy: 1656, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1184, 2 + xy: 2428, 845 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 2424, 1097 + xy: 2428, 815 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 2424, 1067 + xy: 2428, 785 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 2424, 1039 + xy: 2428, 757 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 2426, 1009 + xy: 2428, 727 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 2426, 979 + xy: 2428, 697 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 2426, 951 + xy: 2428, 669 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 2426, 923 + xy: 2428, 641 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 2426, 893 + xy: 2428, 611 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 2426, 833 + xy: 2428, 551 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 2426, 803 + xy: 2428, 521 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 2426, 803 + xy: 2428, 521 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 2426, 743 + xy: 2428, 461 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 2426, 713 + xy: 2428, 431 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 2426, 683 + xy: 2428, 401 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 2426, 653 + xy: 2428, 371 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 2426, 623 + xy: 2428, 341 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 2426, 595 + xy: 2428, 313 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 2426, 528 + xy: 2428, 246 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 2426, 498 + xy: 2428, 216 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 2426, 468 + xy: 2428, 186 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 2428, 408 + xy: 1724, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 2428, 348 + xy: 1792, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 2428, 280 + xy: 1826, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 2428, 250 + xy: 1860, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 2428, 222 + xy: 1894, 10 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 2428, 192 + xy: 1928, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1418, 10 + xy: 2030, 7 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1452, 8 + xy: 440, 1234 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1520, 10 + xy: 2416, 1896 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1554, 8 + xy: 776, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 2423, 1757 + xy: 1116, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1758, 8 + xy: 2423, 1824 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1792, 8 + xy: 2423, 1794 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1826, 10 + xy: 2064, 2 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1860, 10 + xy: 2423, 1766 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1894, 8 + xy: 2423, 1736 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1928, 8 + xy: 2423, 1706 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1962, 12 + xy: 2423, 1678 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1996, 8 + xy: 2423, 1648 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 2030, 5 + xy: 2423, 1618 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 2423, 1535 + xy: 2423, 1588 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 2362, 176 + xy: 2419, 1494 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 2064, 2 + xy: 2419, 1466 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 2378, 84 + xy: 2378, 118 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 2378, 54 + xy: 2378, 88 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 2378, 26 + xy: 2378, 60 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 2412, 164 + xy: 2378, 32 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 2412, 136 + xy: 2378, 4 size: 32, 26 orig: 32, 26 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 5cb2148feb..c2a40f6b60 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index eb31564491..ceab4fdfba 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -215,7 +215,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) hideCircle() if (viewingCiv != null && !showEntireMap && !viewingCiv.exploredTiles.contains(tileInfo.position)) { - tileBaseImages.firstOrNull()?.color = Color.DARK_GRAY + for(image in tileBaseImages) image.color = Color.DARK_GRAY return } @@ -388,7 +388,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) else tileInfo.getBaseTerrain().getColor() if (!isViewable) color =color.cpy().lerp(Color.BLACK, 0.6f) - tileBaseImages.firstOrNull()?.color = color + for(image in tileBaseImages) image.color = color } private fun updateTerrainFeatureImage() { diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt index 974eb732d3..b88d26b73c 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt @@ -36,17 +36,6 @@ class WorldTileGroup(internal val worldScreen: WorldScreen, tileInfo: TileInfo, updateCityButton(city, tileIsViewable || UnCivGame.Current.viewEntireMapForDebug) // needs to be before the update so the units will be above the city button super.update(viewingCiv, UnCivGame.Current.settings.showResourcesAndImprovements) - - - // order by z index! - cityImage?.toFront() - terrainFeatureOverlayImage?.toFront() - icons.improvementIcon?.toFront() - resourceImage?.toFront() - cityButton?.toFront() - icons.civilianUnitIcon?.toFront() - icons.militaryUnitIcon?.toFront() - fogImage.toFront() }