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

Changed to use new effects system

Browse Source
This commit is contained in:
Anuken
2017-11-18 20:40:04 -05:00
parent abb6cb9e9f
commit 858791de3b
36 changed files with 678 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ backgrounds/background
index: -1
blank
rotate: false
xy: 395, 231
xy: 379, 256
size: 1, 1
orig: 1, 1
offset: 0, 0
@@ -55,98 +55,98 @@ blocks/chainturret-icon
index: -1
blocks/coal1
rotate: false
xy: 502, 493
xy: 498, 424
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coal2
rotate: false
xy: 498, 423
xy: 395, 234
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coal3
rotate: false
xy: 395, 234
xy: 432, 424
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coaldrill
rotate: false
xy: 432, 424
xy: 276, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalgenerator
rotate: false
xy: 276, 119
xy: 286, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalpurifier
rotate: false
xy: 286, 119
xy: 296, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/combustiongenerator
rotate: false
xy: 296, 119
xy: 306, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/compositewall
rotate: false
xy: 306, 119
xy: 316, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduit
rotate: false
xy: 316, 119
xy: 326, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitbottom
rotate: false
xy: 326, 119
xy: 336, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitliquid
rotate: false
xy: 336, 119
xy: 346, 116
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduittop
rotate: false
xy: 346, 116
xy: 356, 116
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyor
rotate: false
xy: 356, 116
xy: 366, 116
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyormove
rotate: false
xy: 366, 116
xy: 474, 415
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -160,14 +160,14 @@ blocks/core
index: -1
blocks/cross
rotate: false
xy: 474, 415
xy: 484, 415
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/crucible
rotate: false
xy: 484, 415
xy: 494, 414
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -181,28 +181,28 @@ blocks/deepwater
index: -1
blocks/dirt1
rotate: false
xy: 494, 413
xy: 228, 22
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt2
rotate: false
xy: 228, 22
xy: 228, 12
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt3
rotate: false
xy: 228, 12
xy: 226, 2
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirtblock
rotate: false
xy: 226, 2
xy: 375, 192
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -223,14 +223,14 @@ blocks/doubleturret
index: -1
blocks/drill
rotate: false
xy: 375, 192
xy: 375, 182
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/duriumwall
rotate: false
xy: 375, 182
xy: 373, 172
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -244,7 +244,7 @@ blocks/duriumwall-large
index: -1
blocks/duriumwall-large-icon
rotate: false
xy: 373, 172
xy: 385, 230
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -258,35 +258,35 @@ blocks/flameturret
index: -1
blocks/grass1
rotate: false
xy: 388, 221
xy: 395, 215
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass2
rotate: false
xy: 398, 224
xy: 385, 210
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass3
rotate: false
xy: 405, 234
xy: 395, 205
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock
rotate: false
xy: 408, 224
xy: 385, 200
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock2
rotate: false
xy: 398, 214
xy: 385, 190
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -300,42 +300,42 @@ blocks/grassedge
index: -1
blocks/iron1
rotate: false
xy: 401, 298
xy: 390, 160
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron2
rotate: false
xy: 401, 288
xy: 390, 150
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron3
rotate: false
xy: 401, 278
xy: 401, 358
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/irondrill
rotate: false
xy: 401, 268
xy: 401, 348
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ironwall
rotate: false
xy: 401, 258
xy: 401, 338
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/junction
rotate: false
xy: 411, 360
xy: 401, 328
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -349,7 +349,7 @@ blocks/laserturret
index: -1
blocks/lava
rotate: false
xy: 411, 350
xy: 401, 318
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -363,21 +363,21 @@ blocks/lavaedge
index: -1
blocks/liquiditemjunction
rotate: false
xy: 411, 340
xy: 401, 308
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidjunction
rotate: false
xy: 411, 330
xy: 401, 298
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidrouter
rotate: false
xy: 411, 320
xy: 401, 288
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -405,14 +405,14 @@ blocks/mortarturret
index: -1
blocks/mossblock
rotate: false
xy: 411, 300
xy: 401, 268
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/mossstone
rotate: false
xy: 411, 300
xy: 401, 268
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -426,7 +426,7 @@ blocks/nuclearreactor
index: -1
blocks/nuclearreactor-icon
rotate: false
xy: 411, 280
xy: 411, 360
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -440,7 +440,7 @@ blocks/nuclearreactor-small
index: -1
blocks/oil
rotate: false
xy: 411, 270
xy: 411, 350
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -454,14 +454,14 @@ blocks/oiledge
index: -1
blocks/oilrefinery
rotate: false
xy: 411, 260
xy: 411, 340
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/omnidrill
rotate: false
xy: 230, 119
xy: 411, 330
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -475,42 +475,42 @@ blocks/plasmaturret
index: -1
blocks/powerbooster
rotate: false
xy: 230, 109
xy: 411, 320
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyor
rotate: false
xy: 240, 119
xy: 411, 310
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyormove
rotate: false
xy: 230, 99
xy: 411, 300
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaser
rotate: false
xy: 240, 109
xy: 411, 290
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaserrouter
rotate: false
xy: 230, 89
xy: 411, 280
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pump
rotate: false
xy: 240, 99
xy: 411, 270
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -524,35 +524,35 @@ blocks/repairturret
index: -1
blocks/rock
rotate: false
xy: 240, 89
xy: 405, 234
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2
rotate: false
xy: 230, 69
xy: 405, 224
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2shadow
rotate: false
xy: 240, 79
xy: 405, 214
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rockshadow
rotate: false
xy: 230, 59
xy: 405, 204
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/router
rotate: false
xy: 240, 69
xy: 405, 194
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -566,70 +566,70 @@ blocks/shadow
index: -1
blocks/shieldgenerator
rotate: false
xy: 230, 49
xy: 405, 174
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shotgunturret
rotate: false
xy: 498, 481
xy: 498, 482
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/shrub
rotate: false
xy: 240, 49
xy: 240, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shrubshadow
rotate: false
xy: 240, 39
xy: 230, 99
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/smelter
rotate: false
xy: 250, 115
xy: 240, 109
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sniperturret
rotate: false
xy: 498, 469
xy: 498, 470
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/sorter
rotate: false
xy: 260, 115
xy: 230, 89
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyor
rotate: false
xy: 250, 105
xy: 240, 99
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyormove
rotate: false
xy: 250, 95
xy: 230, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelwall
rotate: false
xy: 260, 105
xy: 240, 89
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -643,49 +643,49 @@ blocks/stone
index: -1
blocks/stone1
rotate: false
xy: 250, 85
xy: 230, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone2
rotate: false
xy: 260, 95
xy: 240, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone3
rotate: false
xy: 250, 75
xy: 230, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock
rotate: false
xy: 260, 85
xy: 240, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock2
rotate: false
xy: 250, 65
xy: 230, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock3
rotate: false
xy: 260, 75
xy: 240, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonedrill
rotate: false
xy: 250, 55
xy: 230, 39
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -699,28 +699,28 @@ blocks/stoneedge
index: -1
blocks/stonewall
rotate: false
xy: 260, 65
xy: 240, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter
rotate: false
xy: 250, 45
xy: 240, 39
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter-top
rotate: false
xy: 260, 55
xy: 250, 115
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/thermalgenerator
rotate: false
xy: 260, 45
xy: 260, 115
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -734,56 +734,56 @@ blocks/titancannon
index: -1
blocks/titancannon-icon
rotate: false
xy: 498, 457
xy: 498, 458
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/titanium1
rotate: false
xy: 250, 35
xy: 250, 105
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium2
rotate: false
xy: 260, 35
xy: 250, 95
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium3
rotate: false
xy: 270, 109
xy: 260, 105
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumdrill
rotate: false
xy: 270, 99
xy: 250, 85
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumpurifier
rotate: false
xy: 280, 109
xy: 260, 95
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumshieldwall
rotate: false
xy: 270, 89
xy: 250, 75
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumwall
rotate: false
xy: 280, 99
xy: 260, 85
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -797,49 +797,49 @@ blocks/titaniumwall-large
index: -1
blocks/titaniumwall-large-icon
rotate: false
xy: 290, 109
xy: 250, 65
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/turret
rotate: false
xy: 498, 445
xy: 498, 446
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/uranium1
rotate: false
xy: 280, 89
xy: 260, 65
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium2
rotate: false
xy: 290, 99
xy: 250, 45
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium3
rotate: false
xy: 300, 109
xy: 260, 55
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uraniumdrill
rotate: false
xy: 270, 69
xy: 260, 45
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/water
rotate: false
xy: 280, 79
xy: 250, 35
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -853,7 +853,7 @@ blocks/wateredge
index: -1
blocks/waveturret
rotate: false
xy: 498, 433
xy: 498, 434
size: 10, 10
orig: 10, 10
offset: 0, 0
@@ -865,6 +865,13 @@ bullet
orig: 8, 8
offset: 0, 0
index: -1
chainbullet
rotate: false
xy: 502, 494
size: 8, 7
orig: 8, 7
offset: 0, 0
index: -1
circle
rotate: false
xy: 359, 220
@@ -1098,56 +1105,56 @@ enemies/titanenemy-t3
index: -1
enemyarrow
rotate: false
xy: 385, 231
xy: 395, 225
size: 8, 7
orig: 8, 7
offset: 0, 0
index: -1
icon-coal
rotate: false
xy: 408, 214
xy: 395, 195
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-dirium
rotate: false
xy: 401, 358
xy: 385, 180
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-iron
rotate: false
xy: 401, 348
xy: 395, 185
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-steel
rotate: false
xy: 401, 338
xy: 383, 170
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-stone
rotate: false
xy: 401, 328
xy: 380, 160
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-titanium
rotate: false
xy: 401, 318
xy: 380, 150
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-uranium
rotate: false
xy: 401, 308
xy: 395, 175
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1173,16 +1180,30 @@ mechs/player
orig: 12, 12
offset: 0, 0
index: -1
shell
rotate: false
xy: 405, 184
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot
rotate: false
xy: 240, 59
xy: 230, 119
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot-long
rotate: false
xy: 230, 39
xy: 230, 109
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanshell
rotate: false
xy: 260, 75
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1534,14 +1555,14 @@ ui/scroll-knob-vertical
index: -1
ui/selection
rotate: false
xy: 379, 256
xy: 382, 256
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
ui/separator
rotate: false
xy: 382, 256
xy: 350, 170
size: 1, 1
orig: 1, 1
offset: 0, 0
@@ -1629,35 +1650,35 @@ weapons/blaster
index: -1
weapons/flamer
rotate: false
xy: 378, 221
xy: 385, 220
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/mortar
rotate: false
xy: 411, 310
xy: 401, 278
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/multigun
rotate: false
xy: 411, 290
xy: 401, 258
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/railgun
rotate: false
xy: 230, 79
xy: 411, 260
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/triblaster
rotate: false
xy: 270, 79
xy: 250, 55
size: 8, 8
orig: 8, 8
offset: 0, 0

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB