diff --git a/core/assets-raw/sprites/blocks/production/omnidrill.png b/core/assets-raw/sprites/blocks/production/omnidrill.png deleted file mode 100644 index 5ff4798aab..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/omnidrill.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/production/waterextractor-liquid.png b/core/assets-raw/sprites/blocks/production/waterextractor-liquid.png index 3f938a0c61..1404f2afd6 100644 Binary files a/core/assets-raw/sprites/blocks/production/waterextractor-liquid.png and b/core/assets-raw/sprites/blocks/production/waterextractor-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/waterextractor-rotator.png b/core/assets-raw/sprites/blocks/production/waterextractor-rotator.png new file mode 100644 index 0000000000..8f6b5ece25 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/waterextractor-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/production/waterextractor-top.png b/core/assets-raw/sprites/blocks/production/waterextractor-top.png new file mode 100644 index 0000000000..6917779757 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/waterextractor-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/waterextractor.png b/core/assets-raw/sprites/blocks/production/waterextractor.png index 8e3a678eab..446172f8bd 100644 Binary files a/core/assets-raw/sprites/blocks/production/waterextractor.png and b/core/assets-raw/sprites/blocks/production/waterextractor.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index a25b8c9901..ee27e9df54 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: 264, 83 + xy: 309, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 284, 103 + xy: 329, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 274, 83 + xy: 339, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 284, 93 + xy: 349, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 284, 83 + xy: 359, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 294, 103 + xy: 369, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,42 +62,42 @@ core index: -1 junction rotate: false - xy: 636, 276 + xy: 687, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 646, 286 + xy: 699, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 646, 276 + xy: 699, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 646, 266 + xy: 699, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 646, 256 + xy: 699, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 642, 246 + xy: 697, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -132,70 +132,70 @@ multiplexer index: -1 poweredconveyor rotate: false - xy: 672, 301 + xy: 750, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 682, 301 + xy: 750, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 750, 396 + xy: 770, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 760, 399 + xy: 760, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 840, 399 + xy: 800, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 344, 97 + xy: 840, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 354, 107 + xy: 850, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 344, 87 + xy: 860, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 354, 97 + xy: 850, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 364, 107 + xy: 860, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -209,7 +209,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 544, 175 + xy: 471, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,70 +223,70 @@ vault index: -1 vault-icon rotate: false - xy: 554, 175 + xy: 662, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 680, 371 + xy: 716, 368 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 233, 113 + xy: 223, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 243, 113 + xy: 269, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 253, 113 + xy: 279, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 263, 113 + xy: 289, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 273, 113 + xy: 582, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 283, 113 + xy: 579, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 293, 113 + xy: 592, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 224, 103 + xy: 602, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,49 +300,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 254, 103 + xy: 299, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 244, 83 + xy: 427, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 254, 93 + xy: 437, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 294, 83 + xy: 441, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 582, 244 + xy: 451, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 579, 234 + xy: 461, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 477, 152 + xy: 669, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,35 +356,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 887, 403 + xy: 669, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 413, 123 + xy: 679, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 477, 132 + xy: 667, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 897, 403 + xy: 677, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 907, 405 + xy: 622, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -398,406 +398,406 @@ grassedge index: -1 ice1 rotate: false - xy: 423, 123 + xy: 632, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 433, 124 + xy: 626, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 443, 124 + xy: 626, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 903, 415 + xy: 919, 415 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 453, 124 + xy: 626, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 669, 351 + xy: 626, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 669, 341 + xy: 622, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 669, 341 + xy: 622, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 669, 331 + xy: 636, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 669, 331 + xy: 636, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 674, 361 + xy: 636, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 684, 361 + xy: 636, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 679, 351 + xy: 636, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 636, 266 + xy: 694, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 919, 431 + xy: 933, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 632, 246 + xy: 662, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 642, 296 + xy: 672, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 652, 299 + xy: 682, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 656, 276 + xy: 702, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 656, 266 + xy: 707, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 734, 380 + xy: 947, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 820, 399 + xy: 770, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 830, 399 + xy: 780, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 870, 397 + xy: 790, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 744, 370 + xy: 810, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 744, 360 + xy: 780, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 744, 350 + xy: 790, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 305, 117 + xy: 800, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 315, 117 + xy: 820, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 730, 366 + xy: 935, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 304, 97 + xy: 840, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 314, 107 + xy: 810, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 314, 87 + xy: 820, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 324, 97 + xy: 830, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 334, 107 + xy: 840, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 324, 87 + xy: 860, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 334, 97 + xy: 830, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 344, 107 + xy: 840, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 933, 445 + xy: 963, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 374, 97 + xy: 870, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 374, 87 + xy: 148, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 999, 449 + xy: 158, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 1009, 450 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 148, 54 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 158, 54 + xy: 188, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 947, 431 + xy: 977, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 208, 54 + xy: 319, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 218, 54 + xy: 329, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 504, 185 + xy: 339, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 514, 185 + xy: 349, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 524, 185 + xy: 359, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 534, 185 + xy: 369, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 494, 169 + xy: 770, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 961, 445 + xy: 991, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 234, 93 + xy: 887, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 234, 93 + xy: 887, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 274, 93 + xy: 319, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 294, 93 + xy: 431, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -818,28 +818,28 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 494, 179 + xy: 679, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 662, 299 + xy: 750, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 441, 134 + xy: 477, 150 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow rotate: false - xy: 453, 134 + xy: 233, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -860,21 +860,21 @@ batterylarge index: -1 coalgenerator rotate: false - xy: 264, 103 + xy: 447, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 254, 83 + xy: 457, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 264, 93 + xy: 467, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,42 +909,42 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 687, 311 + xy: 750, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 692, 301 + xy: 750, 366 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 750, 406 + xy: 760, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 850, 399 + xy: 770, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 860, 399 + xy: 780, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 345, 117 + xy: 810, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -958,7 +958,7 @@ shieldprojector index: -1 solarpanel rotate: false - xy: 334, 87 + xy: 850, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -972,7 +972,7 @@ teleporter index: -1 thermalgenerator rotate: false - xy: 198, 54 + xy: 309, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1077,56 +1077,56 @@ cultivator-top index: -1 extractor rotate: false - xy: 627, 306 + xy: 679, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 637, 306 + xy: 679, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 679, 341 + xy: 632, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 679, 331 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 679, 331 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 669, 321 + xy: 652, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 622, 246 + xy: 689, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 636, 286 + xy: 689, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,14 +1154,14 @@ laserdrill-top index: -1 lavasmelter rotate: false - xy: 636, 256 + xy: 704, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 656, 286 + xy: 692, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1196,14 +1196,7 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 656, 256 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -omnidrill - rotate: false - xy: 652, 246 + xy: 712, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1252,119 +1245,119 @@ powersmelter-top index: -1 pulverizer rotate: false - xy: 770, 399 + xy: 780, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 780, 399 + xy: 760, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 790, 399 + xy: 770, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 800, 399 + xy: 790, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 810, 399 + xy: 760, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 325, 117 + xy: 790, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 304, 87 + xy: 820, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 314, 97 + xy: 830, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 324, 107 + xy: 850, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 354, 87 + xy: 860, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 364, 97 + xy: 870, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 374, 107 + xy: 870, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 168, 54 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 178, 54 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 544, 185 + xy: 379, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 554, 185 + xy: 389, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 564, 185 + xy: 399, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1383,9 +1376,23 @@ waterextractor-liquid orig: 16, 16 offset: 0, 0 index: -1 +waterextractor-rotator + rotate: false + xy: 680, 371 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +waterextractor-top + rotate: false + xy: 698, 373 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-1 rotate: false - xy: 224, 83 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1427,7 +1434,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 602, 246 + xy: 674, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1462,7 +1469,7 @@ gatlingturret index: -1 laserturret rotate: false - xy: 453, 146 + xy: 441, 146 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1490,28 +1497,28 @@ missileturret index: -1 railgunturret rotate: false - xy: 417, 133 + xy: 453, 146 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 429, 134 + xy: 465, 148 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 465, 148 + xy: 245, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 465, 136 + xy: 257, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1567,14 +1574,14 @@ walkerfactory-top-open index: -1 compositewall rotate: false - xy: 274, 103 + xy: 477, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 477, 142 + xy: 669, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1595,14 +1602,14 @@ door-large-open index: -1 door-open rotate: false - xy: 592, 246 + xy: 669, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 612, 246 + xy: 684, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1616,14 +1623,14 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 679, 321 + xy: 646, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 364, 87 + xy: 870, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,21 +1644,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 188, 54 + xy: 218, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 574, 185 + xy: 409, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 504, 175 + xy: 379, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1672,7 +1679,7 @@ blank index: -1 bullet rotate: false - xy: 244, 103 + xy: 897, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1714,119 +1721,119 @@ laserfull index: -1 shell rotate: false - xy: 335, 117 + xy: 800, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 375, 117 + xy: 810, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 304, 107 + xy: 820, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 514, 175 + xy: 389, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 667, 311 + xy: 646, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 677, 311 + xy: 646, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 487, 152 + xy: 646, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 487, 142 + xy: 642, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 487, 132 + xy: 656, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 622, 296 + xy: 656, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 632, 296 + xy: 656, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 626, 286 + xy: 656, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 626, 276 + xy: 652, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 626, 266 + xy: 689, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 626, 256 + xy: 689, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 933, 431 + xy: 989, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 947, 445 + xy: 1003, 446 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2023,7 +2030,7 @@ icon-admin index: -1 icon-admin-small rotate: false - xy: 494, 189 + xy: 1017, 452 size: 6, 6 orig: 6, 6 offset: 0, 0 @@ -2037,7 +2044,7 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 698, 375 + xy: 225, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2058,14 +2065,14 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 961, 433 + xy: 1005, 434 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 975, 447 + xy: 502, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2079,28 +2086,28 @@ icon-back index: -1 icon-ban rotate: false - xy: 225, 123 + xy: 241, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 241, 123 + xy: 257, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 987, 447 + xy: 514, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 257, 123 + xy: 273, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2128,77 +2135,77 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 502, 195 + xy: 526, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 514, 195 + xy: 538, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 526, 195 + xy: 550, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 273, 123 + xy: 289, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 289, 123 + xy: 305, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 538, 195 + xy: 562, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 305, 127 + xy: 321, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 321, 127 + xy: 337, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 337, 127 + xy: 353, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 353, 127 + xy: 369, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 369, 127 + xy: 651, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2212,35 +2219,35 @@ icon-fill index: -1 icon-floppy rotate: false - xy: 651, 309 + xy: 939, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 939, 459 + xy: 955, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 955, 459 + xy: 971, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 971, 459 + xy: 987, 459 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 714, 370 + xy: 1003, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2254,28 +2261,28 @@ icon-grid index: -1 icon-hold rotate: false - xy: 550, 195 + xy: 385, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 562, 195 + xy: 397, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 987, 459 + xy: 734, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1003, 460 + xy: 734, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2289,7 +2296,7 @@ icon-info index: -1 icon-itch.io rotate: false - xy: 698, 359 + xy: 734, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2303,7 +2310,7 @@ icon-line index: -1 icon-link rotate: false - xy: 714, 354 + xy: 476, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2317,7 +2324,7 @@ icon-liquid index: -1 icon-load rotate: false - xy: 734, 394 + xy: 118, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2387,7 +2394,7 @@ icon-pencil index: -1 icon-pencil-small rotate: false - xy: 476, 162 + xy: 113, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2408,7 +2415,7 @@ icon-play index: -1 icon-play-2 rotate: false - xy: 118, 31 + xy: 129, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2422,21 +2429,21 @@ icon-players index: -1 icon-power rotate: false - xy: 417, 157 + xy: 409, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 417, 145 + xy: 417, 157 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 113, 15 + xy: 134, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2450,14 +2457,14 @@ icon-redo index: -1 icon-refresh rotate: false - xy: 129, 15 + xy: 145, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 134, 31 + xy: 385, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2471,35 +2478,35 @@ icon-resize index: -1 icon-rotate rotate: false - xy: 145, 15 + xy: 401, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 385, 135 + xy: 885, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 401, 135 + xy: 901, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 885, 445 + xy: 917, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 901, 445 + xy: 871, 423 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2520,7 +2527,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 429, 158 + xy: 417, 145 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2534,28 +2541,28 @@ icon-terrain index: -1 icon-tools rotate: false - xy: 917, 445 + xy: 871, 407 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 441, 158 + xy: 429, 158 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 429, 146 + xy: 441, 158 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 871, 423 + xy: 887, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2569,14 +2576,14 @@ icon-trash-16 index: -1 icon-trello rotate: false - xy: 871, 407 + xy: 887, 413 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 887, 429 + xy: 903, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2590,21 +2597,21 @@ icon-undo index: -1 icon-units rotate: false - xy: 453, 158 + xy: 429, 146 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 441, 146 + xy: 453, 158 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 887, 413 + xy: 903, 413 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2618,7 +2625,7 @@ icon-zoom index: -1 icon-zoom-small rotate: false - xy: 903, 429 + xy: 919, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2798,119 +2805,119 @@ flier index: -1 scout rotate: false - xy: 730, 352 + xy: 961, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 385, 121 + xy: 949, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 385, 121 + xy: 949, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 399, 121 + xy: 975, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 399, 121 + xy: 975, 445 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 beam rotate: false - xy: 465, 160 + 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: 224, 93 + xy: 612, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 234, 103 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 234, 83 + xy: 907, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 244, 93 + xy: 421, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 355, 117 + xy: 830, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 365, 117 + xy: 800, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 524, 175 + xy: 399, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 534, 175 + xy: 409, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 564, 175 + xy: 750, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 574, 175 + xy: 760, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 63662f833a..74c87bb2c7 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 d0f852c552..27bde985b0 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Thu Mar 29 22:50:34 EDT 2018 +#Thu Mar 29 23:33:54 EDT 2018 version=release -androidBuildCode=727 +androidBuildCode=729 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/Liquids.java b/core/src/io/anuke/mindustry/content/Liquids.java index 0285830043..28101ccff3 100644 --- a/core/src/io/anuke/mindustry/content/Liquids.java +++ b/core/src/io/anuke/mindustry/content/Liquids.java @@ -8,7 +8,7 @@ public class Liquids { public static final Liquid none = new Liquid("none", Color.CLEAR), - water = new Liquid("water", Color.ROYAL) { + water = new Liquid("water", Color.valueOf("486acd")) { { heatCapacity = 0.4f; } @@ -26,7 +26,7 @@ public class Liquids { viscosity = 0.8f; } }, - oil = new Liquid("oil", Color.valueOf("292929")) { + oil = new Liquid("oil", Color.valueOf("313131")) { { viscosity = 0.7f; flammability = 0.6f; diff --git a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java index f6bf8c02a5..2170b0b649 100644 --- a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java @@ -71,6 +71,7 @@ public class ProductionBlocks { pumpAmount = 0.1f; size = 2; liquidCapacity = 30f; + rotateSpeed = 1.4f; }}, oilextractor = new Fracker("oilextractor") {{ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java index 3b094c2ffe..43cb41dc1b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java @@ -113,7 +113,7 @@ public class Drill extends Block{ float powerUsed = Math.min(powerCapacity, powerUse * Timers.delta()); float liquidUsed = Math.min(liquidCapacity, liquidUse * Timers.delta()); - if(entity.inventory.totalItems() < itemCapacity && + if(entity.inventory.totalItems() < itemCapacity && toAdd.size > 0 && (!hasPower || entity.power.amount >= powerUsed) && (!liquidRequired || entity.liquid.amount >= liquidUsed)){ 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 a2622e2b10..0bff274746 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 @@ -1,5 +1,6 @@ package io.anuke.mindustry.world.blocks.types.production; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.entities.TileEntity; @@ -9,6 +10,7 @@ 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.graphics.Draw; import io.anuke.ucore.util.Mathf; /**Pump that makes liquid from solids and takes in power. Only works on solid floor blocks.*/ @@ -18,6 +20,7 @@ public class SolidPump extends Pump { protected float powerUse = 0.1f; protected Effect updateEffect = Fx.none; protected float updateEffectChance = 0.02f; + protected float rotateSpeed = 1f; protected final Array drawTiles = new Array<>(); @@ -27,6 +30,24 @@ public class SolidPump extends Pump { liquidRegion = name + "-liquid"; } + @Override + public void draw(Tile tile) { + SolidPumpEntity entity = tile.entity(); + + Draw.rect(name, tile.drawx(), tile.drawy()); + Draw.color(tile.entity.liquid.liquid.color); + Draw.alpha(tile.entity.liquid.amount / liquidCapacity); + Draw.rect(liquidRegion, tile.drawx(), tile.drawy()); + Draw.color(); + Draw.rect(name + "-rotator", tile.drawx(), tile.drawy(), entity.pumpTime * rotateSpeed); + Draw.rect(name + "-top", tile.drawx(), tile.drawy()); + } + + @Override + public TextureRegion[] getIcon() { + return new TextureRegion[]{Draw.region(name), Draw.region(name + "-rotator"), Draw.region(name + "-top")}; + } + @Override public void update(Tile tile){ SolidPumpEntity entity = tile.entity(); @@ -45,7 +66,7 @@ public class SolidPump extends Pump { if(isValid(tile)) fraction = 1f; } - if(tile.entity.power.amount >= used){ + if(tile.entity.power.amount >= used && tile.entity.liquid.amount < liquidCapacity - 0.001f){ float maxPump = Math.min(liquidCapacity - tile.entity.liquid.amount, pumpAmount * Timers.delta() * fraction); tile.entity.liquid.liquid = result; tile.entity.liquid.amount += maxPump;