diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 377f3c271f..3b543cd061 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -3020,499 +3020,506 @@ TileSets/FantasyHex/Tiles/Coast orig: 32, 28 offset: 0, 0 index: -1 +TileSets/FantasyHex/Tiles/Coast+Oil well + rotate: false + xy: 1534, 274 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 1938, 423 + xy: 1972, 423 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1972, 430 + xy: 920, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+City rotate: false - xy: 920, 11 + xy: 954, 11 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Fallout rotate: false - xy: 954, 16 + xy: 988, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 988, 16 + xy: 1568, 274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains rotate: false - xy: 1596, 296 + xy: 1648, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1648, 348 + xy: 1700, 400 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Trading post rotate: false - xy: 1700, 400 + xy: 1734, 402 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Oasis rotate: false - xy: 1734, 402 + xy: 1768, 402 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Trading post rotate: false - xy: 1768, 402 + xy: 1802, 402 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 1802, 402 + xy: 1836, 402 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 1870, 395 + xy: 1904, 395 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 1938, 365 + xy: 546, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Fallout rotate: false - xy: 1972, 372 + xy: 580, 73 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 546, 8 + xy: 580, 43 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false - xy: 580, 70 + xy: 580, 10 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 580, 37 + xy: 1682, 367 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 580, 4 + xy: 1682, 334 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false - xy: 1630, 312 + xy: 1716, 364 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Camp rotate: false - xy: 1664, 312 + xy: 1750, 366 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1682, 364 + xy: 1784, 366 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1630, 281 + xy: 1818, 371 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 1664, 282 + xy: 1716, 334 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1026, 240 + xy: 2006, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Camp rotate: false - xy: 1060, 240 + xy: 1852, 366 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Customs house rotate: false - xy: 1026, 206 + xy: 1852, 332 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Fallout rotate: false - xy: 1094, 240 + xy: 1886, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest rotate: false - xy: 1026, 159 + xy: 1886, 314 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp rotate: false - xy: 1060, 193 + xy: 1920, 329 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill rotate: false - xy: 1026, 112 + xy: 1026, 227 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 1128, 240 + xy: 1060, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 1060, 159 + xy: 1026, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Terrace Farm rotate: false - xy: 1094, 206 + xy: 1094, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1094, 148 + xy: 1094, 180 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1230, 244 + xy: 1196, 244 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1094, 81 + xy: 1060, 85 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1298, 244 + xy: 1264, 244 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1196, 156 + xy: 1162, 156 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1264, 206 + xy: 1230, 206 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1264, 176 + xy: 1196, 156 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1298, 214 + xy: 1230, 176 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1264, 146 + xy: 1230, 146 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture2 rotate: false - xy: 1298, 184 + xy: 1264, 186 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1264, 116 + xy: 1298, 184 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 1298, 117 + xy: 1162, 89 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Fallout rotate: false - xy: 1264, 86 + xy: 1196, 96 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1298, 87 + xy: 1230, 116 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 1060, 34 + xy: 1264, 121 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1094, 46 + xy: 1298, 149 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1128, 57 + xy: 1298, 114 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 1162, 59 + xy: 1026, 36 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1196, 63 + xy: 1060, 48 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 1230, 66 + xy: 1094, 62 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1026, 22 + xy: 1128, 68 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 1264, 56 + xy: 1162, 59 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1298, 57 + xy: 1196, 66 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1060, 2 + xy: 1264, 89 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 1094, 14 + xy: 1298, 82 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 1128, 25 + xy: 1230, 54 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 1162, 27 + xy: 1264, 57 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 1196, 31 + xy: 1298, 50 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 1264, 24 + xy: 1196, 34 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1784, 342 + xy: 1886, 284 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Camp rotate: false - xy: 1818, 342 + xy: 1920, 269 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 1852, 358 + xy: 1954, 328 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Fallout rotate: false - xy: 1852, 328 + xy: 1954, 298 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 1886, 340 + xy: 1954, 264 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1698, 306 + xy: 1988, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1698, 272 + xy: 1988, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 1732, 310 + xy: 1988, 251 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1534, 246 + xy: 1128, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3652,98 +3659,98 @@ TileSets/FantasyHex/Units/Companion Cavalry index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1534, 276 + xy: 1836, 432 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1836, 430 + xy: 1870, 430 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1870, 430 + xy: 1904, 430 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 1904, 432 + xy: 1938, 432 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 1836, 400 + xy: 1870, 400 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 1904, 404 + xy: 1938, 404 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 1938, 395 + xy: 1972, 395 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 1972, 402 + xy: 1938, 376 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 1904, 374 + xy: 1972, 365 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1904, 374 + xy: 1972, 365 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1716, 370 + xy: 1750, 336 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1750, 372 + xy: 1784, 336 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1750, 372 + xy: 1784, 336 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1784, 372 + xy: 1818, 341 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3785,343 +3792,343 @@ TileSets/FantasyHex/Units/Infantry index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1026, 82 + xy: 1060, 210 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1162, 244 + xy: 1026, 163 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1060, 129 + xy: 1128, 244 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1094, 178 + xy: 1060, 182 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1128, 210 + xy: 1094, 210 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1026, 52 + xy: 1026, 133 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1196, 246 + xy: 1162, 246 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1162, 216 + xy: 1128, 216 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1060, 99 + xy: 1060, 152 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1128, 180 + xy: 1026, 103 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1196, 216 + xy: 1162, 216 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1196, 216 + xy: 1162, 216 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1162, 186 + xy: 1128, 186 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1060, 69 + xy: 1060, 122 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1094, 118 + xy: 1094, 150 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1128, 150 + xy: 1026, 73 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1264, 244 + xy: 1230, 244 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1230, 216 + xy: 1196, 216 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1162, 156 + xy: 1128, 156 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1196, 186 + xy: 1162, 186 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1128, 122 + xy: 1094, 122 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1162, 126 + xy: 1128, 126 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1230, 186 + xy: 1196, 186 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1128, 92 + xy: 1094, 92 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1162, 96 + xy: 1298, 244 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1196, 128 + xy: 1128, 98 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1230, 156 + xy: 1162, 126 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1196, 100 + xy: 1264, 216 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1230, 126 + xy: 1196, 126 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1298, 154 + xy: 1298, 214 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1230, 96 + xy: 1264, 156 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1230, 36 + xy: 1230, 86 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1298, 27 + xy: 1230, 24 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1230, 6 + xy: 1264, 27 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1196, 3 + xy: 1298, 22 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 2006, 355 + xy: 1022, 8 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1972, 342 + xy: 1920, 299 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 2006, 325 + xy: 1128, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1818, 372 + xy: 1162, 31 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1432, 244 + xy: 1094, 32 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1466, 244 + xy: 1060, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1500, 244 + xy: 1094, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1716, 340 + xy: 1818, 311 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1750, 344 + xy: 1852, 304 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1732, 282 + xy: 1162, 3 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1886, 310 + xy: 1196, 4 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1664, 254 + xy: 1432, 246 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1698, 244 + xy: 1466, 246 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1732, 254 + xy: 1500, 246 size: 32, 26 orig: 32, 26 offset: 0, 0 diff --git a/android/assets/game2.png b/android/assets/game2.png index bcbf338376..4ab23a1329 100644 Binary files a/android/assets/game2.png and b/android/assets/game2.png differ diff --git a/desktop/build.gradle b/desktop/build.gradle index 6d05b6ebbf..067428d925 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -56,13 +56,8 @@ for(platform in PackrConfig.Platform.values()) { config.removePlatformLibs = config.classpath config.mainClass = project.ext.mainClassName config.vmArgs = Arrays.asList("Xmx1G") - // configuration comprised from 3 sources: - // https://github.com/libgdx/packr/blob/master/src/main/resources/minimize/hard - // https://github.com/libgdx/packr/blob/master/src/main/resources/minimize/oraclejre8 - // And Mindustry, - // and added a few touches of my own. - // Down from ~80MB to ~50MB! - config.minimizeJre = "desktop/packrConfig.json" +// config.minimizeJre = "desktop/packrConfig.json" + config.minimizeJre = "soft" config.outDir = file("packr") config.cacheJre=file("packrCache") diff --git a/desktop/packrConfig.json b/desktop/packrConfig.json index af64ae2f1b..0b9c78dc57 100644 --- a/desktop/packrConfig.json +++ b/desktop/packrConfig.json @@ -37,117 +37,15 @@ { "platform": "*", "paths": [ - "jre/lib/rhino.jar", - - - - "jre/lib/ext", - "jre/bin/rmid", - "jre/bin/rmiregistry", - "jre/bin/tnameserv", - "jre/bin/keytool", - "jre/bin/policytool", - "jre/bin/orbd", - "jre/bin/servertool", - "jre/bin/javaws", - "jre/lib/javaws.jar", - "jre/lib/jfr.jar", - "jre/lib/oblique-fonts", - "jre/lib/desktop", - "jre/plugin", - - - "jre/THIRDPARTYLICENSEREADME-JAVAFX.txt", - "jre/lib/ant-javafx.jar", - "jre/lib/javafx.properties", - "jre/lib/jfxswt.jar", - - - "jre/lib/fonts", - "jre/lib/amd64/libjfxwebkit.so" - ] - }, - { - "platform": "linux", - "paths": [ - "jre/lib/amd64/libawt.so", - "jre/lib/amd64/libawt_xawt.so", - "jre/lib/amd64/libjawt.so", - "jre/lib/amd64/libhprof.so", - "jre/lib/amd64/libdt_socket.so", - "jre/lib/amd64/libsplashscreen.so", - "jre/lib/amd64/libunpack.so", - "jre/lib/amd64/liblcms.so", - "jre/lib/amd64/libnpt.so", - "jre/lib/amd64/libmlib_image.so", - "jre/lib/amd64/libjsig.so", - "jre/lib/amd64/libinstrument.so", - "jre/lib/amd64/libjaas_unix.so", - "jre/lib/amd64/libj2pcsc.so", - "jre/lib/amd64/libsaproc.so", - "jre/lib/amd64/libsunec.so", - "jre/lib/amd64/libj2pkcs11.so", - "jre/lib/amd64/libjsdt.so", - "jre/lib/amd64/libjdwp.so", - "jre/lib/amd64/libjava_crw_demo.so", - "jre/lib/amd64/libfreetype.so", - "jre/lib/amd64/libmanagement.so", - "jre/lib/amd64/libsctp.so", - "jre/lib/amd64/libj2gss.so", - "jre/lib/amd64/libjpeg.so", - "jre/lib/amd64/libfreetype.so.6", - "jre/lib/amd64/libjsoundalsa.so", - "jre/lib/amd64/libjsound.so", - "jre/lib/amd64/libattach.so", - "jre/lib/amd64/libawt_headless.so", - "jre/lib/amd64/libfontmanager.so" + "jre/lib/rhino.jar" + "jre/lib/amd64/libjfxwebkit.so" ] }, { "platform": "windows", "paths": [ "jre/bin/*.exe", - "jre/bin/client", - "jre/bin/awt.dll", - - - "jre/bin/jfr.dll", - - "jre/bin/java.exe", - "jre/bin/javaw.exe", - "jre/bin/javacpl.exe", - "jre/bin/jucheck.exe", - "jre/bin/dtplugin", - "jre/bin/jabswitch.exe", - "jre/bin/java_crw_demo.dll", - "jre/bin/JavaAccessBridge-32.dll", - "jre/bin/JavaAccessBridge.dll", - "jre/bin/JAWTAccessBridge-32.dll", - "jre/bin/JAWTAccessBridge.dll", - "jre/bin/WindowsAccessBridge-32.dll", - "jre/bin/WindowsAccessBridge.dll", - "jre/bin/wsdetect.dll", - "jre/bin/plugin2", - "jre/bin/deploy.dll", - "jre/bin/javacpl.cpl", - "jre/lib/deploy.jar", - "jre/lib/plugin.jar", - "jre/lib/deploy", - - "jre/bin/decora-sse.dll", - "jre/bin/fxplugins.dll", - "jre/bin/glass.dll", - "jre/bin/glib-lite.dll", - "jre/bin/gstreamer-lite.dll", - "jre/bin/javafx-font.dll", - "jre/bin/javafx_font_t2k.dll", - "jre/bin/javafx-iio.dll", - "jre/bin/jfxmedia.dll", - "jre/bin/jfxwebkit.dll", - "jre/bin/prism_common.dll", - "jre/bin/prism-d3d.dll", - "jre/bin/prism_es2.dll", - "jre/bin/prism_sw.dll" + "jre/bin/client" ] } ]