diff --git a/core/assets-raw/sprites/blocks/nuclearreactor-small.png b/core/assets-raw/sprites/blocks/nuclearreactor-small.png new file mode 100644 index 0000000000..6d9f0bfd35 Binary files /dev/null and b/core/assets-raw/sprites/blocks/nuclearreactor-small.png differ diff --git a/core/assets-raw/sprites/blocks/nuclearreactor.png b/core/assets-raw/sprites/blocks/nuclearreactor.png index 4a4b196cc0..5e28126f38 100644 Binary files a/core/assets-raw/sprites/blocks/nuclearreactor.png and b/core/assets-raw/sprites/blocks/nuclearreactor.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 731a2715cc..ba2aaf7e8c 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,112 +13,112 @@ backgrounds/background index: -1 blank rotate: false - xy: 450, 490 + xy: 228, 175 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 blocks/block rotate: false - xy: 503, 485 + xy: 228, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal1 rotate: false - xy: 503, 465 + xy: 284, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 503, 455 + xy: 301, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 443, 430 + xy: 311, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 443, 420 + xy: 321, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 453, 427 + xy: 443, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 453, 417 + xy: 443, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 449, 407 + xy: 294, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 201, 4 + xy: 304, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 449, 397 + xy: 314, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 230, 62 + xy: 324, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 230, 52 + xy: 118, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 467, 451 + xy: 128, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 477, 453 + xy: 230, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 487, 453 + xy: 230, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -132,665 +132,672 @@ blocks/core index: -1 blocks/cross rotate: false - xy: 459, 407 + xy: 240, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 459, 397 + xy: 240, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 228, 154 + xy: 250, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 228, 144 + xy: 250, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 228, 134 + xy: 230, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 211, 8 + xy: 240, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtblock rotate: false - xy: 270, 173 + xy: 250, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtedge rotate: false - xy: 37, 1 + xy: 1, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/doubleturret rotate: false - xy: 93, 4 + xy: 238, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/drill rotate: false - xy: 280, 173 + xy: 480, 491 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/duriumwall rotate: false - xy: 290, 173 + xy: 490, 491 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/duriumwall-large rotate: false - xy: 470, 495 + xy: 138, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/duriumwall-large-icon rotate: false - xy: 300, 173 + xy: 500, 491 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/flameturret rotate: false - xy: 105, 2 + xy: 250, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 320, 173 + xy: 258, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 330, 173 + xy: 258, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 241, 170 + xy: 258, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock rotate: false - xy: 241, 160 + xy: 258, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 238, 150 + xy: 258, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 79, 1 + xy: 43, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 244, 120 + xy: 391, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 244, 110 + xy: 174, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 244, 100 + xy: 185, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 244, 90 + xy: 195, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 244, 80 + xy: 184, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 248, 150 + xy: 194, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 158, 14 + xy: 234, 83 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 248, 140 + xy: 453, 446 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 92, 16 + xy: 57, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 248, 130 + xy: 453, 436 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 254, 120 + xy: 453, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 153, 2 + xy: 246, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 170, 14 + xy: 246, 83 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 165, 2 + xy: 234, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 254, 100 + xy: 449, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 254, 100 + xy: 449, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/nuclearreactor rotate: false - xy: 252, 181 - size: 16, 16 - orig: 16, 16 + xy: 92, 12 + size: 24, 24 + orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-icon rotate: false - xy: 254, 80 + xy: 459, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +blocks/nuclearreactor-small + rotate: false + xy: 156, 1 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 blocks/oil rotate: false - xy: 389, 224 + xy: 459, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 220, 32 + xy: 71, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 389, 214 + xy: 389, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 389, 204 + xy: 389, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 182, 14 + xy: 246, 71 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 389, 272 + xy: 272, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 389, 262 + xy: 262, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 389, 252 + xy: 262, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 391, 242 + xy: 272, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 393, 392 + xy: 268, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 393, 382 + xy: 268, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 177, 2 + xy: 265, 175 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock rotate: false - xy: 393, 372 + xy: 268, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 403, 382 + xy: 268, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2shadow rotate: false - xy: 413, 392 + xy: 268, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow rotate: false - xy: 393, 362 + xy: 270, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 403, 372 + xy: 270, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 194, 14 + xy: 260, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 413, 382 + xy: 270, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 189, 2 + xy: 277, 175 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 423, 392 + xy: 282, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 393, 352 + xy: 282, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 403, 362 + xy: 282, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 206, 18 + xy: 260, 151 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 413, 372 + xy: 278, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 423, 382 + xy: 278, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 433, 392 + xy: 278, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone rotate: false - xy: 385, 320 + xy: 450, 491 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 393, 342 + xy: 278, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 403, 352 + xy: 278, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 413, 362 + xy: 278, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock rotate: false - xy: 423, 372 + xy: 292, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 433, 382 + xy: 292, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 403, 342 + xy: 292, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 413, 352 + xy: 280, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneedge rotate: false - xy: 385, 306 + xy: 389, 272 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 423, 362 + xy: 280, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 433, 372 + xy: 280, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 413, 342 + xy: 288, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 423, 352 + xy: 288, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 433, 362 + xy: 288, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 423, 342 + xy: 288, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 433, 352 + xy: 288, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 433, 342 + xy: 288, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 443, 387 + xy: 290, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall-large rotate: false - xy: 488, 495 + xy: 157, 20 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 443, 377 + xy: 290, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 455, 449 + xy: 272, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 443, 367 + xy: 329, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 453, 377 + xy: 329, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 443, 357 + xy: 331, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 453, 367 + xy: 339, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 443, 347 + xy: 339, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/wateredge rotate: false - xy: 385, 292 + xy: 389, 258 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/waveturret rotate: false - xy: 453, 437 + xy: 289, 175 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 503, 475 + xy: 272, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 circle rotate: false - xy: 233, 180 + xy: 138, 19 size: 17, 17 orig: 17, 17 offset: 0, 0 @@ -804,231 +811,231 @@ circle2 index: -1 enemies/blastenemy-t1 rotate: false - xy: 270, 183 + xy: 175, 22 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t2 rotate: false - xy: 286, 183 + xy: 233, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 302, 183 + xy: 249, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t1 rotate: false - xy: 401, 402 + xy: 191, 22 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 401, 402 + xy: 191, 22 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t2 rotate: false - xy: 51, 1 + xy: 15, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/enemy-t3 rotate: false - xy: 65, 1 + xy: 29, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/fastenemy-t1 rotate: false - xy: 455, 477 + xy: 401, 402 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t2 rotate: false - xy: 455, 461 + xy: 464, 489 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t3 rotate: false - xy: 471, 479 + xy: 228, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t1 rotate: false - xy: 471, 463 + xy: 228, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t2 rotate: false - xy: 487, 479 + xy: 244, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t3 rotate: false - xy: 487, 463 + xy: 244, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 357, 218 + xy: 375, 234 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 375, 234 + xy: 373, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 373, 218 + xy: 357, 202 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 357, 202 + xy: 373, 202 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 373, 202 + xy: 427, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 318, 183 + xy: 433, 402 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 427, 418 + xy: 385, 318 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 433, 402 + xy: 385, 302 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 204, 30 + xy: 385, 286 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 231, 164 + xy: 175, 13 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 238, 140 + xy: 260, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 238, 130 + xy: 260, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 234, 120 + xy: 260, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 234, 110 + xy: 85, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 234, 100 + xy: 95, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 234, 90 + xy: 105, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 234, 80 + xy: 391, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser rotate: false - xy: 228, 164 + xy: 510, 499 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laserend rotate: false - xy: 450, 493 + xy: 118, 18 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 player rotate: false - xy: 389, 282 + xy: 389, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1119,21 +1126,21 @@ ui/clear index: -1 ui/cursor rotate: false - xy: 1, 1 + xy: 437, 434 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 ui/icon-cancel rotate: false - xy: 106, 14 + xy: 437, 440 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-check rotate: false - xy: 437, 440 + xy: 417, 402 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1161,98 +1168,98 @@ ui/icon-close-over index: -1 ui/icon-crafting rotate: false - xy: 128, 26 + xy: 486, 501 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cursor rotate: false - xy: 140, 26 + xy: 498, 501 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-defense rotate: false - xy: 152, 26 + xy: 269, 187 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-distribution rotate: false - xy: 164, 26 + xy: 281, 187 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-menu rotate: false - xy: 176, 26 + xy: 293, 187 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-pause rotate: false - xy: 188, 26 + xy: 305, 187 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play rotate: false - xy: 122, 14 + xy: 317, 187 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-power rotate: false - xy: 117, 2 + xy: 234, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-production rotate: false - xy: 134, 14 + xy: 234, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-rotate rotate: false - xy: 417, 402 + xy: 359, 234 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate-arrow rotate: false - xy: 359, 234 + xy: 357, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-settings rotate: false - xy: 129, 2 + xy: 246, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-touch rotate: false - xy: 146, 14 + xy: 234, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-weapon rotate: false - xy: 141, 2 + xy: 246, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1281,7 +1288,7 @@ ui/pane index: -1 ui/scroll rotate: false - xy: 92, 30 + xy: 233, 191 size: 34, 6 split: 4, 4, 2, 2 orig: 34, 6 @@ -1307,7 +1314,7 @@ ui/scroll-knob-horizontal index: -1 ui/scroll-knob-vertical rotate: false - xy: 1, 7 + xy: 450, 505 size: 34, 6 split: 12, 12, 2, 2 orig: 34, 6 @@ -1315,21 +1322,21 @@ ui/scroll-knob-vertical index: -1 ui/selection rotate: false - xy: 238, 161 + xy: 85, 12 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/separator rotate: false - xy: 201, 1 + xy: 115, 9 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/slider rotate: false - xy: 506, 503 + xy: 510, 489 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -1357,7 +1364,7 @@ ui/slider-knob-over index: -1 ui/slider-vertical rotate: false - xy: 93, 1 + xy: 389, 255 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -1380,7 +1387,7 @@ ui/textfield-over index: -1 ui/white rotate: false - xy: 443, 397 + xy: 393, 401 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -1402,35 +1409,35 @@ weapons/blaster index: -1 weapons/flamer rotate: false - xy: 310, 173 + xy: 258, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 254, 110 + xy: 453, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 254, 90 + xy: 449, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 403, 392 + xy: 268, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 453, 387 + xy: 290, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 9a19b0a69f..ac0d47f26f 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 148b6cb553..95294743a1 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -131,15 +131,15 @@ public class Tile{ } /**Returns the list of all tiles linked to this multiblock, or an empty array if it's not a multiblock. - * This array contains only linked tiles, not this tile itself.*/ + * This array contains all linked tiles, including this tile itself.*/ public Array getLinkedTiles(){ tmpArray.clear(); - if(!(block.width == 1 && block.health == 1)){ + if(!(block.width == 1 && block.height == 1)){ int offsetx = -(block.width-1)/2; int offsety = -(block.height-1)/2; for(int dx = 0; dx < block.width; dx ++){ for(int dy = 0; dy < block.height; dy ++){ - Tile other = World.tile(x + dx - offsetx, y + dy - offsety); + Tile other = World.tile(x + dx + offsetx, y + dy + offsety); tmpArray.add(other); } } diff --git a/core/src/io/anuke/mindustry/world/World.java b/core/src/io/anuke/mindustry/world/World.java index eed56ab127..40d6075b39 100644 --- a/core/src/io/anuke/mindustry/world/World.java +++ b/core/src/io/anuke/mindustry/world/World.java @@ -281,7 +281,7 @@ public class World{ int offsety = -(type.height-1)/2; for(int dx = 0; dx < type.width; dx ++){ for(int dy = 0; dy < type.height; dy ++){ - Tile other = tile(x + dx - offsetx, y + dy - offsety); + Tile other = tile(x + dx + offsetx, y + dy + offsety); if(other == null || other.block() != Blocks.air){ return false; } @@ -311,7 +311,6 @@ public class World{ }else{ Tile target = tile.isLinked() ? tile.getLinked() : tile; Array removals = target.getLinkedTiles(); - removals.add(tile); for(Tile toremove : removals){ //note that setting a new block automatically unlinks it toremove.setBlock(Blocks.air); diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index ac8579a03c..67e5971355 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -220,14 +220,14 @@ public class ProductionBlocks{ { //TODO formalName = "nuclear reactor"; - width = 2; - height = 2; + width = 3; + height = 3; generateLiquid = Liquid.water; generateItem = Item.uranium; itemCapacity = 60; itemInput = 6; inputLiquid = 2f; - health = 340; + health = 500; breaktime *= 2.2f; powerCapacity = 100f; }