diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png b/core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png new file mode 100644 index 0000000000..17f8bd2e4d Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor-top.png b/core/assets-raw/sprites/blocks/production/biomattercompressor-top.png new file mode 100644 index 0000000000..0c97e631b8 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/biomattercompressor-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor.png b/core/assets-raw/sprites/blocks/production/biomattercompressor.png index d19510025c..0652d74220 100644 Binary files a/core/assets-raw/sprites/blocks/production/biomattercompressor.png and b/core/assets-raw/sprites/blocks/production/biomattercompressor.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index f997c93d49..7dde9525be 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: 626, 256 + xy: 429, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 636, 286 + xy: 449, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 636, 276 + xy: 459, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 636, 266 + xy: 622, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 636, 256 + xy: 632, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 634, 246 + xy: 626, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,42 +62,42 @@ core index: -1 junction rotate: false - xy: 850, 401 + xy: 780, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 760, 371 + xy: 800, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 770, 371 + xy: 810, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 780, 371 + xy: 820, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 790, 371 + xy: 810, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 800, 371 + xy: 820, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -125,77 +125,77 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 853, 427 + xy: 680, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 870, 401 + xy: 850, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 870, 391 + xy: 840, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 684, 363 + xy: 945, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 679, 351 + xy: 955, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 672, 301 + xy: 955, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 985, 455 + xy: 201, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 985, 445 + xy: 211, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 981, 435 + xy: 211, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 955, 425 + xy: 163, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 965, 425 + xy: 173, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,14 +223,14 @@ vault index: -1 vault-icon rotate: false - xy: 676, 261 + xy: 686, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 608, 256 + xy: 781, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -244,49 +244,49 @@ blackrock1 index: -1 blackrockshadow1 rotate: false - xy: 604, 246 + xy: 591, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 614, 246 + xy: 604, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 627, 306 + xy: 614, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 637, 306 + xy: 674, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 889, 409 + xy: 684, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 899, 409 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 909, 409 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,511 +300,511 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 429, 160 + xy: 669, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 439, 160 + xy: 669, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 449, 160 + xy: 679, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 652, 299 + xy: 626, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 646, 286 + xy: 626, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 646, 276 + xy: 624, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 646, 266 + xy: 636, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 121, 1 + xy: 871, 425 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 662, 299 + xy: 646, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 750, 406 + xy: 646, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 750, 396 + xy: 646, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 750, 386 + xy: 644, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 750, 376 + xy: 656, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 149, 1 + xy: 135, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 760, 401 + xy: 656, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 760, 391 + xy: 656, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 770, 401 + xy: 656, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 353, 121 + xy: 149, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 760, 381 + xy: 654, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 770, 391 + xy: 689, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 780, 401 + xy: 689, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 780, 401 + xy: 689, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 770, 381 + xy: 689, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 770, 381 + xy: 689, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 780, 391 + xy: 689, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 790, 401 + xy: 694, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 780, 381 + xy: 662, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 840, 381 + xy: 790, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 367, 121 + xy: 353, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 860, 401 + xy: 790, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 850, 381 + xy: 800, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 860, 391 + xy: 800, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 820, 371 + xy: 820, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 830, 371 + xy: 830, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 381, 121 + xy: 367, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 679, 321 + xy: 965, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 677, 311 + xy: 945, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 692, 301 + xy: 945, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 148, 54 + xy: 955, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 158, 54 + xy: 965, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 168, 54 + xy: 975, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 178, 54 + xy: 985, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 188, 54 + xy: 955, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 395, 121 + xy: 381, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 955, 455 + xy: 985, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 965, 465 + xy: 985, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 975, 465 + xy: 171, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 965, 445 + xy: 171, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 961, 435 + xy: 181, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 975, 455 + xy: 181, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 985, 465 + xy: 191, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 975, 445 + xy: 191, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 913, 433 + xy: 154, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 985, 425 + xy: 193, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 991, 435 + xy: 203, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 995, 425 + xy: 213, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 305, 105 + xy: 601, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 955, 415 + xy: 611, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 965, 415 + xy: 621, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 903, 419 + xy: 196, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 582, 212 + xy: 677, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 592, 222 + xy: 687, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 592, 212 + xy: 697, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 586, 192 + xy: 692, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 596, 202 + xy: 702, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 596, 192 + xy: 707, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 696, 291 + xy: 686, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 917, 419 + xy: 210, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 669, 331 + xy: 915, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 669, 331 + xy: 915, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 624, 246 + xy: 439, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 642, 296 + xy: 626, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 604, 292 + xy: 525, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -818,28 +818,28 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 656, 266 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 860, 371 + xy: 840, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 305, 115 + xy: 293, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow rotate: false - xy: 579, 232 + xy: 305, 115 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -860,21 +860,21 @@ batterylarge index: -1 coalgenerator rotate: false - xy: 632, 296 + xy: 669, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 626, 286 + xy: 679, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 626, 276 + xy: 667, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,56 +909,56 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 870, 381 + xy: 850, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 870, 371 + xy: 850, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 674, 361 + xy: 945, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 682, 301 + xy: 965, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 687, 311 + xy: 975, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 218, 54 + xy: 985, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 572, 272 + xy: 590, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 971, 435 + xy: 201, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -972,7 +972,7 @@ teleporter index: -1 thermalgenerator rotate: false - xy: 582, 222 + xy: 672, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -991,128 +991,142 @@ biomattercompressor orig: 16, 16 offset: 0, 0 index: -1 +biomattercompressor-liquid + rotate: false + xy: 329, 151 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +biomattercompressor-top + rotate: false + xy: 586, 292 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 centrifuge rotate: false - xy: 151, 112 + xy: 347, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 coaldrill rotate: false - xy: 459, 160 + xy: 679, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 622, 296 + xy: 679, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 169, 112 + xy: 365, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 525, 225 + xy: 187, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 365, 151 + xy: 543, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 187, 112 + xy: 383, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 543, 225 + xy: 205, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 383, 151 + xy: 401, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 656, 256 + xy: 652, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 654, 246 + xy: 646, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 790, 391 + xy: 699, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 830, 381 + xy: 770, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 840, 391 + xy: 780, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 781, 427 + xy: 817, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 850, 391 + xy: 790, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 leaddrill rotate: false - xy: 860, 381 + xy: 810, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 810, 371 + xy: 830, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1133,175 +1147,175 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 840, 371 + xy: 840, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 850, 371 + xy: 830, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasticformer rotate: false - xy: 680, 407 + xy: 698, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 680, 389 + xy: 698, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 698, 409 + xy: 716, 404 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 698, 391 + xy: 716, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 716, 404 + xy: 572, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 679, 341 + xy: 945, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 679, 331 + xy: 955, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 716, 386 + xy: 572, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 separator rotate: false - xy: 198, 54 + xy: 965, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 955, 445 + xy: 305, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 951, 435 + xy: 161, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 965, 455 + xy: 161, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 975, 415 + xy: 631, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 985, 415 + xy: 641, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thoriumdrill rotate: false - xy: 586, 202 + xy: 682, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 666, 289 + xy: 712, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 666, 279 + xy: 666, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 686, 281 + xy: 676, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 590, 256 + xy: 608, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 608, 274 + xy: 763, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 669, 341 + xy: 905, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 329, 151 + xy: 151, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 586, 292 + xy: 507, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1322,21 +1336,21 @@ block-3-top index: -1 chainturret rotate: false - xy: 507, 225 + xy: 604, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 656, 286 + xy: 636, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 118, 47 + xy: 492, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1364,56 +1378,56 @@ gatlingturret index: -1 laserturret rotate: false - xy: 269, 111 + xy: 257, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 799, 427 + xy: 835, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 817, 427 + xy: 853, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 835, 427 + xy: 680, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 281, 111 + xy: 269, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 293, 111 + xy: 281, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 592, 244 + xy: 579, 232 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 591, 232 + xy: 592, 244 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1427,140 +1441,140 @@ titancannon index: -1 flierfactory rotate: false - xy: 476, 178 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 476, 178 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 492, 207 + xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 492, 207 + xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 510, 207 + xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 510, 207 + xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 compositewall rotate: false - xy: 626, 266 + xy: 419, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 646, 256 + xy: 636, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 205, 112 + xy: 656, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 401, 151 + xy: 118, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 644, 246 + xy: 636, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 656, 276 + xy: 634, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 656, 361 + xy: 476, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 800, 401 + xy: 699, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 975, 425 + xy: 183, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 572, 254 + xy: 590, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 995, 415 + xy: 651, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 666, 269 + xy: 666, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 666, 259 + xy: 666, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 590, 274 + xy: 608, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1574,7 +1588,7 @@ blank index: -1 bullet rotate: false - xy: 669, 321 + xy: 925, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1616,126 +1630,126 @@ laserfull index: -1 shell rotate: false - xy: 208, 54 + xy: 975, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 945, 455 + xy: 985, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 945, 445 + xy: 975, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 676, 291 + xy: 666, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 790, 381 + xy: 699, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 800, 391 + xy: 699, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 810, 401 + xy: 750, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 800, 381 + xy: 750, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 810, 391 + xy: 750, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 820, 401 + xy: 750, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 810, 381 + xy: 760, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 820, 391 + xy: 760, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 830, 401 + xy: 770, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 820, 381 + xy: 760, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 830, 391 + xy: 770, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 840, 401 + xy: 780, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 875, 413 + xy: 168, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 889, 419 + xy: 182, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1883,7 +1897,7 @@ clear index: -1 cursor rotate: false - xy: 883, 427 + xy: 674, 373 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -1904,7 +1918,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 347, 151 + xy: 169, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1946,7 +1960,7 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 763, 411 + xy: 799, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1967,49 +1981,49 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 871, 427 + xy: 502, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 502, 195 + xy: 514, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 528, 207 + xy: 867, 453 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 779, 411 + xy: 815, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 795, 411 + xy: 831, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 514, 195 + xy: 526, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 811, 411 + xy: 847, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2037,364 +2051,364 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 526, 195 + xy: 538, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 538, 195 + xy: 550, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 550, 195 + xy: 562, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 827, 411 + xy: 680, 373 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 843, 411 + xy: 225, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 562, 195 + xy: 933, 457 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 859, 411 + xy: 241, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 680, 373 + xy: 257, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 225, 123 + xy: 273, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 241, 123 + xy: 289, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 257, 123 + xy: 305, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 546, 207 + xy: 134, 92 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 273, 123 + xy: 651, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 289, 123 + xy: 734, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 305, 127 + xy: 329, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 651, 309 + xy: 345, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 734, 394 + xy: 361, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 867, 453 + xy: 134, 74 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 933, 457 + xy: 933, 445 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 933, 445 + xy: 933, 433 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 329, 135 + xy: 377, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 345, 135 + xy: 393, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 927, 433 + xy: 574, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 361, 135 + xy: 409, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 134, 92 + xy: 152, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 377, 135 + xy: 476, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 136, 53 + xy: 150, 50 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 393, 135 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 134, 74 + xy: 152, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 152, 94 + xy: 170, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 152, 76 + xy: 170, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 154, 64 + xy: 162, 50 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 166, 64 + xy: 174, 50 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 170, 94 + xy: 188, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 178, 64 + xy: 186, 50 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 190, 64 + xy: 198, 50 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 170, 76 + xy: 188, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 409, 135 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 188, 94 + xy: 206, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 202, 64 + xy: 210, 50 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 476, 162 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 214, 64 + xy: 150, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 574, 195 + xy: 162, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 931, 421 + xy: 174, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 885, 463 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 188, 76 + xy: 206, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 901, 463 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 917, 463 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 206, 94 + xy: 561, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 885, 447 + xy: 885, 431 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 901, 447 + xy: 901, 431 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 917, 447 + xy: 917, 431 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2415,28 +2429,28 @@ icon-save index: -1 icon-save-image rotate: false - xy: 206, 76 + xy: 564, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 561, 225 + xy: 651, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 939, 433 + xy: 186, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 564, 207 + xy: 651, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2450,14 +2464,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 943, 421 + xy: 198, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 233, 111 + xy: 210, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2471,7 +2485,7 @@ icon-trash index: -1 icon-trash-16 rotate: false - xy: 651, 343 + xy: 763, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2492,21 +2506,21 @@ icon-tutorial index: -1 icon-undo rotate: false - xy: 651, 325 + xy: 781, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 245, 111 + xy: 233, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 257, 111 + xy: 245, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2520,7 +2534,7 @@ icon-wiki index: -1 icon-zoom rotate: false - xy: 763, 427 + xy: 799, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2700,42 +2714,42 @@ window-empty index: -1 flier rotate: false - xy: 135, 1 + xy: 121, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 409, 121 + xy: 395, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 885, 433 + xy: 409, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 885, 433 + xy: 409, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 899, 433 + xy: 136, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 899, 433 + xy: 136, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2756,70 +2770,70 @@ beam-equip index: -1 blaster rotate: false - xy: 919, 409 + xy: 885, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 669, 351 + xy: 895, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 667, 311 + xy: 935, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 419, 159 + xy: 669, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 945, 465 + xy: 965, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 955, 465 + xy: 975, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 676, 281 + xy: 676, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 686, 291 + xy: 676, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 686, 271 + xy: 686, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 686, 261 + xy: 686, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 9f53ceeaeb..a95e28bdd4 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 0e03c7b529..6f94402b5e 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Tue Mar 27 23:20:43 EDT 2018 +#Tue Mar 27 23:35:26 EDT 2018 version=release -androidBuildCode=690 +androidBuildCode=692 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java index 5e5ec42b97..ddb7b0b233 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -112,13 +112,14 @@ public class CraftingBlocks { hasPower = hasLiquids = true; }}, - biomatterCompressor = new PowerCrafter("biomattercompressor") {{ + biomatterCompressor = new Compressor("biomattercompressor") {{ input = new ItemStack(Items.biomatter, 1); liquidCapacity = 60f; + itemCapacity = 50; powerUse = 0.05f; craftTime = 10f; outputLiquid = Liquids.oil; - outputLiquidAmount = 0.4f; + outputLiquidAmount = 0.05f; size = 2; health = 320; hasLiquids = true; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java index 423bf2f80c..5f4d99cf62 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java @@ -41,6 +41,7 @@ public class Conveyor extends Block{ update = true; layer = Layer.overlay; group = BlockGroup.transportation; + hasInventory = false; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java index 3cc6ba7649..86f05b7183 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java @@ -21,6 +21,7 @@ public class Junction extends Block{ solid = true; instantTransfer = true; group = BlockGroup.transportation; + hasInventory = false; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java index fb92234ad3..d3c50c7efa 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java @@ -14,6 +14,7 @@ public class LiquidJunction extends LiquidBlock{ update = true; solid = true; rotate = false; + hasLiquids = false; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Compressor.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Compressor.java new file mode 100644 index 0000000000..20a03d4f46 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Compressor.java @@ -0,0 +1,28 @@ +package io.anuke.mindustry.world.blocks.types.production; + +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.graphics.Draw; + +public class Compressor extends PowerCrafter { + + public Compressor(String name) { + super(name); + hasLiquids = true; + } + + @Override + public void draw(Tile tile) { + Draw.rect(name, tile.drawx(), tile.drawy()); + Draw.color(Color.CLEAR, tile.entity.liquid.liquid.color, tile.entity.liquid.amount / liquidCapacity); + Draw.rect(name + "-liquid", tile.drawx(), tile.drawy()); + Draw.color(); + Draw.rect(name + "-top", tile.drawx(), tile.drawy()); + } + + @Override + public TextureRegion[] getIcon() { + return new TextureRegion[]{Draw.region(name), Draw.region(name + "-top")}; + } +}