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

Added new crafters, pumps and conduits

Browse Source
This commit is contained in:
Anuken
2017-11-19 00:22:26 -05:00
parent 858791de3b
commit 8e602a8b5b
19 changed files with 198 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
core/assets/sprites/sprites.atlas
View File

@@ -256,41 +256,48 @@ blocks/flameturret
orig: 10, 10
offset: 0, 0
index: -1
blocks/grass1
blocks/fluxpump
rotate: false
xy: 395, 215
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass2
blocks/grass1
rotate: false
xy: 385, 210
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass3
blocks/grass2
rotate: false
xy: 395, 205
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock
blocks/grass3
rotate: false
xy: 385, 200
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock2
blocks/grassblock
rotate: false
xy: 385, 190
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock2
rotate: false
xy: 395, 195
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassedge
rotate: false
xy: 450, 491
@@ -300,42 +307,42 @@ blocks/grassedge
index: -1
blocks/iron1
rotate: false
xy: 390, 160
xy: 390, 150
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron2
rotate: false
xy: 390, 150
xy: 401, 358
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron3
rotate: false
xy: 401, 358
xy: 401, 348
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/irondrill
rotate: false
xy: 401, 348
xy: 401, 338
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ironwall
rotate: false
xy: 401, 338
xy: 401, 328
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/junction
rotate: false
xy: 401, 328
xy: 401, 318
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -349,7 +356,7 @@ blocks/laserturret
index: -1
blocks/lava
rotate: false
xy: 401, 318
xy: 401, 308
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -363,21 +370,21 @@ blocks/lavaedge
index: -1
blocks/liquiditemjunction
rotate: false
xy: 401, 308
xy: 401, 298
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidjunction
rotate: false
xy: 401, 298
xy: 401, 288
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidrouter
rotate: false
xy: 401, 288
xy: 401, 278
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -405,14 +412,14 @@ blocks/mortarturret
index: -1
blocks/mossblock
rotate: false
xy: 401, 268
xy: 401, 258
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/mossstone
rotate: false
xy: 401, 268
xy: 401, 258
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -426,7 +433,7 @@ blocks/nuclearreactor
index: -1
blocks/nuclearreactor-icon
rotate: false
xy: 411, 360
xy: 411, 350
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -440,7 +447,7 @@ blocks/nuclearreactor-small
index: -1
blocks/oil
rotate: false
xy: 411, 350
xy: 411, 340
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -454,14 +461,14 @@ blocks/oiledge
index: -1
blocks/oilrefinery
rotate: false
xy: 411, 340
xy: 411, 330
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/omnidrill
rotate: false
xy: 411, 330
xy: 411, 320
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -475,42 +482,63 @@ blocks/plasmaturret
index: -1
blocks/powerbooster
rotate: false
xy: 411, 320
xy: 411, 310
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyor
rotate: false
xy: 411, 310
xy: 411, 300
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyormove
rotate: false
xy: 411, 300
xy: 411, 290
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaser
rotate: false
xy: 411, 290
xy: 411, 280
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaserrouter
rotate: false
xy: 411, 280
xy: 411, 270
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduit
rotate: false
xy: 411, 260
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduitbottom
rotate: false
xy: 405, 234
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduittop
rotate: false
xy: 405, 224
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pump
rotate: false
xy: 411, 270
xy: 405, 214
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -524,35 +552,35 @@ blocks/repairturret
index: -1
blocks/rock
rotate: false
xy: 405, 234
xy: 405, 194
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2
rotate: false
xy: 405, 224
xy: 405, 184
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2shadow
rotate: false
xy: 405, 214
xy: 405, 174
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rockshadow
rotate: false
xy: 405, 204
xy: 230, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/router
rotate: false
xy: 405, 194
xy: 230, 109
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -566,7 +594,7 @@ blocks/shadow
index: -1
blocks/shieldgenerator
rotate: false
xy: 405, 174
xy: 230, 99
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -580,21 +608,21 @@ blocks/shotgunturret
index: -1
blocks/shrub
rotate: false
xy: 240, 119
xy: 240, 99
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shrubshadow
rotate: false
xy: 230, 99
xy: 230, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/smelter
rotate: false
xy: 240, 109
xy: 240, 89
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -608,28 +636,28 @@ blocks/sniperturret
index: -1
blocks/sorter
rotate: false
xy: 230, 89
xy: 230, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyor
rotate: false
xy: 240, 99
xy: 240, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyormove
rotate: false
xy: 230, 79
xy: 230, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelwall
rotate: false
xy: 240, 89
xy: 240, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -643,49 +671,49 @@ blocks/stone
index: -1
blocks/stone1
rotate: false
xy: 230, 69
xy: 230, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone2
rotate: false
xy: 240, 79
xy: 240, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone3
rotate: false
xy: 230, 59
xy: 230, 39
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock
rotate: false
xy: 240, 69
xy: 240, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock2
rotate: false
xy: 230, 49
xy: 240, 39
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock3
rotate: false
xy: 240, 59
xy: 250, 115
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonedrill
rotate: false
xy: 230, 39
xy: 260, 115
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -699,28 +727,28 @@ blocks/stoneedge
index: -1
blocks/stonewall
rotate: false
xy: 240, 49
xy: 250, 105
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter
rotate: false
xy: 240, 39
xy: 250, 95
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter-top
rotate: false
xy: 250, 115
xy: 260, 105
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/thermalgenerator
rotate: false
xy: 260, 115
xy: 250, 85
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -741,49 +769,49 @@ blocks/titancannon-icon
index: -1
blocks/titanium1
rotate: false
xy: 250, 105
xy: 260, 95
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium2
rotate: false
xy: 250, 95
xy: 250, 75
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium3
rotate: false
xy: 260, 105
xy: 260, 85
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumdrill
rotate: false
xy: 250, 85
xy: 250, 65
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumpurifier
rotate: false
xy: 260, 95
xy: 260, 75
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumshieldwall
rotate: false
xy: 250, 75
xy: 250, 55
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumwall
rotate: false
xy: 260, 85
xy: 260, 65
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -797,7 +825,7 @@ blocks/titaniumwall-large
index: -1
blocks/titaniumwall-large-icon
rotate: false
xy: 250, 65
xy: 250, 45
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -811,35 +839,35 @@ blocks/turret
index: -1
blocks/uranium1
rotate: false
xy: 260, 65
xy: 250, 35
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium2
rotate: false
xy: 250, 45
xy: 260, 35
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium3
rotate: false
xy: 260, 55
xy: 270, 109
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uraniumdrill
rotate: false
xy: 260, 45
xy: 270, 99
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/water
rotate: false
xy: 250, 35
xy: 280, 109
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1112,49 +1140,49 @@ enemyarrow
index: -1
icon-coal
rotate: false
xy: 395, 195
xy: 385, 180
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-dirium
rotate: false
xy: 385, 180
xy: 395, 185
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-iron
rotate: false
xy: 395, 185
xy: 383, 170
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-steel
rotate: false
xy: 383, 170
xy: 380, 160
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-stone
rotate: false
xy: 380, 160
xy: 380, 150
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-titanium
rotate: false
xy: 380, 150
xy: 395, 175
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-uranium
rotate: false
xy: 395, 175
xy: 390, 160
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1182,28 +1210,28 @@ mechs/player
index: -1
shell
rotate: false
xy: 405, 184
xy: 240, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot
rotate: false
xy: 230, 119
xy: 240, 109
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot-long
rotate: false
xy: 230, 109
xy: 230, 89
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanshell
rotate: false
xy: 260, 75
xy: 260, 55
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1657,28 +1685,28 @@ weapons/flamer
index: -1
weapons/mortar
rotate: false
xy: 401, 278
xy: 401, 268
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/multigun
rotate: false
xy: 401, 258
xy: 411, 360
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/railgun
rotate: false
xy: 411, 260
xy: 405, 204
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/triblaster
rotate: false
xy: 250, 55
xy: 260, 45
size: 8, 8
orig: 8, 8
offset: 0, 0