diff --git a/core/assets-raw/sprites/blocks/environment/coal1.png b/core/assets-raw/sprites/blocks/environment/coal1.png index 8f784eff3c..5063fac253 100644 Binary files a/core/assets-raw/sprites/blocks/environment/coal1.png and b/core/assets-raw/sprites/blocks/environment/coal1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/coal2.png b/core/assets-raw/sprites/blocks/environment/coal2.png index 65b531eac5..3905917cf1 100644 Binary files a/core/assets-raw/sprites/blocks/environment/coal2.png and b/core/assets-raw/sprites/blocks/environment/coal2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/coal3.png b/core/assets-raw/sprites/blocks/environment/coal3.png index 1457793e91..9e6a1cebdc 100644 Binary files a/core/assets-raw/sprites/blocks/environment/coal3.png and b/core/assets-raw/sprites/blocks/environment/coal3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper1.png b/core/assets-raw/sprites/blocks/environment/copper1.png new file mode 100644 index 0000000000..93350ac819 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper2.png b/core/assets-raw/sprites/blocks/environment/copper2.png new file mode 100644 index 0000000000..5ff07d3358 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper3.png b/core/assets-raw/sprites/blocks/environment/copper3.png new file mode 100644 index 0000000000..9b5942473d Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper3.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 031689c3b5..9fd1f13b55 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -95,30 +95,51 @@ coal3 orig: 8, 8 offset: 0, 0 index: -1 -deepwater +copper1 + rotate: false + xy: 642, 296 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +copper2 rotate: false xy: 695, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -dirt1 +copper3 rotate: false xy: 147, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +deepwater + rotate: false + xy: 652, 301 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +dirt1 + rotate: false + xy: 157, 23 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 dirt2 rotate: false - xy: 152, 33 + xy: 652, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 652, 301 + xy: 662, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -132,35 +153,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 127, 13 + xy: 157, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 137, 13 + xy: 423, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 147, 13 + xy: 433, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 157, 13 + xy: 443, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 423, 129 + xy: 453, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -174,21 +195,21 @@ grassedge index: -1 ice1 rotate: false - xy: 433, 130 + xy: 148, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 443, 130 + xy: 158, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 453, 130 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -202,70 +223,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 148, 54 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 158, 54 + xy: 188, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 168, 54 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 168, 54 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 178, 54 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 178, 54 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 188, 54 + xy: 156, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 198, 54 + xy: 166, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 208, 54 + xy: 176, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 187, 14 + xy: 218, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -279,14 +300,14 @@ lavaedge index: -1 mossblock rotate: false - xy: 207, 14 + xy: 222, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 217, 24 + xy: 226, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,56 +321,56 @@ oiledge index: -1 rock1 rotate: false - xy: 640, 276 + xy: 630, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 640, 266 + xy: 640, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 652, 281 + xy: 650, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 662, 281 + xy: 660, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 650, 271 + xy: 660, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 650, 261 + xy: 650, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 660, 271 + xy: 660, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 660, 261 + xy: 121, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,56 +384,56 @@ sandedge index: -1 shrub rotate: false - xy: 161, 3 + xy: 191, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 171, 4 + xy: 201, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 211, 4 + xy: 241, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 221, 4 + xy: 423, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 231, 4 + xy: 433, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 241, 4 + xy: 443, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 423, 119 + xy: 453, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 433, 120 + xy: 463, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -426,42 +447,42 @@ snowedge index: -1 stone1 rotate: false - xy: 483, 118 + xy: 705, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 493, 128 + xy: 901, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 493, 118 + xy: 911, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 705, 349 + xy: 921, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 901, 455 + xy: 931, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 911, 455 + xy: 899, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -475,49 +496,49 @@ stoneedge index: -1 titanium1 rotate: false - xy: 909, 445 + xy: 919, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 909, 435 + xy: 929, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 919, 445 + xy: 929, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 939, 441 + xy: 969, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 949, 441 + xy: 979, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 959, 441 + xy: 939, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 969, 431 + xy: 989, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -552,7 +573,7 @@ conduit-liquid index: -1 cross-1 rotate: false - xy: 642, 296 + xy: 152, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -573,14 +594,14 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 875, 405 + xy: 137, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 226, 44 + xy: 232, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -664,14 +685,14 @@ cultivator index: -1 fluxpump rotate: false - xy: 305, 105 + xy: 147, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 156, 44 + xy: 186, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -692,7 +713,7 @@ laserdrill index: -1 lavasmelter rotate: false - xy: 197, 24 + xy: 216, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -734,35 +755,35 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 217, 14 + xy: 227, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 222, 34 + xy: 227, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 227, 24 + xy: 237, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 630, 276 + xy: 640, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 630, 266 + xy: 620, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,91 +797,91 @@ quartzextractor index: -1 rtgenerator rotate: false - xy: 630, 256 + xy: 662, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 640, 256 + xy: 650, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 181, 4 + xy: 211, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 191, 4 + xy: 221, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 201, 4 + xy: 231, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 443, 120 + xy: 463, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 921, 455 + xy: 899, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 931, 455 + xy: 909, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 899, 435 + xy: 919, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 919, 435 + xy: 941, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 929, 445 + xy: 951, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 969, 441 + xy: 949, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 979, 441 + xy: 959, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -951,49 +972,49 @@ core index: -1 junction rotate: false - xy: 177, 14 + xy: 197, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 187, 24 + xy: 197, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 197, 14 + xy: 212, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 218, 54 + xy: 207, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 216, 44 + xy: 207, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 212, 34 + xy: 217, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 207, 24 + xy: 217, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,77 +1049,77 @@ multiplexer index: -1 poweredconveyor rotate: false - xy: 227, 14 + xy: 237, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 232, 34 + xy: 622, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 237, 24 + xy: 632, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 237, 14 + xy: 642, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 622, 286 + xy: 620, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 632, 286 + xy: 620, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 642, 286 + xy: 630, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 620, 276 + xy: 630, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 620, 266 + xy: 640, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 620, 256 + xy: 652, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 660, 251 + xy: 141, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1112,35 +1133,35 @@ shieldprojector index: -1 sortedunloader rotate: false - xy: 453, 120 + xy: 473, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 463, 130 + xy: 483, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 463, 120 + xy: 473, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 473, 128 + xy: 483, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 483, 128 + xy: 493, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1161,7 +1182,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 981, 451 + xy: 959, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1175,7 +1196,7 @@ vault index: -1 vault-icon rotate: false - xy: 939, 431 + xy: 969, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1231,7 +1252,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 662, 301 + xy: 305, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1336,7 +1357,7 @@ compositewall index: -1 door rotate: false - xy: 157, 23 + xy: 662, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1357,14 +1378,14 @@ door-large-open index: -1 door-open rotate: false - xy: 652, 291 + xy: 875, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 662, 291 + xy: 127, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1378,14 +1399,14 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 166, 44 + xy: 196, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 473, 118 + xy: 493, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1399,21 +1420,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 899, 445 + xy: 909, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 929, 435 + xy: 961, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 941, 451 + xy: 971, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1476,28 +1497,28 @@ laserfull index: -1 shell rotate: false - xy: 650, 251 + xy: 131, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 141, 3 + xy: 171, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 151, 3 + xy: 181, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 951, 451 + xy: 981, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1539,84 +1560,84 @@ standard-mech-leg index: -1 item-biomatter rotate: false - xy: 176, 44 + xy: 206, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 186, 44 + xy: 162, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 196, 44 + xy: 172, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 206, 44 + xy: 182, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 162, 34 + xy: 192, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 172, 34 + xy: 202, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 182, 34 + xy: 167, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 192, 34 + xy: 167, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 202, 34 + xy: 177, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 167, 24 + xy: 177, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 167, 14 + xy: 187, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 177, 24 + xy: 187, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2637,42 +2658,42 @@ clustergun-equip index: -1 shockgun rotate: false - xy: 121, 3 + xy: 151, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 131, 3 + xy: 161, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 961, 451 + xy: 939, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 971, 451 + xy: 949, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 949, 431 + xy: 979, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 959, 431 + xy: 989, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 43a884e5ae..78e7c388d2 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 4d3dd781ca..9c345acd82 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Mar 21 20:03:34 EDT 2018 +#Wed Mar 21 20:49:05 EDT 2018 version=release -androidBuildCode=596 +androidBuildCode=599 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/io/versions/Save16.java b/core/src/io/anuke/mindustry/io/versions/Save16.java index 47bc7cd219..cdf356d9e7 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save16.java +++ b/core/src/io/anuke/mindustry/io/versions/Save16.java @@ -81,7 +81,7 @@ public class Save16 extends SaveFileVersion { int weapons = stream.readByte(); for (int i = 0; i < weapons; i++) { - control.upgrades().addWeapon((Weapon) Upgrade.getByID(stream.readByte())); + control.upgrades().addWeapon(Upgrade.getByID(stream.readByte())); } ui.hudfrag.updateWeapons(); diff --git a/core/src/io/anuke/mindustry/world/blocks/Blocks.java b/core/src/io/anuke/mindustry/world/blocks/Blocks.java index 46ceff53fe..95fefbe4fa 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Blocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/Blocks.java @@ -74,6 +74,10 @@ public class Blocks{ iron = new Ore("iron"){{ drops = new ItemStack(Item.iron, 1); }}, + + copper = new Ore("copper"){{ + drops = new ItemStack(Item.copper, 1); + }}, coal = new Ore("coal"){{ drops = new ItemStack(Item.coal, 1);