diff --git a/core/assets-raw/sprites/blocks/turrets/block-2-top.png b/core/assets-raw/sprites/blocks/turrets/block-2-top.png new file mode 100644 index 0000000000..62f631c40b Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/block-2-top.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/block-3-top.png b/core/assets-raw/sprites/blocks/turrets/block-3-top.png new file mode 100644 index 0000000000..c06f2803fc Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/block-3-top.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/chainturret.png b/core/assets-raw/sprites/blocks/turrets/chainturret.png index dab2e4df60..742768bb07 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/chainturret.png and b/core/assets-raw/sprites/blocks/turrets/chainturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/doubleturret.png b/core/assets-raw/sprites/blocks/turrets/doubleturret.png index faea5bb3c7..7bae2646f3 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/doubleturret.png and b/core/assets-raw/sprites/blocks/turrets/doubleturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/flakturret.png b/core/assets-raw/sprites/blocks/turrets/flakturret.png index 6f5abdcde7..c33739af3b 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/flakturret.png and b/core/assets-raw/sprites/blocks/turrets/flakturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/flameturret.png b/core/assets-raw/sprites/blocks/turrets/flameturret.png index 135e491575..4f92d30ec7 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/flameturret.png and b/core/assets-raw/sprites/blocks/turrets/flameturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/fornaxcannon.png b/core/assets-raw/sprites/blocks/turrets/fornaxcannon.png index 7e2546371c..2a5edf540a 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/fornaxcannon.png and b/core/assets-raw/sprites/blocks/turrets/fornaxcannon.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/gatlingturret.png b/core/assets-raw/sprites/blocks/turrets/gatlingturret.png index 15f9b74b99..48b8baa5e8 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/gatlingturret.png and b/core/assets-raw/sprites/blocks/turrets/gatlingturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/laserturret.png b/core/assets-raw/sprites/blocks/turrets/laserturret.png index f672bccb40..8cf447ebec 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/laserturret.png and b/core/assets-raw/sprites/blocks/turrets/laserturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/magmaturret.png b/core/assets-raw/sprites/blocks/turrets/magmaturret.png index d0056317ba..398b626e27 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/magmaturret.png and b/core/assets-raw/sprites/blocks/turrets/magmaturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/megarepairturret.png b/core/assets-raw/sprites/blocks/turrets/megarepairturret.png index 97612b9499..1b2ab05bf8 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/megarepairturret.png and b/core/assets-raw/sprites/blocks/turrets/megarepairturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/missileturret.png b/core/assets-raw/sprites/blocks/turrets/missileturret.png index 3f76791685..ba80299957 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/missileturret.png and b/core/assets-raw/sprites/blocks/turrets/missileturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/railgunturret.png b/core/assets-raw/sprites/blocks/turrets/railgunturret.png index dd2f28fac0..3f443a2d75 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/railgunturret.png and b/core/assets-raw/sprites/blocks/turrets/railgunturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/repairturret.png b/core/assets-raw/sprites/blocks/turrets/repairturret.png index c9738d4540..276c8bd6ad 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/repairturret.png and b/core/assets-raw/sprites/blocks/turrets/repairturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/teslaturret.png b/core/assets-raw/sprites/blocks/turrets/teslaturret.png index 9342bb805b..6c083ce15f 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/teslaturret.png and b/core/assets-raw/sprites/blocks/turrets/teslaturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titancannon.png b/core/assets-raw/sprites/blocks/turrets/titancannon.png index 0c0b0d1b4f..350e7c66f4 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titancannon.png and b/core/assets-raw/sprites/blocks/turrets/titancannon.png differ diff --git a/core/assets-raw/sprites/items/item-copper.png b/core/assets-raw/sprites/items/item-copper.png new file mode 100644 index 0000000000..82e8da080a Binary files /dev/null and b/core/assets-raw/sprites/items/item-copper.png differ diff --git a/core/assets-raw/sprites/items/item-dirium.png b/core/assets-raw/sprites/items/item-dirium.png index df7bfef7ab..da431340a8 100644 Binary files a/core/assets-raw/sprites/items/item-dirium.png and b/core/assets-raw/sprites/items/item-dirium.png differ diff --git a/core/assets-raw/sprites/items/item-silicon.png b/core/assets-raw/sprites/items/item-silicon.png index 67001586a3..da7570e443 100644 Binary files a/core/assets-raw/sprites/items/item-silicon.png and b/core/assets-raw/sprites/items/item-silicon.png differ diff --git a/core/assets-raw/sprites/items/item-steel.png b/core/assets-raw/sprites/items/item-steel.png index 1f4cd1eda8..7a7acaa344 100644 Binary files a/core/assets-raw/sprites/items/item-steel.png and b/core/assets-raw/sprites/items/item-steel.png differ diff --git a/core/assets-raw/sprites/items/item-titanium.png b/core/assets-raw/sprites/items/item-titanium.png index 01e75295de..acdf51c211 100644 Binary files a/core/assets-raw/sprites/items/item-titanium.png and b/core/assets-raw/sprites/items/item-titanium.png differ diff --git a/core/assets-raw/sprites/items/item-uranium.png b/core/assets-raw/sprites/items/item-uranium.png index 0dd3f67a71..55f48f20f3 100644 Binary files a/core/assets-raw/sprites/items/item-uranium.png and b/core/assets-raw/sprites/items/item-uranium.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index c750f10087..031689c3b5 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,56 +13,56 @@ background index: -1 blackrock1 rotate: false - xy: 579, 234 + xy: 337, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 627, 306 + xy: 484, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 637, 306 + xy: 579, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 690, 367 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 700, 369 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 136, 43 + xy: 690, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 690, 357 + xy: 700, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 700, 359 + xy: 353, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -76,49 +76,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 622, 296 + xy: 700, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 632, 296 + xy: 413, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 685, 347 + xy: 132, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 127, 13 + xy: 695, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 137, 13 + xy: 147, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 147, 13 + xy: 152, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 157, 13 + xy: 652, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -132,35 +132,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 198, 54 + xy: 127, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 208, 54 + xy: 137, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 156, 44 + xy: 147, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 166, 44 + xy: 157, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 176, 44 + xy: 423, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -174,21 +174,21 @@ grassedge index: -1 ice1 rotate: false - xy: 186, 44 + xy: 433, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 196, 44 + xy: 443, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 206, 44 + xy: 453, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -202,70 +202,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 162, 34 + xy: 148, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 172, 34 + xy: 158, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 182, 34 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 182, 34 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 192, 34 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 192, 34 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 202, 34 + xy: 188, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 167, 24 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 167, 14 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 227, 24 + xy: 187, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -279,14 +279,14 @@ lavaedge index: -1 mossblock rotate: false - xy: 642, 286 + xy: 207, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 620, 276 + xy: 217, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,56 +300,56 @@ oiledge index: -1 rock1 rotate: false - xy: 660, 251 + xy: 640, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 121, 3 + xy: 640, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 161, 3 + xy: 652, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 171, 4 + xy: 662, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 181, 4 + xy: 650, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 191, 4 + xy: 650, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 201, 4 + xy: 660, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 211, 4 + xy: 660, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,56 +363,56 @@ sandedge index: -1 shrub rotate: false - xy: 901, 455 + xy: 161, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 911, 455 + xy: 171, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 899, 435 + xy: 211, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 909, 445 + xy: 221, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 909, 435 + xy: 231, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 919, 445 + xy: 241, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 919, 435 + xy: 423, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 929, 445 + xy: 433, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -426,42 +426,42 @@ snowedge index: -1 stone1 rotate: false - xy: 949, 441 + xy: 483, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 959, 441 + xy: 493, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 969, 441 + xy: 493, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 979, 441 + xy: 705, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 939, 431 + xy: 901, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 949, 431 + xy: 911, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -475,49 +475,49 @@ stoneedge index: -1 titanium1 rotate: false - xy: 989, 431 + xy: 909, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 999, 438 + xy: 909, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 999, 428 + xy: 919, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 321, 103 + xy: 939, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 331, 113 + xy: 949, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 331, 103 + xy: 959, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 361, 103 + xy: 969, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -531,63 +531,63 @@ wateredge index: -1 block-middle rotate: false - xy: 429, 160 + xy: 393, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 429, 160 + xy: 393, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 652, 301 + xy: 137, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 875, 405 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 151, 112 + xy: 507, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 346, 169 + xy: 372, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 enemyspawn rotate: false - xy: 178, 54 + xy: 875, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 630, 266 + xy: 226, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 245, 111 + xy: 281, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -601,84 +601,84 @@ alloysmelter index: -1 coaldrill rotate: false - xy: 137, 23 + xy: 127, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 142, 33 + xy: 479, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 146, 43 + xy: 479, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 642, 296 + xy: 479, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 695, 347 + xy: 622, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 507, 225 + xy: 373, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 347, 151 + xy: 604, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 604, 292 + xy: 169, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 169, 112 + xy: 525, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 188, 54 + xy: 305, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 177, 24 + xy: 156, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 largesolarpanel rotate: false - xy: 398, 169 + xy: 424, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -692,77 +692,77 @@ laserdrill index: -1 lavasmelter rotate: false - xy: 227, 14 + xy: 197, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 466, 196 + xy: 450, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 450, 170 + xy: 721, 422 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 721, 422 + xy: 61, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor rotate: false - xy: 61, 13 + xy: 87, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-liquid rotate: false - xy: 87, 13 + xy: 225, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 620, 266 + xy: 217, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 630, 276 + xy: 222, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 640, 276 + xy: 227, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 660, 261 + xy: 630, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 650, 251 + xy: 630, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,91 +776,91 @@ quartzextractor index: -1 rtgenerator rotate: false - xy: 141, 3 + xy: 630, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 151, 3 + xy: 640, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 921, 455 + xy: 181, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 931, 455 + xy: 191, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 899, 445 + xy: 201, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 929, 435 + xy: 443, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 959, 431 + xy: 921, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 969, 431 + xy: 931, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 989, 441 + xy: 899, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 1009, 430 + xy: 919, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 281, 103 + xy: 929, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 341, 113 + xy: 969, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 341, 103 + xy: 979, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -902,119 +902,119 @@ batterylarge-base index: -1 conduit-bottom rotate: false - xy: 152, 33 + xy: 685, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 157, 23 + xy: 142, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 652, 291 + xy: 146, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 662, 301 + xy: 489, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 662, 291 + xy: 489, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 305, 117 + xy: 489, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core rotate: false - xy: 320, 169 + xy: 346, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction rotate: false - xy: 222, 34 + xy: 177, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 226, 44 + xy: 187, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 232, 34 + xy: 197, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 237, 24 + xy: 218, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 237, 14 + xy: 216, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 622, 286 + xy: 212, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 632, 286 + xy: 207, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 424, 170 + xy: 66, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 66, 39 + xy: 92, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 92, 39 + xy: 466, 196 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1028,77 +1028,77 @@ multiplexer index: -1 poweredconveyor rotate: false - xy: 640, 266 + xy: 227, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 620, 256 + xy: 232, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 630, 256 + xy: 237, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 640, 256 + xy: 237, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 652, 281 + xy: 622, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 662, 281 + xy: 632, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 650, 271 + xy: 642, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 650, 261 + xy: 620, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 660, 271 + xy: 620, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 131, 3 + xy: 620, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 231, 4 + xy: 660, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1112,70 +1112,70 @@ shieldprojector index: -1 sortedunloader rotate: false - xy: 941, 451 + xy: 453, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 951, 451 + xy: 463, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 961, 451 + xy: 463, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 971, 451 + xy: 473, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 981, 451 + xy: 483, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 225, 139 + xy: 251, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 251, 139 + xy: 277, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 321, 113 + xy: 981, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 303, 143 + xy: 329, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 351, 113 + xy: 939, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1189,7 +1189,7 @@ weaponfactory index: -1 block-1 rotate: false - xy: 419, 159 + xy: 383, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1201,6 +1201,13 @@ block-2 orig: 16, 16 offset: 0, 0 index: -1 +block-2-top + rotate: false + xy: 355, 151 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-3 rotate: false xy: 858, 487 @@ -1208,51 +1215,58 @@ block-3 orig: 24, 24 offset: 0, 0 index: -1 +block-3-top + rotate: false + xy: 294, 169 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 chainturret rotate: false - xy: 329, 151 + xy: 586, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 73, 1 - size: 10, 10 - orig: 10, 10 + xy: 662, 301 + size: 8, 8 + orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 543, 225 + xy: 205, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 85, 1 + xy: 73, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 372, 169 + xy: 398, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 97, 1 + xy: 85, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 574, 195 + xy: 245, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1280,98 +1294,98 @@ missileturret index: -1 railgunturret rotate: false - xy: 417, 123 + xy: 257, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 233, 111 + xy: 269, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 257, 111 + xy: 293, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 269, 111 + xy: 305, 115 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 277, 139 + xy: 303, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 compositewall rotate: false - xy: 147, 23 + xy: 632, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 148, 54 + xy: 157, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 525, 225 + xy: 391, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 365, 151 + xy: 187, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 158, 54 + xy: 652, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 168, 54 + xy: 662, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 187, 112 + xy: 543, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 177, 14 + xy: 166, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 939, 441 + xy: 473, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1385,21 +1399,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 979, 431 + xy: 899, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 291, 103 + xy: 929, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 301, 107 + xy: 941, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1420,7 +1434,7 @@ blank index: -1 bullet rotate: false - xy: 439, 160 + xy: 403, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1462,28 +1476,28 @@ laserfull index: -1 shell rotate: false - xy: 221, 4 + xy: 650, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 492, 168 + xy: 141, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 492, 158 + xy: 151, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 301, 97 + xy: 951, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1525,77 +1539,84 @@ standard-mech-leg index: -1 item-biomatter rotate: false - xy: 187, 24 + xy: 176, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 187, 14 + xy: 186, 44 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-copper + rotate: false + xy: 196, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 197, 24 + xy: 206, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 197, 14 + xy: 162, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 218, 54 + xy: 172, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 216, 44 + xy: 182, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 212, 34 + xy: 192, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 207, 24 + xy: 202, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 207, 14 + xy: 167, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 217, 24 + xy: 167, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 217, 14 + xy: 177, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1714,7 +1735,7 @@ button-map-over index: -1 button-select rotate: false - xy: 294, 169 + xy: 320, 169 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -1778,7 +1799,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 586, 292 + xy: 151, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1806,14 +1827,14 @@ icon-admin index: -1 icon-admin-small rotate: false - xy: 321, 135 + xy: 476, 170 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 109, 1 + xy: 97, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1827,63 +1848,63 @@ icon-arrow index: -1 icon-arrow-down rotate: false - xy: 871, 427 + xy: 109, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 1013, 464 + xy: 871, 427 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 1013, 452 + xy: 1013, 464 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 1013, 440 + xy: 1013, 452 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 383, 151 + xy: 656, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 680, 409 + xy: 463, 154 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 680, 393 + xy: 680, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 502, 195 + xy: 1013, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 696, 411 + xy: 680, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1911,210 +1932,210 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 514, 195 + xy: 502, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 526, 195 + xy: 514, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 538, 195 + xy: 526, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 696, 395 + xy: 696, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 680, 377 + xy: 696, 395 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 550, 195 + xy: 538, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 696, 379 + xy: 680, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 572, 274 + xy: 696, 379 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 572, 258 + xy: 572, 274 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 588, 276 + xy: 572, 258 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 588, 260 + xy: 588, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 205, 112 + xy: 118, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 604, 276 + xy: 588, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 604, 260 + xy: 604, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 763, 411 + xy: 604, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 779, 411 + xy: 763, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 795, 411 + xy: 779, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 401, 151 + xy: 476, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 562, 195 + xy: 550, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 321, 123 + xy: 562, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 811, 411 + xy: 795, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 827, 411 + xy: 811, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 333, 123 + xy: 419, 139 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 843, 411 + xy: 827, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 656, 361 + xy: 409, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 859, 411 + xy: 843, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 345, 123 + xy: 431, 140 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 651, 311 + xy: 859, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 118, 47 + xy: 427, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 476, 178 + xy: 445, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2128,14 +2149,14 @@ icon-loading index: -1 icon-logic rotate: false - xy: 357, 123 + xy: 443, 140 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 369, 123 + xy: 875, 415 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2149,14 +2170,14 @@ icon-menu-large index: -1 icon-none rotate: false - xy: 381, 123 + xy: 136, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 393, 123 + xy: 154, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2170,7 +2191,7 @@ icon-pencil index: -1 icon-pencil-small rotate: false - xy: 674, 361 + xy: 651, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2184,42 +2205,42 @@ icon-pick index: -1 icon-play rotate: false - xy: 405, 123 + xy: 166, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 669, 345 + xy: 674, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 875, 415 + xy: 178, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 136, 53 + xy: 190, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 154, 64 + xy: 202, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 225, 123 + xy: 669, 345 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2233,14 +2254,14 @@ icon-redo index: -1 icon-refresh rotate: false - xy: 241, 123 + xy: 225, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 257, 123 + xy: 241, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2254,35 +2275,35 @@ icon-resize index: -1 icon-rotate rotate: false - xy: 273, 123 + xy: 257, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 289, 123 + xy: 273, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 305, 127 + xy: 289, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 329, 135 + xy: 305, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 345, 135 + xy: 321, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2303,7 +2324,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 166, 64 + xy: 214, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2317,28 +2338,28 @@ icon-terrain index: -1 icon-tools rotate: false - xy: 361, 135 + xy: 337, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 178, 64 + xy: 574, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 190, 64 + xy: 455, 140 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 377, 135 + xy: 355, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2352,14 +2373,14 @@ icon-trash-16 index: -1 icon-trello rotate: false - xy: 393, 135 + xy: 371, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 409, 135 + xy: 387, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2373,21 +2394,21 @@ icon-undo index: -1 icon-units rotate: false - xy: 202, 64 + xy: 467, 142 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 214, 64 + xy: 233, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 476, 162 + xy: 403, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2574,84 +2595,84 @@ window-empty index: -1 beam rotate: false - xy: 281, 113 + xy: 317, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 291, 113 + xy: 327, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 132, 33 + xy: 363, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 127, 23 + xy: 373, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 449, 160 + xy: 136, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 459, 160 + xy: 690, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 241, 4 + xy: 121, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 705, 349 + xy: 131, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 311, 107 + xy: 961, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 311, 97 + xy: 971, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 351, 103 + xy: 949, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 361, 113 + xy: 959, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 30b4a0d124..43a884e5ae 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 8bafaeccce..4d3dd781ca 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Mar 21 16:44:11 EDT 2018 +#Wed Mar 21 20:03:34 EDT 2018 version=release -androidBuildCode=587 +androidBuildCode=596 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 5aa8279761..c71db3208f 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -103,12 +103,13 @@ public class UI extends SceneModule{ Colors.put("healthstats", Color.SCARLET); Colors.put("interact", Color.ORANGE); Colors.put("accent", Color.valueOf("f4ba6e")); - Colors.put("place", Color.PURPLE); + Colors.put("place", Color.valueOf("6335f8")); Colors.put("placeInvalid", Color.RED); Colors.put("placeRotate", Color.ORANGE); Colors.put("break", Color.CORAL); Colors.put("breakStart", Color.YELLOW); Colors.put("breakInvalid", Color.RED); + Colors.put("range", Colors.get("accent")); } @Override diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 1bfd96ac7e..e5efff01f9 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -160,6 +160,10 @@ public class World extends Module{ return tiles; } + + public void setMap(Map map){ + this.currentMap = map; + } public void loadMap(Map map){ loadMap(map, MathUtils.random(0, 999999)); diff --git a/core/src/io/anuke/mindustry/game/Team.java b/core/src/io/anuke/mindustry/game/Team.java index 7490fcace9..6662c15090 100644 --- a/core/src/io/anuke/mindustry/game/Team.java +++ b/core/src/io/anuke/mindustry/game/Team.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.Color; public enum Team { none(Color.DARK_GRAY), blue(Color.ROYAL), - red(Color.SCARLET); + red(Color.valueOf("e84737")); public final Color color; diff --git a/core/src/io/anuke/mindustry/io/versions/Save16.java b/core/src/io/anuke/mindustry/io/versions/Save16.java index 73bf0f3672..47bc7cd219 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save16.java +++ b/core/src/io/anuke/mindustry/io/versions/Save16.java @@ -40,6 +40,7 @@ public class Save16 extends SaveFileVersion { //general state byte mode = stream.readByte(); String mapname = stream.readUTF(); + world.setMap(world.maps().getByName(mapname)); int wave = stream.readInt(); byte difficulty = stream.readByte(); @@ -141,22 +142,24 @@ public class Save16 extends SaveFileVersion { Tile[][] tiles = world.createTiles(width, height); - for(int x = 0; x < world.width(); x ++){ - for(int y = 0; y < world.height(); y ++) { + for(int x = 0; x < width; x ++){ + for(int y = 0; y < height; y ++) { byte floorid = stream.readByte(); byte wallid = stream.readByte(); Tile tile = new Tile(x, y, floorid, wallid); + if (wallid == Blocks.blockpart.id) { tile.link = stream.readByte(); } if (tile.entity != null) { byte tr = stream.readByte(); + short health = stream.readShort(); + byte team = Bits.getLeftByte(tr); byte rotation = Bits.getRightByte(tr); - short health = stream.readShort(); tile.setTeam(Team.values()[team]); tile.entity.health = health; diff --git a/core/src/io/anuke/mindustry/resource/Item.java b/core/src/io/anuke/mindustry/resource/Item.java index e9c0a82200..b5d9b2d25c 100644 --- a/core/src/io/anuke/mindustry/resource/Item.java +++ b/core/src/io/anuke/mindustry/resource/Item.java @@ -15,6 +15,7 @@ public class Item implements Comparable{ } }, iron = new Item("iron"), + copper = new Item("copper"), coal = new Item("coal"){ { explosiveness = 0.2f; @@ -38,7 +39,6 @@ public class Item implements Comparable{ fluxiness = 0.65f; } }, - glass = new Item("glass"), silicon = new Item("silicon"), biomatter = new Item("biomatter"){ { diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 6d2e79c610..9e96043e84 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -8,7 +8,6 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.net.Net; import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Settings; import io.anuke.ucore.function.Consumer; import io.anuke.ucore.scene.ui.Image; @@ -146,13 +145,9 @@ public class SettingsMenuDialog extends SettingsDialog{ renderer.pixelSurface.setScale(Core.cameraScale); renderer.shadowSurface.setScale(Core.cameraScale); renderer.shieldSurface.setScale(Core.cameraScale); - Graphics.getEffects1().setScale(Core.cameraScale); - Graphics.getEffects2().setScale(Core.cameraScale); }else{ renderer.shadowSurface.setScale(1); renderer.shieldSurface.setScale(1); - Graphics.getEffects1().setScale(1); - Graphics.getEffects2().setScale(1); } renderer.setPixelate(b); }); diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 57700de5c8..f5dea32ab5 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -42,6 +42,7 @@ public class Tile{ this(x, y); this.floor = floor; this.wall = wall; + changed(); } public Tile(int x, int y, byte floor, byte wall, byte rotation, byte team){ @@ -50,6 +51,7 @@ public class Tile{ this.wall = wall; this.rotation = rotation; this.team = team; + changed(); } public int packedPosition(){ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/PowerTurret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/PowerTurret.java index 35acb69c88..55cc0cd947 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/PowerTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/PowerTurret.java @@ -1,10 +1,7 @@ package io.anuke.mindustry.world.blocks.types.defense; -import com.badlogic.gdx.graphics.Color; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Strings; public abstract class PowerTurret extends Turret{ @@ -22,13 +19,6 @@ public abstract class PowerTurret extends Turret{ stats.add("powershot", Strings.toFixed(powerUsed, 1)); } - @Override - public void drawSelect(Tile tile){ - Draw.color(Color.GREEN); - Lines.dashCircle(tile.drawx(), tile.drawy(), range); - Draw.reset(); - } - @Override public boolean hasAmmo(Tile tile){ return tile.entity.power.amount >= powerUsed; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/RepairTurret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/RepairTurret.java index d8f74fb496..a65aba5909 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/RepairTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/RepairTurret.java @@ -1,6 +1,5 @@ package io.anuke.mindustry.world.blocks.types.defense; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.MathUtils; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Layer; @@ -68,13 +67,6 @@ public class RepairTurret extends PowerTurret{ } } - @Override - public void drawSelect(Tile tile){ - Draw.color(Color.GREEN); - Lines.dashCircle(tile.drawx(), tile.drawy(), range); - Draw.reset(); - } - @Override public void drawLayer2(Tile tile){ TurretEntity entity = tile.entity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java index 8e05184f2d..c7b897ff9e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java @@ -77,6 +77,11 @@ public class Turret extends Block{ public void draw(Tile tile){ if(base == null) { Draw.rect("block-" + size, tile.drawx(), tile.drawy()); + if(Draw.hasRegion("block-" + size + "-top")) { + Draw.color(tile.getTeam().color, Color.WHITE, 0.45f); + Draw.rect("block-" + size + "-top", tile.drawx(), tile.drawy()); + Draw.color(); + } }else{ Draw.rect(base, tile.drawx(), tile.drawy()); } @@ -95,14 +100,14 @@ public class Turret extends Block{ @Override public void drawSelect(Tile tile){ - Draw.color(Color.GREEN); + Draw.color(tile.getTeam().color); Lines.dashCircle(tile.drawx(), tile.drawy(), range); Draw.reset(); } @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - Draw.color(Color.PURPLE); + Draw.color("place"); Lines.stroke(1f); Lines.dashCircle(x * tilesize, y * tilesize, range); } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java index e6f8a22442..fd5c223c39 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java @@ -92,7 +92,7 @@ public class Generator extends PowerBlock{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ if(hasLasers){ - Draw.color(Color.PURPLE); + Draw.color("place"); Lines.stroke(2f); for(int i = 0; i < laserDirections; i++){ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/types/production/UnitFactory.java new file mode 100644 index 0000000000..7ca4cd833d --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/UnitFactory.java @@ -0,0 +1,14 @@ +package io.anuke.mindustry.world.blocks.types.production; + +import io.anuke.mindustry.entities.units.UnitType; +import io.anuke.mindustry.world.Block; + +public class UnitFactory extends Block { + protected UnitType type; + + public UnitFactory(String name) { + super(name); + } + + +}