Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented many new weapons (still broken)

Browse Source
This commit is contained in:
Anuken
2018-01-08 16:14:32 -05:00
parent c5d13d26ea
commit 0e82a4491f
30 changed files with 427 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+9 -2
View File
@@ -272,12 +272,19 @@ mode.waves.name=waves
mode.sandbox.name=sandbox
mode.freebuild.name=freebuild
upgrade.standard.name=standard
upgrade.standard.description=The standard mech.
upgrade.blaster.name=blaster
upgrade.blaster.description=Shoots a slow, weak bullet.
upgrade.triblaster.name=triblaster
upgrade.multigun.name=multigun
upgrade.flamer.name=flamer
upgrade.triblaster.description=Shoots 3 bullets in a spread.
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.railgun.name=railgun
upgrade.railgun.description=Shoots one long-range bullet.
upgrade.mortar.name=mortar
upgrade.mortar.description=Shoots a slow, but damaging shell.
item.stone.name=stone
item.iron.name=iron
item.coal.name=coal
core/assets/shaders/outline.fragment
+3 -1
View File
@@ -7,6 +7,7 @@ uniform sampler2D u_texture;
uniform vec4 u_color;
uniform vec2 u_texsize;
uniform float u_lighten;
varying vec4 v_color;
varying vec2 v_texCoord;
@@ -30,6 +31,7 @@ void main() {
if(any){
gl_FragColor = u_color;
}else{
gl_FragColor = texture2D(u_texture, T) * v_color;
vec4 c = texture2D(u_texture, T);
gl_FragColor = mix(c, vec4(1.0, 1.0, 1.0, c.a), u_lighten) * v_color;
}
}
core/assets/sprites/sprites.atlas
+87 -87
View File
@@ -20,56 +20,56 @@ blank
index: -1
blocks/blackrock1
rotate: false
xy: 521, 136
xy: 482, 95
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackrockshadow1
rotate: false
xy: 482, 95
xy: 868, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstone1
rotate: false
xy: 868, 485
xy: 878, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstone2
rotate: false
xy: 878, 485
xy: 888, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstone3
rotate: false
xy: 888, 485
xy: 898, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstoneblock1
rotate: false
xy: 898, 485
xy: 908, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstoneblock2
rotate: false
xy: 908, 485
xy: 918, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstoneblock3
rotate: false
xy: 918, 485
xy: 928, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -83,7 +83,7 @@ blocks/blackstoneedge
index: -1
blocks/block
rotate: false
xy: 938, 485
xy: 948, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -111,7 +111,7 @@ blocks/block-3x3
index: -1
blocks/block-middle
rotate: false
xy: 948, 485
xy: 958, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -132,112 +132,112 @@ blocks/chainturret-icon
index: -1
blocks/coal1
rotate: false
xy: 968, 485
xy: 988, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coal2
rotate: false
xy: 978, 485
xy: 998, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coal3
rotate: false
xy: 988, 485
xy: 1008, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coaldrill
rotate: false
xy: 998, 485
xy: 841, 473
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalgenerator
rotate: false
xy: 1008, 485
xy: 841, 463
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalgenerator-top
rotate: false
xy: 841, 473
xy: 851, 473
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalpurifier
rotate: false
xy: 841, 463
xy: 851, 463
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/combustiongenerator
rotate: false
xy: 851, 473
xy: 851, 453
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/compositewall
rotate: false
xy: 851, 463
xy: 861, 473
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduit
rotate: false
xy: 851, 453
xy: 861, 463
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitbottom
rotate: false
xy: 861, 473
xy: 861, 453
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitliquid
rotate: false
xy: 861, 463
xy: 871, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduittop
rotate: false
xy: 861, 453
xy: 871, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyor
rotate: false
xy: 871, 475
xy: 881, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyormove
rotate: false
xy: 871, 465
xy: 871, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyortunnel
rotate: false
xy: 881, 475
xy: 881, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -251,42 +251,42 @@ blocks/core
index: -1
blocks/cross
rotate: false
xy: 871, 455
xy: 891, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/crucible
rotate: false
xy: 881, 465
xy: 881, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/deepwater
rotate: false
xy: 891, 475
xy: 891, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt1
rotate: false
xy: 881, 455
xy: 901, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt2
rotate: false
xy: 891, 465
xy: 891, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt3
rotate: false
xy: 901, 475
xy: 901, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -300,7 +300,7 @@ blocks/dirtedge
index: -1
blocks/door
rotate: false
xy: 891, 455
xy: 911, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -314,7 +314,7 @@ blocks/door-large
index: -1
blocks/door-large-icon
rotate: false
xy: 901, 465
xy: 901, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -328,7 +328,7 @@ blocks/door-large-open
index: -1
blocks/door-open
rotate: false
xy: 911, 475
xy: 911, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -342,7 +342,7 @@ blocks/doubleturret
index: -1
blocks/duriumwall
rotate: false
xy: 901, 455
xy: 921, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -356,14 +356,14 @@ blocks/duriumwall-large
index: -1
blocks/duriumwall-large-icon
rotate: false
xy: 911, 465
xy: 911, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/enemyspawn
rotate: false
xy: 921, 475
xy: 921, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -377,42 +377,42 @@ blocks/flameturret
index: -1
blocks/fluxpump
rotate: false
xy: 921, 465
xy: 931, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass1
rotate: false
xy: 931, 475
xy: 921, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass2
rotate: false
xy: 921, 455
xy: 931, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass3
rotate: false
xy: 931, 465
xy: 941, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock1
rotate: false
xy: 941, 475
xy: 931, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock2
rotate: false
xy: 931, 455
xy: 941, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -426,21 +426,21 @@ blocks/grassedge
index: -1
blocks/ice1
rotate: false
xy: 941, 465
xy: 951, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ice2
rotate: false
xy: 951, 475
xy: 941, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ice3
rotate: false
xy: 941, 455
xy: 951, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -454,84 +454,84 @@ blocks/iceedge
index: -1
blocks/icerock1
rotate: false
xy: 951, 465
xy: 961, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/icerock2
rotate: false
xy: 961, 475
xy: 951, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/icerockshadow1
rotate: false
xy: 951, 455
xy: 961, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rockshadow1
rotate: false
xy: 951, 455
xy: 961, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/icerockshadow2
rotate: false
xy: 961, 465
xy: 971, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rockshadow2
rotate: false
xy: 961, 465
xy: 971, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron1
rotate: false
xy: 991, 465
xy: 1001, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron2
rotate: false
xy: 1001, 475
xy: 991, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron3
rotate: false
xy: 991, 455
xy: 1001, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/irondrill
rotate: false
xy: 1001, 465
xy: 1001, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ironwall
rotate: false
xy: 1001, 455
xy: 1011, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/junction
rotate: false
xy: 1011, 475
xy: 1011, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -545,7 +545,7 @@ blocks/laserturret
index: -1
blocks/lava
rotate: false
xy: 1011, 465
xy: 1011, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -559,28 +559,28 @@ blocks/lavaedge
index: -1
blocks/lavasmelter
rotate: false
xy: 1011, 455
xy: 492, 82
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquiditemjunction
rotate: false
xy: 492, 82
xy: 502, 82
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidjunction
rotate: false
xy: 502, 82
xy: 512, 82
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidrouter
rotate: false
xy: 512, 82
xy: 522, 82
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -608,14 +608,14 @@ blocks/mortarturret
index: -1
blocks/mossblock
rotate: false
xy: 801, 443
xy: 811, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/mossstone
rotate: false
xy: 801, 443
xy: 811, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1231,7 +1231,7 @@ blocks/waveturret
index: -1
bullet
rotate: false
xy: 958, 485
xy: 968, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1504,56 +1504,56 @@ enemyarrow
index: -1
icon-coal
rotate: false
xy: 971, 475
xy: 961, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-dirium
rotate: false
xy: 961, 455
xy: 971, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-iron
rotate: false
xy: 971, 465
xy: 981, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-sand
rotate: false
xy: 981, 475
xy: 971, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-steel
rotate: false
xy: 971, 455
xy: 981, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-stone
rotate: false
xy: 981, 465
xy: 991, 475
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-titanium
rotate: false
xy: 991, 475
xy: 981, 455
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-uranium
rotate: false
xy: 981, 455
xy: 991, 465
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -2383,30 +2383,30 @@ ui/window-empty
orig: 27, 61
offset: 0, 0
index: -1
weapons/blaster
weapons/beam
rotate: false
xy: 928, 485
xy: 521, 136
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/flamer
weapons/blaster
rotate: false
xy: 911, 455
xy: 938, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/clustergun
rotate: false
xy: 978, 485
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/mortar
rotate: false
xy: 522, 82
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/multigun
rotate: false
xy: 811, 445
xy: 801, 443
size: 8, 8
orig: 8, 8
offset: 0, 0
core/assets/sprites/sprites.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB