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

Implemented liquid turrets with ammo / Implemented flamer turret

Browse Source
This commit is contained in:
Anuken
2018-04-03 23:06:39 -04:00
parent 636da8f95f
commit 397220e682
18 changed files with 355 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/sprites/sprites.atlas
+92 -85
View File
@@ -132,70 +132,70 @@ multiplexer
index: -1
poweredconveyor
rotate: false
xy: 413, 103
xy: 572, 161
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
poweredconveyormove
rotate: false
xy: 572, 161
xy: 582, 165
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
pulseconduit-bottom
rotate: false
xy: 592, 160
xy: 592, 150
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
pulseconduit-top
rotate: false
xy: 592, 150
xy: 582, 145
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
router
rotate: false
xy: 756, 384
xy: 766, 384
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sortedunloader
rotate: false
xy: 423, 103
xy: 433, 144
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sorter
rotate: false
xy: 433, 144
xy: 443, 144
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
splitter
rotate: false
xy: 443, 144
xy: 433, 134
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
steelconveyor
rotate: false
xy: 433, 134
xy: 453, 144
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
steelconveyormove
rotate: false
xy: 453, 144
xy: 433, 124
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -209,7 +209,7 @@ teleporter-top
index: -1
unloader
rotate: false
xy: 493, 124
xy: 483, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -223,7 +223,7 @@ vault
index: -1
vault-icon
rotate: false
xy: 483, 104
xy: 493, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -524,14 +524,14 @@ lead3
index: -1
mossblock
rotate: false
xy: 373, 104
xy: 383, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
oil
rotate: false
xy: 383, 104
xy: 393, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -545,56 +545,56 @@ oiledge
index: -1
rock1
rotate: false
xy: 717, 281
xy: 678, 207
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
rock2
rotate: false
xy: 678, 207
xy: 756, 384
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sand1
rotate: false
xy: 786, 387
xy: 796, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sand2
rotate: false
xy: 796, 387
xy: 806, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sand3
rotate: false
xy: 806, 387
xy: 816, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sandblock1
rotate: false
xy: 816, 387
xy: 826, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sandblock2
rotate: false
xy: 826, 387
xy: 836, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
sandblock3
rotate: false
xy: 836, 387
xy: 846, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -608,56 +608,56 @@ sandedge
index: -1
shrub
rotate: false
xy: 926, 387
xy: 936, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shrubshadow
rotate: false
xy: 936, 387
xy: 946, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
snow1
rotate: false
xy: 966, 387
xy: 681, 231
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
snow2
rotate: false
xy: 681, 231
xy: 682, 221
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
snow3
rotate: false
xy: 682, 221
xy: 423, 143
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
snowblock1
rotate: false
xy: 423, 143
xy: 423, 133
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
snowblock2
rotate: false
xy: 423, 133
xy: 423, 123
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
snowblock3
rotate: false
xy: 423, 123
xy: 423, 113
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -671,42 +671,42 @@ snowedge
index: -1
stone1
rotate: false
xy: 443, 124
xy: 453, 134
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
stone2
rotate: false
xy: 453, 134
xy: 473, 144
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
stone3
rotate: false
xy: 473, 144
xy: 433, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
stoneblock1
rotate: false
xy: 433, 104
xy: 443, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
stoneblock2
rotate: false
xy: 443, 114
xy: 453, 124
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
stoneblock3
rotate: false
xy: 453, 124
xy: 463, 134
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -720,49 +720,49 @@ stoneedge
index: -1
thorium1
rotate: false
xy: 463, 124
xy: 473, 134
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
thorium2
rotate: false
xy: 473, 134
xy: 493, 144
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
thorium3
rotate: false
xy: 493, 144
xy: 453, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanium1
rotate: false
xy: 453, 104
xy: 463, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanium2
rotate: false
xy: 463, 114
xy: 473, 124
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanium3
rotate: false
xy: 473, 124
xy: 483, 134
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
water
rotate: false
xy: 503, 143
xy: 513, 143
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -832,7 +832,7 @@ enemyspawn
index: -1
playerspawn
rotate: false
xy: 403, 103
xy: 413, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -972,14 +972,14 @@ nuclearreactor-lights
index: -1
powerinfinite
rotate: false
xy: 582, 165
xy: 572, 151
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
powernode
rotate: false
xy: 572, 151
xy: 582, 155
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -993,28 +993,28 @@ powernodelarge
index: -1
powervoid
rotate: false
xy: 582, 155
xy: 592, 160
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
rtgenerator
rotate: false
xy: 766, 384
xy: 776, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
rtgenerator-top
rotate: false
xy: 776, 387
xy: 786, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shieldgenerator
rotate: false
xy: 876, 387
xy: 886, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1028,7 +1028,7 @@ shieldprojector
index: -1
solarpanel
rotate: false
xy: 423, 113
xy: 423, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1042,7 +1042,7 @@ teleporter
index: -1
thermalgenerator
rotate: false
xy: 453, 114
xy: 463, 124
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1236,13 +1236,20 @@ lavasmelter
orig: 8, 8
offset: 0, 0
index: -1
melter
liquidsource
rotate: false
xy: 363, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
melter
rotate: false
xy: 373, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
nucleardrill
rotate: false
xy: 751, 422
@@ -1301,7 +1308,7 @@ oilextractor-top
index: -1
oilrefinery
rotate: false
xy: 393, 103
xy: 403, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1385,63 +1392,63 @@ siliconsmelter-top
index: -1
pulverizer
rotate: false
xy: 582, 145
xy: 592, 140
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
pulverizer-rotator
rotate: false
xy: 592, 140
xy: 677, 281
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
pump
rotate: false
xy: 677, 281
xy: 687, 281
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
reinforceddrill
rotate: false
xy: 687, 281
xy: 697, 281
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
reinforceddrill-rotator
rotate: false
xy: 697, 281
xy: 707, 281
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
reinforceddrill-top
rotate: false
xy: 707, 281
xy: 717, 281
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
separator
rotate: false
xy: 846, 387
xy: 856, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
separator-liquid
rotate: false
xy: 856, 387
xy: 866, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
siliconextractor
rotate: false
xy: 946, 387
xy: 956, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1455,56 +1462,56 @@ siliconsmelter
index: -1
smelter
rotate: false
xy: 956, 387
xy: 966, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
steeldrill
rotate: false
xy: 433, 124
xy: 443, 134
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
steeldrill-rotator
rotate: false
xy: 443, 134
xy: 463, 144
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
steeldrill-top
rotate: false
xy: 463, 144
xy: 433, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
stonedrill
rotate: false
xy: 463, 134
xy: 483, 144
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
stoneformer
rotate: false
xy: 483, 144
xy: 443, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titaniumdrill
rotate: false
xy: 483, 134
xy: 463, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titaniumdrill-top
rotate: false
xy: 463, 104
xy: 473, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1777,7 +1784,7 @@ ironwall
index: -1
steelwall
rotate: false
xy: 433, 114
xy: 443, 124
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1791,21 +1798,21 @@ steelwall-large
index: -1
stonewall
rotate: false
xy: 443, 104
xy: 453, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titaniumshieldwall
rotate: false
xy: 473, 114
xy: 483, 124
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titaniumwall
rotate: false
xy: 483, 124
xy: 493, 134
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1868,28 +1875,28 @@ laserfull
index: -1
shell
rotate: false
xy: 866, 387
xy: 876, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot
rotate: false
xy: 906, 387
xy: 916, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot-long
rotate: false
xy: 916, 387
xy: 926, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanshell
rotate: false
xy: 493, 134
xy: 473, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -3043,42 +3050,42 @@ clustergun-equip
index: -1
shockgun
rotate: false
xy: 886, 387
xy: 896, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shockgun-equip
rotate: false
xy: 896, 387
xy: 906, 387
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
triblaster
rotate: false
xy: 473, 104
xy: 483, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
triblaster-equip
rotate: false
xy: 483, 114
xy: 493, 124
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
vulcan
rotate: false
xy: 493, 114
xy: 493, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
vulcan-equip
rotate: false
xy: 493, 104
xy: 503, 143
size: 8, 8
orig: 8, 8
offset: 0, 0