diff --git a/core/assets-raw/sprites/blocks/production/oilextractor-liquid.png b/core/assets-raw/sprites/blocks/production/oilextractor-liquid.png index f66c06517a..5e3f1cea3a 100644 Binary files a/core/assets-raw/sprites/blocks/production/oilextractor-liquid.png and b/core/assets-raw/sprites/blocks/production/oilextractor-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/oilextractor-rotator.png b/core/assets-raw/sprites/blocks/production/oilextractor-rotator.png new file mode 100644 index 0000000000..118a8595ba Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oilextractor-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/production/oilextractor-top.png b/core/assets-raw/sprites/blocks/production/oilextractor-top.png new file mode 100644 index 0000000000..8f5e693961 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oilextractor-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/oilextractor.png b/core/assets-raw/sprites/blocks/production/oilextractor.png index 48af0dd82a..7a73cd3611 100644 Binary files a/core/assets-raw/sprites/blocks/production/oilextractor.png and b/core/assets-raw/sprites/blocks/production/oilextractor.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 6453a29324..2d0618c06d 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,42 +13,42 @@ background index: -1 conduit-bottom rotate: false - xy: 459, 160 + xy: 274, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 632, 296 + xy: 274, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 626, 286 + xy: 284, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 626, 276 + xy: 284, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 626, 266 + xy: 294, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 626, 256 + xy: 294, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,42 +62,42 @@ core index: -1 junction rotate: false - xy: 800, 399 + xy: 487, 142 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 810, 379 + xy: 622, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 820, 389 + xy: 636, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 830, 399 + xy: 636, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 820, 379 + xy: 636, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 830, 389 + xy: 636, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -125,686 +125,686 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 716, 404 + xy: 572, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 860, 399 + xy: 646, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 850, 379 + xy: 642, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 870, 387 + xy: 656, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 870, 377 + xy: 652, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 945, 455 + xy: 694, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 211, 20 + xy: 375, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 221, 30 + xy: 385, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 221, 20 + xy: 395, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 183, 8 + xy: 405, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 193, 10 + xy: 415, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 251, 139 + xy: 303, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 810, 369 + xy: 374, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 303, 143 + xy: 355, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 830, 369 + xy: 374, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 853, 409 + xy: 921, 461 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 281, 113 + xy: 223, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 291, 113 + xy: 233, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 582, 244 + xy: 243, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 579, 234 + xy: 253, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 592, 246 + xy: 263, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 602, 246 + xy: 273, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 612, 246 + xy: 283, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 674, 363 + xy: 293, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 871, 439 + xy: 121, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 679, 343 + xy: 244, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 679, 333 + xy: 254, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 669, 321 + xy: 244, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 636, 286 + xy: 674, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 636, 276 + xy: 684, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 636, 266 + xy: 582, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 636, 256 + xy: 579, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 121, 1 + xy: 135, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 642, 246 + xy: 897, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 656, 286 + xy: 907, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 656, 276 + xy: 917, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 656, 266 + xy: 927, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 656, 256 + xy: 421, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 149, 1 + xy: 871, 439 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 652, 246 + xy: 937, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 689, 353 + xy: 947, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 689, 343 + xy: 957, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 417, 121 + xy: 933, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 689, 333 + xy: 967, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 689, 323 + xy: 977, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 694, 363 + xy: 987, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 694, 363 + xy: 987, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 662, 299 + xy: 427, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 662, 299 + xy: 427, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 699, 353 + xy: 437, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 699, 343 + xy: 447, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 699, 333 + xy: 457, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 790, 379 + xy: 622, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 321, 105 + xy: 947, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 810, 399 + xy: 626, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 800, 379 + xy: 626, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 810, 389 + xy: 626, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 830, 379 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 840, 389 + xy: 652, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 335, 105 + xy: 935, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 880, 377 + xy: 689, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 945, 465 + xy: 689, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 955, 455 + xy: 699, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 965, 465 + xy: 699, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 955, 445 + xy: 699, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 965, 455 + xy: 750, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 975, 465 + xy: 750, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 965, 445 + xy: 760, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 349, 105 + xy: 961, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 161, 18 + xy: 840, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 171, 28 + xy: 850, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 181, 28 + xy: 305, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 181, 18 + xy: 315, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 191, 30 + xy: 325, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 191, 20 + xy: 335, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 201, 30 + xy: 345, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 201, 20 + xy: 355, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 405, 105 + xy: 949, 417 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 213, 10 + xy: 435, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 223, 10 + xy: 445, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 589, 234 + xy: 455, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 599, 236 + xy: 465, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 609, 236 + xy: 304, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 619, 236 + xy: 304, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 154, 62 + xy: 1003, 446 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 672, 301 + xy: 314, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 677, 311 + xy: 324, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 687, 313 + xy: 334, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 682, 301 + xy: 334, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 692, 303 + xy: 344, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 702, 303 + xy: 334, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 860, 369 + xy: 384, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 168, 62 + xy: 963, 417 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 669, 351 + xy: 224, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 669, 351 + xy: 224, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 622, 296 + xy: 284, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 622, 246 + xy: 294, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 543, 225 + xy: 205, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -818,28 +818,28 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 646, 276 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 850, 389 + xy: 646, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 233, 111 + xy: 453, 158 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow rotate: false - xy: 245, 111 + xy: 441, 146 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -860,21 +860,21 @@ batterylarge index: -1 coalgenerator rotate: false - xy: 419, 159 + xy: 254, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 429, 160 + xy: 264, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 439, 160 + xy: 274, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,70 +909,70 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 860, 389 + xy: 656, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 860, 379 + xy: 656, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 870, 397 + xy: 656, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 955, 465 + xy: 662, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 945, 445 + xy: 699, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 975, 445 + xy: 790, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 763, 409 + xy: 817, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 211, 30 + xy: 365, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 225, 139 + xy: 277, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 659, 236 + xy: 324, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -993,7 +993,7 @@ biomattercompressor index: -1 biomattercompressor-frame0 rotate: false - xy: 329, 151 + xy: 381, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1021,7 +1021,7 @@ biomattercompressor-liquid index: -1 biomattercompressor-top rotate: false - xy: 347, 151 + xy: 399, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1035,119 +1035,119 @@ centrifuge index: -1 coaldrill rotate: false - xy: 679, 323 + xy: 254, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 667, 311 + xy: 264, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 383, 151 + xy: 656, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 205, 112 + xy: 118, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 401, 151 + xy: 476, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 656, 361 + xy: 492, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 118, 47 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 476, 178 + xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 646, 266 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 646, 256 + xy: 887, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 699, 323 + xy: 467, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 780, 379 + xy: 667, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 790, 389 + xy: 487, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 680, 407 + xy: 698, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 800, 389 + xy: 632, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 leaddrill rotate: false - xy: 820, 399 + xy: 626, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 840, 399 + xy: 632, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1166,170 +1166,184 @@ oilextractor-liquid orig: 24, 24 offset: 0, 0 index: -1 +oilextractor-rotator + rotate: false + xy: 225, 139 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +oilextractor-top + rotate: false + xy: 251, 139 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 oilrefinery rotate: false - xy: 850, 399 + xy: 646, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 840, 379 + xy: 646, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasticformer rotate: false - xy: 716, 386 + xy: 590, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 572, 272 + xy: 590, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 572, 254 + xy: 608, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 590, 274 + xy: 608, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 590, 256 + xy: 763, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 608, 274 + xy: 781, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 880, 397 + xy: 689, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 880, 387 + xy: 689, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 608, 256 + xy: 799, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 separator rotate: false - xy: 975, 455 + xy: 770, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 171, 18 + xy: 860, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 163, 8 + xy: 870, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 173, 8 + xy: 746, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 629, 236 + xy: 314, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 639, 236 + xy: 304, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thoriumdrill rotate: false - xy: 697, 313 + xy: 324, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 707, 313 + xy: 344, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 712, 303 + xy: 354, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 820, 369 + xy: 364, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 817, 409 + xy: 885, 461 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 835, 409 + xy: 903, 461 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 637, 306 + xy: 234, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1364,21 +1378,21 @@ block-3-top index: -1 chainturret rotate: false - xy: 365, 151 + xy: 187, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 652, 299 + xy: 602, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 546, 207 + xy: 152, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1406,203 +1420,203 @@ gatlingturret index: -1 laserturret rotate: false - xy: 218, 64 + xy: 429, 158 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 680, 389 + xy: 716, 404 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 698, 409 + xy: 716, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 698, 391 + xy: 572, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 222, 52 + xy: 441, 158 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 222, 40 + xy: 429, 146 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 257, 111 + xy: 453, 146 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 269, 111 + xy: 465, 148 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 277, 139 + xy: 329, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 flierfactory rotate: false - xy: 134, 92 + xy: 152, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 134, 92 + xy: 152, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 134, 74 + xy: 170, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 134, 74 + xy: 170, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 152, 94 + xy: 170, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 152, 94 + xy: 170, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 compositewall rotate: false - xy: 449, 160 + xy: 264, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 632, 246 + xy: 477, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 492, 207 + xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 510, 207 + xy: 134, 92 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 642, 296 + xy: 592, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 646, 286 + xy: 612, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 528, 207 + xy: 134, 74 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 750, 406 + xy: 477, 142 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 203, 10 + xy: 425, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 781, 409 + xy: 835, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 649, 236 + xy: 314, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 760, 369 + xy: 344, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 770, 369 + xy: 354, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 799, 409 + xy: 853, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1616,7 +1630,7 @@ blank index: -1 bullet rotate: false - xy: 669, 341 + xy: 234, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1658,126 +1672,126 @@ laserfull index: -1 shell rotate: false - xy: 985, 465 + xy: 780, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 662, 246 + xy: 820, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 161, 28 + xy: 830, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 780, 369 + xy: 364, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 750, 396 + xy: 431, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 750, 386 + xy: 441, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 750, 376 + xy: 451, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 760, 399 + xy: 461, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 760, 389 + xy: 669, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 770, 399 + xy: 669, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 760, 379 + xy: 669, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 770, 389 + xy: 679, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 780, 399 + xy: 679, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 770, 379 + xy: 679, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 780, 389 + xy: 669, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 790, 399 + xy: 679, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 419, 107 + xy: 963, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 136, 51 + xy: 989, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1946,7 +1960,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 187, 112 + xy: 543, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1974,7 +1988,7 @@ icon-admin index: -1 icon-admin-small rotate: false - xy: 321, 135 + xy: 1017, 452 size: 6, 6 orig: 6, 6 offset: 0, 0 @@ -2009,21 +2023,21 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 182, 64 + xy: 977, 433 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 194, 64 + xy: 977, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 152, 76 + xy: 188, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2044,7 +2058,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 206, 64 + xy: 989, 433 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2079,21 +2093,21 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 502, 195 + xy: 989, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 514, 195 + xy: 502, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 526, 195 + xy: 514, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2114,7 +2128,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 538, 195 + xy: 526, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2128,448 +2142,448 @@ icon-donate index: -1 icon-dots rotate: false - xy: 651, 309 + xy: 321, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 734, 394 + xy: 337, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 329, 135 + xy: 353, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 345, 135 + xy: 369, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 170, 94 + xy: 188, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 361, 135 + xy: 651, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 377, 135 + xy: 939, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 393, 135 + xy: 955, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 409, 135 + xy: 971, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 476, 162 + xy: 987, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 170, 76 + xy: 206, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 550, 195 + xy: 538, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 562, 195 + xy: 550, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 885, 463 + xy: 1003, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 901, 463 + xy: 734, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 933, 457 + xy: 562, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 917, 463 + xy: 476, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 188, 94 + xy: 206, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 885, 447 + xy: 118, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 933, 445 + xy: 734, 382 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 901, 447 + xy: 113, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 188, 76 + xy: 867, 453 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 206, 94 + xy: 561, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 206, 76 + xy: 564, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 574, 195 + xy: 385, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 150, 50 + xy: 397, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 867, 453 + xy: 651, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 162, 50 + xy: 136, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 150, 38 + xy: 154, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 561, 225 + xy: 651, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 917, 447 + xy: 129, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 564, 207 + xy: 763, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 162, 38 + xy: 166, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 871, 423 + xy: 134, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 174, 50 + xy: 178, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 174, 38 + xy: 190, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 186, 52 + xy: 202, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 871, 407 + xy: 145, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 651, 343 + xy: 781, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 118, 31 + xy: 385, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 113, 15 + xy: 401, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 651, 325 + xy: 799, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 129, 15 + xy: 885, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 134, 31 + xy: 901, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 145, 15 + xy: 917, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 734, 378 + xy: 871, 423 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 321, 119 + xy: 871, 407 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 763, 427 + xy: 817, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 781, 427 + xy: 835, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 186, 40 + xy: 214, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 799, 427 + xy: 853, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 337, 119 + xy: 887, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 198, 52 + xy: 574, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 198, 40 + xy: 409, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 353, 119 + xy: 887, 413 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 817, 427 + xy: 680, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 369, 119 + xy: 903, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 385, 119 + xy: 903, 413 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 835, 427 + xy: 680, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 210, 52 + xy: 417, 157 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 210, 40 + xy: 417, 145 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 401, 119 + xy: 919, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 853, 427 + xy: 698, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 305, 111 + xy: 919, 413 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2742,126 +2756,126 @@ window-empty index: -1 flier rotate: false - xy: 135, 1 + xy: 149, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 363, 105 + xy: 935, 417 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 377, 105 + xy: 949, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 377, 105 + xy: 949, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 391, 105 + xy: 975, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 391, 105 + xy: 975, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 beam rotate: false - xy: 933, 469 + xy: 417, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 223, 113 + xy: 465, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 684, 363 + xy: 224, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 627, 306 + xy: 224, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 669, 331 + xy: 244, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 679, 353 + xy: 234, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 985, 455 + xy: 800, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 985, 445 + xy: 810, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 790, 369 + xy: 354, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 800, 369 + xy: 364, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 840, 369 + xy: 374, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 850, 369 + xy: 384, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 88ad541728..6b7a8ca86f 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index e72aa992b1..1ea8926681 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Mar 28 19:56:26 EDT 2018 +#Wed Mar 28 21:22:01 EDT 2018 version=release -androidBuildCode=706 +androidBuildCode=708 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index fd5400a0bb..7edaa8b162 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -19,6 +19,7 @@ public class DebugBlocks { powerInfinite = new PowerDistributor("powerinfinite") { { powerCapacity = 10000f; + powerSpeed = 100f; } @Override diff --git a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java index b17114cd24..69258eaa50 100644 --- a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.content.blocks; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; +import io.anuke.mindustry.graphics.Fx; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.types.production.*; @@ -86,6 +87,8 @@ public class ProductionBlocks { oilextractor = new Fracker("oilextractor") {{ result = Liquids.oil; inputLiquid = Liquids.water; + updateEffect = Fx.pulverize; + updateEffectChance = 0.05f; inputLiquidUse = 0.3f; powerUse = 0.6f; pumpAmount = 0.06f; diff --git a/core/src/io/anuke/mindustry/graphics/Fx.java b/core/src/io/anuke/mindustry/graphics/Fx.java index af7ffa2e30..436cdf70c8 100644 --- a/core/src/io/anuke/mindustry/graphics/Fx.java +++ b/core/src/io/anuke/mindustry/graphics/Fx.java @@ -187,9 +187,9 @@ public class Fx{ }); }), - pulverize = new Effect(25, e -> { - Angles.randLenVectors(e.id, 5, 3f + e.ifract()*5f, (x, y)->{ - Draw.color(Color.valueOf("eae4f0"), Color.GRAY, e.ifract()); + pulverize = new Effect(40, e -> { + Angles.randLenVectors(e.id, 5, 3f + e.ifract()*8f, (x, y)->{ + Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.ifract()); Fill.poly(e.x + x, e.y + y, 4, e.fract() * 2f + 0.5f, 45); Draw.reset(); }); @@ -532,6 +532,7 @@ public class Fx{ Draw.tscl(0.5f); Draw.reset(); }), + transfer = new Effect(20, e -> { Draw.color(Color.SCARLET, Color.CLEAR, e.fract()); Lines.square(e.x, e.y, 4); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Fracker.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Fracker.java index 57f18e6374..451cb85ba6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/Fracker.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Fracker.java @@ -1,9 +1,11 @@ package io.anuke.mindustry.world.blocks.types.production; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.core.Timers; +import io.anuke.ucore.graphics.Draw; public class Fracker extends SolidPump { protected Liquid inputLiquid; @@ -13,6 +15,26 @@ public class Fracker extends SolidPump { super(name); } + @Override + public void draw(Tile tile) { + FrackerEntity entity = tile.entity(); + + Draw.rect(name, tile.worldx(), tile.worldy()); + + Draw.color(tile.entity.liquid.liquid.color); + Draw.alpha(tile.entity.liquid.amount/liquidCapacity); + Draw.rect(name + "-liquid", tile.worldx(), tile.worldy()); + Draw.color(); + + Draw.rect(name + "-rotator", tile.worldx(), tile.worldy(), entity.pumpTime); + Draw.rect(name + "-top", tile.worldx(), tile.worldy()); + } + + @Override + public TextureRegion[] getIcon() { + return new TextureRegion[]{Draw.region(name), Draw.region(name + "-rotator"), Draw.region(name + "-top")}; + } + @Override public void update(Tile tile) { FrackerEntity entity = tile.entity(); @@ -45,7 +67,7 @@ public class Fracker extends SolidPump { return new FrackerEntity(); } - public static class FrackerEntity extends TileEntity{ + public static class FrackerEntity extends SolidPumpEntity{ public float input; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java index 93d12faad6..a2622e2b10 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java @@ -2,15 +2,22 @@ package io.anuke.mindustry.world.blocks.types.production; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.content.Liquids; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.graphics.Fx; import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.core.Effects; +import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Timers; +import io.anuke.ucore.util.Mathf; /**Pump that makes liquid from solids and takes in power. Only works on solid floor blocks.*/ public class SolidPump extends Pump { protected Liquid result = Liquids.water; /**Power use per liquid unit.*/ protected float powerUse = 0.1f; + protected Effect updateEffect = Fx.none; + protected float updateEffectChance = 0.02f; protected final Array drawTiles = new Array<>(); @@ -22,6 +29,8 @@ public class SolidPump extends Pump { @Override public void update(Tile tile){ + SolidPumpEntity entity = tile.entity(); + float used = Math.min(powerUse * Timers.delta(), powerCapacity); float fraction = 0f; @@ -41,8 +50,15 @@ public class SolidPump extends Pump { tile.entity.liquid.liquid = result; tile.entity.liquid.amount += maxPump; tile.entity.power.amount -= used; + entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.02f); + if(Mathf.chance(Timers.delta() * updateEffectChance)) + Effects.effect(updateEffect, entity.x + Mathf.range(size*2f), entity.y + Mathf.range(size*2f)); + }else{ + entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, 0.02f); } + entity.pumpTime += entity.warmup * Timers.delta(); + tryDumpLiquid(tile); } @@ -63,4 +79,14 @@ public class SolidPump extends Pump { protected boolean isValid(Tile tile){ return !tile.floor().liquid; } + + @Override + public TileEntity getEntity() { + return new SolidPumpEntity(); + } + + public static class SolidPumpEntity extends TileEntity{ + public float warmup; + public float pumpTime; + } }