diff --git a/core/assets-raw/sprites/blocks/extra/ripples.png b/core/assets-raw/sprites/blocks/extra/ripples.png new file mode 100644 index 0000000000..7e975a5b4c Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/ripples.png differ diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor.png b/core/assets-raw/sprites/blocks/production/biomattercompressor.png new file mode 100644 index 0000000000..d19510025c Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/biomattercompressor.png differ diff --git a/core/assets-raw/sprites/blocks/production/centrifuge.png b/core/assets-raw/sprites/blocks/production/centrifuge.png new file mode 100644 index 0000000000..39942b01dd Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/centrifuge.png differ diff --git a/core/assets-raw/sprites/blocks/production/cultivator.png b/core/assets-raw/sprites/blocks/production/cultivator.png index 6167bdbeda..dede08c985 100644 Binary files a/core/assets-raw/sprites/blocks/production/cultivator.png and b/core/assets-raw/sprites/blocks/production/cultivator.png differ diff --git a/core/assets-raw/sprites/blocks/production/extractor.png b/core/assets-raw/sprites/blocks/production/extractor.png new file mode 100644 index 0000000000..8bb66782c4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/extractor.png differ diff --git a/core/assets-raw/sprites/blocks/production/plasticformer.png b/core/assets-raw/sprites/blocks/production/plasticformer.png new file mode 100644 index 0000000000..3f19a7ba90 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/plasticformer.png differ diff --git a/core/assets-raw/sprites/blocks/production/powersmelter.png b/core/assets-raw/sprites/blocks/production/powersmelter.png new file mode 100644 index 0000000000..cd09e7f564 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/powersmelter.png differ diff --git a/core/assets-raw/sprites/blocks/production/separator.png b/core/assets-raw/sprites/blocks/production/separator.png new file mode 100644 index 0000000000..b76f345288 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/separator.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 5bd386a308..b890a9c71f 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: 142, 33 + xy: 642, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 642, 296 + xy: 652, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 652, 299 + xy: 652, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 147, 23 + xy: 652, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 152, 33 + xy: 662, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 662, 299 + xy: 662, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,42 +62,42 @@ core index: -1 junction rotate: false - xy: 662, 289 + xy: 860, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 620, 256 + xy: 770, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 630, 256 + xy: 780, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 640, 256 + xy: 790, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 148, 54 + xy: 800, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 158, 54 + xy: 810, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -125,77 +125,77 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 781, 427 + xy: 817, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 156, 44 + xy: 870, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 166, 44 + xy: 880, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 206, 44 + xy: 609, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 162, 34 + xy: 619, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 167, 24 + xy: 650, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 977, 435 + xy: 947, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 929, 425 + xy: 957, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 929, 415 + xy: 967, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 939, 425 + xy: 977, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 939, 415 + xy: 987, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -209,7 +209,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 201, 4 + xy: 919, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,14 +223,14 @@ vault index: -1 vault-icon rotate: false - xy: 221, 4 + xy: 920, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 698, 409 + xy: 572, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -272,224 +272,224 @@ blackstone3 index: -1 blackstoneblock1 rotate: false - xy: 579, 234 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 627, 306 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 637, 306 + xy: 419, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 572, 244 + xy: 871, 439 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 689, 311 + xy: 449, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 419, 159 + xy: 459, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 429, 160 + xy: 622, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 889, 423 + xy: 590, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 889, 413 + xy: 600, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 899, 423 + xy: 610, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 899, 413 + xy: 620, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 871, 439 + xy: 121, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 955, 465 + xy: 604, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 945, 445 + xy: 618, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 955, 455 + xy: 614, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 965, 465 + xy: 628, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 955, 445 + xy: 624, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 118, 33 + xy: 149, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 965, 455 + xy: 638, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 975, 465 + xy: 634, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 965, 445 + xy: 750, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 113, 19 + xy: 734, 380 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 975, 455 + xy: 750, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 985, 465 + xy: 760, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 975, 445 + xy: 770, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 975, 445 + xy: 770, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 985, 455 + xy: 780, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 985, 455 + xy: 780, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 985, 445 + xy: 790, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 305, 105 + xy: 800, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 698, 383 + xy: 810, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 620, 276 + xy: 750, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -503,35 +503,35 @@ lavaedge index: -1 lead1 rotate: false - xy: 630, 276 + xy: 870, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 630, 266 + xy: 880, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 640, 276 + xy: 880, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 168, 54 + xy: 820, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 178, 54 + xy: 830, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,56 +545,56 @@ oiledge index: -1 rock1 rotate: false - xy: 192, 34 + xy: 644, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 202, 34 + xy: 648, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 177, 14 + xy: 658, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 187, 24 + xy: 660, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 187, 14 + xy: 659, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 197, 24 + xy: 664, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 197, 14 + xy: 668, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 218, 54 + xy: 669, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -608,56 +608,56 @@ sandedge index: -1 shrub rotate: false - xy: 222, 34 + xy: 965, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 226, 44 + xy: 955, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 237, 24 + xy: 975, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 237, 14 + xy: 985, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 927, 435 + xy: 975, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 937, 435 + xy: 985, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 947, 435 + xy: 985, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 957, 435 + xy: 927, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -671,42 +671,42 @@ snowedge index: -1 stone1 rotate: false - xy: 949, 415 + xy: 158, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 959, 425 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 959, 415 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 969, 425 + xy: 188, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 969, 415 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 987, 435 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -720,49 +720,49 @@ stoneedge index: -1 thorium1 rotate: false - xy: 706, 373 + xy: 889, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 708, 363 + xy: 899, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 711, 353 + xy: 899, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 711, 333 + xy: 909, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 711, 323 + xy: 890, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 121, 3 + xy: 909, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 652, 279 + xy: 929, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,35 +776,35 @@ wateredge index: -1 block-middle rotate: false - xy: 691, 321 + xy: 689, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 691, 321 + xy: 689, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 146, 43 + xy: 642, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 157, 23 + xy: 662, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 507, 225 + xy: 604, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -818,18 +818,25 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 945, 465 + xy: 598, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 208, 54 + xy: 860, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +ripples + rotate: false + xy: 669, 337 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 shadow rotate: false xy: 669, 325 @@ -853,21 +860,21 @@ batterylarge index: -1 coalgenerator rotate: false - xy: 459, 160 + xy: 622, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 622, 296 + xy: 632, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 632, 296 + xy: 632, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -902,56 +909,56 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 176, 44 + xy: 579, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 186, 44 + xy: 589, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 196, 44 + xy: 599, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 167, 14 + xy: 649, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 177, 24 + xy: 654, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 212, 34 + xy: 945, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 817, 427 + xy: 680, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 967, 435 + xy: 937, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -965,7 +972,7 @@ teleporter index: -1 thermalgenerator rotate: false - xy: 989, 415 + xy: 889, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -977,86 +984,107 @@ alloysmelter orig: 8, 8 offset: 0, 0 index: -1 +biomattercompressor + rotate: false + xy: 489, 225 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +centrifuge + rotate: false + xy: 151, 112 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 coaldrill rotate: false - xy: 439, 160 + xy: 622, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 449, 160 + xy: 632, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 347, 151 + xy: 169, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 604, 292 + xy: 525, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 169, 112 + xy: 365, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 525, 225 + xy: 187, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +extractor + rotate: false + xy: 594, 246 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 fluxpump rotate: false - xy: 945, 455 + xy: 608, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 696, 373 + xy: 820, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 652, 289 + xy: 850, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 564, 207 + xy: 651, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 620, 266 + xy: 870, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 leaddrill rotate: false - xy: 640, 266 + xy: 760, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1077,133 +1105,154 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 188, 54 + xy: 840, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 198, 54 + xy: 850, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +plasticformer + rotate: false + xy: 835, 427 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +powersmelter + rotate: false + xy: 853, 427 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 pulverizer rotate: false - xy: 172, 34 + xy: 629, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 182, 34 + xy: 639, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 799, 427 + xy: 680, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +separator + rotate: false + xy: 674, 246 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 siliconextractor rotate: false - xy: 227, 24 + xy: 965, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 227, 14 + xy: 975, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 232, 34 + xy: 965, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 979, 425 + xy: 218, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 979, 415 + xy: 305, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thoriumdrill rotate: false - xy: 711, 343 + xy: 890, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 131, 3 + xy: 900, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 141, 3 + xy: 890, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 211, 4 + xy: 919, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 680, 407 + xy: 716, 404 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 680, 389 + xy: 716, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 681, 321 + xy: 679, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 489, 225 + xy: 329, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 329, 151 + xy: 586, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1224,21 +1273,21 @@ block-3-top index: -1 chainturret rotate: false - xy: 586, 292 + xy: 507, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 919, 423 + xy: 588, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 383, 151 + xy: 401, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1266,42 +1315,42 @@ gatlingturret index: -1 laserturret rotate: false - xy: 674, 361 + xy: 305, 115 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 651, 343 + xy: 763, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 651, 325 + xy: 781, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 763, 427 + xy: 799, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 669, 349 + xy: 674, 361 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 669, 337 + xy: 669, 349 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1329,140 +1378,140 @@ titancannon index: -1 flierfactory rotate: false - xy: 205, 112 + xy: 656, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 205, 112 + xy: 656, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 401, 151 + xy: 118, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 401, 151 + xy: 118, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 656, 361 + xy: 476, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 656, 361 + xy: 476, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 compositewall rotate: false - xy: 137, 23 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 909, 423 + xy: 630, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 365, 151 + xy: 543, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 187, 112 + xy: 383, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 909, 413 + xy: 640, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 919, 413 + xy: 584, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 543, 225 + xy: 205, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 698, 363 + xy: 830, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 949, 425 + xy: 148, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 835, 427 + xy: 698, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 989, 425 + xy: 419, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 151, 3 + xy: 900, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 161, 3 + xy: 900, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 853, 427 + xy: 698, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1476,7 +1525,7 @@ blank index: -1 bullet rotate: false - xy: 132, 33 + xy: 419, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1518,112 +1567,112 @@ laserfull index: -1 shell rotate: false - xy: 216, 44 + xy: 679, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 217, 24 + xy: 945, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 217, 14 + xy: 955, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 171, 4 + xy: 910, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 701, 353 + xy: 840, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 701, 343 + xy: 850, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 701, 333 + xy: 860, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 701, 323 + xy: 760, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 419, 115 + xy: 770, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 127, 13 + xy: 780, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 137, 13 + xy: 790, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 147, 13 + xy: 800, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 157, 13 + xy: 810, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 622, 286 + xy: 820, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 632, 286 + xy: 830, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 642, 286 + xy: 840, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1806,7 +1855,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 151, 112 + xy: 347, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1848,7 +1897,7 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 698, 393 + xy: 572, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1862,56 +1911,56 @@ icon-arrow-down index: -1 icon-arrow-left rotate: false - xy: 871, 427 + xy: 734, 410 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 502, 195 + xy: 572, 244 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 514, 195 + xy: 871, 427 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 118, 47 + xy: 492, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 572, 274 + xy: 590, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 572, 258 + xy: 606, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 526, 195 + xy: 502, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 588, 276 + xy: 763, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1939,497 +1988,497 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 538, 195 + xy: 514, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 550, 195 + xy: 526, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 562, 195 + xy: 538, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 588, 260 + xy: 779, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 604, 276 + xy: 795, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 933, 457 + xy: 550, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 604, 260 + xy: 811, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 763, 411 + xy: 827, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 779, 411 + xy: 843, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 795, 411 + xy: 859, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 811, 411 + xy: 680, 373 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 476, 178 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 827, 411 + xy: 225, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 843, 411 + xy: 241, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 859, 411 + xy: 257, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 680, 373 + xy: 273, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 225, 123 + xy: 289, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 492, 207 + xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 933, 445 + xy: 562, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 136, 53 + xy: 933, 457 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 241, 123 + xy: 305, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 257, 123 + xy: 651, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 154, 64 + xy: 933, 445 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 273, 123 + xy: 734, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 510, 207 + xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 289, 123 + xy: 329, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 166, 64 + xy: 136, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 305, 127 + xy: 345, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 528, 207 + xy: 867, 453 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 546, 207 + xy: 134, 92 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 867, 453 + xy: 134, 74 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 178, 64 + xy: 154, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 190, 64 + xy: 166, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 134, 92 + xy: 152, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 202, 64 + xy: 178, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 214, 64 + xy: 190, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 134, 74 + xy: 152, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 651, 309 + xy: 361, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 152, 94 + xy: 170, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 574, 195 + xy: 202, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 329, 135 + xy: 377, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 746, 404 + xy: 214, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 233, 111 + xy: 574, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 245, 111 + xy: 233, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 345, 135 + xy: 393, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 152, 76 + xy: 170, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 361, 135 + xy: 409, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 377, 135 + xy: 476, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 170, 94 + xy: 188, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 393, 135 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 409, 135 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 476, 162 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 885, 463 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 901, 463 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 170, 76 + xy: 188, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 188, 94 + xy: 206, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 257, 111 + xy: 245, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 188, 76 + xy: 206, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 917, 463 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 269, 111 + xy: 257, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 281, 111 + xy: 269, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 885, 447 + xy: 118, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 206, 94 + xy: 561, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 901, 447 + xy: 113, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 917, 447 + xy: 129, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 206, 76 + xy: 564, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 293, 111 + xy: 281, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 305, 115 + xy: 293, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 716, 406 + xy: 134, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 561, 225 + xy: 651, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 714, 390 + xy: 145, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2535,7 +2584,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 171, 1 + xy: 652, 276 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2602,7 +2651,7 @@ window-empty index: -1 flier rotate: false - xy: 732, 408 + xy: 135, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2658,70 +2707,70 @@ beam-equip index: -1 blaster rotate: false - xy: 419, 125 + xy: 681, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 136, 43 + xy: 691, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 127, 23 + xy: 429, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 679, 311 + xy: 439, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 207, 24 + xy: 945, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 207, 14 + xy: 955, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 181, 4 + xy: 910, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 191, 4 + xy: 910, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 231, 4 + xy: 920, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 241, 4 + xy: 920, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 7f1df54c73..714c56e5f4 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 1b7658a628..b6b638ed08 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Mon Mar 26 20:24:57 EDT 2018 +#Mon Mar 26 22:36:42 EDT 2018 version=release -androidBuildCode=662 +androidBuildCode=669 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index cd52f7844e..4234f30aed 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -60,7 +60,7 @@ public class Recipes { new Recipe(crafting, CraftingBlocks.separator, stack(Items.steel, 30), stack(Items.iron, 30)), new Recipe(crafting, CraftingBlocks.centrifuge, stack(Items.steel, 30), stack(Items.iron, 30)), new Recipe(crafting, CraftingBlocks.oilRefinery, stack(Items.steel, 15), stack(Items.iron, 15)), - new Recipe(crafting, CraftingBlocks.biomassCompressor, stack(Items.steel, 15), stack(Items.iron, 15)), + new Recipe(crafting, CraftingBlocks.biomatterCompressor, stack(Items.steel, 15), stack(Items.iron, 15)), new Recipe(crafting, CraftingBlocks.stoneFormer, stack(Items.steel, 10), stack(Items.iron, 10)), new Recipe(crafting, CraftingBlocks.plasticFormer, stack(Items.steel, 30), stack(Items.titanium, 15)), new Recipe(crafting, CraftingBlocks.cryofluidmixer, stack(Items.steel, 30), stack(Items.titanium, 15)), diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java index 0c0a056c82..685b1a5a3a 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -60,20 +60,21 @@ public class CraftingBlocks { size = 2; }}, - separator = new Filtrator("separator") {{ + separator = new Separator("separator") {{ liquid = Liquids.water; item = Items.stone; results = new Item[]{ - null, null, null, null, null, - Items.stone, Items.stone, Items.stone, Items.stone, - Items.iron, Items.iron, Items.iron, + null, null, null, null, null, null, null, null, null, null, null, null, + Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, + Items.iron, Items.iron, Items.iron, Items.iron, Items.lead, Items.lead, Items.coal, Items.coal, Items.titanium }; - liquidUse = 0.1f; + liquidUse = 0.2f; filterTime = 40f; + itemCapacity = 40; health = 50; }}, @@ -111,7 +112,7 @@ public class CraftingBlocks { hasPower = hasLiquids = true; }}, - biomassCompressor = new PowerCrafter("biomasscompressor") {{ + biomatterCompressor = new PowerCrafter("biomattercompressor") {{ input = new ItemStack(Items.biomatter, 1); liquidCapacity = 60f; powerUse = 0.05f; diff --git a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java index 9ec0bdb7b7..00de1d0102 100644 --- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java @@ -11,11 +11,11 @@ public class LiquidBlocks { public static final Block pump = new Pump("pump") {{ - pumpAmount = 0.8f; + pumpAmount = 0.1f; }}, fluxpump = new Pump("fluxpump") {{ - pumpAmount = 1.2f; + pumpAmount = 0.2f; }}, conduit = new Conduit("conduit") {{ diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 08a59e78e6..04d6eee9a8 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -12,6 +12,7 @@ import io.anuke.mindustry.io.MapTileData.TileDataMarker; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.ColorMapper; import io.anuke.mindustry.world.ColorMapper.BlockPair; +import io.anuke.ucore.util.Log; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -137,9 +138,14 @@ public class MapIO { short blocks = stream.readShort(); for(int i = 0; i < blocks; i ++){ - Block block = Block.getByName(stream.readUTF()); - if(block == null) block = Blocks.air; - map.put(stream.readShort(), block.id); + short id = stream.readShort(); + String name = stream.readUTF(); + Block block = Block.getByName(name); + if(block == null){ + Log.info("Map load info: No block with name {0} found.", name); + block = Blocks.air; + } + map.put(id, block.id); } int width = stream.readShort(); diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java index 9339a798c5..ffe8696296 100644 --- a/core/src/io/anuke/mindustry/world/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/BaseBlock.java @@ -92,7 +92,7 @@ public abstract class BaseBlock { if(ofract > fract) return; - float flow = Math.min((fract - ofract) * (liquidCapacity/(1.3f + tile.entity.liquid.liquid.viscosity)), + float flow = Math.min((fract - ofract) * (liquidCapacity/(1.1f + tile.entity.liquid.liquid.viscosity)), Math.min(tile.entity.liquid.amount/liquidFlowFactor * Math.max(Timers.delta(), 1f), tile.entity.liquid.amount)); if(flow <= 0f || tile.entity.liquid.amount < flow) return; 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 dbff990fee..c75594458d 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 @@ -25,7 +25,7 @@ public class Conveyor extends Block{ private static ItemPos drawpos = new ItemPos(); private static ItemPos pos1 = new ItemPos(); private static ItemPos pos2 = new ItemPos(); - private static final float itemSpace = 0.135f * 1.3f; + private static final float itemSpace = 0.135f * 2f; private static final float offsetScl = 128f*3f; private static final float itemSize = 5f; private static final float minmove = 1f / (Short.MAX_VALUE - 2); @@ -142,7 +142,7 @@ public class Conveyor extends Block{ public boolean acceptItem(Item item, Tile tile, Tile source){ int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.getRotation()); float minitem = tile.entity().minitem; - return (((direction == 0) && minitem > 0.05f) || + return (((direction == 0) && minitem > itemSpace) || ((direction %2 == 1) && minitem > 0.52f)) && (source == null || !(source.block().rotate && (source.getRotation() + 2) % 4 == tile.getRotation())); } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java index d9d3bc6e62..39b58e3d24 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java @@ -33,7 +33,6 @@ public class GenericCrafter extends Block{ public GenericCrafter(String name) { super(name); update = true; - rotate = false; solid = true; health = 60; } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Filtrator.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Separator.java similarity index 82% rename from core/src/io/anuke/mindustry/world/blocks/types/production/Filtrator.java rename to core/src/io/anuke/mindustry/world/blocks/types/production/Separator.java index eb094fa32b..fc3ae799c1 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/Filtrator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Separator.java @@ -10,7 +10,7 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.util.Mathf; /**Extracts a random list of items from an input item and an input liquid.*/ -public class Filtrator extends Block { +public class Separator extends Block { protected final int timerDump = timers ++; protected Liquid liquid; @@ -19,7 +19,9 @@ public class Filtrator extends Block { protected float liquidUse; protected float filterTime; - public Filtrator(String name) { + protected boolean offloading = false; + + public Separator(String name) { super(name); update = true; solid = true; @@ -37,12 +39,18 @@ public class Filtrator extends Block { if(entity.liquid.amount >= liquidUsed && entity.inventory.hasItem(item)){ entity.progress += 1f/filterTime; + entity.liquid.amount -= liquidUsed; } if(entity.progress >= 1f){ entity.progress = 0f; Item item = Mathf.select(results); - if(item != null) offloadNear(tile, item); + entity.inventory.removeItem(this.item, 1); + if(item != null){ + offloading = true; + offloadNear(tile, item); + offloading = false; + } } if(entity.timer.get(timerDump, 5)){ @@ -52,7 +60,7 @@ public class Filtrator extends Block { @Override public boolean canDump(Tile tile, Tile to, Item item) { - return item != this.item; + return offloading || item != this.item; } @Override