diff --git a/android/Images/TileSets/FantasyHex/Tiles/Desert+Flood plains+Plantation.png b/android/Images/TileSets/FantasyHex/Tiles/Desert+Flood plains+Plantation.png deleted file mode 100644 index c4fcb77a5c..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Desert+Flood plains+Plantation.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Desert+Plantation.png b/android/Images/TileSets/FantasyHex/Tiles/Desert+Plantation.png deleted file mode 100644 index 444d207eb6..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Desert+Plantation.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Grassland+Plantation.png b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Plantation.png deleted file mode 100644 index 1e69cec42c..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Grassland+Plantation.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Plains+Plantation.png b/android/Images/TileSets/FantasyHex/Tiles/Plains+Plantation.png deleted file mode 100644 index 38826c5f86..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Plains+Plantation.png and /dev/null differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index a130e02a86..fce5487e7f 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -2545,79 +2545,65 @@ TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Desert+Flood plains+Plantation +TileSets/FantasyHex/Tiles/Desert+Flood plains+Trading post rotate: false xy: 1860, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Desert+Flood plains+Trading post +TileSets/FantasyHex/Tiles/Desert+Oasis rotate: false xy: 1894, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Desert+Oasis +TileSets/FantasyHex/Tiles/Desert+Trading post rotate: false xy: 1928, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Desert+Plantation - rotate: false - xy: 1962, 38 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/Desert+Trading post +TileSets/FantasyHex/Tiles/Fishing Boats rotate: false xy: 1996, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Fishing Boats - rotate: false - xy: 2064, 35 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 2132, 30 + xy: 2064, 30 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 810, 2 + xy: 742, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Customs house rotate: false - xy: 844, 2 + xy: 776, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 878, 2 + xy: 810, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false - xy: 912, 7 + xy: 844, 7 size: 32, 31 orig: 32, 31 offset: 0, 0 @@ -2643,30 +2629,23 @@ TileSets/FantasyHex/Tiles/Grassland+Marsh orig: 32, 29 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Plantation - rotate: false - xy: 946, 10 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 980, 10 + xy: 878, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1384, 4 + xy: 1116, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Customs house rotate: false - xy: 1418, 4 + xy: 1150, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2680,84 +2659,84 @@ TileSets/FantasyHex/Tiles/Hill+Forest index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 1452, 4 + xy: 2424, 1161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 1486, 6 + xy: 2424, 1127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1184, 2 + xy: 2426, 863 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 2428, 955 + xy: 2426, 773 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 2428, 740 + xy: 2426, 558 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 2428, 620 + xy: 2428, 438 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 2428, 560 + xy: 2428, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 2428, 492 + xy: 2428, 310 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 2428, 344 + xy: 1350, 3 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 2428, 314 + xy: 1384, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 2428, 226 + xy: 1486, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1690, 8 + xy: 1588, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2771,21 +2750,21 @@ TileSets/FantasyHex/Tiles/Plains+City index: -1 TileSets/FantasyHex/Tiles/Plains+Customs house rotate: false - xy: 1724, 8 + xy: 1622, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1758, 8 + xy: 1656, 3 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 1792, 3 + xy: 2098, 2 size: 32, 33 orig: 32, 33 offset: 0, 0 @@ -2804,142 +2783,135 @@ TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post orig: 32, 35 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Plains+Plantation - rotate: false - xy: 1826, 8 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 2423, 1787 + xy: 1690, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1860, 8 + xy: 2132, 7 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 2423, 1757 + xy: 2423, 1787 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1894, 8 + xy: 1724, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 2423, 1695 + xy: 2423, 1725 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 2423, 1663 + xy: 2423, 1693 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 2423, 1631 + xy: 2423, 1661 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 2423, 1599 + xy: 2423, 1629 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 2423, 1567 + xy: 2423, 1597 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 1928, 6 + xy: 2423, 1565 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Terrace Farm rotate: false - xy: 2362, 172 + xy: 2419, 1501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 2344, 54 + xy: 2344, 146 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Camp rotate: false - xy: 2344, 24 + xy: 2344, 116 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 2378, 135 + xy: 2344, 79 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Customs house rotate: false - xy: 2378, 105 + xy: 2344, 49 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 2378, 71 + xy: 2344, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 2378, 37 + xy: 2378, 142 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 2378, 7 + xy: 2378, 112 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 2344, 142 + xy: 2419, 1471 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3093,448 +3065,448 @@ TileSets/FantasyHex/Units/Crossbowman index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 2030, 37 + xy: 1962, 40 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 2098, 35 + xy: 2030, 35 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 488, 1054 + xy: 2098, 37 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 742, 2 + xy: 2132, 37 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 776, 2 + xy: 488, 1052 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 776, 2 + xy: 488, 1052 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1014, 10 + xy: 912, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1048, 10 + xy: 946, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1048, 10 + xy: 946, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1082, 10 + xy: 980, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1116, 10 + xy: 1014, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1116, 10 + xy: 1014, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1150, 10 + xy: 1048, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1350, 3 + xy: 1082, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1350, 3 + xy: 1082, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1520, 10 + xy: 1184, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 2424, 1165 + xy: 2424, 1097 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 2424, 1135 + xy: 2424, 1067 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1554, 10 + xy: 2424, 1039 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 2424, 1105 + xy: 2426, 1009 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 2424, 1075 + xy: 2426, 979 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1588, 10 + xy: 2426, 951 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1622, 10 + xy: 2426, 923 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 2424, 1045 + xy: 2426, 893 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 2428, 1015 + xy: 2426, 833 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 2428, 985 + xy: 2426, 803 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 2428, 985 + xy: 2426, 803 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 2428, 925 + xy: 2426, 743 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 2428, 895 + xy: 2426, 713 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 2428, 865 + xy: 2426, 683 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 2428, 835 + xy: 2426, 653 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 2428, 805 + xy: 2426, 623 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 2428, 777 + xy: 2426, 595 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 2428, 710 + xy: 2426, 528 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 2428, 680 + xy: 2426, 498 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 2428, 650 + xy: 2426, 468 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 2428, 590 + xy: 2428, 408 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 2428, 530 + xy: 2428, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 2428, 462 + xy: 2428, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 2428, 432 + xy: 2428, 250 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 2428, 404 + xy: 2428, 222 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 2428, 374 + xy: 2428, 192 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 2428, 286 + xy: 1418, 10 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 2428, 256 + xy: 1452, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 2428, 196 + xy: 1520, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1656, 3 + xy: 1554, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 2423, 1727 + xy: 2423, 1757 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1962, 8 + xy: 1758, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1996, 8 + xy: 1792, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 2030, 9 + xy: 1826, 10 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 2064, 7 + xy: 1860, 10 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 2098, 5 + xy: 1894, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 2423, 1537 + xy: 1928, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 2132, 2 + xy: 1962, 12 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 2419, 1507 + xy: 1996, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 2419, 1477 + xy: 2030, 5 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 2419, 1447 + xy: 2423, 1535 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 2344, 112 + xy: 2362, 176 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 2344, 84 + xy: 2064, 2 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 2412, 168 + xy: 2378, 84 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 2412, 138 + xy: 2378, 54 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 2412, 110 + xy: 2378, 26 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 2412, 82 + xy: 2412, 164 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 2412, 54 + xy: 2412, 136 size: 32, 26 orig: 32, 26 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index c827b91120..5cb2148feb 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ