diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index ae5c163889..dd4fe7f27e 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="19" + android:versionName="3.03b" > diff --git a/core/assets-raw/sprites/backgrounds/background.png b/core/assets-raw/sprites/backgrounds/background.png index 48e629dde8..8b42400042 100644 Binary files a/core/assets-raw/sprites/backgrounds/background.png and b/core/assets-raw/sprites/backgrounds/background.png differ diff --git a/core/assets-raw/sprites/blocks/dirtblock.png b/core/assets-raw/sprites/blocks/dirtblock.png deleted file mode 100644 index 86e5ac689c..0000000000 Binary files a/core/assets-raw/sprites/blocks/dirtblock.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/grassblock-edge-0.png b/core/assets-raw/sprites/blocks/grassblock-edge-0.png deleted file mode 100644 index 637f3bbab0..0000000000 Binary files a/core/assets-raw/sprites/blocks/grassblock-edge-0.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/grassblock-edge-1.png b/core/assets-raw/sprites/blocks/grassblock-edge-1.png deleted file mode 100644 index f5b8c5f503..0000000000 Binary files a/core/assets-raw/sprites/blocks/grassblock-edge-1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/grassblock-edge-2.png b/core/assets-raw/sprites/blocks/grassblock-edge-2.png deleted file mode 100644 index 88860d981f..0000000000 Binary files a/core/assets-raw/sprites/blocks/grassblock-edge-2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/grassblock-edge-3.png b/core/assets-raw/sprites/blocks/grassblock-edge-3.png deleted file mode 100644 index b087d0c2f2..0000000000 Binary files a/core/assets-raw/sprites/blocks/grassblock-edge-3.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/stone.png b/core/assets-raw/sprites/blocks/stone.png deleted file mode 100644 index 68fd5ac409..0000000000 Binary files a/core/assets-raw/sprites/blocks/stone.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/stoneblock-edge-0.png b/core/assets-raw/sprites/blocks/stoneblock-edge-0.png deleted file mode 100644 index 6a3a9bb5fc..0000000000 Binary files a/core/assets-raw/sprites/blocks/stoneblock-edge-0.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/stoneblock-edge-1.png b/core/assets-raw/sprites/blocks/stoneblock-edge-1.png deleted file mode 100644 index ac7dc1b2bc..0000000000 Binary files a/core/assets-raw/sprites/blocks/stoneblock-edge-1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/stoneblock-edge-2.png b/core/assets-raw/sprites/blocks/stoneblock-edge-2.png deleted file mode 100644 index f04fc23d9c..0000000000 Binary files a/core/assets-raw/sprites/blocks/stoneblock-edge-2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/stoneblock-edge-3.png b/core/assets-raw/sprites/blocks/stoneblock-edge-3.png deleted file mode 100644 index 4ab05cd11e..0000000000 Binary files a/core/assets-raw/sprites/blocks/stoneblock-edge-3.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/stoneblock-smooth1.png b/core/assets-raw/sprites/blocks/stoneblock-smooth1.png deleted file mode 100644 index 181d85bcd0..0000000000 Binary files a/core/assets-raw/sprites/blocks/stoneblock-smooth1.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index aa25c19c99..60e59018fb 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -1,1650 +1,1573 @@ sprites.png -size: 512,512 +size: 1024,512 format: RGBA8888 filter: Nearest,Nearest repeat: none backgrounds/background rotate: false - xy: 1, 241 - size: 356, 270 - orig: 356, 270 + xy: 1, 131 + size: 492, 380 + orig: 492, 380 offset: 0, 0 index: -1 blank rotate: false - xy: 355, 218 + xy: 92, 91 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 blocks/blackrock1 rotate: false - xy: 401, 234 + xy: 95, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackrockshadow1 rotate: false - xy: 401, 224 + xy: 105, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone1 rotate: false - xy: 450, 480 + xy: 519, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone2 rotate: false - xy: 348, 231 + xy: 722, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone3 rotate: false - xy: 450, 470 + xy: 732, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock1 rotate: false - xy: 348, 221 + xy: 740, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock2 rotate: false - xy: 461, 325 + xy: 740, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock3 rotate: false - xy: 449, 301 + xy: 224, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneedge rotate: false - xy: 427, 229 + xy: 656, 246 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/block rotate: false - xy: 449, 291 + xy: 244, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/block-2x2 rotate: false - xy: 194, 15 + xy: 169, 90 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/block-3x3 rotate: false - xy: 263, 150 + xy: 224, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/chainturret rotate: false - xy: 228, 128 + xy: 428, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/chainturret-icon rotate: false - xy: 372, 220 + xy: 115, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/coal1 rotate: false - xy: 449, 271 + xy: 264, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 449, 261 + xy: 274, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 449, 251 + xy: 284, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 441, 233 + xy: 294, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 317, 173 + xy: 304, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator-top rotate: false - xy: 315, 163 + xy: 314, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 315, 153 + xy: 324, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 488, 459 + xy: 334, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 498, 459 + xy: 344, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 484, 449 + xy: 354, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 484, 439 + xy: 364, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 494, 449 + xy: 374, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 484, 429 + xy: 384, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 494, 439 + xy: 394, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 494, 429 + xy: 684, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyortunnel rotate: false - xy: 484, 419 + xy: 694, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/core rotate: false - xy: 413, 361 + xy: 276, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/cross rotate: false - xy: 494, 419 + xy: 704, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 480, 409 + xy: 169, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 480, 399 + xy: 179, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 490, 409 + xy: 165, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 490, 399 + xy: 175, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 476, 385 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/dirtblock - rotate: false - xy: 486, 389 + xy: 171, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtedge rotate: false - xy: 460, 465 + xy: 670, 246 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/door rotate: false - xy: 461, 305 + xy: 171, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/door-large rotate: false - xy: 228, 110 + xy: 747, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/door-large-icon rotate: false - xy: 459, 295 + xy: 171, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/door-large-open rotate: false - xy: 246, 128 + xy: 446, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/door-open rotate: false - xy: 459, 285 + xy: 174, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/doubleturret rotate: false - xy: 384, 216 + xy: 583, 215 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/duriumwall rotate: false - xy: 459, 275 + xy: 514, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/duriumwall-large rotate: false - xy: 246, 110 + xy: 464, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/duriumwall-large-icon rotate: false - xy: 459, 265 + xy: 733, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/flameturret rotate: false - xy: 452, 383 + xy: 514, 124 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/fluxpump rotate: false - xy: 441, 223 + xy: 416, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 500, 409 + xy: 428, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 500, 399 + xy: 438, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 496, 389 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/grassblock-edge-0 - rotate: false - xy: 476, 375 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/grassblock-edge-1 - rotate: false - xy: 475, 365 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/grassblock-edge-2 - rotate: false - xy: 475, 355 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/grassblock-edge-3 - rotate: false - xy: 475, 345 + xy: 448, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock1 rotate: false - xy: 486, 379 + xy: 458, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 496, 379 + xy: 468, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 456, 437 + xy: 157, 40 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/ice1 rotate: false - xy: 473, 335 + xy: 684, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice2 rotate: false - xy: 471, 325 + xy: 694, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice3 rotate: false - xy: 471, 315 + xy: 704, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iceedge rotate: false - xy: 470, 451 + xy: 524, 217 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/icerock1 rotate: false - xy: 471, 305 + xy: 185, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerock2 rotate: false - xy: 469, 295 + xy: 181, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow1 rotate: false - xy: 469, 285 + xy: 181, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow1 rotate: false - xy: 469, 285 + xy: 181, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow2 rotate: false - xy: 469, 275 + xy: 181, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow2 rotate: false - xy: 469, 275 + xy: 181, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 485, 349 + xy: 592, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 495, 359 + xy: 602, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 495, 349 + xy: 612, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 485, 339 + xy: 622, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 495, 339 + xy: 632, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 325, 209 + xy: 642, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 437, 303 + xy: 724, 345 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 325, 199 + xy: 591, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 470, 437 + xy: 538, 217 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/lavasmelter rotate: false - xy: 325, 189 + xy: 601, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 335, 211 + xy: 611, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 345, 211 + xy: 621, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 335, 201 + xy: 631, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 437, 291 + xy: 728, 333 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 437, 279 + xy: 728, 321 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 437, 267 + xy: 728, 309 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 345, 201 + xy: 595, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 345, 201 + xy: 595, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/nuclearreactor rotate: false - xy: 411, 335 + xy: 302, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-center rotate: false - xy: 411, 309 + xy: 328, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-icon rotate: false - xy: 355, 208 + xy: 615, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/nuclearreactor-lights rotate: false - xy: 411, 283 + xy: 354, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-small rotate: false - xy: 230, 92 + xy: 661, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/oil rotate: false - xy: 355, 198 + xy: 625, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 470, 423 + xy: 519, 189 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 355, 188 + xy: 635, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 327, 173 + xy: 645, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 437, 255 + xy: 731, 297 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 325, 163 + xy: 651, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 325, 153 + xy: 655, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 315, 143 + xy: 742, 382 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 325, 143 + xy: 743, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlasercorner rotate: false - xy: 314, 133 + xy: 187, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 314, 123 + xy: 197, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 324, 133 + xy: 207, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 314, 113 + xy: 189, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 324, 123 + xy: 199, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 314, 103 + xy: 195, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 437, 243 + xy: 733, 285 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock1 rotate: false - xy: 314, 93 + xy: 205, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 324, 103 + xy: 201, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 314, 83 + xy: 201, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 324, 93 + xy: 201, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator-top rotate: false - xy: 314, 73 + xy: 204, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand1 rotate: false - xy: 324, 83 + xy: 215, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand2 rotate: false - xy: 314, 63 + xy: 211, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand3 rotate: false - xy: 324, 73 + xy: 211, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock1 rotate: false - xy: 314, 53 + xy: 211, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock2 rotate: false - xy: 324, 63 + xy: 214, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock3 rotate: false - xy: 314, 43 + xy: 221, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandedge rotate: false - xy: 452, 409 + xy: 533, 203 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 451, 347 + xy: 498, 108 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 314, 33 + xy: 221, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 463, 347 + xy: 162, 28 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 324, 33 + xy: 714, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 314, 13 + xy: 714, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 324, 23 + xy: 714, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 449, 335 + xy: 736, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/snow1 rotate: false - xy: 324, 13 + xy: 704, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow2 rotate: false - xy: 314, 3 + xy: 694, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow3 rotate: false - xy: 324, 3 + xy: 714, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock1 rotate: false - xy: 411, 217 + xy: 704, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock2 rotate: false - xy: 408, 207 + xy: 714, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock3 rotate: false - xy: 408, 197 + xy: 498, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowedge rotate: false - xy: 452, 395 + xy: 533, 189 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/sorter rotate: false - xy: 421, 217 + xy: 488, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 431, 219 + xy: 595, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 418, 207 + xy: 605, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 418, 197 + xy: 615, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall-large rotate: false - xy: 230, 74 + xy: 679, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/steelwall-large-icon rotate: false - xy: 441, 213 + xy: 625, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -blocks/stone - rotate: false - xy: 466, 409 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 blocks/stone1 rotate: false - xy: 431, 209 + xy: 635, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 428, 199 + xy: 645, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 441, 203 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/stoneblock-edge-0 - rotate: false - xy: 481, 315 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/stoneblock-edge-1 - rotate: false - xy: 481, 305 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/stoneblock-edge-2 - rotate: false - xy: 479, 295 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/stoneblock-edge-3 - rotate: false - xy: 479, 285 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/stoneblock-smooth1 - rotate: false - xy: 479, 275 + xy: 655, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock1 rotate: false - xy: 365, 198 + xy: 748, 372 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 365, 188 + xy: 748, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 481, 325 + xy: 748, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 479, 265 + xy: 498, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneedge rotate: false - xy: 466, 395 + xy: 555, 213 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stoneformer rotate: false - xy: 479, 255 + xy: 781, 446 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 479, 245 + xy: 781, 436 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 491, 329 + xy: 791, 446 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 491, 319 + xy: 791, 436 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 491, 309 + xy: 801, 446 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titancannon rotate: false - xy: 411, 257 + xy: 380, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/titancannon-icon rotate: false - xy: 449, 323 + xy: 736, 357 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 501, 329 + xy: 801, 436 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 501, 319 + xy: 781, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 501, 309 + xy: 791, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 491, 299 + xy: 801, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 501, 299 + xy: 521, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 489, 289 + xy: 521, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 489, 279 + xy: 531, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall-large rotate: false - xy: 264, 114 + xy: 147, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 499, 289 + xy: 521, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 461, 335 + xy: 736, 345 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 489, 259 + xy: 521, 137 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 499, 269 + xy: 531, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 489, 249 + xy: 541, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 499, 259 + xy: 531, 137 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 499, 249 + xy: 541, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/wateredge rotate: false - xy: 358, 218 + xy: 569, 213 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/waveturret rotate: false - xy: 449, 311 + xy: 740, 333 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 449, 281 + xy: 254, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 206, 1 + xy: 69, 1 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 circle rotate: false - xy: 212, 14 + xy: 95, 11 size: 17, 17 orig: 17, 17 offset: 0, 0 index: -1 circle2 rotate: false - xy: 1, 38 + xy: 495, 310 size: 201, 201 orig: 201, 201 offset: 0, 0 index: -1 enemies/blastenemy-t1 rotate: false - xy: 282, 134 + xy: 881, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t2 rotate: false - xy: 282, 118 + xy: 897, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 298, 134 + xy: 913, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t1 rotate: false - xy: 298, 118 + xy: 929, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t2 rotate: false - xy: 385, 228 + xy: 945, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t3 rotate: false - xy: 266, 98 + xy: 961, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t1 rotate: false - xy: 282, 102 + xy: 977, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 282, 102 + xy: 977, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t2 rotate: false - xy: 474, 465 + xy: 688, 261 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/enemy-t3 rotate: false - xy: 456, 451 + xy: 157, 54 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/fastenemy-t1 rotate: false - xy: 266, 82 + xy: 993, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t2 rotate: false - xy: 282, 86 + xy: 1009, 497 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t3 rotate: false - xy: 298, 102 + xy: 765, 432 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t1 rotate: false - xy: 298, 86 + xy: 482, 115 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t2 rotate: false - xy: 234, 58 + xy: 715, 293 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t3 rotate: false - xy: 234, 42 + xy: 114, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fortressenemy-t1 rotate: false - xy: 491, 491 + xy: 125, 72 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 enemies/fortressenemy-t2 rotate: false - xy: 491, 469 + xy: 147, 86 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 enemies/fortressenemy-t3 rotate: false - xy: 306, 219 + xy: 406, 109 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 enemies/healerenemy-t1 rotate: false - xy: 250, 58 + xy: 498, 120 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t2 rotate: false - xy: 266, 66 + xy: 141, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t3 rotate: false - xy: 282, 70 + xy: 141, 36 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 231, 10 + xy: 608, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 247, 10 + xy: 608, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 266, 18 + xy: 624, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 282, 22 + xy: 624, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 298, 22 + xy: 640, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 266, 2 + xy: 640, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 282, 6 + xy: 693, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 298, 6 + xy: 656, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 411, 227 + xy: 672, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/titanenemy-t1 rotate: false - xy: 248, 92 + xy: 697, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t2 rotate: false - xy: 248, 74 + xy: 555, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t3 rotate: false - xy: 264, 132 + xy: 573, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 228, 1 + xy: 79, 1 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 469, 265 + xy: 184, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 469, 255 + xy: 478, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 459, 245 + xy: 488, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 469, 245 + xy: 191, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 486, 369 + xy: 191, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 496, 369 + xy: 191, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 485, 359 + xy: 194, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser rotate: false - xy: 263, 12 + xy: 552, 217 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laserend rotate: false - xy: 328, 221 + xy: 727, 428 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 mechs/mech-standard rotate: false - xy: 456, 423 + xy: 519, 203 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shell rotate: false - xy: 324, 53 + xy: 221, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 324, 43 + xy: 224, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 314, 23 + xy: 714, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 489, 269 + xy: 531, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ui/border rotate: false - xy: 204, 67 + xy: 727, 448 size: 24, 40 split: 5, 5, 5, 10 orig: 24, 40 @@ -1652,7 +1575,7 @@ ui/border index: -1 ui/button rotate: false - xy: 359, 232 + xy: 753, 448 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -1660,7 +1583,7 @@ ui/button index: -1 ui/button-down rotate: false - xy: 359, 316 + xy: 43, 43 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -1668,7 +1591,7 @@ ui/button-down index: -1 ui/button-over rotate: false - xy: 359, 316 + xy: 43, 43 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -1676,7 +1599,7 @@ ui/button-over index: -1 ui/button-map rotate: false - xy: 430, 425 + xy: 566, 245 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -1684,7 +1607,7 @@ ui/button-map index: -1 ui/button-map-down rotate: false - xy: 359, 274 + xy: 43, 1 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -1692,7 +1615,7 @@ ui/button-map-down index: -1 ui/button-map-over rotate: false - xy: 359, 274 + xy: 43, 1 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -1700,7 +1623,7 @@ ui/button-map-over index: -1 ui/button-select rotate: false - xy: 289, 150 + xy: 250, 105 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -1708,252 +1631,252 @@ ui/button-select index: -1 ui/check-off rotate: false - xy: 204, 33 + xy: 698, 309 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/check-on rotate: false - xy: 461, 479 + xy: 779, 456 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/check-over rotate: false - xy: 388, 391 + xy: 95, 60 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/clear rotate: false - xy: 216, 2 + xy: 529, 177 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/cursor rotate: false - xy: 325, 183 + xy: 89, 4 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 ui/icon-arrow-left rotate: false - xy: 464, 383 + xy: 702, 263 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-arrow-right rotate: false - xy: 372, 208 + xy: 130, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cancel rotate: false - xy: 250, 42 + xy: 130, 20 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-check rotate: false - xy: 266, 50 + xy: 146, 20 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-close rotate: false - xy: 233, 176 + xy: 1, 43 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 ui/icon-close-down rotate: false - xy: 388, 425 + xy: 1, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 ui/icon-close-over rotate: false - xy: 275, 176 + xy: 524, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 ui/icon-crafting rotate: false - xy: 384, 204 + xy: 142, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cursor rotate: false - xy: 396, 212 + xy: 154, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-defense rotate: false - xy: 396, 200 + xy: 541, 177 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-distribution rotate: false - xy: 439, 375 + xy: 709, 279 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-info rotate: false - xy: 439, 363 + xy: 721, 281 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-load rotate: false - xy: 282, 54 + xy: 597, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-menu rotate: false - xy: 451, 371 + xy: 722, 415 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-pause rotate: false - xy: 463, 371 + xy: 722, 403 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play rotate: false - xy: 451, 359 + xy: 722, 391 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play-2 rotate: false - xy: 298, 70 + xy: 613, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-power rotate: false - xy: 463, 359 + xy: 734, 416 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-production rotate: false - xy: 439, 351 + xy: 734, 404 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-quit rotate: false - xy: 298, 54 + xy: 629, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate rotate: false - xy: 234, 26 + xy: 645, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate-arrow rotate: false - xy: 250, 26 + xy: 661, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-save rotate: false - xy: 266, 34 + xy: 677, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-settings rotate: false - xy: 437, 339 + xy: 734, 392 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-tools rotate: false - xy: 282, 38 + xy: 592, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-touch rotate: false - xy: 437, 327 + xy: 724, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-tutorial rotate: false - xy: 298, 38 + xy: 592, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-weapon rotate: false - xy: 437, 315 + xy: 724, 357 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/logotext rotate: false - xy: 359, 467 + xy: 1, 85 size: 89, 21 orig: 89, 21 offset: 0, 0 index: -1 ui/logotext-gray rotate: false - xy: 103, 15 + xy: 103, 108 size: 89, 21 orig: 89, 21 offset: 0, 0 index: -1 ui/pane rotate: false - xy: 385, 281 + xy: 69, 47 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -1961,7 +1884,7 @@ ui/pane index: -1 ui/pane-button rotate: false - xy: 418, 387 + xy: 698, 343 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -1969,7 +1892,7 @@ ui/pane-button index: -1 ui/scroll rotate: false - xy: 385, 244 + xy: 69, 10 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -1977,7 +1900,7 @@ ui/scroll index: -1 ui/scroll-horizontal rotate: false - xy: 444, 389 + xy: 125, 36 size: 6, 34 split: 2, 2, 0, 34 pad: 0, 5, 5, 4 @@ -1986,7 +1909,7 @@ ui/scroll-horizontal index: -1 ui/scroll-knob-horizontal rotate: false - xy: 317, 183 + xy: 133, 36 size: 6, 34 split: 2, 2, 0, 34 pad: 0, 5, 13, 12 @@ -1995,7 +1918,7 @@ ui/scroll-knob-horizontal index: -1 ui/scroll-knob-vertical rotate: false - xy: 385, 319 + xy: 495, 136 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2003,112 +1926,112 @@ ui/scroll-knob-vertical index: -1 ui/selection rotate: false - xy: 231, 30 + xy: 495, 133 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/separator rotate: false - xy: 228, 11 + xy: 89, 1 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/slider rotate: false - xy: 488, 469 + xy: 127, 4 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 ui/slider-knob rotate: false - xy: 204, 109 + xy: 495, 178 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 ui/slider-knob-down rotate: false - xy: 359, 358 + xy: 698, 381 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 ui/slider-knob-over rotate: false - xy: 359, 358 + xy: 698, 381 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 ui/slider-vertical rotate: false - xy: 450, 467 + xy: 127, 1 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 ui/text-exit rotate: false - xy: 411, 243 + xy: 855, 499 size: 24, 12 orig: 24, 12 offset: 0, 0 index: -1 ui/text-load rotate: false - xy: 1, 1 + xy: 597, 296 size: 62, 12 orig: 62, 12 offset: 0, 0 index: -1 ui/text-play rotate: false - xy: 175, 1 + xy: 524, 231 size: 29, 12 orig: 29, 12 offset: 0, 0 index: -1 ui/text-settings rotate: false - xy: 65, 1 + xy: 800, 499 size: 53, 12 orig: 53, 12 offset: 0, 0 index: -1 ui/text-sides rotate: false - xy: 359, 490 + xy: 1, 108 size: 100, 21 orig: 100, 21 offset: 0, 0 index: -1 ui/text-sides-down rotate: false - xy: 1, 15 + xy: 495, 287 size: 100, 21 orig: 100, 21 offset: 0, 0 index: -1 ui/text-sides-over rotate: false - xy: 204, 218 + xy: 698, 490 size: 100, 21 orig: 100, 21 offset: 0, 0 index: -1 ui/text-tutorial rotate: false - xy: 120, 1 + xy: 92, 94 size: 53, 12 orig: 53, 12 offset: 0, 0 index: -1 ui/textfield rotate: false - xy: 233, 146 + xy: 194, 101 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -2116,7 +2039,7 @@ ui/textfield index: -1 ui/textfield-over rotate: false - xy: 383, 361 + xy: 95, 30 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -2124,14 +2047,14 @@ ui/textfield-over index: -1 ui/white rotate: false - xy: 383, 399 + xy: 125, 31 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 ui/window rotate: false - xy: 359, 404 + xy: 698, 427 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -2139,7 +2062,7 @@ ui/window index: -1 ui/window-empty rotate: false - xy: 204, 155 + xy: 495, 224 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -2147,42 +2070,42 @@ ui/window-empty index: -1 weapons/blaster rotate: false - xy: 461, 315 + xy: 234, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/flamer rotate: false - xy: 459, 255 + xy: 406, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 335, 191 + xy: 641, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 345, 191 + xy: 605, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 324, 113 + xy: 209, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 499, 279 + xy: 541, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index acee2ab45b..5057744022 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index b452f33964..22c22dfdce 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -100,8 +100,7 @@ public class Control extends Module{ "left", Keys.A, "down", Keys.S, "right", Keys.D, - "rotate", Keys.R, - "rotate_back", Keys.E, + "zoom_hold", Keys.CONTROL_LEFT, "menu", Gdx.app.getType() == ApplicationType.Android ? Keys.BACK : Keys.ESCAPE, "pause", Keys.SPACE ); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 1f972e6c46..cccd55a5a3 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -38,7 +38,7 @@ import io.anuke.ucore.util.*; public class Renderer extends RendererModule{ String[] surfaces = { "shadow", "shield", "pixel", "indicators" }; int targetscale = baseCameraScale; - int chunksize = 16; + int chunksize = 32; int[][][] cache; FloatArray shieldHits = new FloatArray(); float shieldHitDuration = 18f; diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index cc9151c122..38a4df9b3c 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -112,8 +112,9 @@ public class UI extends SceneModule{ Draw.color(); TextureRegion back = Draw.region("background"); - float backscl = 5.5f; + float backscl = 4f; + Draw.alpha(0.8f); Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2, h/2 - back.getRegionHeight()*backscl/2, back.getRegionWidth()*backscl, back.getRegionHeight()*backscl); @@ -122,10 +123,9 @@ public class UI extends SceneModule{ float logow = logo.getRegionWidth()*logoscl; float logoh = logo.getRegionHeight()*logoscl; - Draw.color(); - Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh); Draw.color(); + Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh); } diff --git a/core/src/io/anuke/mindustry/input/Input.java b/core/src/io/anuke/mindustry/input/Input.java index 0479e879bb..5f6ae171ac 100644 --- a/core/src/io/anuke/mindustry/input/Input.java +++ b/core/src/io/anuke/mindustry/input/Input.java @@ -25,20 +25,15 @@ public class Input{ //player is dead if(player.health <= 0) return; - if(Inputs.scrolled() && !GameState.is(State.menu) && !Vars.ui.onDialog()){ + if(Inputs.scrolled() && Inputs.keyDown("zoom_hold") && !GameState.is(State.menu) && !Vars.ui.onDialog()){ Vars.renderer.scaleCamera(Inputs.scroll()); } - - if(Inputs.keyUp("rotate")) - player.rotation ++; - if(Inputs.keyUp("rotate_back")) - player.rotation --; - - if(player.rotation < 0) - player.rotation += 4; + if(Inputs.scrolled()){ + player.rotation += Inputs.scroll(); + } - player.rotation %= 4; + player.rotation = Mathf.mod(player.rotation, 4); for(int i = 0; i < 9; i ++){ if(Inputs.keyUp(Keys.valueOf(""+(i+1))) && i < control.getWeapons().size){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index f8db0692d7..8069e63101 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -41,7 +41,7 @@ public class BlocksFragment implements Fragment{ row(); new table("pane"){{ - + get().setTouchable(Touchable.enabled); int rows = 4; int maxcol = 0; float size = 48; @@ -139,6 +139,7 @@ public class BlocksFragment implements Fragment{ void updateRecipe(){ Recipe recipe = player.recipe; desctable.clear(); + desctable.setTouchable(Touchable.enabled); desctable.defaults().left(); desctable.left(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index d80c08810c..fd2522d2ce 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -66,12 +66,14 @@ public class HudFragment implements Fragment{ row(); new table(){{ + get().setTouchable(Touchable.enabled); addWaveTable(); }}.fillX().end(); row(); itemtable = new table("button").end().top().left().fillX().size(-1).get(); + itemtable.setTouchable(Touchable.enabled); itemtable.setVisible(()-> control.getMode() != GameMode.sandbox); itemcell = get().getCell(itemtable); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 9d30a0ce45..19900479a5 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -11,6 +11,7 @@ import io.anuke.mindustry.input.PlaceMode; import io.anuke.ucore.scene.builders.imagebutton; import io.anuke.ucore.scene.builders.label; import io.anuke.ucore.scene.builders.table; +import io.anuke.ucore.scene.event.Touchable; import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Unit; @@ -27,6 +28,7 @@ public class PlacementFragment implements Fragment{ new table("pane"){{ + get().setTouchable(Touchable.enabled); new label(()->"Placement Mode: [orange]" + AndroidInput.mode.name()).pad(4).units(Unit.dp); row();