diff --git a/core/assets-raw/sprites/blocks/production/melter.png b/core/assets-raw/sprites/blocks/production/melter.png index 96ccaccdcf..8a34464160 100644 Binary files a/core/assets-raw/sprites/blocks/production/melter.png and b/core/assets-raw/sprites/blocks/production/melter.png differ diff --git a/core/assets-raw/sprites/blocks/production/powersmelter-top.png b/core/assets-raw/sprites/blocks/production/powersmelter-top.png new file mode 100644 index 0000000000..9db85fcb46 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/powersmelter-top.png differ diff --git a/core/assets-raw/sprites/items/item-densealloy.png b/core/assets-raw/sprites/items/item-densealloy.png index 02cdef894c..db7d97a9e7 100644 Binary files a/core/assets-raw/sprites/items/item-densealloy.png and b/core/assets-raw/sprites/items/item-densealloy.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 89b33e5a9f..22f4fc9934 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: 654, 289 + xy: 644, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 662, 299 + xy: 652, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 664, 289 + xy: 624, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 664, 279 + xy: 634, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 750, 406 + xy: 644, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 750, 396 + xy: 654, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,42 +62,42 @@ core index: -1 junction rotate: false - xy: 840, 371 + xy: 860, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 945, 465 + xy: 810, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 945, 455 + xy: 820, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 955, 465 + xy: 830, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 945, 445 + xy: 840, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 955, 455 + xy: 850, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -132,70 +132,70 @@ multiplexer index: -1 poweredconveyor rotate: false - xy: 985, 465 + xy: 945, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 975, 445 + xy: 955, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 927, 425 + xy: 955, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 937, 435 + xy: 965, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 957, 425 + xy: 975, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 929, 405 + xy: 624, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 939, 405 + xy: 634, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 949, 405 + xy: 644, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 959, 405 + xy: 654, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 969, 405 + xy: 664, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -209,7 +209,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 181, 24 + xy: 667, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,14 +223,14 @@ vault index: -1 vault-icon rotate: false - xy: 201, 24 + xy: 674, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 590, 274 + xy: 590, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -251,42 +251,42 @@ blackrockshadow1 index: -1 blackstone1 rotate: false - xy: 669, 327 + xy: 669, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 627, 306 + xy: 669, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 637, 306 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 419, 125 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 889, 409 + xy: 419, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 419, 159 + xy: 889, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -321,28 +321,28 @@ coal3 index: -1 deepwater rotate: false - xy: 750, 376 + xy: 654, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 760, 401 + xy: 654, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 760, 391 + xy: 662, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 770, 401 + xy: 664, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,35 +356,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 790, 391 + xy: 760, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 800, 401 + xy: 760, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 790, 381 + xy: 770, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 800, 391 + xy: 760, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 810, 401 + xy: 770, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -398,21 +398,21 @@ grassedge index: -1 ice1 rotate: false - xy: 800, 381 + xy: 780, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 810, 391 + xy: 770, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 820, 401 + xy: 780, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -426,70 +426,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 810, 381 + xy: 790, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 820, 391 + xy: 780, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 830, 401 + xy: 790, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 830, 401 + xy: 790, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 820, 381 + xy: 800, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 820, 381 + xy: 800, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 830, 391 + xy: 790, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 840, 401 + xy: 800, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 830, 381 + xy: 810, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 850, 371 + xy: 860, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -503,35 +503,35 @@ lavaedge index: -1 lead1 rotate: false - xy: 870, 401 + xy: 770, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 870, 391 + xy: 780, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 870, 381 + xy: 790, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 955, 445 + xy: 870, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 965, 455 + xy: 870, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,56 +545,56 @@ oiledge index: -1 rock1 rotate: false - xy: 947, 425 + xy: 975, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 957, 435 + xy: 985, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 977, 435 + xy: 927, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 977, 425 + xy: 927, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 987, 435 + xy: 937, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 987, 425 + xy: 937, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 148, 54 + xy: 947, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 158, 54 + xy: 947, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -608,56 +608,56 @@ sandedge index: -1 shrub rotate: false - xy: 419, 115 + xy: 987, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 899, 409 + xy: 148, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 939, 415 + xy: 188, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 949, 415 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 959, 415 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 969, 415 + xy: 218, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 979, 415 + xy: 305, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 989, 415 + xy: 604, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -671,42 +671,42 @@ snowedge index: -1 stone1 rotate: false - xy: 989, 405 + xy: 604, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 691, 353 + xy: 624, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 691, 343 + xy: 634, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 691, 333 + xy: 644, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 654, 269 + xy: 654, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 664, 269 + xy: 664, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -720,49 +720,49 @@ stoneedge index: -1 thorium1 rotate: false - xy: 160, 34 + xy: 654, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 180, 44 + xy: 664, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 170, 34 + xy: 419, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 180, 34 + xy: 909, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 200, 44 + xy: 919, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 190, 34 + xy: 929, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 492, 168 + xy: 674, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,28 +776,28 @@ wateredge index: -1 block-middle rotate: false - xy: 459, 160 + xy: 449, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 459, 160 + xy: 449, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 654, 279 + xy: 644, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 750, 386 + xy: 654, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -818,28 +818,28 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 780, 391 + xy: 750, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 975, 455 + xy: 945, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 592, 246 + xy: 592, 244 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow rotate: false - xy: 674, 361 + xy: 591, 232 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -860,21 +860,21 @@ batterylarge index: -1 coalgenerator rotate: false - xy: 642, 296 + xy: 634, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 644, 286 + xy: 634, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 644, 276 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,56 +909,56 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 985, 455 + xy: 945, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 985, 445 + xy: 955, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 927, 435 + xy: 965, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 967, 435 + xy: 985, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 967, 425 + xy: 985, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 188, 54 + xy: 967, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 698, 391 + xy: 716, 404 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 681, 331 + xy: 614, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -972,7 +972,7 @@ teleporter index: -1 thermalgenerator rotate: false - xy: 170, 44 + xy: 644, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1000,14 +1000,14 @@ centrifuge index: -1 coaldrill rotate: false - xy: 634, 286 + xy: 624, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 634, 276 + xy: 634, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1042,35 +1042,35 @@ cultivator index: -1 extractor rotate: false - xy: 790, 401 + xy: 750, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 780, 381 + xy: 750, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 840, 391 + xy: 800, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 820, 371 + xy: 860, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 830, 371 + xy: 850, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1084,21 +1084,21 @@ laserdrill index: -1 lavasmelter rotate: false - xy: 860, 371 + xy: 760, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 leaddrill rotate: false - xy: 870, 371 + xy: 800, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 965, 465 + xy: 860, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1119,14 +1119,14 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 975, 465 + xy: 870, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 965, 445 + xy: 870, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1159,114 +1159,121 @@ powersmelter orig: 16, 16 offset: 0, 0 index: -1 -pulverizer - rotate: false - xy: 937, 425 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -pump - rotate: false - xy: 947, 435 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -quartzextractor +powersmelter-top rotate: false xy: 698, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +pulverizer + rotate: false + xy: 975, 465 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +pump + rotate: false + xy: 965, 445 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +quartzextractor + rotate: false + xy: 698, 391 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 separator rotate: false - xy: 168, 54 + xy: 957, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 909, 411 + xy: 158, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 919, 411 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 929, 415 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 150, 44 + xy: 614, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 150, 34 + xy: 624, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thoriumdrill rotate: false - xy: 190, 44 + xy: 899, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 210, 44 + xy: 939, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 200, 34 + xy: 949, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 191, 24 + xy: 672, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 572, 272 + xy: 572, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 572, 254 + xy: 590, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 449, 160 + xy: 439, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1308,7 +1315,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 780, 401 + xy: 664, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1385,14 +1392,14 @@ repairturret index: -1 shotgunturret rotate: false - xy: 669, 349 + xy: 674, 361 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 669, 337 + xy: 669, 349 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1448,14 +1455,14 @@ walkerfactory-top-open index: -1 compositewall rotate: false - xy: 652, 299 + xy: 644, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 760, 381 + xy: 664, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1476,14 +1483,14 @@ door-large-open index: -1 door-open rotate: false - xy: 770, 391 + xy: 664, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 770, 381 + xy: 750, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1497,49 +1504,49 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 850, 401 + xy: 810, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 979, 405 + xy: 614, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 716, 404 + xy: 716, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 160, 44 + xy: 634, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 210, 34 + xy: 959, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 220, 44 + xy: 969, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 716, 386 + xy: 572, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1553,7 +1560,7 @@ blank index: -1 bullet rotate: false - xy: 681, 351 + xy: 459, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1595,112 +1602,112 @@ laserfull index: -1 shell rotate: false - xy: 178, 54 + xy: 957, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 218, 54 + xy: 977, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 305, 105 + xy: 987, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 220, 34 + xy: 979, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 840, 381 + xy: 820, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 850, 391 + xy: 810, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 860, 401 + xy: 820, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 850, 381 + xy: 830, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 860, 391 + xy: 820, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 860, 381 + xy: 830, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 760, 371 + xy: 840, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 770, 371 + xy: 830, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 780, 371 + xy: 840, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 790, 371 + xy: 850, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 800, 371 + xy: 840, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 810, 371 + xy: 850, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1925,7 +1932,7 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 590, 258 + xy: 608, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1967,7 +1974,7 @@ icon-back index: -1 icon-ban rotate: false - xy: 608, 276 + xy: 608, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2735,21 +2742,21 @@ beam-equip index: -1 blaster rotate: false - xy: 429, 160 + xy: 419, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 439, 160 + xy: 429, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 681, 341 + xy: 681, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2763,42 +2770,42 @@ clustergun-equip index: -1 shockgun rotate: false - xy: 198, 54 + xy: 967, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 208, 54 + xy: 977, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 161, 24 + xy: 989, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 171, 24 + xy: 669, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 211, 24 + xy: 674, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 221, 24 + xy: 674, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index ee4d36a3fe..1836a06937 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 b4cb1649c6..3bef978c96 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Tue Mar 27 20:10:08 EDT 2018 +#Tue Mar 27 21:26:54 EDT 2018 version=release -androidBuildCode=678 +androidBuildCode=681 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 ab0ef34766..d9ea8fcb85 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -41,8 +41,9 @@ public class CraftingBlocks { powersmelter = new PowerSmelter("powersmelter") {{ health = 90; + craftEffect = Fx.smeltsmoke; inputs = new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.iron, 1)}; - result = Items.densealloy; + result = Items.steel; burnDuration = 45f; powerUse = 0.1f; craftTime = 25f; diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java index ffe8696296..89c358a1c8 100644 --- a/core/src/io/anuke/mindustry/world/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/BaseBlock.java @@ -111,10 +111,12 @@ public abstract class BaseBlock { int size = tile.block().size; GridPoint2[] nearby = Edges.getEdges(size); + byte i = (byte)(tile.getDump() % nearby.length); for(int j = 0; j < nearby.length; j ++){ - Tile other = tile.getNearby(nearby[j]); - Tile in = tile.getNearby(Edges.getInsideEdges(size)[j]); + tile.setDump((byte)((i + 1) % nearby.length)); + Tile other = tile.getNearby(nearby[i]); + Tile in = tile.getNearby(Edges.getInsideEdges(size)[i]); if(other != null && other.block().acceptItem(item, other, in) && canDump(tile, other, item)){ other.block().handleItem(item, other, in); return; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/PowerSmelter.java b/core/src/io/anuke/mindustry/world/blocks/types/production/PowerSmelter.java index efaecca4cb..5106773558 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/PowerSmelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/PowerSmelter.java @@ -14,7 +14,6 @@ import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Log; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; @@ -131,21 +130,19 @@ public class PowerSmelter extends PowerBlock { PowerSmelterEntity entity = tile.entity(); - Log.info(entity.heat + ""); - //draw glowing center if(entity.heat > 0f){ float g = 0.3f; float r = 0.06f; float cr = Mathf.random(0.1f); - Draw.alpha(((1f-g) + Mathf.absin(Timers.time(), 9f, g) + Mathf.random(r) - r) * entity.heat); + Draw.alpha(((1f-g) + Mathf.absin(Timers.time(), 8f, g) + Mathf.random(r) - r) * entity.heat); Draw.tint(Color.valueOf("ffc999")); - Fill.circle(tile.drawx(), tile.drawy(), 3f + Mathf.absin(Timers.time(), 6f, 2f) + cr); + Fill.circle(tile.drawx(), tile.drawy(), 3f + Mathf.absin(Timers.time(), 5f, 2f) + cr); Draw.color(1f, 1f, 1f, entity.heat); Draw.rect(name + "-top", tile.drawx(), tile.drawy()); - Fill.circle(tile.drawx(), tile.drawy(), 2f + Mathf.absin(Timers.time(), 6f, 1f) + cr); + Fill.circle(tile.drawx(), tile.drawy(), 1.9f + Mathf.absin(Timers.time(), 5f, 1f) + cr); Draw.color(); }