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

Fixed tutorial, many balancing changes

Browse Source
This commit is contained in:
Anuken
2017-12-03 17:08:28 -05:00
parent 9dd2bfaeeb
commit 8481a3a5f3
17 changed files with 125 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -718,41 +718,48 @@ blocks/powerlaser
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaserrouter
blocks/powerlasercorner
rotate: false
xy: 315, 143
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduit
blocks/powerlaserrouter
rotate: false
xy: 325, 143
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduitbottom
blocks/pulseconduit
rotate: false
xy: 314, 133
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduittop
blocks/pulseconduitbottom
rotate: false
xy: 314, 123
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pump
blocks/pulseconduittop
rotate: false
xy: 324, 133
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pump
rotate: false
xy: 314, 113
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/repairturret
rotate: false
xy: 437, 243
@@ -762,70 +769,70 @@ blocks/repairturret
index: -1
blocks/rock1
rotate: false
xy: 324, 123
xy: 314, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2
rotate: false
xy: 314, 103
xy: 324, 113
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/router
rotate: false
xy: 324, 113
xy: 314, 93
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rtgenerator
rotate: false
xy: 314, 93
xy: 324, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand1
rotate: false
xy: 324, 103
xy: 314, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand2
rotate: false
xy: 314, 83
xy: 324, 93
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand3
rotate: false
xy: 324, 93
xy: 314, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock1
rotate: false
xy: 314, 73
xy: 324, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock2
rotate: false
xy: 324, 83
xy: 314, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock3
rotate: false
xy: 314, 63
xy: 324, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -846,7 +853,7 @@ blocks/shadow
index: -1
blocks/shieldgenerator
rotate: false
xy: 314, 53
xy: 324, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -860,21 +867,21 @@ blocks/shotgunturret
index: -1
blocks/shrub
rotate: false
xy: 324, 53
xy: 314, 33
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shrubshadow
rotate: false
xy: 314, 33
xy: 324, 43
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/smelter
rotate: false
xy: 324, 43
xy: 314, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -888,42 +895,42 @@ blocks/sniperturret
index: -1
blocks/snow1
rotate: false
xy: 314, 23
xy: 324, 33
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snow2
rotate: false
xy: 324, 33
xy: 314, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snow3
rotate: false
xy: 314, 13
xy: 324, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock1
rotate: false
xy: 324, 23
xy: 324, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock2
rotate: false
xy: 324, 13
xy: 314, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock3
rotate: false
xy: 314, 3
xy: 324, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -937,28 +944,28 @@ blocks/snowedge
index: -1
blocks/sorter
rotate: false
xy: 324, 3
xy: 411, 217
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyor
rotate: false
xy: 411, 217
xy: 408, 207
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyormove
rotate: false
xy: 408, 207
xy: 408, 197
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelwall
rotate: false
xy: 408, 197
xy: 421, 217
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -972,7 +979,7 @@ blocks/steelwall-large
index: -1
blocks/steelwall-large-icon
rotate: false
xy: 421, 217
xy: 431, 219
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -986,84 +993,84 @@ blocks/stone
index: -1
blocks/stone1
rotate: false
xy: 431, 219
xy: 418, 207
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone2
rotate: false
xy: 418, 207
xy: 418, 197
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone3
rotate: false
xy: 418, 197
xy: 441, 213
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock-edge-0
rotate: false
xy: 441, 203
xy: 365, 198
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock-edge-1
rotate: false
xy: 365, 198
xy: 365, 188
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock-edge-2
rotate: false
xy: 365, 188
xy: 481, 325
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock-edge-3
rotate: false
xy: 481, 325
xy: 481, 315
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock-smooth1
rotate: false
xy: 481, 315
xy: 481, 305
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock1
rotate: false
xy: 441, 213
xy: 431, 209
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock2
rotate: false
xy: 431, 209
xy: 428, 199
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock3
rotate: false
xy: 428, 199
xy: 441, 203
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonedrill
rotate: false
xy: 481, 305
xy: 479, 295
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1077,35 +1084,35 @@ blocks/stoneedge
index: -1
blocks/stoneformer
rotate: false
xy: 479, 295
xy: 479, 285
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonewall
rotate: false
xy: 479, 285
xy: 479, 275
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter
rotate: false
xy: 479, 275
xy: 479, 265
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter-top
rotate: false
xy: 479, 265
xy: 479, 255
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/thermalgenerator
rotate: false
xy: 479, 255
xy: 479, 245
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1126,49 +1133,49 @@ blocks/titancannon-icon
index: -1
blocks/titanium1
rotate: false
xy: 479, 245
xy: 491, 329
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium2
rotate: false
xy: 491, 329
xy: 491, 319
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium3
rotate: false
xy: 491, 319
xy: 491, 309
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumdrill
rotate: false
xy: 491, 309
xy: 501, 329
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumpurifier
rotate: false
xy: 501, 329
xy: 501, 319
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumshieldwall
rotate: false
xy: 501, 319
xy: 501, 309
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumwall
rotate: false
xy: 501, 309
xy: 491, 299
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1182,7 +1189,7 @@ blocks/titaniumwall-large
index: -1
blocks/titaniumwall-large-icon
rotate: false
xy: 491, 299
xy: 501, 299
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1196,35 +1203,35 @@ blocks/turret
index: -1
blocks/uranium1
rotate: false
xy: 489, 279
xy: 499, 289
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium2
rotate: false
xy: 499, 289
xy: 489, 269
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium3
rotate: false
xy: 489, 269
xy: 499, 279
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uraniumdrill
rotate: false
xy: 499, 279
xy: 489, 259
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/water
rotate: false
xy: 489, 259
xy: 499, 269
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1588,28 +1595,28 @@ mechs/mech-standard
index: -1
shell
rotate: false
xy: 324, 73
xy: 314, 53
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot
rotate: false
xy: 324, 63
xy: 314, 43
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot-long
rotate: false
xy: 314, 43
xy: 324, 53
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanshell
rotate: false
xy: 501, 299
xy: 489, 289
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -2147,14 +2154,14 @@ weapons/multigun
index: -1
weapons/railgun
rotate: false
xy: 314, 113
xy: 324, 123
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/triblaster
rotate: false
xy: 489, 289
xy: 489, 279
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: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB