diff --git a/core/assets-raw/sprites/blocks/production/crucible.png b/core/assets-raw/sprites/blocks/production/alloysmelter.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/crucible.png rename to core/assets-raw/sprites/blocks/production/alloysmelter.png diff --git a/core/assets-raw/sprites/blocks/production/coalpurifier.png b/core/assets-raw/sprites/blocks/production/coalextractor.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/coalpurifier.png rename to core/assets-raw/sprites/blocks/production/coalextractor.png diff --git a/core/assets-raw/sprites/blocks/production/nuclearreactor-small.png b/core/assets-raw/sprites/blocks/production/nuclearreactor-small.png deleted file mode 100644 index 6d9f0bfd35..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/nuclearreactor-small.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/production/quartzextractor.png b/core/assets-raw/sprites/blocks/production/quartzextractor.png index dc16631e3f..73070e8cd5 100644 Binary files a/core/assets-raw/sprites/blocks/production/quartzextractor.png and b/core/assets-raw/sprites/blocks/production/quartzextractor.png differ diff --git a/core/assets-raw/sprites/blocks/production/solarpanel.png b/core/assets-raw/sprites/blocks/production/solarpanel.png new file mode 100644 index 0000000000..986ee478cb Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/solarpanel.png differ diff --git a/core/assets-raw/sprites/blocks/production/titaniumpurifier.png b/core/assets-raw/sprites/blocks/production/titaniumextractor.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/titaniumpurifier.png rename to core/assets-raw/sprites/blocks/production/titaniumextractor.png diff --git a/core/assets-raw/sprites/blocks/production/uraniumextractor.png b/core/assets-raw/sprites/blocks/production/uraniumextractor.png new file mode 100644 index 0000000000..77c42162e8 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/uraniumextractor.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d83ea033fe..840ffbd7c6 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,539 +13,539 @@ backgrounds/background index: -1 blocks/environment/blackrock1 rotate: false - xy: 701, 258 + xy: 701, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackrockshadow1 rotate: false - xy: 713, 272 + xy: 715, 294 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackstone1 rotate: false - xy: 637, 234 + xy: 689, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackstone2 rotate: false - xy: 647, 234 + xy: 701, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackstone3 rotate: false - xy: 657, 234 + xy: 689, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackstoneblock1 rotate: false - xy: 667, 234 + xy: 584, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackstoneblock2 rotate: false - xy: 677, 234 + xy: 584, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackstoneblock3 rotate: false - xy: 584, 214 + xy: 584, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/blackstoneedge rotate: false - xy: 171, 20 + xy: 239, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/coal1 rotate: false - xy: 594, 175 + xy: 580, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/coal2 rotate: false - xy: 580, 165 + xy: 580, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/coal3 rotate: false - xy: 590, 165 + xy: 547, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/deepwater rotate: false - xy: 723, 272 + xy: 624, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/dirt1 rotate: false - xy: 713, 262 + xy: 594, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/dirt2 rotate: false - xy: 723, 262 + xy: 590, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/dirt3 rotate: false - xy: 600, 165 + xy: 604, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/dirtedge rotate: false - xy: 171, 6 + xy: 255, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/grass1 rotate: false - xy: 857, 431 + xy: 711, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/grass2 rotate: false - xy: 620, 169 + xy: 711, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/grass3 rotate: false - xy: 620, 159 + xy: 721, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/grassblock1 rotate: false - xy: 610, 149 + xy: 721, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/grassblock2 rotate: false - xy: 620, 149 + xy: 701, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/grassedge rotate: false - xy: 191, 28 + xy: 269, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/ice1 rotate: false - xy: 633, 224 + xy: 711, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/ice2 rotate: false - xy: 643, 224 + xy: 721, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/ice3 rotate: false - xy: 653, 224 + xy: 699, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/iceedge rotate: false - xy: 205, 26 + xy: 283, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/icerock1 rotate: false - xy: 663, 224 + xy: 709, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/icerock2 rotate: false - xy: 673, 224 + xy: 689, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/icerockshadow1 rotate: false - xy: 683, 224 + xy: 699, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/rockshadow1 rotate: false - xy: 683, 224 + xy: 699, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/icerockshadow2 rotate: false - xy: 687, 234 + xy: 709, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/rockshadow2 rotate: false - xy: 687, 234 + xy: 709, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/iron1 rotate: false - xy: 693, 224 + xy: 624, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/iron2 rotate: false - xy: 556, 125 + xy: 837, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/iron3 rotate: false - xy: 556, 115 + xy: 847, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/lava rotate: false - xy: 251, 33 + xy: 734, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/lavaedge rotate: false - xy: 185, 14 + xy: 297, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/mossblock rotate: false - xy: 293, 47 + xy: 253, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/oil rotate: false - xy: 303, 47 + xy: 263, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/oiledge rotate: false - xy: 993, 437 + xy: 339, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/rock1 rotate: false - xy: 785, 416 + xy: 253, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/rock2 rotate: false - xy: 785, 406 + xy: 263, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/sand1 rotate: false - xy: 785, 386 + xy: 303, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/sand2 rotate: false - xy: 795, 396 + xy: 313, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/sand3 rotate: false - xy: 795, 386 + xy: 323, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/sandblock1 rotate: false - xy: 805, 416 + xy: 333, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/sandblock2 rotate: false - xy: 805, 406 + xy: 343, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/sandblock3 rotate: false - xy: 805, 396 + xy: 353, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/sandedge rotate: false - xy: 609, 231 + xy: 353, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/shrub rotate: false - xy: 825, 420 + xy: 423, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/shrubshadow rotate: false - xy: 815, 400 + xy: 237, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/snow1 rotate: false - xy: 825, 400 + xy: 247, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/snow2 rotate: false - xy: 835, 410 + xy: 257, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/snow3 rotate: false - xy: 815, 380 + xy: 253, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/snowblock1 rotate: false - xy: 825, 390 + xy: 249, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/snowblock2 rotate: false - xy: 835, 400 + xy: 267, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/snowblock3 rotate: false - xy: 825, 380 + xy: 277, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/snowedge rotate: false - xy: 223, 55 + xy: 381, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/stone1 rotate: false - xy: 711, 252 + xy: 347, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/stone2 rotate: false - xy: 721, 252 + xy: 357, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/stone3 rotate: false - xy: 701, 248 + xy: 367, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/stoneblock1 rotate: false - xy: 711, 242 + xy: 377, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/stoneblock2 rotate: false - xy: 721, 242 + xy: 387, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/stoneblock3 rotate: false - xy: 867, 437 + xy: 397, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/stoneedge rotate: false - xy: 237, 41 + xy: 423, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/environment/titanium1 rotate: false - xy: 877, 427 + xy: 273, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/titanium2 rotate: false - xy: 887, 427 + xy: 283, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/titanium3 rotate: false - xy: 897, 427 + xy: 293, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/uranium1 rotate: false - xy: 545, 57 + xy: 383, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/uranium2 rotate: false - xy: 733, 284 + xy: 393, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/uranium3 rotate: false - xy: 733, 274 + xy: 403, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/water rotate: false - xy: 293, 37 + xy: 453, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/environment/wateredge rotate: false - xy: 251, 55 + xy: 223, 23 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/extra/block-middle rotate: false - xy: 594, 215 + xy: 594, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/extra/conduitliquid rotate: false - xy: 614, 189 + xy: 614, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/extra/cross-1 rotate: false - xy: 827, 430 + xy: 624, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -559,25 +559,32 @@ blocks/extra/cross-2 index: -1 blocks/extra/enemyspawn rotate: false - xy: 837, 430 + xy: 803, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/extra/playerspawn rotate: false - xy: 333, 47 + xy: 293, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/extra/shadow rotate: false - xy: 689, 268 + xy: 853, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +blocks/production/alloysmelter + rotate: false + xy: 219, 1 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 blocks/production/biomatterextractor rotate: false xy: 763, 426 @@ -587,63 +594,56 @@ blocks/production/biomatterextractor index: -1 blocks/production/coaldrill rotate: false - xy: 580, 155 + xy: 725, 294 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +blocks/production/coalextractor + rotate: false + xy: 604, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/coalgenerator rotate: false - xy: 590, 155 + xy: 604, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/coalgenerator-top rotate: false - xy: 604, 209 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/production/coalpurifier - rotate: false - xy: 604, 199 + xy: 604, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/combustiongenerator rotate: false - xy: 604, 189 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blocks/production/crucible - rotate: false - xy: 723, 282 + xy: 604, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/fluxpump rotate: false - xy: 847, 431 + xy: 827, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/irondrill rotate: false - xy: 724, 352 + xy: 857, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/lavasmelter rotate: false - xy: 263, 45 + xy: 734, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -669,177 +669,184 @@ blocks/production/nuclearreactor-lights orig: 24, 24 offset: 0, 0 index: -1 -blocks/production/nuclearreactor-small - rotate: false - xy: 303, 69 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 blocks/production/oilrefinery rotate: false - xy: 313, 47 + xy: 273, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/omnidrill rotate: false - xy: 323, 47 + xy: 283, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/powerbooster rotate: false - xy: 343, 47 + xy: 303, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/pulverizer rotate: false - xy: 453, 47 + xy: 413, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/pump rotate: false - xy: 221, 4 + xy: 423, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/quartzextractor rotate: false - xy: 321, 69 + xy: 303, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/production/rtgenerator rotate: false - xy: 785, 396 + xy: 283, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/rtgenerator-top rotate: false - xy: 795, 406 + xy: 293, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/siliconextractor rotate: false - xy: 825, 410 + xy: 433, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/smelter rotate: false - xy: 835, 420 + xy: 433, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/smelter-middle rotate: false - xy: 815, 390 + xy: 243, 13 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +blocks/production/solarpanel + rotate: false + xy: 287, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/stonedrill rotate: false - xy: 877, 437 + xy: 407, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/stoneformer rotate: false - xy: 887, 437 + xy: 417, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/thermalgenerator rotate: false - xy: 867, 427 + xy: 259, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/titaniumdrill rotate: false - xy: 907, 427 + xy: 303, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -blocks/production/titaniumpurifier +blocks/production/titaniumextractor rotate: false - xy: 917, 427 + xy: 313, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/production/uraniumdrill rotate: false - xy: 733, 264 + xy: 413, 15 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +blocks/production/uraniumextractor + rotate: false + xy: 423, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/conduit rotate: false - xy: 614, 209 + xy: 614, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/conduitbottom rotate: false - xy: 614, 199 + xy: 614, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/conduittop rotate: false - xy: 614, 179 + xy: 604, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/conduittunnel rotate: false - xy: 1007, 437 + xy: 614, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/conveyor rotate: false - xy: 793, 426 + xy: 624, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/conveyormove rotate: false - xy: 803, 426 + xy: 624, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/conveyortunnel rotate: false - xy: 817, 430 + xy: 624, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -853,21 +860,21 @@ blocks/tech/core index: -1 blocks/tech/junction rotate: false - xy: 740, 312 + xy: 734, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/liquidjunction rotate: false - xy: 273, 47 + xy: 730, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/liquidrouter rotate: false - xy: 283, 47 + xy: 740, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -881,140 +888,140 @@ blocks/tech/multiplexer index: -1 blocks/tech/poweredconveyor rotate: false - xy: 353, 47 + xy: 313, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/poweredconveyormove rotate: false - xy: 363, 47 + xy: 323, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/powerinfinite rotate: false - xy: 373, 47 + xy: 333, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/powerlaser rotate: false - xy: 383, 47 + xy: 343, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/powerlasercorner rotate: false - xy: 393, 47 + xy: 353, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/powerlaserrouter rotate: false - xy: 403, 47 + xy: 363, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/powervoid rotate: false - xy: 413, 47 + xy: 373, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/pulseconduit rotate: false - xy: 423, 47 + xy: 383, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/pulseconduitbottom rotate: false - xy: 433, 47 + xy: 393, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/pulseconduittop rotate: false - xy: 443, 47 + xy: 403, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/router rotate: false - xy: 795, 416 + xy: 273, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/shieldgenerator rotate: false - xy: 785, 376 + xy: 373, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/shieldprojector rotate: false - xy: 339, 69 + xy: 321, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/tech/sorter rotate: false - xy: 835, 390 + xy: 297, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/splitter rotate: false - xy: 835, 380 + xy: 307, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/steelconveyor rotate: false - xy: 815, 370 + xy: 317, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/steelconveyormove rotate: false - xy: 825, 370 + xy: 327, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/teleporter rotate: false - xy: 907, 437 + xy: 437, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/teleporter-top rotate: false - xy: 917, 437 + xy: 263, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/unloader rotate: false - xy: 947, 424 + xy: 373, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,21 +1035,21 @@ blocks/tech/vault index: -1 blocks/tech/vault-icon rotate: false - xy: 261, 33 + xy: 433, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/tech/weaponfactory rotate: false - xy: 447, 69 + xy: 429, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/turrets/block-1 rotate: false - xy: 584, 184 + xy: 594, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1091,7 +1098,7 @@ blocks/turrets/flakturret index: -1 blocks/turrets/flameturret rotate: false - xy: 185, 2 + xy: 437, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1105,14 +1112,14 @@ blocks/turrets/fornaxcannon index: -1 blocks/turrets/gatlingturret rotate: false - xy: 251, 43 + xy: 449, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/turrets/laserturret rotate: false - xy: 609, 219 + xy: 805, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1140,35 +1147,35 @@ blocks/turrets/missileturret index: -1 blocks/turrets/plasmaturret rotate: false - xy: 691, 292 + xy: 817, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/turrets/railgunturret rotate: false - xy: 689, 280 + xy: 829, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/turrets/repairturret rotate: false - xy: 703, 292 + xy: 841, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/turrets/shotgunturret rotate: false - xy: 701, 280 + xy: 691, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/turrets/teslaturret rotate: false - xy: 715, 292 + xy: 689, 280 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1182,28 +1189,28 @@ blocks/turrets/titancannon index: -1 blocks/turrets/titancannon-icon rotate: false - xy: 689, 256 + xy: 703, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/turrets/turret rotate: false - xy: 701, 268 + xy: 689, 268 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/walls/compositewall rotate: false - xy: 604, 179 + xy: 614, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/walls/door rotate: false - xy: 600, 155 + xy: 614, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1224,14 +1231,14 @@ blocks/walls/door-large-open index: -1 blocks/walls/door-open rotate: false - xy: 610, 169 + xy: 624, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/walls/duriumwall rotate: false - xy: 610, 159 + xy: 793, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1245,49 +1252,49 @@ blocks/walls/duriumwall-large index: -1 blocks/walls/ironwall rotate: false - xy: 724, 342 + xy: 731, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/walls/steelwall rotate: false - xy: 835, 370 + xy: 337, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/walls/steelwall-large rotate: false - xy: 357, 69 + xy: 339, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/walls/stonewall rotate: false - xy: 897, 437 + xy: 427, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/walls/titaniumshieldwall rotate: false - xy: 927, 434 + xy: 323, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/walls/titaniumwall rotate: false - xy: 937, 434 + xy: 333, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/walls/titaniumwall-large rotate: false - xy: 429, 69 + xy: 411, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1301,28 +1308,28 @@ effects/blank index: -1 effects/bullet rotate: false - xy: 594, 205 + xy: 594, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 effects/chainbullet rotate: false - xy: 584, 175 + xy: 187, 1 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 effects/enemyarrow rotate: false - xy: 623, 226 + xy: 817, 431 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 effects/laser rotate: false - xy: 219, 26 + xy: 465, 91 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1343,112 +1350,112 @@ effects/laserfull index: -1 effects/shell rotate: false - xy: 805, 386 + xy: 363, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 effects/shot rotate: false - xy: 815, 420 + xy: 403, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 effects/shot-long rotate: false - xy: 815, 410 + xy: 413, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 effects/titanshell rotate: false - xy: 947, 434 + xy: 343, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemies/blastenemy-t1 rotate: false - xy: 540, 119 + xy: 447, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t2 rotate: false - xy: 641, 276 + xy: 540, 119 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 641, 260 + xy: 641, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t1 rotate: false - xy: 657, 276 + xy: 641, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t2 rotate: false - xy: 657, 260 + xy: 657, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t3 rotate: false - xy: 673, 276 + xy: 657, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t1 rotate: false - xy: 673, 260 + xy: 673, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t2 rotate: false - xy: 641, 244 + xy: 673, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t3 rotate: false - xy: 657, 244 + xy: 641, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t1 rotate: false - xy: 673, 244 + xy: 657, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t2 rotate: false - xy: 698, 304 + xy: 673, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t3 rotate: false - xy: 753, 409 + xy: 698, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1476,231 +1483,231 @@ enemies/fortressenemy-t3 index: -1 enemies/healerenemy-t1 rotate: false - xy: 753, 393 + xy: 753, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t2 rotate: false - xy: 769, 410 + xy: 753, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t3 rotate: false - xy: 769, 394 + xy: 769, 410 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 497, 65 + xy: 207, 56 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 513, 65 + xy: 207, 40 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 191, 58 + xy: 171, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 532, 97 + xy: 191, 26 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 529, 81 + xy: 207, 24 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 529, 65 + xy: 187, 10 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/standardenemy-t1 rotate: false - xy: 207, 56 + xy: 203, 8 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 207, 56 + xy: 203, 8 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/standardenemy-t2 rotate: false - xy: 223, 41 + xy: 395, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/standardenemy-t3 rotate: false - xy: 237, 55 + xy: 409, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 191, 42 + xy: 223, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 175, 34 + xy: 223, 37 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 207, 40 + xy: 239, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/titanenemy-t1 rotate: false - xy: 375, 69 + xy: 357, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t2 rotate: false - xy: 393, 69 + xy: 375, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t3 rotate: false - xy: 411, 69 + xy: 393, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 items/item-biomatter rotate: false - xy: 724, 332 + xy: 731, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-coal rotate: false - xy: 724, 322 + xy: 731, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-dirium rotate: false - xy: 545, 87 + xy: 699, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-glass rotate: false - xy: 545, 77 + xy: 709, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-iron rotate: false - xy: 545, 67 + xy: 724, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-quartz rotate: false - xy: 727, 294 + xy: 724, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-silicon rotate: false - xy: 734, 352 + xy: 724, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-steel rotate: false - xy: 734, 342 + xy: 724, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-stone rotate: false - xy: 734, 332 + xy: 556, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-titanium rotate: false - xy: 734, 322 + xy: 556, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 items/item-uranium rotate: false - xy: 730, 312 + xy: 734, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechs/mech-standard rotate: false - xy: 965, 437 + xy: 311, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mechs/mech-standard-icon rotate: false - xy: 979, 437 + xy: 325, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mechs/ship-standard rotate: false - xy: 623, 235 + xy: 367, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1848,7 +1855,7 @@ ui/clear index: -1 ui/cursor rotate: false - xy: 185, 28 + xy: 540, 113 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -1862,21 +1869,21 @@ ui/icons/controller-cursor index: -1 ui/icons/icon-about rotate: false - xy: 714, 304 + xy: 769, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-add rotate: false - xy: 753, 377 + xy: 714, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-admin rotate: false - xy: 769, 378 + xy: 753, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1890,42 +1897,42 @@ ui/icons/icon-admin-small index: -1 ui/icons/icon-areaDelete rotate: false - xy: 265, 57 + xy: 219, 11 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow rotate: false - xy: 869, 463 + xy: 769, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-arrow-down rotate: false - xy: 277, 57 + xy: 231, 11 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-left rotate: false - xy: 289, 57 + xy: 965, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-right rotate: false - xy: 301, 57 + xy: 977, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-up rotate: false - xy: 313, 57 + xy: 989, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1939,28 +1946,28 @@ ui/icons/icon-back index: -1 ui/icons/icon-ban rotate: false - xy: 885, 463 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-cancel rotate: false - xy: 901, 463 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-chat rotate: false - xy: 325, 57 + xy: 1001, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-check rotate: false - xy: 917, 463 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1988,63 +1995,63 @@ ui/icons/icon-close-over index: -1 ui/icons/icon-crafting rotate: false - xy: 337, 57 + xy: 1013, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-cursor rotate: false - xy: 349, 57 + xy: 609, 233 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-defense rotate: false - xy: 361, 57 + xy: 621, 237 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-discord rotate: false - xy: 869, 447 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-distribution rotate: false - xy: 373, 57 + xy: 609, 221 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-donate rotate: false - xy: 885, 447 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-dots rotate: false - xy: 901, 447 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-editor rotate: false - xy: 917, 447 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-file-text rotate: false - xy: 933, 460 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2058,21 +2065,21 @@ ui/icons/icon-fill index: -1 ui/icons/icon-floppy rotate: false - xy: 949, 460 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-folder rotate: false - xy: 933, 444 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-folder-parent rotate: false - xy: 949, 444 + xy: 933, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2086,35 +2093,35 @@ ui/icons/icon-grid index: -1 ui/icons/icon-hold rotate: false - xy: 385, 57 + xy: 621, 225 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-holdDelete rotate: false - xy: 397, 57 + xy: 468, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-home rotate: false - xy: 965, 467 + xy: 949, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-host rotate: false - xy: 965, 451 + xy: 965, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-info rotate: false - xy: 409, 57 + xy: 480, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2128,14 +2135,14 @@ ui/icons/icon-line index: -1 ui/icons/icon-liquid rotate: false - xy: 421, 57 + xy: 492, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-load rotate: false - xy: 981, 467 + xy: 965, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2163,28 +2170,28 @@ ui/icons/icon-loading index: -1 ui/icons/icon-logic rotate: false - xy: 433, 57 + xy: 504, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-menu rotate: false - xy: 445, 57 + xy: 516, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-none rotate: false - xy: 199, 14 + xy: 528, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-pause rotate: false - xy: 197, 2 + xy: 540, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2198,7 +2205,7 @@ ui/icons/icon-pencil index: -1 ui/icons/icon-pencil-small rotate: false - xy: 981, 451 + xy: 981, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2212,42 +2219,42 @@ ui/icons/icon-pick index: -1 ui/icons/icon-play rotate: false - xy: 211, 14 + xy: 463, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-play-2 rotate: false - xy: 997, 467 + xy: 981, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-players rotate: false - xy: 209, 2 + xy: 475, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-power rotate: false - xy: 781, 432 + xy: 487, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-production rotate: false - xy: 793, 436 + xy: 499, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-quit rotate: false - xy: 997, 451 + xy: 997, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2261,14 +2268,14 @@ ui/icons/icon-redo index: -1 ui/icons/icon-refresh rotate: false - xy: 175, 50 + xy: 997, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rename rotate: false - xy: 468, 97 + xy: 175, 50 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2282,35 +2289,35 @@ ui/icons/icon-resize index: -1 ui/icons/icon-rotate rotate: false - xy: 484, 97 + xy: 468, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-arrow rotate: false - xy: 500, 97 + xy: 484, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-left rotate: false - xy: 516, 97 + xy: 500, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-right rotate: false - xy: 465, 81 + xy: 516, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-save rotate: false - xy: 481, 81 + xy: 191, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2331,7 +2338,7 @@ ui/icons/icon-save-map index: -1 ui/icons/icon-settings rotate: false - xy: 805, 436 + xy: 511, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2345,28 +2352,28 @@ ui/icons/icon-terrain index: -1 ui/icons/icon-tools rotate: false - xy: 497, 81 + xy: 532, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-touch rotate: false - xy: 817, 440 + xy: 523, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-touchDelete rotate: false - xy: 829, 440 + xy: 535, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-trash rotate: false - xy: 513, 81 + xy: 191, 42 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2380,7 +2387,7 @@ ui/icons/icon-trash-16 index: -1 ui/icons/icon-tutorial rotate: false - xy: 465, 65 + xy: 175, 34 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2394,14 +2401,14 @@ ui/icons/icon-undo index: -1 ui/icons/icon-units rotate: false - xy: 841, 441 + xy: 781, 432 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-weapon rotate: false - xy: 853, 441 + xy: 793, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2415,7 +2422,7 @@ ui/icons/icon-zoom index: -1 ui/icons/icon-zoom-small rotate: false - xy: 481, 65 + xy: 171, 18 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2565,7 +2572,7 @@ ui/textfield-over index: -1 ui/white rotate: false - xy: 604, 220 + xy: 183, 69 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2588,84 +2595,84 @@ ui/window-empty index: -1 weapons/beam rotate: false - xy: 713, 282 + xy: 229, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/beam-equip rotate: false - xy: 689, 246 + xy: 239, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/blaster rotate: false - xy: 584, 204 + xy: 584, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/blaster-equip rotate: false - xy: 584, 194 + xy: 594, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/clustergun rotate: false - xy: 594, 195 + xy: 584, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/clustergun-equip rotate: false - xy: 594, 185 + xy: 594, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/shockgun rotate: false - xy: 795, 376 + xy: 383, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/shockgun-equip rotate: false - xy: 805, 376 + xy: 393, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 927, 424 + xy: 353, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster-equip rotate: false - xy: 937, 424 + xy: 363, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/vulcan rotate: false - xy: 273, 37 + xy: 443, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/vulcan-equip rotate: false - xy: 283, 37 + xy: 443, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 01448f64ef..e7fe65ee31 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 44b766677c..c1046360d2 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Mon Mar 05 16:14:27 EST 2018 +#Mon Mar 05 21:35:42 EST 2018 version=release -androidBuildCode=395 +androidBuildCode=399 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/game/Difficulty.java b/core/src/io/anuke/mindustry/game/Difficulty.java index 0acfd411b9..d483322449 100644 --- a/core/src/io/anuke/mindustry/game/Difficulty.java +++ b/core/src/io/anuke/mindustry/game/Difficulty.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.world.blocks.types.defense.Turret; import io.anuke.mindustry.world.blocks.types.distribution.Conveyor; import io.anuke.mindustry.world.blocks.types.distribution.Router; import io.anuke.mindustry.world.blocks.types.production.Drill; -import io.anuke.mindustry.world.blocks.types.production.Generator; +import io.anuke.mindustry.world.blocks.types.generation.Generator; import io.anuke.mindustry.world.blocks.types.production.Smelter; import io.anuke.ucore.util.Bundles; diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index 5656836063..3e2697670d 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -48,9 +48,10 @@ public class Recipes { new Recipe(weapon, WeaponBlocks.fornaxcannon, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)), new Recipe(crafting, ProductionBlocks.smelter, stack(Item.stone, 40), stack(Item.iron, 40)), - new Recipe(crafting, ProductionBlocks.crucible, stack(Item.titanium, 50), stack(Item.steel, 50)), - new Recipe(crafting, ProductionBlocks.coalpurifier, stack(Item.steel, 10), stack(Item.iron, 10)), - new Recipe(crafting, ProductionBlocks.titaniumpurifier, stack(Item.steel, 30), stack(Item.iron, 30)), + new Recipe(crafting, ProductionBlocks.alloysmelter, stack(Item.titanium, 50), stack(Item.steel, 50)), + new Recipe(crafting, ProductionBlocks.coalextractor, stack(Item.steel, 10), stack(Item.iron, 10)), + new Recipe(crafting, ProductionBlocks.titaniumextractor, stack(Item.steel, 30), stack(Item.iron, 30)), + new Recipe(crafting, ProductionBlocks.uraniumextractor, stack(Item.steel, 30), stack(Item.iron, 30)), 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)), @@ -69,9 +70,9 @@ public class Recipes { new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30), stack(Item.stone, 20)), new Recipe(power, ProductionBlocks.thermalgenerator, stack(Item.steel, 30), stack(Item.iron, 30)), new Recipe(power, ProductionBlocks.combustiongenerator, stack(Item.iron, 30), stack(Item.stone, 20)), + new Recipe(power, ProductionBlocks.solarpanel, stack(Item.iron, 30), stack(Item.silicon, 20)), new Recipe(power, ProductionBlocks.rtgenerator, stack(Item.titanium, 20), stack(Item.steel, 20)), new Recipe(power, ProductionBlocks.nuclearReactor, stack(Item.titanium, 40), stack(Item.dirium, 40), stack(Item.steel, 50)), - //new Recipe(power, DistributionBlocks.powerbooster, stack(Item.steel, 8), stack(Item.iron, 8)), new Recipe(power, DistributionBlocks.powerlaser, stack(Item.steel, 3), stack(Item.iron, 3)), new Recipe(power, DistributionBlocks.powerlasercorner, stack(Item.steel, 4), stack(Item.iron, 4)), new Recipe(power, DistributionBlocks.powerlaserrouter, stack(Item.steel, 5), stack(Item.iron, 5)), diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index 5b024c3b85..2611b62a42 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -5,6 +5,8 @@ import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.resource.ItemStack; import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.blocks.types.generation.*; +import io.anuke.mindustry.world.blocks.types.generation.SolarGenerator; import io.anuke.mindustry.world.blocks.types.storage.CoreBlock; import io.anuke.mindustry.world.blocks.types.production.*; @@ -30,7 +32,7 @@ public class ProductionBlocks{ } }, - crucible = new Smelter("crucible"){ + alloysmelter = new Smelter("alloysmelter"){ { health = 90; inputs = new Item[]{Item.titanium, Item.steel}; @@ -41,7 +43,7 @@ public class ProductionBlocks{ } }, - coalpurifier = new LiquidCrafter("coalpurifier"){ + coalextractor = new LiquidCrafter("coalextractor"){ { input = Item.stone; inputAmount = 5; @@ -53,7 +55,7 @@ public class ProductionBlocks{ } }, - titaniumpurifier = new LiquidCrafter("titaniumpurifier"){ + titaniumextractor = new LiquidCrafter("titaniumextractor"){ { input = Item.iron; inputAmount = 6; @@ -65,6 +67,19 @@ public class ProductionBlocks{ health = 70; } }, + + uraniumextractor = new LiquidCrafter("uraniumextractor"){ + { + input = Item.iron; + inputAmount = 6; + inputLiquid = Liquid.water; + liquidAmount = 40f; + liquidCapacity = 41f; + purifyTime = 60; + output = Item.uranium; + health = 70; + } + }, oilrefinery = new LiquidCrafter("oilrefinery"){ { @@ -168,9 +183,27 @@ public class ProductionBlocks{ } }, - omnidrill = new Omnidrill("omnidrill"){ + laserdrill = new PowerDrill("laserdrill"){ { time = 4; + size = 2; + powerUse = 0.08f; + } + }, + + plasmadrill = new PowerDrill("plasmadrill"){ + { + time = 4; + size = 3; + powerUse = 0.16f; + } + }, + + nucleardrill = new PowerDrill("nucleardrill"){ + { + time = 4; + size = 4; + powerUse = 0.32f; } }, @@ -223,6 +256,9 @@ public class ProductionBlocks{ powerOutput = 0.03f; itemDuration = 240f; } + }, + solarpanel = new SolarGenerator("solarpanel"){ + }, nuclearReactor = new NuclearReactor("nuclearreactor"){ { diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerBooster.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerBooster.java index 2e843577dc..f8325a3f9b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerBooster.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerBooster.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.PowerAcceptor; -import io.anuke.mindustry.world.blocks.types.production.Generator; +import io.anuke.mindustry.world.blocks.types.generation.Generator; import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Lines; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java index ba7e09c94b..df5b23d445 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.types.distribution; import com.badlogic.gdx.graphics.Color; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.types.production.Generator; +import io.anuke.mindustry.world.blocks.types.generation.Generator; public class PowerLaser extends Generator{ public Color color = Color.valueOf("e54135"); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Generator.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java similarity index 99% rename from core/src/io/anuke/mindustry/world/blocks/types/production/Generator.java rename to core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java index 4afffc4582..cef8097f49 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/Generator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks.types.production; +package io.anuke.mindustry.world.blocks.types.generation; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.GridPoint2; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/ItemPowerGenerator.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/ItemPowerGenerator.java similarity index 97% rename from core/src/io/anuke/mindustry/world/blocks/types/production/ItemPowerGenerator.java rename to core/src/io/anuke/mindustry/world/blocks/types/generation/ItemPowerGenerator.java index 88ecc43b6c..8da7c33c80 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/ItemPowerGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/ItemPowerGenerator.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks.types.production; +package io.anuke.mindustry.world.blocks.types.generation; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Array; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidPowerGenerator.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/LiquidPowerGenerator.java similarity index 98% rename from core/src/io/anuke/mindustry/world/blocks/types/production/LiquidPowerGenerator.java rename to core/src/io/anuke/mindustry/world/blocks/types/generation/LiquidPowerGenerator.java index fa9abb17e7..6e504b6d5e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidPowerGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/LiquidPowerGenerator.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks.types.production; +package io.anuke.mindustry.world.blocks.types.generation; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java similarity index 99% rename from core/src/io/anuke/mindustry/world/blocks/types/production/NuclearReactor.java rename to core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java index ad9b71befb..d79d56b576 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks.types.production; +package io.anuke.mindustry.world.blocks.types.generation; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Array; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/generation/SolarGenerator.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/SolarGenerator.java new file mode 100644 index 0000000000..6c2748eb1d --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/SolarGenerator.java @@ -0,0 +1,21 @@ +package io.anuke.mindustry.world.blocks.types.generation; + +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.core.Timers; + +public class SolarGenerator extends Generator { + /**power generated per frame*/ + protected float generation = 0.005f; + + public SolarGenerator(String name){ + super(name); + } + + @Override + public void update(Tile tile){ + addPower(tile, generation * Timers.delta()); + + distributeLaserPower(tile); + } + +} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidDrill.java b/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidDrill.java deleted file mode 100644 index 5240bab4bf..0000000000 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidDrill.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.anuke.mindustry.world.blocks.types.production; - -import io.anuke.mindustry.world.Block; - -public class LiquidDrill extends Block { - - public LiquidDrill(String name) { - super(name); - } -} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/PowerDrill.java b/core/src/io/anuke/mindustry/world/blocks/types/production/PowerDrill.java new file mode 100644 index 0000000000..34855cbc62 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/PowerDrill.java @@ -0,0 +1,80 @@ +package io.anuke.mindustry.world.blocks.types.production; + +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.types.PowerAcceptor; +import io.anuke.mindustry.world.blocks.types.PowerBlock.PowerEntity; +import io.anuke.ucore.core.Effects; +import io.anuke.ucore.core.Timers; + +public class PowerDrill extends Drill implements PowerAcceptor { + public float powerCapacity = 10f; + /**power use per frame.*/ + public float powerUse = 0.08f; + + public PowerDrill(String name){ + super(name); + } + + @Override + public void update(Tile tile){ + PowerEntity entity = tile.entity(); + + int mines = 0; + + float used = Math.min(entity.power * Timers.delta(), powerCapacity-0.1f); + + if(entity.power >= used){ + entity.power -= used; + } + + if(isMultiblock()){ + for(Tile other : tile.getLinkedTiles(tempTiles)){ + if(isValid(other)){ + mines ++; + } + } + }else{ + if(isValid(tile)) mines = 1; + } + + if(mines > 0 && entity.power > powerUse && entity.timer.get(timerDrill, 60 * time) + && tile.entity.getItem(result) < capacity){ + for(int i = 0; i < mines; i ++) offloadNear(tile, result); + Effects.effect(drillEffect, tile.drawx(), tile.drawy()); + } + + if(entity.timer.get(timerDump, 30)){ + tryDump(tile); + } + } + + @Override + public boolean acceptsPower(Tile tile){ + PowerEntity entity = tile.entity(); + + return entity.power + 0.001f <= powerCapacity; + } + + @Override + public float addPower(Tile tile, float amount){ + PowerEntity entity = tile.entity(); + + float canAccept = Math.min(powerCapacity - entity.power, amount); + + entity.power += canAccept; + + return canAccept; + } + + @Override + public void setPower(Tile tile, float power){ + PowerEntity entity = tile.entity(); + entity.power = power; + } + + @Override + public TileEntity getEntity() { + return new PowerEntity(); + } +}