diff --git a/core/assets-raw/sprites/blocks/production/cultivator-middle.png b/core/assets-raw/sprites/blocks/production/cultivator-middle.png new file mode 100644 index 0000000000..636a7c9865 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cultivator-middle.png differ diff --git a/core/assets-raw/sprites/blocks/production/cultivator-top.png b/core/assets-raw/sprites/blocks/production/cultivator-top.png new file mode 100644 index 0000000000..c5db5a8ffd Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cultivator-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/cultivator.png b/core/assets-raw/sprites/blocks/production/cultivator.png index dede08c985..584451324f 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/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 22f4fc9934..f997c93d49 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: 644, 276 + xy: 626, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 652, 299 + xy: 636, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 624, 256 + xy: 636, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 634, 256 + xy: 636, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 644, 256 + xy: 636, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 654, 289 + xy: 634, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,42 +62,42 @@ core index: -1 junction rotate: false - xy: 860, 391 + xy: 850, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 810, 371 + xy: 760, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 820, 371 + xy: 770, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 830, 371 + xy: 780, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 840, 371 + xy: 790, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 850, 371 + xy: 800, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -125,77 +125,77 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 817, 427 + xy: 853, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 945, 455 + xy: 870, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 955, 465 + xy: 870, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 955, 445 + xy: 684, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 965, 455 + xy: 679, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 975, 445 + xy: 672, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 624, 246 + xy: 985, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 634, 246 + xy: 985, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 644, 246 + xy: 981, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 654, 249 + xy: 955, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 664, 249 + xy: 965, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -209,7 +209,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 667, 309 + xy: 676, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,14 +223,14 @@ vault index: -1 vault-icon rotate: false - xy: 674, 289 + xy: 676, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 590, 256 + xy: 608, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -244,49 +244,49 @@ blackrock1 index: -1 blackrockshadow1 rotate: false - xy: 686, 363 + xy: 604, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 669, 339 + xy: 614, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 669, 329 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 627, 306 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 637, 306 + xy: 889, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 419, 125 + xy: 899, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 889, 409 + xy: 909, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,49 +300,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 632, 296 + xy: 429, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 624, 286 + xy: 439, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 624, 276 + xy: 449, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 654, 269 + xy: 652, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 654, 259 + xy: 646, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 662, 299 + xy: 646, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 664, 289 + xy: 646, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,35 +356,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 760, 401 + xy: 662, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 760, 391 + xy: 750, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 770, 401 + xy: 750, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 760, 381 + xy: 750, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 770, 391 + xy: 750, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -398,406 +398,406 @@ grassedge index: -1 ice1 rotate: false - xy: 780, 401 + xy: 760, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 770, 381 + xy: 760, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 780, 391 + xy: 770, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 321, 121 + xy: 353, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 790, 401 + xy: 760, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 780, 381 + xy: 770, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 790, 391 + xy: 780, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 790, 391 + xy: 780, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 800, 401 + xy: 770, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 800, 401 + xy: 770, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 790, 381 + xy: 780, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 800, 391 + xy: 790, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 810, 401 + xy: 780, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 860, 381 + xy: 840, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 335, 121 + xy: 367, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 770, 371 + xy: 860, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 780, 371 + xy: 850, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 790, 371 + xy: 860, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 870, 401 + xy: 820, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 870, 391 + xy: 830, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 349, 121 + xy: 381, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 975, 455 + xy: 679, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 985, 465 + xy: 677, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 927, 435 + xy: 692, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 927, 425 + xy: 148, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 937, 435 + xy: 158, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 937, 425 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 947, 435 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 947, 425 + xy: 188, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 363, 121 + xy: 395, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 987, 425 + xy: 955, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 148, 54 + xy: 965, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 188, 54 + xy: 975, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 198, 54 + xy: 965, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 208, 54 + xy: 961, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 218, 54 + xy: 975, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 305, 105 + xy: 985, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 604, 246 + xy: 975, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 885, 433 + xy: 913, 433 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 604, 236 + xy: 985, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 624, 236 + xy: 991, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 634, 236 + xy: 995, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 644, 236 + xy: 305, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 654, 239 + xy: 955, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 664, 239 + xy: 965, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 875, 413 + xy: 903, 419 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 654, 229 + xy: 582, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 664, 229 + xy: 592, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 419, 115 + xy: 592, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 909, 411 + xy: 586, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 919, 411 + xy: 596, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 929, 415 + xy: 596, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 674, 259 + xy: 696, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 889, 419 + xy: 917, 419 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 449, 160 + xy: 669, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 449, 160 + xy: 669, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 644, 266 + xy: 624, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 654, 279 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -818,28 +818,28 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 750, 396 + xy: 656, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 945, 465 + xy: 860, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 592, 244 + xy: 305, 115 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow rotate: false - xy: 591, 232 + xy: 579, 232 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -860,21 +860,21 @@ batterylarge index: -1 coalgenerator rotate: false - xy: 634, 276 + xy: 632, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 634, 266 + xy: 626, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 642, 296 + xy: 626, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,56 +909,56 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 945, 445 + xy: 870, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 955, 455 + xy: 870, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 965, 465 + xy: 674, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 985, 455 + xy: 682, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 985, 445 + xy: 687, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 967, 435 + xy: 218, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 716, 404 + xy: 572, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 614, 250 + xy: 971, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -972,7 +972,7 @@ teleporter index: -1 thermalgenerator rotate: false - xy: 644, 226 + xy: 582, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1000,14 +1000,14 @@ centrifuge index: -1 coaldrill rotate: false - xy: 624, 266 + xy: 459, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 634, 286 + xy: 622, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1040,65 +1040,79 @@ cultivator orig: 16, 16 offset: 0, 0 index: -1 +cultivator-middle + rotate: false + xy: 543, 225 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +cultivator-top + rotate: false + xy: 383, 151 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 extractor rotate: false - xy: 750, 386 + xy: 656, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 750, 376 + xy: 654, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 800, 381 + xy: 790, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 860, 401 + xy: 830, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 850, 381 + xy: 840, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 651, 325 + xy: 781, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 760, 371 + xy: 850, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 leaddrill rotate: false - xy: 800, 371 + xy: 860, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 860, 371 + xy: 810, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1119,161 +1133,161 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 870, 381 + xy: 840, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 870, 371 + xy: 850, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasticformer rotate: false - xy: 835, 427 + xy: 680, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 853, 427 + xy: 680, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 680, 407 + xy: 698, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 680, 389 + xy: 698, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 698, 409 + xy: 716, 404 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 975, 465 + xy: 679, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 965, 445 + xy: 679, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 698, 391 + xy: 716, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 separator rotate: false - xy: 957, 435 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 158, 54 + xy: 955, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 168, 54 + xy: 951, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 178, 54 + xy: 965, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 614, 230 + xy: 975, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 624, 226 + xy: 985, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thoriumdrill rotate: false - xy: 899, 409 + xy: 586, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 939, 415 + xy: 666, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 949, 415 + xy: 666, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 672, 299 + xy: 686, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 572, 254 + xy: 590, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 590, 274 + xy: 608, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 439, 160 + xy: 669, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1315,14 +1329,14 @@ chainturret index: -1 doubleturret rotate: false - xy: 664, 259 + xy: 656, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 401, 151 + xy: 118, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1350,56 +1364,56 @@ gatlingturret index: -1 laserturret rotate: false - xy: 293, 111 + xy: 269, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 763, 427 + xy: 799, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 781, 427 + xy: 817, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 799, 427 + xy: 835, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 305, 115 + xy: 281, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 579, 232 + xy: 293, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 674, 361 + xy: 592, 244 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 669, 349 + xy: 591, 232 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1413,140 +1427,140 @@ titancannon index: -1 flierfactory rotate: false - xy: 656, 361 + xy: 476, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 656, 361 + xy: 476, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 118, 47 + xy: 492, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 118, 47 + xy: 492, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 476, 178 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 476, 178 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 compositewall rotate: false - xy: 644, 286 + xy: 626, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 664, 279 + xy: 646, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 543, 225 + xy: 205, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 383, 151 + xy: 401, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 664, 269 + xy: 644, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 750, 406 + xy: 656, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 205, 112 + xy: 656, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 810, 391 + xy: 800, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 614, 240 + xy: 975, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 716, 386 + xy: 572, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 634, 226 + xy: 995, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 959, 415 + xy: 666, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 969, 415 + xy: 666, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 572, 272 + xy: 590, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1560,7 +1574,7 @@ blank index: -1 bullet rotate: false - xy: 459, 160 + xy: 669, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1602,126 +1616,126 @@ laserfull index: -1 shell rotate: false - xy: 957, 425 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 977, 425 + xy: 945, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 987, 435 + xy: 945, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 979, 415 + xy: 676, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 820, 401 + xy: 790, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 810, 381 + xy: 800, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 820, 391 + xy: 810, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 830, 401 + xy: 800, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 820, 381 + xy: 810, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 830, 391 + xy: 820, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 840, 401 + xy: 810, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 830, 381 + xy: 820, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 840, 391 + xy: 830, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 850, 401 + xy: 820, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 840, 381 + xy: 830, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 850, 391 + xy: 840, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 899, 433 + xy: 875, 413 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 913, 433 + xy: 889, 419 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1932,7 +1946,7 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 608, 276 + xy: 763, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1960,42 +1974,42 @@ icon-arrow-right index: -1 icon-arrow-up rotate: false - xy: 903, 421 + xy: 502, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 492, 207 + xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 608, 260 + xy: 779, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 763, 411 + xy: 795, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 915, 421 + xy: 514, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 779, 411 + xy: 811, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2023,497 +2037,497 @@ 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: 795, 411 + xy: 827, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 811, 411 + xy: 843, 411 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: 827, 411 + xy: 859, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 843, 411 + xy: 680, 373 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 859, 411 + xy: 225, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 680, 373 + xy: 241, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 225, 123 + xy: 257, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 510, 207 + xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 241, 123 + xy: 273, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 257, 123 + xy: 289, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 273, 123 + xy: 305, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 289, 123 + xy: 651, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 305, 127 + xy: 734, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 528, 207 + xy: 867, 453 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 550, 195 + xy: 933, 457 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 562, 195 + xy: 933, 445 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 651, 309 + xy: 329, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 734, 394 + xy: 345, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 933, 457 + xy: 927, 433 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 329, 135 + xy: 361, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 546, 207 + xy: 134, 92 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 345, 135 + xy: 377, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 933, 445 + xy: 136, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 361, 135 + xy: 393, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 867, 453 + xy: 134, 74 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 134, 92 + xy: 152, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 134, 74 + xy: 152, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 136, 53 + xy: 154, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 154, 64 + xy: 166, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 152, 94 + xy: 170, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 166, 64 + xy: 178, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 178, 64 + xy: 190, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 152, 76 + xy: 170, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 377, 135 + xy: 409, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 170, 94 + xy: 188, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 190, 64 + xy: 202, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 393, 135 + xy: 476, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 202, 64 + xy: 214, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 214, 64 + xy: 574, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 574, 195 + xy: 931, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 409, 135 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 170, 76 + xy: 188, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 476, 162 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 885, 463 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 188, 94 + xy: 206, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 901, 463 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 917, 463 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 885, 447 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 901, 447 + xy: 118, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 917, 447 + xy: 113, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 188, 76 + xy: 206, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 206, 94 + xy: 561, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 233, 111 + xy: 939, 433 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 206, 76 + xy: 564, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 118, 31 + xy: 129, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 245, 111 + xy: 943, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 257, 111 + xy: 233, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 113, 15 + xy: 134, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 561, 225 + xy: 651, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 129, 15 + xy: 145, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 134, 31 + xy: 734, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 564, 207 + xy: 651, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 269, 111 + xy: 245, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 281, 111 + xy: 257, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 145, 15 + xy: 321, 119 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 651, 343 + xy: 763, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 734, 378 + xy: 337, 119 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2619,7 +2633,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 1, 5 + xy: 652, 296 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2693,35 +2707,35 @@ flier index: -1 scout rotate: false - xy: 377, 121 + xy: 409, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 391, 121 + xy: 885, 433 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 391, 121 + xy: 885, 433 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 405, 121 + xy: 899, 433 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 405, 121 + xy: 899, 433 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2742,70 +2756,70 @@ beam-equip index: -1 blaster rotate: false - xy: 419, 159 + xy: 919, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 429, 160 + xy: 669, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 681, 351 + xy: 667, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 622, 296 + xy: 419, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 967, 425 + xy: 945, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 977, 435 + xy: 955, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 989, 415 + xy: 676, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 669, 319 + xy: 686, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 674, 279 + xy: 686, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 674, 269 + xy: 686, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 1836a06937..9f53ceeaeb 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 3bef978c96..719fc49245 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Tue Mar 27 21:26:54 EDT 2018 +#Tue Mar 27 23:14:38 EDT 2018 version=release -androidBuildCode=681 +androidBuildCode=686 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 d9ea8fcb85..5e5ec42b97 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -34,7 +34,6 @@ public class CraftingBlocks { inputs = new ItemStack[]{new ItemStack(Items.titanium, 4), new ItemStack(Items.thorium, 4)}; result = Items.densealloy; powerUse = 0.3f; - burnDuration = 45f; craftTime = 25f; size = 2; }}, @@ -44,7 +43,6 @@ public class CraftingBlocks { craftEffect = Fx.smeltsmoke; inputs = new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.iron, 1)}; result = Items.steel; - burnDuration = 45f; powerUse = 0.1f; craftTime = 25f; size = 2; diff --git a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java index 9074a0fbcc..dc6369b293 100644 --- a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java @@ -3,6 +3,7 @@ package io.anuke.mindustry.content.blocks; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.blocks.types.production.Cultivator; import io.anuke.mindustry.world.blocks.types.production.Drill; import io.anuke.mindustry.world.blocks.types.production.GenericDrill; import io.anuke.mindustry.world.blocks.types.production.SolidPump; @@ -93,7 +94,7 @@ public class ProductionBlocks { liquidCapacity = 80f; }}, - cultivator = new GenericDrill("cultivator") {{ + cultivator = new Cultivator("cultivator") {{ resource = Blocks.grass; result = Items.biomatter; inputLiquid = Liquids.water; diff --git a/core/src/io/anuke/mindustry/graphics/Fx.java b/core/src/io/anuke/mindustry/graphics/Fx.java index 0e48b79760..414d1723e1 100644 --- a/core/src/io/anuke/mindustry/graphics/Fx.java +++ b/core/src/io/anuke/mindustry/graphics/Fx.java @@ -22,6 +22,8 @@ public class Fx{ public static Color beamLight = Color.valueOf("ddffe9"); public static final Effect + + none = new Effect(0, 0f, e->{}), generatorexplosion = new Effect(28, 40f, e -> { Angles.randLenVectors(e.id, 16, 10f + e.ifract()*8f, (x, y)->{ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Cultivator.java new file mode 100644 index 0000000000..73ac40d1d6 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Cultivator.java @@ -0,0 +1,91 @@ +package io.anuke.mindustry.world.blocks.types.production; + +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.graphics.Fx; +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.core.Timers; +import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.graphics.Lines; +import io.anuke.ucore.util.Mathf; +import io.anuke.ucore.util.SeedRandom; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +public class Cultivator extends GenericDrill { + protected Color plantColor = Color.valueOf("648b55"); + protected Color plantColorLight = Color.valueOf("73a75f"); + protected Color bottomColor = Color.valueOf("474747"); + + protected SeedRandom random = new SeedRandom(0); + protected float recurrence = 6f; + + public Cultivator(String name) { + super(name); + drillEffect = Fx.none; + } + + @Override + public void update(Tile tile) { + super.update(tile); + + CultivatorEntity entity = tile.entity(); + entity.warmup = Mathf.lerpDelta(entity.warmup, + tile.entity.liquid.amount > liquidUse ? 1f : 0f, 0.015f); + } + + @Override + public void draw(Tile tile) { + CultivatorEntity entity = tile.entity(); + + Draw.rect(name, tile.drawx(), tile.drawy()); + + Draw.color(plantColor); + Draw.alpha(entity.warmup); + Draw.rect(name + "-middle", tile.drawx(), tile.drawy()); + + Draw.color(bottomColor, plantColorLight, entity.warmup); + + random.setSeed(tile.packedPosition()); + for(int i = 0; i < 12; i ++){ + float offset = random.nextFloat() * 999999f; + float x = random.range(4f), y = random.range(4f); + float life = 1f - (((Timers.time() + offset) / 50f) % recurrence); + + if(life > 0){ + Lines.stroke(entity.warmup * (life*1f + 0.2f)); + Lines.poly(tile.drawx() + x, tile.drawy() + y, 8, (1f-life) * 3f); + } + } + + Draw.color(); + Draw.rect(name + "-top", tile.drawx(), tile.drawy()); + } + + @Override + public TextureRegion[] getIcon() { + return new TextureRegion[]{Draw.region(name), Draw.region(name + "-top"), }; + } + + @Override + public TileEntity getEntity() { + return new CultivatorEntity(); + } + + public static class CultivatorEntity extends DrillEntity{ + public float warmup; + + @Override + public void write(DataOutputStream stream) throws IOException { + stream.writeFloat(warmup); + } + + @Override + public void read(DataInputStream stream) throws IOException { + warmup = stream.readFloat(); + } + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/GenericDrill.java b/core/src/io/anuke/mindustry/world/blocks/types/production/GenericDrill.java index 94742a30d1..081a8a09d8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/GenericDrill.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/GenericDrill.java @@ -29,6 +29,15 @@ public class GenericDrill extends Drill{ DrillEntity entity = tile.entity(); + float multiplier = 0f; + + for(Tile other : tile.getLinkedTiles(tempTiles)){ + if(isValid(other)){ + toAdd.add(result == null ? other.floor().drops.item : result); + multiplier += 1f; + } + } + float powerUsed = Math.min(powerCapacity, powerUse * Timers.delta()); float liquidUsed = Math.min(liquidCapacity, liquidUse * Timers.delta()); @@ -36,25 +45,24 @@ public class GenericDrill extends Drill{ && (!hasLiquids || entity.liquid.amount >= liquidUsed)){ if(hasPower) entity.power.amount -= powerUsed; if(hasLiquids) entity.liquid.amount -= liquidUsed; - entity.time += Timers.delta(); + entity.time += Timers.delta() * multiplier; }else{ return; } - for(Tile other : tile.getLinkedTiles(tempTiles)){ - if(isValid(other)){ - toAdd.add(result == null ? other.floor().drops.item : result); - } - } - if(toAdd.size > 0 && entity.time >= drillTime && tile.entity.inventory.totalItems() < itemCapacity){ - for(Item item : toAdd) offloadNear(tile, item); - Effects.effect(drillEffect, tile.drawx(), tile.drawy()); + + int index = entity.index % toAdd.size; + offloadNear(tile, toAdd.get(index)); + + entity.index ++; entity.time = 0f; + + Effects.effect(drillEffect, tile.drawx(), tile.drawy()); } - if(entity.timer.get(timerDump, 30)){ + if(entity.timer.get(timerDump, 15)){ tryDump(tile); } } @@ -78,7 +86,8 @@ public class GenericDrill extends Drill{ return new DrillEntity(); } - static class DrillEntity extends TileEntity{ + public static class DrillEntity extends TileEntity{ public float time; + public int index; } } 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 5106773558..407ff34386 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 @@ -17,6 +17,10 @@ import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + public class PowerSmelter extends PowerBlock { protected final int timerDump = timers++; protected final int timerCraft = timers++; @@ -32,10 +36,10 @@ public class PowerSmelter extends PowerBlock { protected float minHeat = 0.5f; protected float craftTime = 20f; //time to craft one item, so max 3 items per second by default - protected float burnDuration = 50f; //by default, the fuel will burn 45 frames, so that's 2.5 items/fuel at most protected float burnEffectChance = 0.01f; protected Effect craftEffect = Fx.smelt, burnEffect = Fx.fuelburn; + protected Color flameColor = Color.valueOf("ffc999"); protected int capacity = 20; @@ -62,7 +66,6 @@ public class PowerSmelter extends PowerBlock { // stats.add("input", Arrays.toString(inputs)); stats.add("powersecond", Strings.toFixed(powerUse *60f, 2)); //stats.add("output", result); - stats.add("fuelduration", Strings.toFixed(burnDuration/60f, 1)); stats.add("maxoutputsecond", Strings.toFixed(60f/craftTime, 1)); stats.add("inputcapacity", capacity); stats.add("outputcapacity", capacity); @@ -138,7 +141,7 @@ public class PowerSmelter extends PowerBlock { Draw.alpha(((1f-g) + Mathf.absin(Timers.time(), 8f, g) + Mathf.random(r) - r) * entity.heat); - Draw.tint(Color.valueOf("ffc999")); + Draw.tint(flameColor); 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()); @@ -155,5 +158,15 @@ public class PowerSmelter extends PowerBlock { class PowerSmelterEntity extends TileEntity{ public float heat; + + @Override + public void write(DataOutputStream stream) throws IOException { + stream.writeFloat(heat); + } + + @Override + public void read(DataInputStream stream) throws IOException { + heat = stream.readFloat(); + } } }