diff --git a/android/Images/TileSets/FantasyHex/Tiles/Grand Mesa.png b/android/Images/TileSets/FantasyHex/Tiles/Grand Mesa.png new file mode 100644 index 0000000000..0feb1b1212 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Grand Mesa.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 6181b2ef64..3822ec5411 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -2574,7 +2574,7 @@ OtherIcons/TableBackground index: -1 OtherIcons/whiteDot rotate: false - xy: 852, 19 + xy: 2008, 479 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -3174,83 +3174,90 @@ TileSets/FantasyHex/Tiles/Gold orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland +TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 1828, 296 - size: 32, 28 - orig: 32, 28 + xy: 1828, 292 + size: 32, 32 + orig: 32, 32 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Fallout +TileSets/FantasyHex/Tiles/Grassland rotate: false xy: 1862, 291 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Farm +TileSets/FantasyHex/Tiles/Grassland+Fallout rotate: false xy: 1896, 296 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest +TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 1930, 295 - size: 32, 31 - orig: 32, 31 + xy: 1930, 298 + size: 32, 28 + orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Aluminum +TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false xy: 1964, 293 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Camp +TileSets/FantasyHex/Tiles/Grassland+Forest+Aluminum rotate: false xy: 920, 15 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Coal +TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false xy: 954, 15 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Gold +TileSets/FantasyHex/Tiles/Grassland+Forest+Coal rotate: false xy: 988, 15 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Iron +TileSets/FantasyHex/Tiles/Grassland+Forest+Gold rotate: false xy: 1454, 249 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill +TileSets/FantasyHex/Tiles/Grassland+Forest+Iron rotate: false xy: 1488, 258 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/Grassland+Forest+Silver +TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false xy: 1522, 263 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 +TileSets/FantasyHex/Tiles/Grassland+Forest+Silver + rotate: false + xy: 1556, 263 + size: 32, 31 + orig: 32, 31 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false xy: 546, 2 @@ -3274,385 +3281,385 @@ TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1556, 265 + xy: 1590, 265 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 1590, 266 + xy: 1624, 268 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1658, 268 + xy: 1692, 268 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1862, 257 + xy: 1896, 262 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Camp rotate: false - xy: 1896, 262 + xy: 1930, 264 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Customs house rotate: false - xy: 1930, 261 + xy: 1964, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Fallout rotate: false - xy: 1964, 259 + xy: 1076, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest rotate: false - xy: 1026, 125 + xy: 1110, 175 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp rotate: false - xy: 1026, 78 + xy: 1144, 175 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill rotate: false - xy: 1026, 31 + xy: 1178, 175 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 1076, 188 + xy: 1212, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 1110, 188 + xy: 1246, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Terrace Farm rotate: false - xy: 1144, 188 + xy: 1284, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 1284, 236 + xy: 1420, 231 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1454, 219 + xy: 1590, 235 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1556, 235 + xy: 1692, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1794, 229 + xy: 1930, 227 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1930, 231 + xy: 1246, 158 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1828, 206 + xy: 1488, 200 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1896, 196 + xy: 1556, 195 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1522, 203 + xy: 1726, 208 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1556, 205 + xy: 1760, 205 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1590, 206 + xy: 1794, 206 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1692, 208 + xy: 1896, 204 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture2 rotate: false - xy: 1726, 208 + xy: 1930, 197 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1828, 176 + xy: 1556, 165 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 1862, 160 + xy: 1590, 168 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Fallout rotate: false - xy: 1896, 166 + xy: 1624, 178 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1930, 171 + xy: 1658, 180 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 1964, 164 + xy: 1692, 173 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1998, 321 + xy: 1726, 173 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1998, 286 + xy: 1760, 170 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 1998, 249 + xy: 1794, 169 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1998, 212 + xy: 1828, 167 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 1998, 182 + xy: 1862, 171 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1998, 152 + xy: 1896, 174 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 1930, 141 + xy: 1930, 167 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1964, 134 + xy: 1964, 169 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1998, 120 + xy: 1658, 148 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 1930, 109 + xy: 1692, 141 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 1964, 102 + xy: 1726, 141 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 1998, 88 + xy: 1760, 138 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 2010, 450 + xy: 1794, 137 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 2010, 418 + xy: 1828, 135 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1624, 180 + xy: 1930, 137 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1896, 106 + xy: 1998, 178 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Camp rotate: false - xy: 1760, 149 + xy: 1998, 148 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 1794, 132 + xy: 1998, 111 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Fallout rotate: false - xy: 1828, 116 + xy: 1026, 142 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 1862, 98 + xy: 1026, 108 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1930, 75 + xy: 1026, 74 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1964, 68 + xy: 1026, 40 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 1896, 76 + xy: 1022, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1178, 162 + xy: 1658, 118 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1522, 173 + xy: 1998, 266 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3862,84 +3869,84 @@ TileSets/FantasyHex/Units/Machine Gun index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1624, 268 + xy: 1658, 268 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1692, 268 + xy: 1726, 268 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1692, 268 + xy: 1726, 268 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1726, 268 + xy: 1760, 265 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1760, 265 + xy: 1794, 266 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1760, 265 + xy: 1794, 266 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1794, 266 + xy: 1828, 262 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1828, 266 + xy: 1862, 261 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1828, 266 + xy: 1862, 261 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1178, 192 + xy: 1318, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1212, 192 + xy: 1352, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1246, 192 + xy: 1386, 236 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3953,315 +3960,315 @@ TileSets/FantasyHex/Units/Ironclad index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1318, 238 + xy: 1280, 202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1352, 238 + xy: 1454, 219 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1386, 238 + xy: 1488, 230 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1420, 233 + xy: 1522, 235 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1280, 206 + xy: 1556, 233 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1488, 228 + xy: 1624, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1522, 233 + xy: 1658, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1522, 233 + xy: 1658, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1590, 236 + xy: 1726, 238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1624, 238 + xy: 1760, 235 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1658, 238 + xy: 1794, 236 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1692, 238 + xy: 1828, 232 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1726, 238 + xy: 1862, 231 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1760, 237 + xy: 1896, 234 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1828, 236 + xy: 1964, 229 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1862, 227 + xy: 1280, 172 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1896, 234 + xy: 1212, 160 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1964, 229 + xy: 1280, 142 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1862, 197 + xy: 1522, 205 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1930, 201 + xy: 1590, 205 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1964, 199 + xy: 1624, 208 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1280, 178 + xy: 1658, 210 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1488, 198 + xy: 1692, 208 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1624, 210 + xy: 1828, 204 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1658, 208 + xy: 1862, 201 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1760, 207 + xy: 1964, 199 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1794, 199 + xy: 1522, 175 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1896, 136 + xy: 1624, 148 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 2010, 388 + xy: 1862, 141 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 2010, 358 + xy: 1896, 144 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1022, 3 + xy: 1590, 140 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1658, 180 + xy: 1964, 141 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1692, 178 + xy: 1896, 114 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1726, 178 + xy: 1862, 111 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1760, 179 + xy: 1930, 109 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1794, 169 + xy: 1964, 111 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1590, 176 + xy: 1998, 326 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1556, 175 + xy: 1998, 296 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1828, 146 + xy: 1998, 236 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1862, 132 + xy: 1998, 208 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1998, 60 + xy: 1624, 120 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1212, 162 + xy: 1692, 111 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1246, 164 + xy: 1726, 113 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1280, 150 + xy: 1760, 110 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1246, 136 + xy: 1794, 109 size: 32, 26 orig: 32, 26 offset: 0, 0 diff --git a/android/assets/game2.png b/android/assets/game2.png index ba89ed93ec..799e0999f3 100644 Binary files a/android/assets/game2.png and b/android/assets/game2.png differ diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json index 2b473ba90a..2bc35138f7 100644 --- a/android/assets/jsons/Terrains.json +++ b/android/assets/jsons/Terrains.json @@ -180,7 +180,17 @@ impassable: true, unbuildable: true, weight: 1 - } + }, + { + name: "Grand Mesa", + type: "NaturalWonder", + production: 2, + gold: 3, + occursOn: ["Plains","Desert","Tundra"], + impassable: true, + unbuildable: true, + weight: 10 + }, /** Yukky tile images { name: "Krakatoa", @@ -230,15 +240,5 @@ unbuildable: true, weight: 10 }, - { - name: "Grand Mesa", - type: "NaturalWonder", - production: 2, - gold: 3, - occursOn: ["Plains","Desert","Tundra"], - impassable: true, - unbuildable: true, - weight: 10 - }, */ ] diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index fb108f7d20..cd64926afc 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -17,13 +17,9 @@ import com.unciv.models.ruleset.Ruleset import com.unciv.models.translations.TranslationFileReader import com.unciv.models.translations.Translations import com.unciv.ui.LanguagePickerScreen -import com.unciv.ui.utils.CameraStageBaseScreen -import com.unciv.ui.utils.CrashController -import com.unciv.ui.utils.CrashReportSender -import com.unciv.ui.utils.ImageGetter -import com.unciv.ui.utils.center +import com.unciv.ui.utils.* import com.unciv.ui.worldscreen.WorldScreen -import java.util.UUID +import java.util.* import kotlin.concurrent.thread class UncivGame(