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

Fixed #2032

Browse Source
This commit is contained in:
Anuken
2020-05-11 13:20:27 -04:00
parent 37c92302f0
commit 9cca79adaa
8 changed files with 251 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/sprites/sprites.atlas
+140 -56
View File
@@ -426,133 +426,133 @@ plastanium-conveyor-stack
index: -1
titanium-conveyor-0-1
rotate: false
xy: 1207, 331
xy: 1343, 433
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-0-2
rotate: false
xy: 1241, 365
xy: 1139, 195
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-0-3
rotate: false
xy: 1275, 399
xy: 1173, 229
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-1-0
rotate: false
xy: 1309, 433
xy: 1207, 263
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-1-1
rotate: false
xy: 1343, 467
xy: 1241, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-1-2
rotate: false
xy: 1105, 195
xy: 1275, 331
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-1-3
rotate: false
xy: 1139, 229
xy: 1309, 365
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-2-0
rotate: false
xy: 1173, 263
xy: 1343, 399
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-2-1
rotate: false
xy: 1207, 297
xy: 1173, 195
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-2-2
rotate: false
xy: 1241, 331
xy: 1207, 229
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-2-3
rotate: false
xy: 1275, 365
xy: 1241, 263
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-3-0
rotate: false
xy: 1309, 399
xy: 1275, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-3-1
rotate: false
xy: 1343, 433
xy: 1309, 331
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-3-2
rotate: false
xy: 1139, 195
xy: 1343, 365
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-3-3
rotate: false
xy: 1173, 229
xy: 1207, 195
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-4-0
rotate: false
xy: 1207, 263
xy: 1241, 229
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-4-1
rotate: false
xy: 1241, 297
xy: 1275, 263
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-4-2
rotate: false
xy: 1275, 331
xy: 1309, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium-conveyor-4-3
rotate: false
xy: 1309, 365
xy: 1343, 331
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -664,7 +664,7 @@ sorter
index: -1
underflow-gate
rotate: false
xy: 1207, 229
xy: 1309, 263
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -1222,6 +1222,13 @@ pulse-conduit-top-6
orig: 32, 32
offset: 0, 0
index: -1
pump-liquid
rotate: false
xy: 1105, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
rotary-pump
rotate: false
xy: 1867, 975
@@ -1747,13 +1754,6 @@ pulverizer-rotator
orig: 32, 32
offset: 0, 0
index: -1
pump-liquid
rotate: false
xy: 1105, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
pyratite-mixer
rotate: false
xy: 1801, 975
@@ -1966,14 +1966,14 @@ launch-pad-large
index: -1
unloader
rotate: false
xy: 1241, 263
xy: 1343, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
unloader-center
rotate: false
xy: 1275, 297
xy: 1275, 195
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -2435,7 +2435,7 @@ scrap-wall5
index: -1
surge-wall
rotate: false
xy: 1139, 263
xy: 1275, 365
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -2449,7 +2449,7 @@ surge-wall-large
index: -1
thorium-wall
rotate: false
xy: 1173, 297
xy: 1309, 399
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -2470,7 +2470,7 @@ thruster
index: -1
titanium-wall
rotate: false
xy: 1343, 399
xy: 1241, 195
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -2610,7 +2610,7 @@ transfer
index: -1
transfer-arrow
rotate: false
xy: 1173, 195
xy: 1275, 229
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -3744,7 +3744,7 @@ item-metaglass-medium
index: -1
item-metaglass-small
rotate: false
xy: 1309, 339
xy: 1309, 237
size: 24, 24
orig: 24, 24
offset: 0, 0
@@ -3779,7 +3779,7 @@ item-phase-fabric-medium
index: -1
item-phase-fabric-small
rotate: false
xy: 1343, 373
xy: 1343, 271
size: 24, 24
orig: 24, 24
offset: 0, 0
@@ -3814,7 +3814,7 @@ item-plastanium-medium
index: -1
item-plastanium-small
rotate: false
xy: 1207, 203
xy: 1689, 1445
size: 24, 24
orig: 24, 24
offset: 0, 0
@@ -3849,7 +3849,7 @@ item-pyratite-medium
index: -1
item-pyratite-small
rotate: false
xy: 1241, 237
xy: 1309, 211
size: 24, 24
orig: 24, 24
offset: 0, 0
@@ -3884,7 +3884,7 @@ item-sand-medium
index: -1
item-sand-small
rotate: false
xy: 1275, 271
xy: 1381, 501
size: 24, 24
orig: 24, 24
offset: 0, 0
@@ -3919,7 +3919,7 @@ item-scrap-medium
index: -1
item-scrap-small
rotate: false
xy: 1689, 1445
xy: 1377, 475
size: 24, 24
orig: 24, 24
offset: 0, 0
@@ -3954,7 +3954,7 @@ item-silicon-medium
index: -1
item-silicon-small
rotate: false
xy: 1309, 313
xy: 1407, 501
size: 24, 24
orig: 24, 24
offset: 0, 0
@@ -3989,14 +3989,14 @@ item-spore-pod-medium
index: -1
item-spore-pod-small
rotate: false
xy: 1381, 501
xy: 1377, 449
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
item-spore-pod-tiny
rotate: false
xy: 1377, 405
xy: 1377, 353
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4024,14 +4024,14 @@ item-surge-alloy-medium
index: -1
item-surge-alloy-small
rotate: false
xy: 1377, 475
xy: 1403, 475
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
item-surge-alloy-tiny
rotate: false
xy: 866, 1609
xy: 1403, 379
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4059,14 +4059,14 @@ item-thorium-medium
index: -1
item-thorium-small
rotate: false
xy: 1407, 501
xy: 1377, 423
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
item-thorium-tiny
rotate: false
xy: 786, 1406
xy: 866, 1609
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4094,14 +4094,14 @@ item-titanium-medium
index: -1
item-titanium-small
rotate: false
xy: 1377, 449
xy: 1403, 449
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
item-titanium-tiny
rotate: false
xy: 955, 1479
xy: 786, 1406
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4136,14 +4136,14 @@ liquid-cryofluid-medium
index: -1
liquid-cryofluid-small
rotate: false
xy: 1403, 475
xy: 1377, 397
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
liquid-cryofluid-tiny
rotate: false
xy: 982, 1340
xy: 955, 1479
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4171,14 +4171,14 @@ liquid-oil-medium
index: -1
liquid-oil-small
rotate: false
xy: 1377, 423
xy: 1403, 423
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
liquid-oil-tiny
rotate: false
xy: 985, 814
xy: 982, 1340
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4206,14 +4206,14 @@ liquid-slag-medium
index: -1
liquid-slag-small
rotate: false
xy: 1403, 449
xy: 1377, 371
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
liquid-slag-tiny
rotate: false
xy: 1395, 405
xy: 985, 814
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4241,14 +4241,14 @@ liquid-water-medium
index: -1
liquid-water-small
rotate: false
xy: 1403, 423
xy: 1403, 397
size: 24, 24
orig: 24, 24
offset: 0, 0
index: -1
liquid-water-tiny
rotate: false
xy: 884, 1609
xy: 1377, 335
size: 16, 16
orig: 16, 16
offset: 0, 0
@@ -4316,6 +4316,90 @@ spectre
orig: 128, 128
offset: 0, 0
index: -1
splash-0
rotate: false
xy: 1139, 263
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-1
rotate: false
xy: 1173, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-10
rotate: false
xy: 1207, 297
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-11
rotate: false
xy: 1241, 331
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-2
rotate: false
xy: 1207, 331
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-3
rotate: false
xy: 1241, 365
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-4
rotate: false
xy: 1275, 399
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-5
rotate: false
xy: 1309, 433
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-6
rotate: false
xy: 1343, 467
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-7
rotate: false
xy: 1105, 195
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-8
rotate: false
xy: 1139, 229
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
splash-9
rotate: false
xy: 1173, 263
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
swarmer
rotate: false
xy: 1009, 807
core/assets/sprites/sprites.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 713 KiB

After

Width:  |  Height:  |  Size: 716 KiB

core/assets/sprites/sprites2.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 128 KiB