diff --git a/core/assets-raw/sprites/blocks/powerinfinite.png b/core/assets-raw/sprites/blocks/powerinfinite.png new file mode 100644 index 0000000000..d6af428dcd Binary files /dev/null and b/core/assets-raw/sprites/blocks/powerinfinite.png differ diff --git a/core/assets-raw/sprites/blocks/powervoid.png b/core/assets-raw/sprites/blocks/powervoid.png new file mode 100644 index 0000000000..13a69fc8f0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/powervoid.png differ diff --git a/core/assets-raw/sprites/blocks/pulverizer.png b/core/assets-raw/sprites/blocks/pulverizer.png new file mode 100644 index 0000000000..68005ee7b4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/pulverizer.png differ diff --git a/core/assets-raw/sprites/blocks/quartzextractor.png b/core/assets-raw/sprites/blocks/quartzextractor.png new file mode 100644 index 0000000000..a1b7ecca1c Binary files /dev/null and b/core/assets-raw/sprites/blocks/quartzextractor.png differ diff --git a/core/assets-raw/sprites/blocks/siliconextractor.png b/core/assets-raw/sprites/blocks/siliconextractor.png new file mode 100644 index 0000000000..d774add1df Binary files /dev/null and b/core/assets-raw/sprites/blocks/siliconextractor.png differ diff --git a/core/assets-raw/sprites/blocks/uraniumdrill.png b/core/assets-raw/sprites/blocks/uraniumdrill.png index 7849b7cecd..9ed2df7eba 100644 Binary files a/core/assets-raw/sprites/blocks/uraniumdrill.png and b/core/assets-raw/sprites/blocks/uraniumdrill.png differ diff --git a/core/assets-raw/sprites/circle.png b/core/assets-raw/sprites/circle.png deleted file mode 100644 index 154fd0dd83..0000000000 Binary files a/core/assets-raw/sprites/circle.png and /dev/null differ diff --git a/core/assets-raw/sprites/icon-glass.png b/core/assets-raw/sprites/icon-glass.png new file mode 100644 index 0000000000..146cef90e9 Binary files /dev/null and b/core/assets-raw/sprites/icon-glass.png differ diff --git a/core/assets-raw/sprites/icon-quartz.png b/core/assets-raw/sprites/icon-quartz.png new file mode 100644 index 0000000000..cce04056b0 Binary files /dev/null and b/core/assets-raw/sprites/icon-quartz.png differ diff --git a/core/assets-raw/sprites/icon-sand.png b/core/assets-raw/sprites/icon-sand.png deleted file mode 100644 index 6492eb7b9d..0000000000 Binary files a/core/assets-raw/sprites/icon-sand.png and /dev/null differ diff --git a/core/assets-raw/sprites/icon-silicon.png b/core/assets-raw/sprites/icon-silicon.png new file mode 100644 index 0000000000..67001586a3 Binary files /dev/null and b/core/assets-raw/sprites/icon-silicon.png differ diff --git a/core/assets-raw/sprites/circle2.png b/core/assets-raw/sprites/shapes/circle.png similarity index 100% rename from core/assets-raw/sprites/circle2.png rename to core/assets-raw/sprites/shapes/circle.png diff --git a/core/assets-raw/sprites/shapes/shape-3.png b/core/assets-raw/sprites/shapes/shape-3.png new file mode 100644 index 0000000000..db75ca9349 Binary files /dev/null and b/core/assets-raw/sprites/shapes/shape-3.png differ diff --git a/core/assets-raw/sprites/shapes/shape-4.png b/core/assets-raw/sprites/shapes/shape-4.png new file mode 100644 index 0000000000..427aa33835 Binary files /dev/null and b/core/assets-raw/sprites/shapes/shape-4.png differ diff --git a/core/assets-raw/sprites/shapes/shape-5.png b/core/assets-raw/sprites/shapes/shape-5.png new file mode 100644 index 0000000000..34873c6ccb Binary files /dev/null and b/core/assets-raw/sprites/shapes/shape-5.png differ diff --git a/core/assets-raw/sprites/shapes/shape-6.png b/core/assets-raw/sprites/shapes/shape-6.png new file mode 100644 index 0000000000..70a6bf4c9a Binary files /dev/null and b/core/assets-raw/sprites/shapes/shape-6.png differ diff --git a/core/assets-raw/sprites/shapes/shape-7.png b/core/assets-raw/sprites/shapes/shape-7.png new file mode 100644 index 0000000000..b1d4298b34 Binary files /dev/null and b/core/assets-raw/sprites/shapes/shape-7.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c906eeebc1..c466b43694 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -449,6 +449,9 @@ block.oilrefinery.name=oil refinery block.oilrefinery.fulldescription=Refines large amounts of oil into coal items. Useful for fueling coal-based turrets when coal veins are scarce. block.stoneformer.name=stone former block.stoneformer.fulldescription=Soldifies liquid lava into stone. Useful for producing massive amounts of stone for coal purifiers. +block.siliconextractor.name=silicon extractor +block.pulverizer.name=pulverizer +block.quartzextractor.name=quartz extractor block.lavasmelter.name=lava smelter block.lavasmelter.fulldescription=Uses lava to convert iron to steel. An alternative to smelteries. Useful in situations where coal is scarce. block.stonedrill.name=stone drill diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 86cd75da30..5b47048b1f 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,1652 +13,1715 @@ backgrounds/background index: -1 blank rotate: false - xy: 862, 491 + xy: 231, 105 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 blocks/blackrock1 rotate: false - xy: 722, 381 + xy: 221, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackrockshadow1 rotate: false - xy: 732, 381 + xy: 399, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone1 rotate: false - xy: 736, 359 + xy: 219, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone2 rotate: false - xy: 736, 349 + xy: 171, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone3 rotate: false - xy: 659, 282 + xy: 231, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock1 rotate: false - xy: 669, 282 + xy: 241, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock2 rotate: false - xy: 679, 282 + xy: 251, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock3 rotate: false - xy: 240, 91 + xy: 261, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneedge rotate: false - xy: 519, 178 + xy: 191, 44 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/block rotate: false - xy: 270, 91 + xy: 291, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/block-2x2 rotate: false - xy: 114, 90 + xy: 763, 426 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/block-3x3 rotate: false - xy: 300, 105 + xy: 234, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/block-middle rotate: false - xy: 280, 91 + xy: 301, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/chainturret rotate: false - xy: 659, 292 + xy: 727, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/chainturret-icon rotate: false - xy: 580, 233 + xy: 1013, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/coal1 rotate: false - xy: 320, 95 + xy: 341, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 330, 95 + xy: 351, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 340, 95 + xy: 361, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 350, 95 + xy: 371, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 360, 95 + xy: 381, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator-top rotate: false - xy: 370, 95 + xy: 391, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 380, 95 + xy: 401, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 390, 95 + xy: 584, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 400, 95 + xy: 584, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 410, 95 + xy: 584, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 420, 95 + xy: 584, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 430, 95 + xy: 594, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 440, 95 + xy: 594, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 450, 95 + xy: 594, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 460, 95 + xy: 594, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyortunnel rotate: false - xy: 470, 95 + xy: 594, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/core rotate: false - xy: 352, 105 + xy: 286, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/cross rotate: false - xy: 624, 233 + xy: 583, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 624, 223 + xy: 593, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 624, 213 + xy: 604, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 634, 235 + xy: 604, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 634, 225 + xy: 604, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 634, 215 + xy: 604, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtedge rotate: false - xy: 521, 164 + xy: 207, 58 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/door rotate: false - xy: 114, 80 + xy: 614, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/door-large rotate: false - xy: 747, 430 + xy: 213, 90 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/door-large-icon rotate: false - xy: 113, 70 + xy: 614, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/door-large-open rotate: false - xy: 881, 495 + xy: 416, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/door-open rotate: false - xy: 113, 60 + xy: 614, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/doubleturret rotate: false - xy: 580, 221 + xy: 1013, 447 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/duriumwall rotate: false - xy: 113, 50 + xy: 614, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/duriumwall-large rotate: false - xy: 677, 292 + xy: 655, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/duriumwall-large-icon rotate: false - xy: 117, 40 + xy: 604, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/enemyspawn rotate: false - xy: 117, 30 + xy: 614, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/flameturret rotate: false - xy: 81, 2 + xy: 445, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/fluxpump rotate: false - xy: 117, 20 + xy: 613, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 117, 10 + xy: 624, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 865, 417 + xy: 624, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 178, 75 + xy: 624, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock1 rotate: false - xy: 188, 75 + xy: 624, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 198, 75 + xy: 624, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 521, 150 + xy: 205, 44 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/ice1 rotate: false - xy: 208, 75 + xy: 547, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice2 rotate: false - xy: 218, 75 + xy: 183, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice3 rotate: false - xy: 228, 75 + xy: 183, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iceedge rotate: false - xy: 521, 136 + xy: 421, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/icerock1 rotate: false - xy: 238, 81 + xy: 793, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerock2 rotate: false - xy: 248, 81 + xy: 803, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow1 rotate: false - xy: 258, 81 + xy: 817, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow1 rotate: false - xy: 258, 81 + xy: 817, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow2 rotate: false - xy: 268, 81 + xy: 827, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow2 rotate: false - xy: 268, 81 + xy: 827, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 300, 85 + xy: 805, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 310, 85 + xy: 805, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 320, 85 + xy: 785, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 330, 85 + xy: 795, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 340, 85 + xy: 805, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 350, 85 + xy: 624, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 731, 297 + xy: 805, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 360, 85 + xy: 557, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 518, 122 + xy: 435, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/lavasmelter rotate: false - xy: 370, 85 + xy: 529, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 380, 85 + xy: 193, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 390, 85 + xy: 193, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 400, 85 + xy: 203, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 731, 285 + xy: 817, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 853, 415 + xy: 829, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 142, 81 + xy: 841, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 410, 85 + xy: 203, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 410, 85 + xy: 203, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/nuclearreactor rotate: false - xy: 378, 105 + xy: 312, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-center rotate: false - xy: 404, 105 + xy: 338, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-icon rotate: false - xy: 420, 85 + xy: 193, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/nuclearreactor-lights rotate: false - xy: 430, 105 + xy: 364, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-small rotate: false - xy: 482, 113 + xy: 375, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/oil rotate: false - xy: 430, 85 + xy: 203, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 535, 197 + xy: 477, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 440, 85 + xy: 183, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 450, 85 + xy: 193, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 154, 81 + xy: 853, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/playerspawn rotate: false - xy: 460, 85 + xy: 203, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 470, 85 + xy: 837, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 480, 87 + xy: 847, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 298, 75 + xy: 857, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerinfinite rotate: false - xy: 308, 75 + xy: 815, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 318, 75 + xy: 815, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlasercorner rotate: false - xy: 328, 75 + xy: 825, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 338, 75 + xy: 815, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powervoid rotate: false - xy: 348, 75 + xy: 825, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 358, 75 + xy: 835, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 368, 75 + xy: 815, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 378, 75 + xy: 825, 400 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +blocks/pulverizer + rotate: false + xy: 835, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 388, 75 + xy: 815, 380 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +blocks/quartzextractor + rotate: false + xy: 825, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 166, 81 + xy: 315, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock1 rotate: false - xy: 398, 75 + xy: 835, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 408, 75 + xy: 825, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 418, 75 + xy: 835, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 428, 75 + xy: 835, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator-top rotate: false - xy: 438, 75 + xy: 213, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand1 rotate: false - xy: 448, 75 + xy: 213, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand2 rotate: false - xy: 458, 75 + xy: 213, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand3 rotate: false - xy: 468, 75 + xy: 213, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock1 rotate: false - xy: 875, 417 + xy: 223, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock2 rotate: false - xy: 885, 421 + xy: 223, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock3 rotate: false - xy: 895, 421 + xy: 223, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandedge rotate: false - xy: 549, 213 + xy: 491, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 178, 85 + xy: 327, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 915, 421 + xy: 233, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 190, 85 + xy: 339, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 965, 421 + xy: 253, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 975, 421 + xy: 233, 7 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +blocks/siliconextractor + rotate: false + xy: 243, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 985, 421 + xy: 253, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter-middle rotate: false - xy: 995, 421 + xy: 263, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 202, 85 + xy: 351, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/snow1 rotate: false - xy: 298, 65 + xy: 243, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow2 rotate: false - xy: 308, 65 + xy: 253, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow3 rotate: false - xy: 318, 65 + xy: 263, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock1 rotate: false - xy: 328, 65 + xy: 273, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock2 rotate: false - xy: 338, 65 + xy: 253, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock3 rotate: false - xy: 348, 65 + xy: 263, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowedge rotate: false - xy: 549, 199 + xy: 519, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/sorter rotate: false - xy: 358, 65 + xy: 273, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/splitter rotate: false - xy: 368, 65 + xy: 283, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 378, 65 + xy: 263, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 388, 65 + xy: 273, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 398, 65 + xy: 283, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall-large rotate: false - xy: 819, 430 + xy: 393, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/steelwall-large-icon rotate: false - xy: 408, 65 + xy: 293, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 418, 65 + xy: 273, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 428, 65 + xy: 283, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 438, 65 + xy: 293, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock1 rotate: false - xy: 448, 65 + xy: 303, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 458, 65 + xy: 283, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 468, 65 + xy: 293, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 885, 411 + xy: 303, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneedge rotate: false - xy: 577, 193 + xy: 417, 69 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stoneformer rotate: false - xy: 895, 411 + xy: 313, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 905, 411 + xy: 293, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 915, 411 + xy: 303, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 925, 411 + xy: 313, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 935, 411 + xy: 303, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titancannon rotate: false - xy: 456, 105 + xy: 390, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/titancannon-icon rotate: false - xy: 214, 85 + xy: 363, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 945, 411 + xy: 313, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 955, 411 + xy: 313, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 965, 411 + xy: 323, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 975, 411 + xy: 323, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 985, 411 + xy: 323, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 995, 411 + xy: 323, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 535, 127 + xy: 333, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall-large rotate: false - xy: 831, 472 + xy: 285, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 742, 382 + xy: 333, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 226, 85 + xy: 375, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 644, 268 + xy: 353, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 654, 272 + xy: 333, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 664, 272 + xy: 343, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 674, 272 + xy: 353, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 654, 262 + xy: 353, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/wateredge rotate: false - xy: 591, 197 + xy: 431, 69 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/waveturret rotate: false - xy: 736, 369 + xy: 387, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/weaponfactory rotate: false - xy: 831, 454 + xy: 303, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/weaponfactory-icon rotate: false - xy: 644, 248 + xy: 363, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bullet rotate: false - xy: 290, 91 + xy: 311, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 591, 188 + xy: 584, 175 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 -circle - rotate: false - xy: 862, 494 - size: 17, 17 - orig: 17, 17 - offset: 0, 0 - index: -1 -circle2 - rotate: false - xy: 495, 310 - size: 201, 201 - orig: 201, 201 - offset: 0, 0 - index: -1 enemies/blastenemy-t1 rotate: false - xy: 849, 475 + xy: 321, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t2 rotate: false - xy: 849, 459 + xy: 337, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 865, 478 + xy: 353, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t1 rotate: false - xy: 881, 479 + xy: 369, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t2 rotate: false - xy: 865, 462 + xy: 385, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t3 rotate: false - xy: 881, 463 + xy: 524, 115 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t1 rotate: false - xy: 897, 479 + xy: 540, 119 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t2 rotate: false - xy: 897, 463 + xy: 641, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t3 rotate: false - xy: 913, 479 + xy: 641, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t1 rotate: false - xy: 913, 463 + xy: 657, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t2 rotate: false - xy: 929, 479 + xy: 657, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t3 rotate: false - xy: 929, 463 + xy: 673, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fortressenemy-t1 rotate: false - xy: 840, 491 + xy: 131, 44 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 enemies/fortressenemy-t2 rotate: false - xy: 92, 86 + xy: 153, 44 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 enemies/fortressenemy-t3 rotate: false - xy: 637, 288 + xy: 537, 135 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 enemies/healerenemy-t1 rotate: false - xy: 945, 479 + xy: 673, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t2 rotate: false - xy: 945, 463 + xy: 641, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t3 rotate: false - xy: 961, 479 + xy: 657, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 965, 447 + xy: 416, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 965, 431 + xy: 432, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 981, 447 + xy: 448, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 981, 431 + xy: 464, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 997, 447 + xy: 480, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 997, 431 + xy: 496, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/standardenemy-t1 rotate: false - xy: 592, 211 + xy: 512, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 592, 211 + xy: 512, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/standardenemy-t2 rotate: false - xy: 563, 199 + xy: 533, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/standardenemy-t3 rotate: false - xy: 577, 207 + xy: 547, 89 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 608, 211 + xy: 528, 99 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 519, 208 + xy: 191, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 519, 192 + xy: 544, 103 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/titanenemy-t1 rotate: false - xy: 99, 32 + xy: 231, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t2 rotate: false - xy: 99, 14 + xy: 249, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t3 rotate: false - xy: 500, 122 + xy: 267, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 117, 1 + xy: 603, 162 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 278, 81 + xy: 785, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 288, 81 + xy: 785, 406 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +icon-glass + rotate: false + xy: 795, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 238, 71 + xy: 785, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -icon-sand +icon-quartz rotate: false - xy: 248, 71 + xy: 795, 406 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +icon-silicon + rotate: false + xy: 785, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 258, 71 + xy: 795, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 268, 71 + xy: 795, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 278, 71 + xy: 805, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 288, 71 + xy: 805, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser rotate: false - xy: 533, 178 + xy: 580, 164 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laserend rotate: false - xy: 524, 225 + xy: 560, 158 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 727, 428 + xy: 589, 225 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 mechs/mech-standard rotate: false - xy: 516, 108 + xy: 449, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mechs/mech-standard-icon rotate: false - xy: 535, 211 + xy: 463, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mechs/ship-standard rotate: false - xy: 563, 213 + xy: 505, 83 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 +shapes/circle + rotate: false + xy: 495, 310 + size: 201, 201 + orig: 201, 201 + offset: 0, 0 + index: -1 +shapes/shape-3 + rotate: false + xy: 1, 43 + size: 63, 63 + orig: 63, 63 + offset: 0, 0 + index: -1 +shapes/shape-4 + rotate: false + xy: 495, 222 + size: 63, 63 + orig: 63, 63 + offset: 0, 0 + index: -1 +shapes/shape-5 + rotate: false + xy: 698, 425 + size: 63, 63 + orig: 63, 63 + offset: 0, 0 + index: -1 +shapes/shape-6 + rotate: false + xy: 66, 43 + size: 63, 63 + orig: 63, 63 + offset: 0, 0 + index: -1 +shapes/shape-7 + rotate: false + xy: 495, 157 + size: 63, 63 + orig: 63, 63 + offset: 0, 0 + index: -1 shell rotate: false - xy: 905, 421 + xy: 223, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 945, 421 + xy: 233, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 955, 421 + xy: 243, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 634, 277 + xy: 343, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ui/border rotate: false - xy: 727, 448 + xy: 127, 1 size: 24, 40 split: 5, 5, 5, 10 orig: 24, 40 @@ -1666,7 +1729,7 @@ ui/border index: -1 ui/button rotate: false - xy: 753, 448 + xy: 131, 66 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -1674,7 +1737,7 @@ ui/button index: -1 ui/button-down rotate: false - xy: 43, 43 + xy: 589, 245 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -1682,7 +1745,7 @@ ui/button-down index: -1 ui/button-over rotate: false - xy: 43, 43 + xy: 589, 245 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -1690,7 +1753,7 @@ ui/button-over index: -1 ui/button-map rotate: false - xy: 566, 245 + xy: 727, 383 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -1698,7 +1761,7 @@ ui/button-map index: -1 ui/button-map-down rotate: false - xy: 43, 1 + xy: 698, 320 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -1706,7 +1769,7 @@ ui/button-map-down index: -1 ui/button-map-over rotate: false - xy: 43, 1 + xy: 698, 320 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -1714,7 +1777,7 @@ ui/button-map-over index: -1 ui/button-select rotate: false - xy: 326, 105 + xy: 260, 105 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -1722,595 +1785,595 @@ ui/button-select index: -1 ui/check-off rotate: false - xy: 69, 14 + xy: 183, 74 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/check-on rotate: false - xy: 698, 309 + xy: 839, 453 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/check-on-over rotate: false - xy: 180, 97 + xy: 877, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/check-over rotate: false - xy: 210, 97 + xy: 907, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/clear rotate: false - xy: 69, 2 + xy: 1013, 459 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/cursor rotate: false - xy: 831, 448 + xy: 781, 426 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 ui/icons/controller-cursor rotate: false - xy: 544, 227 + xy: 637, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-about rotate: false - xy: 961, 463 + xy: 673, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-add rotate: false - xy: 977, 479 + xy: 698, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-areaDelete rotate: false - xy: 93, 2 + xy: 457, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow rotate: false - xy: 977, 463 + xy: 753, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-arrow-down rotate: false - xy: 105, 2 + xy: 469, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-left rotate: false - xy: 1013, 451 + xy: 481, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-right rotate: false - xy: 1013, 439 + xy: 493, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-up rotate: false - xy: 1013, 427 + xy: 505, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-back rotate: false - xy: 562, 227 + xy: 434, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-cancel rotate: false - xy: 993, 479 + xy: 753, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-chat rotate: false - xy: 605, 199 + xy: 517, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-check rotate: false - xy: 1009, 479 + xy: 769, 410 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-close rotate: false - xy: 1, 43 + xy: 1, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 ui/icons/icon-close-down rotate: false - xy: 1, 1 + xy: 43, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 ui/icons/icon-close-over rotate: false - xy: 524, 245 + xy: 85, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 ui/icons/icon-crafting rotate: false - xy: 617, 199 + xy: 965, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-cursor rotate: false - xy: 142, 93 + xy: 977, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-defense rotate: false - xy: 154, 93 + xy: 989, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-discord rotate: false - xy: 993, 463 + xy: 769, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-distribution rotate: false - xy: 166, 93 + xy: 1001, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-donate rotate: false - xy: 1009, 463 + xy: 401, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-dots rotate: false - xy: 592, 227 + xy: 714, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-editor rotate: false - xy: 608, 227 + xy: 753, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-file-text rotate: false - xy: 500, 106 + xy: 769, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-fill rotate: false - xy: 765, 430 + xy: 673, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-floppy rotate: false - xy: 482, 97 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-folder rotate: false - xy: 498, 90 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-folder-parent rotate: false - xy: 628, 245 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-grid rotate: false - xy: 899, 495 + xy: 452, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-hold rotate: false - xy: 536, 185 + xy: 1013, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-holdDelete rotate: false - xy: 536, 173 + xy: 231, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-home rotate: false - xy: 837, 438 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-host rotate: false - xy: 837, 422 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-info rotate: false - xy: 535, 161 + xy: 243, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-line rotate: false - xy: 783, 430 + xy: 470, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-liquid rotate: false - xy: 535, 149 + xy: 255, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-load rotate: false - xy: 853, 443 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-load-image rotate: false - xy: 917, 495 + xy: 488, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-load-map rotate: false - xy: 801, 430 + xy: 506, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-loading rotate: false - xy: 935, 495 + xy: 153, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-logic rotate: false - xy: 535, 137 + xy: 267, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-menu rotate: false - xy: 722, 415 + xy: 279, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-none rotate: false - xy: 722, 403 + xy: 291, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-pause rotate: false - xy: 722, 391 + xy: 303, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-pencil rotate: false - xy: 953, 495 + xy: 153, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-pencil-small rotate: false - xy: 853, 427 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-pick rotate: false - xy: 971, 495 + xy: 213, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-play rotate: false - xy: 734, 416 + xy: 609, 233 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-play-2 rotate: false - xy: 869, 446 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-players rotate: false - xy: 734, 404 + xy: 621, 237 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-power rotate: false - xy: 734, 392 + xy: 609, 221 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-production rotate: false - xy: 724, 369 + xy: 621, 225 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-quit rotate: false - xy: 869, 430 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-redo rotate: false - xy: 989, 495 + xy: 231, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-refresh rotate: false - xy: 885, 447 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rename rotate: false - xy: 885, 431 + xy: 933, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-resize rotate: false - xy: 1007, 495 + xy: 249, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-rotate rotate: false - xy: 901, 447 + xy: 949, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-arrow rotate: false - xy: 901, 431 + xy: 965, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-left rotate: false - xy: 917, 447 + xy: 965, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-right rotate: false - xy: 917, 431 + xy: 981, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-save rotate: false - xy: 933, 447 + xy: 981, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-save-image rotate: false - xy: 95, 68 + xy: 267, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-save-map rotate: false - xy: 95, 50 + xy: 285, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-settings rotate: false - xy: 724, 357 + xy: 175, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-terrain rotate: false - xy: 592, 243 + xy: 303, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-tools rotate: false - xy: 933, 431 + xy: 997, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-touch rotate: false - xy: 724, 345 + xy: 171, 26 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-touchDelete rotate: false - xy: 728, 333 + xy: 171, 14 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-trash rotate: false - xy: 949, 447 + xy: 997, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-trash-16 rotate: false - xy: 610, 243 + xy: 321, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-tutorial rotate: false - xy: 949, 431 + xy: 175, 50 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-undo rotate: false - xy: 695, 291 + xy: 339, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/icons/icon-units rotate: false - xy: 728, 321 + xy: 781, 432 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-weapon rotate: false - xy: 728, 309 + xy: 793, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-zoom rotate: false - xy: 713, 291 + xy: 357, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ui/logotext rotate: false - xy: 1, 85 + xy: 143, 108 size: 89, 21 orig: 89, 21 offset: 0, 0 index: -1 ui/pane rotate: false - xy: 698, 343 + xy: 615, 249 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -2318,7 +2381,7 @@ ui/pane index: -1 ui/pane-button rotate: false - xy: 495, 140 + xy: 813, 452 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -2326,7 +2389,7 @@ ui/pane-button index: -1 ui/scroll rotate: false - xy: 69, 48 + xy: 937, 476 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -2334,7 +2397,7 @@ ui/scroll index: -1 ui/scroll-horizontal rotate: false - xy: 143, 105 + xy: 840, 487 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -2342,7 +2405,7 @@ ui/scroll-horizontal index: -1 ui/scroll-knob-horizontal rotate: false - xy: 592, 261 + xy: 495, 131 size: 40, 24 split: 10, 6, 0, 24 pad: -1, -1, 10, 10 @@ -2351,7 +2414,7 @@ ui/scroll-knob-horizontal index: -1 ui/scroll-knob-vertical rotate: false - xy: 805, 448 + xy: 157, 66 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2359,7 +2422,7 @@ ui/scroll-knob-vertical index: -1 ui/scroll-knob-vertical-black rotate: false - xy: 779, 448 + xy: 787, 448 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2367,42 +2430,42 @@ ui/scroll-knob-vertical-black index: -1 ui/selection rotate: false - xy: 865, 459 + xy: 537, 132 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/slider rotate: false - xy: 532, 126 + xy: 409, 61 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 ui/slider-knob rotate: false - xy: 495, 178 + xy: 763, 444 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 ui/slider-knob-down rotate: false - xy: 698, 381 + xy: 560, 178 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 ui/slider-knob-over rotate: false - xy: 698, 381 + xy: 560, 178 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 ui/slider-vertical rotate: false - xy: 869, 427 + xy: 727, 362 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2430,7 +2493,7 @@ ui/text-sides-over index: -1 ui/textfield rotate: false - xy: 270, 101 + xy: 993, 483 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -2438,7 +2501,7 @@ ui/textfield index: -1 ui/textfield-over rotate: false - xy: 240, 101 + xy: 963, 483 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -2446,14 +2509,14 @@ ui/textfield-over index: -1 ui/white rotate: false - xy: 495, 135 + xy: 411, 100 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 ui/window rotate: false - xy: 698, 427 + xy: 698, 362 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -2461,7 +2524,7 @@ ui/window index: -1 ui/window-empty rotate: false - xy: 495, 224 + xy: 560, 224 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -2469,84 +2532,84 @@ ui/window-empty index: -1 weapons/beam rotate: false - xy: 132, 98 + xy: 221, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/beam-equip rotate: false - xy: 132, 88 + xy: 411, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/blaster rotate: false - xy: 250, 91 + xy: 271, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/blaster-equip rotate: false - xy: 260, 91 + xy: 281, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/clustergun rotate: false - xy: 300, 95 + xy: 321, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/clustergun-equip rotate: false - xy: 310, 95 + xy: 331, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/shockgun rotate: false - xy: 925, 421 + xy: 233, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/shockgun-equip rotate: false - xy: 935, 421 + xy: 243, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 634, 267 + xy: 333, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster-equip rotate: false - xy: 644, 278 + xy: 343, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/vulcan rotate: false - xy: 684, 272 + xy: 363, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/vulcan-equip rotate: false - xy: 644, 258 + xy: 343, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index cf9b5e20ca..10d86fb48c 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 43b621c34d..2aafffd693 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Feb 21 23:25:11 EST 2018 +#Thu Feb 22 20:02:56 EST 2018 version=release -androidBuildCode=269 +androidBuildCode=280 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/entities/effect/Shield.java b/core/src/io/anuke/mindustry/entities/effect/Shield.java index 405389e7e6..0b46e777a7 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Shield.java +++ b/core/src/io/anuke/mindustry/entities/effect/Shield.java @@ -8,7 +8,7 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.entities.BulletEntity; import io.anuke.ucore.entities.Entities; import io.anuke.ucore.entities.Entity; -import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.bulletGroup; @@ -71,13 +71,12 @@ public class Shield extends Entity{ if(!(tile.block() instanceof ShieldBlock) || radius <= 1f){ return; } - - float rad = drawRadius(); - Draw.rect("circle2", x, y, rad, rad); + + Fill.circle(x, y, drawRadius()); } float drawRadius(){ - return (radius*2 + Mathf.sin(Timers.time(), 25f, 2f)); + return (radius + Mathf.sin(Timers.time(), 25f, 1f)); } public void removeDelay(){ diff --git a/core/src/io/anuke/mindustry/graphics/Fx.java b/core/src/io/anuke/mindustry/graphics/Fx.java index ffe5df0724..fddb9da59e 100644 --- a/core/src/io/anuke/mindustry/graphics/Fx.java +++ b/core/src/io/anuke/mindustry/graphics/Fx.java @@ -3,10 +3,7 @@ package io.anuke.mindustry.graphics; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Colors; import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.graphics.Shapes; +import io.anuke.ucore.graphics.*; import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Mathf; @@ -166,7 +163,6 @@ public class Fx{ Angles.randLenVectors(e.id, 5, e.ifract()*8f, (x, y)->{ float len = e.fract()*4f; Draw.color(Color.valueOf("d2b29c"), Color.GRAY, e.ifract()); - //Draw.alpha(e.fract()); Draw.rect("circle", e.x + x, e.y + y, len, len); Draw.reset(); }); @@ -176,11 +172,18 @@ public class Fx{ Angles.randLenVectors(e.id, 5, e.ifract()*9f, (x, y)->{ float len = e.fract()*4f; Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.ifract()); - //Draw.alpha(e.fract()); Draw.rect("circle", e.x + x, e.y + y, len, len); Draw.reset(); }); }), + + pulverize = new Effect(25, e -> { + Angles.randLenVectors(e.id, 5, 3f + e.ifract()*5f, (x, y)->{ + Draw.color(Color.valueOf("eae4f0"), Color.GRAY, e.ifract()); + Fill.poly(e.x + x, e.y + y, 4, e.fract() * 2f + 0.5f, 45); + Draw.reset(); + }); + }), laserspark = new Effect(14, e -> { Angles.randLenVectors(e.id, 8, 1f + e.ifract()*11f, (x, y)->{ @@ -403,29 +406,14 @@ public class Fx{ Draw.reset(); }), - titanExplosion = new Effect(11, 48f, e -> { - Lines.stroke(2f*e.fract()+0.5f); - Draw.color(Color.WHITE, Color.DARK_GRAY, e.powfract()); - Lines.circle(e.x, e.y, 5f + e.powfract() * 8f); - - Draw.color(e.ifract() < 0.5f ? whiteOrange : Color.DARK_GRAY); - float rad = e.fract()*10f + 5f; - Angles.randLenVectors(e.id, 5, 9f, (x, y)->{ - Draw.rect("circle2", e.x + x, e.y + y, rad, rad); - }); - - Draw.reset(); - }), - explosion = new Effect(11, e -> { Lines.stroke(2f*e.fract()+0.5f); Draw.color(Color.WHITE, Color.DARK_GRAY, e.powfract()); Lines.circle(e.x, e.y, 5f + e.powfract() * 6f); Draw.color(e.ifract() < 0.5f ? Color.WHITE : Color.DARK_GRAY); - float rad = e.fract()*10f + 5f; Angles.randLenVectors(e.id, 5, 8f, (x, y)->{ - Draw.rect("circle2", e.x + x, e.y + y, rad, rad); + Fill.circle(e.x + x, e.y + y, e.fract()*5f + 2.5f); }); Draw.reset(); @@ -445,9 +433,8 @@ public class Fx{ Lines.circle(e.x, e.y, 2f + e.powfract() * 9f); Draw.color(e.ifract() < 0.5f ? Color.WHITE : Color.DARK_GRAY); - float rad = e.fract()*10f + 2f; Angles.randLenVectors(e.id, 5, 8f, (x, y)->{ - Draw.rect("circle2", e.x + x, e.y + y, rad, rad); + Fill.circle(e.x + x, e.y + y, e.fract()*5f + 1f); }); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/resource/Item.java b/core/src/io/anuke/mindustry/resource/Item.java index 87959c4b61..fc26015266 100644 --- a/core/src/io/anuke/mindustry/resource/Item.java +++ b/core/src/io/anuke/mindustry/resource/Item.java @@ -11,20 +11,41 @@ public class Item{ public static final Item stone = new Item("stone"), iron = new Item("iron"), - coal = new Item("coal"), + coal = new Item("coal"){ + { + explosiveness = 0.2f; + flammability = 0.5f; + material = false; + } + }, steel = new Item("steel"), titanium = new Item("titanium"), dirium = new Item("dirium"), - uranium = new Item("uranium"), - sand = new Item("sand"); - /*glass = new Item("glass"), - silicon = new Item("silicon");*/ + uranium = new Item("uranium"){ + { + explosiveness = 0.1f; + material = false; + } + }, + quartz = new Item("quartz") { + { + material = false; + } + }, + glass = new Item("glass"), + silicon = new Item("silicon"){ + { + material = false; + } + }; public final int id; public final String name; public TextureRegion region; + public float explosiveness = 0f; public float flammability = 0f; + public boolean material = true; public Item(String name) { this.id = items.size; diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index 1b4fc7d4f2..07cc49c252 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -51,6 +51,8 @@ public class Recipes { new Recipe(crafting, ProductionBlocks.oilrefinery, stack(Item.steel, 15), stack(Item.iron, 15)), new Recipe(crafting, ProductionBlocks.stoneformer, stack(Item.steel, 10), stack(Item.iron, 10)), new Recipe(crafting, ProductionBlocks.lavasmelter, stack(Item.steel, 30), stack(Item.titanium, 15)), + new Recipe(crafting, ProductionBlocks.pulverizer, stack(Item.steel, 30), stack(Item.titanium, 15)), + new Recipe(crafting, ProductionBlocks.siliconextractor, stack(Item.steel, 30), stack(Item.titanium, 15)), new Recipe(crafting, ProductionBlocks.weaponFactory, stack(Item.steel, 60), stack(Item.iron, 60)).setDesktop(), new Recipe(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)), @@ -58,6 +60,7 @@ public class Recipes { new Recipe(production, ProductionBlocks.coaldrill, stack(Item.stone, 25), stack(Item.iron, 40)), new Recipe(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 50), stack(Item.steel, 50)), new Recipe(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)), + new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), new Recipe(production, ProductionBlocks.omnidrill, stack(Item.titanium, 40), stack(Item.dirium, 40)), new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30), stack(Item.stone, 20)), @@ -82,8 +85,8 @@ public class Recipes { new Recipe(liquid, DistributionBlocks.liquidrouter, stack(Item.steel, 2)), new Recipe(liquid, DistributionBlocks.liquidjunction, stack(Item.steel, 2)), - new Recipe(production, ProductionBlocks.pump, stack(Item.steel, 10)), - new Recipe(production, ProductionBlocks.fluxpump, stack(Item.steel, 10), stack(Item.dirium, 5)), + new Recipe(liquid, ProductionBlocks.pump, stack(Item.steel, 10)), + new Recipe(liquid, ProductionBlocks.fluxpump, stack(Item.steel, 10), stack(Item.dirium, 5)), new Recipe(units, DebugBlocks.powerVoid, stack(Item.steel, 10)).setDebug(), new Recipe(units, DebugBlocks.powerInfinite, stack(Item.steel, 10), stack(Item.dirium, 5)).setDebug() diff --git a/core/src/io/anuke/mindustry/world/blocks/Blocks.java b/core/src/io/anuke/mindustry/world/blocks/Blocks.java index 8af12778d2..a1214be359 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Blocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/Blocks.java @@ -103,7 +103,9 @@ public class Blocks{ dirt = new Floor("dirt"){}, - sand = new Floor("sand"){}, + sand = new Floor("sand"){{ + drops = new ItemStack(Item.quartz, 1); + }}, ice = new Floor("ice"){}, diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index 65a946a866..03a7285cb6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -108,20 +108,21 @@ public class ProductionBlocks{ pulverizer = new PowerSmelter("pulverizer"){ { inputs = new ItemStack[]{new ItemStack(Item.stone, 5)}; - result = Item.sand; + result = Item.quartz; health = 50; craftTime = 60f; powerDrain = 0.02f; + craftEffect = Fx.pulverize; } }, siliconextractor = new LiquidCrafter("siliconextractor"){ { - input = Item.sand; + input = Item.quartz; inputAmount = 5; inputLiquid = Liquid.water; liquidAmount = 18.99f; - output = Item.sand; + output = Item.silicon; health = 50; purifyTime = 50; } @@ -172,9 +173,11 @@ public class ProductionBlocks{ } }, - sandextractor = new Omnidrill("sandextractor"){ + quartzextractor = new Drill("quartzextractor"){ { - time = 4; + resource = Blocks.sand; + result = Item.quartz; + time = 5; } }, diff --git a/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java index f44c9d23e6..fdbc0eeae9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java @@ -35,8 +35,7 @@ public abstract class PowerBlock extends Block implements PowerAcceptor{ return entity.power + 0.001f <= powerCapacity; } - - //TODO voltage requirement so blocks need specific voltage + @Override public float addPower(Tile tile, float amount){ if(amount < voltage){ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/CoreBlock.java index 5b73e546e2..5a8052d8a3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/CoreBlock.java @@ -32,6 +32,6 @@ public class CoreBlock extends Block { @Override public boolean acceptItem(Item item, Tile tile, Tile source){ - return true; + return item.material; } }