diff --git a/core/assets-raw/sprites/blocks/weaponfactory-icon.png b/core/assets-raw/sprites/blocks/weaponfactory-icon.png new file mode 100644 index 0000000000..27065c56af Binary files /dev/null and b/core/assets-raw/sprites/blocks/weaponfactory-icon.png differ diff --git a/core/assets-raw/sprites/blocks/weaponfactory.png b/core/assets-raw/sprites/blocks/weaponfactory.png index e2943a001d..0938f64971 100644 Binary files a/core/assets-raw/sprites/blocks/weaponfactory.png and b/core/assets-raw/sprites/blocks/weaponfactory.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2d51ca34a1..fe2a9272cf 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -281,7 +281,7 @@ upgrade.clustergun.name=clustergun upgrade.clustergun.description=Shoots an inaccurate spread of explosive grenades. upgrade.beam.name=beam cannon upgrade.beam.description=Shoots a long-range piercing laser beam. -upgrade.vulcan.name=railgun +upgrade.vulcan.name=vulcan upgrade.vulcan.description=Shoots a barrage of fast bullets. upgrade.shockgun.name=shockgun upgrade.shockgun.description=Shoots a devastating blast of charged shrapnel. diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 29957bbd07..1626056bfb 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,56 +20,56 @@ blank index: -1 blocks/blackrock1 rotate: false - xy: 482, 95 + xy: 172, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackrockshadow1 rotate: false - xy: 868, 485 + xy: 964, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone1 rotate: false - xy: 878, 485 + xy: 974, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone2 rotate: false - xy: 888, 485 + xy: 984, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone3 rotate: false - xy: 898, 485 + xy: 994, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock1 rotate: false - xy: 908, 485 + xy: 1004, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock2 rotate: false - xy: 918, 485 + xy: 1014, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock3 rotate: false - xy: 928, 485 + xy: 841, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -83,7 +83,7 @@ blocks/blackstoneedge index: -1 blocks/block rotate: false - xy: 948, 485 + xy: 861, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -95,13 +95,6 @@ blocks/block-2x2 orig: 16, 16 offset: 0, 0 index: -1 -blocks/weaponfactory - rotate: false - xy: 844, 495 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 blocks/block-3x3 rotate: false xy: 698, 313 @@ -111,7 +104,7 @@ blocks/block-3x3 index: -1 blocks/block-middle rotate: false - xy: 958, 485 + xy: 871, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -125,119 +118,119 @@ blocks/chainturret index: -1 blocks/chainturret-icon rotate: false - xy: 95, 21 + xy: 740, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/coal1 rotate: false - xy: 988, 485 + xy: 901, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 998, 485 + xy: 911, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 1008, 485 + xy: 921, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 841, 473 + xy: 931, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 841, 463 + xy: 941, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator-top rotate: false - xy: 851, 473 + xy: 951, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 851, 463 + xy: 531, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 851, 453 + xy: 527, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 861, 473 + xy: 172, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 861, 463 + xy: 182, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 861, 453 + xy: 192, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 871, 475 + xy: 202, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 871, 465 + xy: 212, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 881, 475 + xy: 222, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 871, 455 + xy: 232, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyortunnel rotate: false - xy: 881, 465 + xy: 242, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -251,42 +244,42 @@ blocks/core index: -1 blocks/cross rotate: false - xy: 891, 475 + xy: 252, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 881, 455 + xy: 262, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 891, 465 + xy: 272, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 901, 475 + xy: 282, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 891, 455 + xy: 292, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 901, 465 + xy: 302, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,7 +293,7 @@ blocks/dirtedge index: -1 blocks/door rotate: false - xy: 911, 475 + xy: 312, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -314,7 +307,7 @@ blocks/door-large index: -1 blocks/door-large-icon rotate: false - xy: 901, 455 + xy: 322, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,21 +321,21 @@ blocks/door-large-open index: -1 blocks/door-open rotate: false - xy: 911, 465 + xy: 332, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/doubleturret rotate: false - xy: 123, 49 + xy: 740, 345 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/duriumwall rotate: false - xy: 921, 475 + xy: 342, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,266 +349,266 @@ blocks/duriumwall-large index: -1 blocks/duriumwall-large-icon rotate: false - xy: 911, 455 + xy: 352, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/enemyspawn rotate: false - xy: 921, 465 + xy: 362, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/flameturret rotate: false - xy: 95, 9 + xy: 740, 333 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/fluxpump rotate: false - xy: 931, 475 + xy: 372, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 921, 455 + xy: 382, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 931, 465 + xy: 392, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 941, 475 + xy: 402, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock1 rotate: false - xy: 931, 455 + xy: 412, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 941, 465 + xy: 422, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 140, 91 + xy: 95, 43 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/ice1 rotate: false - xy: 951, 475 + xy: 432, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice2 rotate: false - xy: 941, 455 + xy: 442, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice3 rotate: false - xy: 951, 465 + xy: 452, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iceedge rotate: false - xy: 154, 91 + xy: 111, 59 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/icerock1 rotate: false - xy: 961, 475 + xy: 462, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerock2 rotate: false - xy: 951, 455 + xy: 472, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow1 rotate: false - xy: 961, 465 + xy: 482, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow1 rotate: false - xy: 961, 465 + xy: 482, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow2 rotate: false - xy: 971, 475 + xy: 492, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow2 rotate: false - xy: 971, 475 + xy: 492, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 1001, 475 + xy: 891, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 991, 455 + xy: 901, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 1001, 465 + xy: 911, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 1001, 455 + xy: 921, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 1011, 475 + xy: 931, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 1011, 465 + xy: 941, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 410, 93 + xy: 1000, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 1011, 455 + xy: 951, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 168, 91 + xy: 127, 75 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/lavasmelter rotate: false - xy: 492, 82 + xy: 541, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 502, 82 + xy: 527, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 512, 82 + xy: 524, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 522, 82 + xy: 696, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 422, 93 + xy: 1012, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 434, 93 + xy: 844, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 446, 93 + xy: 856, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 801, 443 + xy: 706, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 801, 443 + xy: 706, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -636,7 +629,7 @@ blocks/nuclearreactor-center index: -1 blocks/nuclearreactor-icon rotate: false - xy: 811, 445 + xy: 696, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -657,336 +650,336 @@ blocks/nuclearreactor-small index: -1 blocks/oil rotate: false - xy: 821, 445 + xy: 706, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 95, 61 + xy: 141, 75 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 831, 445 + xy: 740, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 841, 444 + xy: 734, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 458, 93 + xy: 868, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/playerspawn rotate: false - xy: 851, 443 + xy: 744, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 861, 443 + xy: 750, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 871, 445 + xy: 754, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 881, 445 + xy: 631, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 891, 445 + xy: 798, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlasercorner rotate: false - xy: 901, 445 + xy: 537, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 911, 445 + xy: 537, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 921, 445 + xy: 534, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 931, 445 + xy: 302, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 941, 445 + xy: 312, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 951, 445 + xy: 322, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 470, 93 + xy: 880, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock1 rotate: false - xy: 961, 445 + xy: 332, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 971, 445 + xy: 342, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 981, 445 + xy: 352, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 991, 445 + xy: 362, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator-top rotate: false - xy: 1001, 445 + xy: 372, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand1 rotate: false - xy: 1011, 445 + xy: 382, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand2 rotate: false - xy: 527, 126 + xy: 392, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand3 rotate: false - xy: 527, 116 + xy: 402, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock1 rotate: false - xy: 524, 106 + xy: 412, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock2 rotate: false - xy: 736, 381 + xy: 422, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock3 rotate: false - xy: 740, 371 + xy: 432, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandedge rotate: false - xy: 109, 75 + xy: 95, 15 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 492, 92 + xy: 892, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 740, 351 + xy: 452, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 504, 92 + xy: 904, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 798, 393 + xy: 492, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 302, 79 + xy: 502, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 312, 79 + xy: 512, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter-middle rotate: false - xy: 322, 79 + xy: 801, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 516, 92 + xy: 916, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/snow1 rotate: false - xy: 332, 79 + xy: 811, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow2 rotate: false - xy: 342, 79 + xy: 821, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow3 rotate: false - xy: 352, 79 + xy: 831, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock1 rotate: false - xy: 362, 83 + xy: 841, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock2 rotate: false - xy: 372, 83 + xy: 851, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock3 rotate: false - xy: 382, 83 + xy: 861, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowedge rotate: false - xy: 109, 61 + xy: 155, 75 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/sorter rotate: false - xy: 392, 83 + xy: 871, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 402, 83 + xy: 881, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 412, 83 + xy: 891, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 422, 83 + xy: 901, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1000,98 +993,98 @@ blocks/steelwall-large index: -1 blocks/steelwall-large-icon rotate: false - xy: 432, 83 + xy: 911, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 442, 83 + xy: 921, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 452, 83 + xy: 931, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 462, 83 + xy: 941, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock1 rotate: false - xy: 472, 83 + xy: 951, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 482, 76 + xy: 734, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 492, 72 + xy: 744, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 502, 72 + xy: 754, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneedge rotate: false - xy: 109, 47 + xy: 537, 150 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stoneformer rotate: false - xy: 512, 72 + xy: 362, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 522, 72 + xy: 372, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 528, 96 + xy: 382, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 534, 106 + xy: 392, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 538, 96 + xy: 402, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1105,56 +1098,56 @@ blocks/titancannon index: -1 blocks/titancannon-icon rotate: false - xy: 786, 391 + xy: 928, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 532, 86 + xy: 412, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 532, 76 + xy: 422, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 542, 86 + xy: 432, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 542, 76 + xy: 442, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 746, 381 + xy: 452, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 750, 371 + xy: 462, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 750, 361 + xy: 472, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1168,77 +1161,91 @@ blocks/titaniumwall-large index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 750, 351 + xy: 482, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 844, 483 + xy: 940, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 750, 321 + xy: 512, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 740, 311 + xy: 547, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 750, 311 + xy: 557, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 734, 301 + xy: 567, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 754, 301 + xy: 587, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/wateredge rotate: false - xy: 123, 61 + xy: 736, 381 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/waveturret rotate: false - xy: 856, 483 + xy: 952, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +blocks/weaponfactory + rotate: false + xy: 646, 273 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +blocks/weaponfactory-icon + rotate: false + xy: 750, 386 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 bullet rotate: false - xy: 968, 485 + xy: 881, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 841, 454 + xy: 644, 236 size: 8, 7 orig: 8, 7 offset: 0, 0 @@ -1259,49 +1266,49 @@ circle2 index: -1 enemies/blastenemy-t1 rotate: false - xy: 646, 275 + xy: 664, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t2 rotate: false - xy: 646, 259 + xy: 646, 257 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 580, 229 + xy: 680, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t1 rotate: false - xy: 596, 232 + xy: 580, 229 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t2 rotate: false - xy: 612, 232 + xy: 596, 232 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t3 rotate: false - xy: 628, 236 + xy: 612, 232 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t1 rotate: false - xy: 646, 243 + xy: 628, 236 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1385,91 +1392,91 @@ enemies/healerenemy-t3 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 738, 396 + xy: 786, 419 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 754, 414 + xy: 786, 403 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 754, 398 + xy: 92, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 770, 414 + xy: 108, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 770, 398 + xy: 124, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 786, 419 + xy: 140, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/standardenemy-t1 rotate: false - xy: 786, 403 + xy: 156, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 786, 403 + xy: 156, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/standardenemy-t2 rotate: false - xy: 123, 75 + xy: 533, 178 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/standardenemy-t3 rotate: false - xy: 95, 33 + xy: 537, 164 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 92, 89 + xy: 95, 73 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 108, 89 + xy: 95, 57 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 124, 89 + xy: 111, 73 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1497,70 +1504,70 @@ enemies/titanenemy-t3 index: -1 enemyarrow rotate: false - xy: 482, 86 + xy: 654, 236 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 961, 455 + xy: 502, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 971, 465 + xy: 512, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 981, 475 + xy: 169, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-sand rotate: false - xy: 971, 455 + xy: 841, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 981, 465 + xy: 851, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 991, 475 + xy: 861, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 981, 455 + xy: 871, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 991, 465 + xy: 881, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser rotate: false - xy: 533, 178 + xy: 841, 477 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1581,42 +1588,42 @@ laserfull index: -1 mechs/mech-standard rotate: false - xy: 95, 75 + xy: 95, 29 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mechs/ship-standard rotate: false - xy: 95, 47 + xy: 95, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shell rotate: false - xy: 740, 361 + xy: 442, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 740, 331 + xy: 472, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 740, 321 + xy: 482, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 750, 341 + xy: 492, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1715,7 +1722,7 @@ ui/check-over index: -1 ui/clear rotate: false - xy: 109, 35 + xy: 740, 357 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1750,7 +1757,7 @@ ui/icons/icon-add index: -1 ui/icons/icon-areaDelete rotate: false - xy: 536, 181 + xy: 740, 321 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1764,28 +1771,28 @@ ui/icons/icon-arrow index: -1 ui/icons/icon-arrow-down rotate: false - xy: 537, 169 + xy: 646, 245 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-left rotate: false - xy: 537, 157 + xy: 647, 224 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-right rotate: false - xy: 537, 145 + xy: 647, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-arrow-up rotate: false - xy: 182, 85 + xy: 647, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1806,7 +1813,7 @@ ui/icons/icon-cancel index: -1 ui/icons/icon-chat rotate: false - xy: 194, 85 + xy: 658, 245 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1841,21 +1848,21 @@ ui/icons/icon-close-over index: -1 ui/icons/icon-crafting rotate: false - xy: 206, 85 + xy: 786, 391 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-cursor rotate: false - xy: 218, 85 + xy: 659, 224 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-defense rotate: false - xy: 230, 85 + xy: 659, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1869,7 +1876,7 @@ ui/icons/icon-discord index: -1 ui/icons/icon-distribution rotate: false - xy: 242, 85 + xy: 659, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1939,14 +1946,14 @@ ui/icons/icon-grid index: -1 ui/icons/icon-hold rotate: false - xy: 254, 85 + xy: 844, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-holdDelete rotate: false - xy: 266, 85 + xy: 856, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1967,7 +1974,7 @@ ui/icons/icon-host index: -1 ui/icons/icon-info rotate: false - xy: 278, 85 + xy: 868, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1981,7 +1988,7 @@ ui/icons/icon-line index: -1 ui/icons/icon-load rotate: false - xy: 647, 227 + xy: 722, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2009,21 +2016,21 @@ ui/icons/icon-loading index: -1 ui/icons/icon-menu rotate: false - xy: 290, 85 + xy: 880, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-none rotate: false - xy: 302, 89 + xy: 892, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-pause rotate: false - xy: 314, 89 + xy: 904, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2044,35 +2051,35 @@ ui/icons/icon-pick index: -1 ui/icons/icon-play rotate: false - xy: 326, 89 + xy: 916, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-play-2 rotate: false - xy: 647, 211 + xy: 722, 395 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-power rotate: false - xy: 338, 89 + xy: 928, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-production rotate: false - xy: 350, 89 + xy: 940, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-quit rotate: false - xy: 647, 195 + xy: 724, 365 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2086,7 +2093,7 @@ ui/icons/icon-redo index: -1 ui/icons/icon-rename rotate: false - xy: 631, 188 + xy: 724, 349 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2100,35 +2107,35 @@ ui/icons/icon-resize index: -1 ui/icons/icon-rotate rotate: false - xy: 647, 179 + xy: 724, 333 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-arrow rotate: false - xy: 722, 411 + xy: 724, 317 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-left rotate: false - xy: 722, 395 + xy: 738, 412 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-rotate-right rotate: false - xy: 724, 365 + xy: 738, 396 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-save rotate: false - xy: 724, 349 + xy: 754, 414 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2149,7 +2156,7 @@ ui/icons/icon-save-map index: -1 ui/icons/icon-settings rotate: false - xy: 362, 93 + xy: 952, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2163,35 +2170,35 @@ ui/icons/icon-terrain index: -1 ui/icons/icon-tools rotate: false - xy: 724, 333 + xy: 754, 398 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-touch rotate: false - xy: 374, 93 + xy: 964, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-touchDelete rotate: false - xy: 386, 93 + xy: 976, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-trash rotate: false - xy: 724, 317 + xy: 770, 414 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icons/icon-tutorial rotate: false - xy: 738, 412 + xy: 770, 398 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2205,7 +2212,7 @@ ui/icons/icon-undo index: -1 ui/icons/icon-weapon rotate: false - xy: 398, 93 + xy: 988, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2362,7 +2369,7 @@ ui/textfield-over index: -1 ui/white rotate: false - xy: 738, 391 + xy: 547, 178 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2392,35 +2399,35 @@ weapons/beam index: -1 weapons/blaster rotate: false - xy: 938, 485 + xy: 851, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/clustergun rotate: false - xy: 978, 485 + xy: 891, 461 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/shockgun rotate: false - xy: 740, 341 + xy: 462, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 750, 331 + xy: 502, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/vulcan rotate: false - xy: 744, 301 + xy: 577, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index ba125a346e..4482b6a672 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/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 712949d1c4..46906b3fe7 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -227,8 +227,8 @@ public class Control extends Module{ player.weaponLeft = player.weaponRight = weapons.first(); if(debug){ - weapons.add(Weapon.triblaster, Weapon.clustergun, Weapon.beam, Weapon.vulcan); - weapons.add(Weapon.shockgun); + //weapons.add(Weapon.triblaster, Weapon.clustergun, Weapon.beam, Weapon.vulcan); + //weapons.add(Weapon.shockgun); player.weaponLeft = player.weaponRight = weapons.peek(); } diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 1f200c4ad3..2e24248672 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.core; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.Colors; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; @@ -324,6 +325,16 @@ public class Renderer extends RendererModule{ } Draw.reset(); } + + //draw config selected block + if(Vars.ui.configfrag.isShown()){ + Tile tile = ui.configfrag.getSelectedTile(); + Draw.color(Colors.get("accent")); + Draw.thick(1f); + Draw.square(tile.worldx() + tile.block().getPlaceOffset().x, tile.worldy() + tile.block().getPlaceOffset().y, + tile.block().width * Vars.tilesize / 2f + 1f); + Draw.reset(); + } int tilex = control.input.getBlockX(); int tiley = control.input.getBlockY(); diff --git a/core/src/io/anuke/mindustry/entities/BulletType.java b/core/src/io/anuke/mindustry/entities/BulletType.java index 4b11494003..c072a834ce 100644 --- a/core/src/io/anuke/mindustry/entities/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/BulletType.java @@ -268,7 +268,7 @@ public abstract class BulletType extends BaseBulletType{ Draw.reset(); } }, - shot = new BulletType(2.7f, 4){ + shot = new BulletType(2.7f, 5){ { lifetime = 40; } @@ -302,8 +302,8 @@ public abstract class BulletType extends BaseBulletType{ public void draw(Bullet b){ Draw.thick(2f); - Draw.color(lightOrange); - Draw.circle(b.x, b.y, 1.6f); + Draw.color(lightOrange, Color.WHITE, 0.4f); + Draw.polygon(b.y, b.x, 3, 1.6f, b.angle()); Draw.thick(1f); Draw.color(Color.WHITE, lightOrange, b.ifract()/2f); Draw.alpha(b.ifract()); @@ -316,7 +316,7 @@ public abstract class BulletType extends BaseBulletType{ } public void removed(Bullet b){ - Effects.shake(1f, 1f, b); + Effects.shake(1.5f, 1.5f, b); Effects.effect(Fx.clusterbomb, b); diff --git a/core/src/io/anuke/mindustry/entities/effect/EMP.java b/core/src/io/anuke/mindustry/entities/effect/EMP.java index 48b7adb103..1f597faa3f 100644 --- a/core/src/io/anuke/mindustry/entities/effect/EMP.java +++ b/core/src/io/anuke/mindustry/entities/effect/EMP.java @@ -84,7 +84,7 @@ public class EMP extends TimedEntity{ } Draw.thick(fract()*2f); - Draw.polygon(34, x, y, radius * Vars.tilesize); + Draw.polygon(y, x, 34, radius * Vars.tilesize); Draw.reset(); } diff --git a/core/src/io/anuke/mindustry/graphics/Fx.java b/core/src/io/anuke/mindustry/graphics/Fx.java index db3cab3b4c..a0a99490d7 100644 --- a/core/src/io/anuke/mindustry/graphics/Fx.java +++ b/core/src/io/anuke/mindustry/graphics/Fx.java @@ -121,7 +121,7 @@ public class Fx{ nuclearShockwave = new Effect(10f, 200f, e -> { Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.ifract()); Draw.thick(e.fract()*3f + 0.2f); - Draw.polygon(40, e.x, e.y, e.ifract()*140f); + Draw.polygon(e.y, e.x, 40, e.ifract()*140f); Draw.reset(); }), @@ -452,7 +452,7 @@ public class Fx{ clusterbomb = new Effect(10f, e -> { Draw.color(Color.WHITE, lightOrange, e.ifract()); Draw.thick(e.fract()*1.5f); - Draw.polygon(4, e.x, e.y, e.fract()*8f); + Draw.polygon(e.y, e.x, 4, e.fract()*8f); Draw.circle(e.x, e.y, e.ifract()*14f); Draw.reset(); }), diff --git a/core/src/io/anuke/mindustry/input/PlaceMode.java b/core/src/io/anuke/mindustry/input/PlaceMode.java index 7e664c7821..6b5a5f8f6a 100644 --- a/core/src/io/anuke/mindustry/input/PlaceMode.java +++ b/core/src/io/anuke/mindustry/input/PlaceMode.java @@ -101,7 +101,7 @@ public enum PlaceMode{ Draw.linecrect(tile.worldx() + offset.x, tile.worldy() + offset.y, tile.block().width * Vars.tilesize, tile.block().height * Vars.tilesize); }else if(android && control.getInput().breaktime > 0){ Draw.color(Colors.get("breakStart"), Colors.get("break"), fract); - Draw.polygon(25, tile.worldx() + offset.x, tile.worldy() + offset.y, 4 + (1f - fract) * 26); + Draw.polygon(tile.worldy() + offset.y, tile.worldx() + offset.x, 25, 4 + (1f - fract) * 26); } Draw.reset(); } diff --git a/core/src/io/anuke/mindustry/mapeditor/MapView.java b/core/src/io/anuke/mindustry/mapeditor/MapView.java index 911ece1cfd..92abf3543e 100644 --- a/core/src/io/anuke/mindustry/mapeditor/MapView.java +++ b/core/src/io/anuke/mindustry/mapeditor/MapView.java @@ -238,9 +238,9 @@ public class MapView extends Element implements GestureListener{ Draw.thick(Unit.dp.scl(3f * zoom)); Draw.line(sx, sy, v2.x, v2.y); - Draw.polygon(40, sx, sy, editor.getBrushSize() * zoom * 3); + Draw.polygon(sy, sx, 40, editor.getBrushSize() * zoom * 3); - Draw.polygon(40, v2.x, v2.y, editor.getBrushSize() * zoom * 3); + Draw.polygon(v2.y, v2.x, 40, editor.getBrushSize() * zoom * 3); } batch.flush(); diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index 2cf60328db..c6542dfe97 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -55,7 +55,7 @@ public class Recipes { new Recipe(crafting, ProductionBlocks.oilrefinery, stack(Item.steel, 15), stack(Item.iron, 15)), new Recipe(crafting, ProductionBlocks.stoneformer, stack(Item.steel, 10), stack(Item.iron, 10)), new Recipe(crafting, ProductionBlocks.lavasmelter, stack(Item.steel, 30), stack(Item.titanium, 15)), - new Recipe(crafting, ProductionBlocks.weaponFactory, stack(Item.steel, 30), stack(Item.titanium, 15)), + new Recipe(crafting, ProductionBlocks.weaponFactory, stack(Item.steel, 60), stack(Item.iron, 60)), new Recipe(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)), new Recipe(production, ProductionBlocks.irondrill, stack(Item.stone, 25)), diff --git a/core/src/io/anuke/mindustry/resource/Weapon.java b/core/src/io/anuke/mindustry/resource/Weapon.java index e23fc32bdd..ca0ed72f84 100644 --- a/core/src/io/anuke/mindustry/resource/Weapon.java +++ b/core/src/io/anuke/mindustry/resource/Weapon.java @@ -47,7 +47,6 @@ public class Weapon extends Upgrade{ }, vulcan = new Weapon("vulcan", 5, BulletType.vulcan){ { - shootsound = "vulcan"; effect = Fx.vulcanShoot; inaccuracy = 5; roundrobin = true; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index d8e8420843..f493f0e347 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -23,6 +23,14 @@ public class BlockConfigFragment implements Fragment { Core.scene.add(table); } + public boolean isShown(){ + return table.isVisible() && configTile != null; + } + + public Tile getSelectedTile(){ + return configTile; + } + public void showConfig(Tile tile){ configTile = tile;