mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-15 10:17:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Re-added sand, better teleporter/sorter UI

Browse Source
This commit is contained in:
Anuken
2018-01-02 12:14:14 -05:00
parent abcd7464ad
commit 7f8598f2bc
13 changed files with 196 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/icon-sand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

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

@ -482,42 +482,42 @@ blocks/rockshadow2
index: -1 index: -1
blocks/iron1 blocks/iron1
rotate: false rotate: false
xy: 512, 82 xy: 522, 82
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/iron2 blocks/iron2
rotate: false rotate: false
xy: 522, 82 xy: 801, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/iron3 blocks/iron3
rotate: false rotate: false
xy: 801, 443 xy: 811, 445
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/irondrill blocks/irondrill
rotate: false rotate: false
xy: 811, 445 xy: 821, 445
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/ironwall blocks/ironwall
rotate: false rotate: false
xy: 821, 445 xy: 831, 445
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/junction blocks/junction
rotate: false rotate: false
xy: 831, 445 xy: 841, 444
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -531,7 +531,7 @@ blocks/laserturret
index: -1 index: -1
blocks/lava blocks/lava
rotate: false rotate: false
xy: 841, 444 xy: 851, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -545,28 +545,28 @@ blocks/lavaedge
index: -1 index: -1
blocks/lavasmelter blocks/lavasmelter
rotate: false rotate: false
xy: 851, 443 xy: 861, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/liquiditemjunction blocks/liquiditemjunction
rotate: false rotate: false
xy: 861, 443 xy: 871, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/liquidjunction blocks/liquidjunction
rotate: false rotate: false
xy: 871, 443 xy: 881, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/liquidrouter blocks/liquidrouter
rotate: false rotate: false
xy: 881, 443 xy: 891, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -594,14 +594,14 @@ blocks/mortarturret
index: -1 index: -1
blocks/mossblock blocks/mossblock
rotate: false rotate: false
xy: 901, 443 xy: 911, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/mossstone blocks/mossstone
rotate: false rotate: false
xy: 901, 443 xy: 911, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -622,7 +622,7 @@ blocks/nuclearreactor-center
index: -1 index: -1
blocks/nuclearreactor-icon blocks/nuclearreactor-icon
rotate: false rotate: false
xy: 921, 443 xy: 931, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -643,7 +643,7 @@ blocks/nuclearreactor-small
index: -1 index: -1
blocks/oil blocks/oil
rotate: false rotate: false
xy: 931, 443 xy: 941, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -657,14 +657,14 @@ blocks/oiledge
index: -1 index: -1
blocks/oilrefinery blocks/oilrefinery
rotate: false rotate: false
xy: 941, 443 xy: 951, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/omnidrill blocks/omnidrill
rotate: false rotate: false
xy: 951, 443 xy: 961, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -678,77 +678,77 @@ blocks/plasmaturret
index: -1 index: -1
blocks/playerspawn blocks/playerspawn
rotate: false rotate: false
xy: 961, 443 xy: 971, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/powerbooster blocks/powerbooster
rotate: false rotate: false
xy: 971, 443 xy: 981, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/poweredconveyor blocks/poweredconveyor
rotate: false rotate: false
xy: 981, 443 xy: 991, 445
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/poweredconveyormove blocks/poweredconveyormove
rotate: false rotate: false
xy: 991, 445 xy: 1001, 445
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/powerlaser blocks/powerlaser
rotate: false rotate: false
xy: 1001, 445 xy: 1011, 445
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/powerlasercorner blocks/powerlasercorner
rotate: false rotate: false
xy: 1011, 445 xy: 109, 13
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/powerlaserrouter blocks/powerlaserrouter
rotate: false rotate: false
xy: 109, 13 xy: 736, 381
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/pulseconduit blocks/pulseconduit
rotate: false rotate: false
xy: 736, 381 xy: 740, 371
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/pulseconduitbottom blocks/pulseconduitbottom
rotate: false rotate: false
xy: 740, 371 xy: 740, 361
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/pulseconduittop blocks/pulseconduittop
rotate: false rotate: false
xy: 740, 361 xy: 740, 351
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/pump blocks/pump
rotate: false rotate: false
xy: 740, 351 xy: 740, 341
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -762,77 +762,77 @@ blocks/repairturret
index: -1 index: -1
blocks/rock1 blocks/rock1
rotate: false rotate: false
xy: 740, 331 xy: 740, 321
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/rock2 blocks/rock2
rotate: false rotate: false
xy: 740, 321 xy: 798, 393
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/router blocks/router
rotate: false rotate: false
xy: 798, 393 xy: 180, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/rtgenerator blocks/rtgenerator
rotate: false rotate: false
xy: 180, 87 xy: 190, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/rtgenerator-top blocks/rtgenerator-top
rotate: false rotate: false
xy: 190, 87 xy: 200, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/sand1 blocks/sand1
rotate: false rotate: false
xy: 200, 87 xy: 210, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/sand2 blocks/sand2
rotate: false rotate: false
xy: 210, 87 xy: 220, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/sand3 blocks/sand3
rotate: false rotate: false
xy: 220, 87 xy: 230, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/sandblock1 blocks/sandblock1
rotate: false rotate: false
xy: 230, 87 xy: 240, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/sandblock2 blocks/sandblock2
rotate: false rotate: false
xy: 240, 87 xy: 250, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/sandblock3 blocks/sandblock3
rotate: false rotate: false
xy: 250, 87 xy: 260, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -853,7 +853,7 @@ blocks/shadow
index: -1 index: -1
blocks/shieldgenerator blocks/shieldgenerator
rotate: false rotate: false
xy: 270, 87 xy: 280, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -867,21 +867,21 @@ blocks/shotgunturret
index: -1 index: -1
blocks/shrub blocks/shrub
rotate: false rotate: false
xy: 527, 126 xy: 527, 116
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/shrubshadow blocks/shrubshadow
rotate: false rotate: false
xy: 527, 116 xy: 524, 106
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/smelter blocks/smelter
rotate: false rotate: false
xy: 524, 106 xy: 362, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -895,42 +895,42 @@ blocks/sniperturret
index: -1 index: -1
blocks/snow1 blocks/snow1
rotate: false rotate: false
xy: 362, 83 xy: 372, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/snow2 blocks/snow2
rotate: false rotate: false
xy: 372, 83 xy: 382, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/snow3 blocks/snow3
rotate: false rotate: false
xy: 382, 83 xy: 392, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/snowblock1 blocks/snowblock1
rotate: false rotate: false
xy: 392, 83 xy: 402, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/snowblock2 blocks/snowblock2
rotate: false rotate: false
xy: 402, 83 xy: 412, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/snowblock3 blocks/snowblock3
rotate: false rotate: false
xy: 412, 83 xy: 422, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -944,28 +944,28 @@ blocks/snowedge
index: -1 index: -1
blocks/sorter blocks/sorter
rotate: false rotate: false
xy: 422, 83 xy: 432, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/steelconveyor blocks/steelconveyor
rotate: false rotate: false
xy: 432, 83 xy: 442, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/steelconveyormove blocks/steelconveyormove
rotate: false rotate: false
xy: 442, 83 xy: 452, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/steelwall blocks/steelwall
rotate: false rotate: false
xy: 452, 83 xy: 462, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -979,56 +979,56 @@ blocks/steelwall-large
index: -1 index: -1
blocks/steelwall-large-icon blocks/steelwall-large-icon
rotate: false rotate: false
xy: 462, 83 xy: 472, 83
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stone1 blocks/stone1
rotate: false rotate: false
xy: 472, 83 xy: 482, 76
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stone2 blocks/stone2
rotate: false rotate: false
xy: 482, 76 xy: 492, 72
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stone3 blocks/stone3
rotate: false rotate: false
xy: 492, 72 xy: 502, 72
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stoneblock1 blocks/stoneblock1
rotate: false rotate: false
xy: 502, 72 xy: 512, 72
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stoneblock2 blocks/stoneblock2
rotate: false rotate: false
xy: 512, 72 xy: 522, 72
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stoneblock3 blocks/stoneblock3
rotate: false rotate: false
xy: 522, 72 xy: 107, 3
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stonedrill blocks/stonedrill
rotate: false rotate: false
xy: 107, 3 xy: 746, 381
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -1042,35 +1042,35 @@ blocks/stoneedge
index: -1 index: -1
blocks/stoneformer blocks/stoneformer
rotate: false rotate: false
xy: 746, 381 xy: 750, 371
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/stonewall blocks/stonewall
rotate: false rotate: false
xy: 750, 371 xy: 750, 361
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/teleporter blocks/teleporter
rotate: false rotate: false
xy: 750, 361 xy: 750, 351
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/teleporter-top blocks/teleporter-top
rotate: false rotate: false
xy: 750, 351 xy: 750, 341
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/thermalgenerator blocks/thermalgenerator
rotate: false rotate: false
xy: 750, 341 xy: 750, 331
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -1091,49 +1091,49 @@ blocks/titancannon-icon
index: -1 index: -1
blocks/titanium1 blocks/titanium1
rotate: false rotate: false
xy: 750, 331 xy: 750, 321
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/titanium2 blocks/titanium2
rotate: false rotate: false
xy: 750, 321 xy: 740, 311
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/titanium3 blocks/titanium3
rotate: false rotate: false
xy: 740, 311 xy: 750, 311
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/titaniumdrill blocks/titaniumdrill
rotate: false rotate: false
xy: 750, 311 xy: 734, 301
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/titaniumpurifier blocks/titaniumpurifier
rotate: false rotate: false
xy: 734, 301 xy: 744, 301
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/titaniumshieldwall blocks/titaniumshieldwall
rotate: false rotate: false
xy: 744, 301 xy: 754, 301
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/titaniumwall blocks/titaniumwall
rotate: false rotate: false
xy: 754, 301 xy: 528, 96
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -1147,7 +1147,7 @@ blocks/titaniumwall-large
index: -1 index: -1
blocks/titaniumwall-large-icon blocks/titaniumwall-large-icon
rotate: false rotate: false
xy: 528, 96 xy: 534, 106
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -1161,35 +1161,35 @@ blocks/turret
index: -1 index: -1
blocks/uranium1 blocks/uranium1
rotate: false rotate: false
xy: 532, 86 xy: 532, 76
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/uranium2 blocks/uranium2
rotate: false rotate: false
xy: 532, 76 xy: 542, 86
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/uranium3 blocks/uranium3
rotate: false rotate: false
xy: 542, 86 xy: 542, 76
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/uraniumdrill blocks/uraniumdrill
rotate: false rotate: false
xy: 542, 76 xy: 756, 381
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
blocks/water blocks/water
rotate: false rotate: false
xy: 756, 381 xy: 760, 371
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -1502,34 +1502,41 @@ icon-iron
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-steel icon-sand
rotate: false rotate: false
xy: 1011, 465 xy: 1011, 465
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-stone icon-steel
rotate: false rotate: false
xy: 1011, 455 xy: 1011, 455
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-titanium icon-stone
rotate: false rotate: false
xy: 492, 82 xy: 492, 82
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-uranium icon-titanium
rotate: false rotate: false
xy: 502, 82 xy: 502, 82
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-uranium
rotate: false
xy: 512, 82
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
laser laser
rotate: false rotate: false
xy: 533, 178 xy: 533, 178
@ -1567,28 +1574,28 @@ mechs/ship-standard
index: -1 index: -1
shell shell
rotate: false rotate: false
xy: 260, 87 xy: 270, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shot shot
rotate: false rotate: false
xy: 280, 87 xy: 290, 87
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shot-long shot-long
rotate: false rotate: false
xy: 290, 87 xy: 527, 126
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
titanshell titanshell
rotate: false rotate: false
xy: 534, 106 xy: 538, 96
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2357,28 +2364,28 @@ weapons/flamer
index: -1 index: -1
weapons/mortar weapons/mortar
rotate: false rotate: false
xy: 891, 443 xy: 901, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
weapons/multigun weapons/multigun
rotate: false rotate: false
xy: 911, 443 xy: 921, 443
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
weapons/railgun weapons/railgun
rotate: false rotate: false
xy: 740, 341 xy: 740, 331
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
weapons/triblaster weapons/triblaster
rotate: false rotate: false
xy: 538, 96 xy: 532, 86
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

9
core/src/io/anuke/mindustry/core/UI.java
View File

@ -331,13 +331,16 @@ public class UI extends SceneModule{
public void showConfig(Tile tile){ public void showConfig(Tile tile){
configTile = tile; configTile = tile;
configtable.setVisible(true);
configtable.clear(); configtable.clear();
((Configurable)tile.block()).buildTable(tile, configtable); ((Configurable)tile.block()).buildTable(tile, configtable);
configtable.pack(); configtable.pack();
configtable.setTransform(true);
configtable.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out));
configtable.update(()->{ configtable.update(()->{
configtable.setOrigin(Align.center);
Vector2 pos = Graphics.screen(tile.worldx(), tile.worldy()); Vector2 pos = Graphics.screen(tile.worldx(), tile.worldy());
configtable.setPosition(pos.x, pos.y, Align.center); configtable.setPosition(pos.x, pos.y, Align.center);
if(configTile == null || configTile.block() == Blocks.air){ if(configTile == null || configTile.block() == Blocks.air){
@ -352,7 +355,7 @@ public class UI extends SceneModule{
} }
public void hideConfig(){ public void hideConfig(){
configtable.setVisible(false); configtable.actions(Actions.scaleTo(0f, 1f, 0.06f, Interpolation.pow3Out), Actions.visible(false));
} }
public void showTextInput(String title, String text, String def, TextFieldFilter filter, Consumer<String> confirmed){ public void showTextInput(String title, String text, String def, TextFieldFilter filter, Consumer<String> confirmed){

10
core/src/io/anuke/mindustry/io/SaveIO.java
View File

@ -236,16 +236,20 @@ public class SaveIO{
//--ENEMIES-- //--ENEMIES--
int totalEnemies = 0; int totalEnemies = 0;
Array<Enemy> enemies = Vars.control.enemyGroup.all();
for(Enemy entity : Vars.control.enemyGroup.all()){ for(int i = 0; i < enemies.size; i ++){
if(idEnemies.containsKey(entity.getClass())){ Enemy enemy = enemies.get(i);
if(idEnemies.containsKey(enemy.getClass())){
totalEnemies ++; totalEnemies ++;
} }
} }
stream.writeInt(totalEnemies); //enemy amount stream.writeInt(totalEnemies); //enemy amount
for(Enemy enemy : Vars.control.enemyGroup.all()){ for(int i = 0; i < enemies.size; i ++){
Enemy enemy = enemies.get(i);
if(idEnemies.containsKey(enemy.getClass())){ if(idEnemies.containsKey(enemy.getClass())){
stream.writeByte(idEnemies.get(enemy.getClass())); //type stream.writeByte(idEnemies.get(enemy.getClass())); //type
stream.writeByte(enemy.lane); //lane stream.writeByte(enemy.lane); //lane

5
core/src/io/anuke/mindustry/net/Packets.java
View File

@ -108,4 +108,9 @@ public class Packets {
public static class BlockUpdatePacket{ public static class BlockUpdatePacket{
public int health, position; public int health, position;
} }
public static class ChatPacket{
public String name;
public String text;
}
} }

1
core/src/io/anuke/mindustry/net/Registrator.java
View File

@ -33,6 +33,7 @@ public class Registrator {
BlockDestroyPacket.class, BlockDestroyPacket.class,
ConnectPacket.class, ConnectPacket.class,
DisconnectPacket.class, DisconnectPacket.class,
ChatPacket.class,
Class.class, Class.class,
byte[].class, byte[].class,

6
core/src/io/anuke/mindustry/resource/Item.java
View File

@ -13,9 +13,9 @@ public class Item{
steel = new Item("steel"), steel = new Item("steel"),
titanium = new Item("titanium"), titanium = new Item("titanium"),
dirium = new Item("dirium"), dirium = new Item("dirium"),
uranium = new Item("uranium"); uranium = new Item("uranium"),
/*sand = new Item("sand"), sand = new Item("sand");
glass = new Item("glass"), /*glass = new Item("glass"),
silicon = new Item("silicon");*/ silicon = new Item("silicon");*/
public final int id; public final int id;

4
core/src/io/anuke/mindustry/ui/MenuDialog.java
View File

@ -52,7 +52,7 @@ public class MenuDialog extends FloatingDialog{
content().row(); content().row();
content().addButton("$text.loadgame", () -> { content().addButton("$text.loadgame", () -> {
load.show(); load.show();
}); }).disabled(Net.active());
content().row(); content().row();
@ -89,7 +89,7 @@ public class MenuDialog extends FloatingDialog{
content().row(); content().row();
new imagebutton("icon-load", isize, () -> load.show()).text("$text.load").padTop(4f); new imagebutton("icon-load", isize, () -> load.show()).text("$text.load").padTop(4f).disabled(Net.active());
new imagebutton("icon-host", isize, () -> ui.showHostServer()).text("$text.host").padTop(4f); new imagebutton("icon-host", isize, () -> ui.showHostServer()).text("$text.host").padTop(4f);

9
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java Normal file
View File

@ -0,0 +1,9 @@
package io.anuke.mindustry.ui.fragments;
public class ChatFragment implements Fragment {
//TODO
@Override
public void build() {
}
}

2
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@ -52,7 +52,7 @@ public class MenuFragment implements Fragment{
get().margin(16); get().margin(16);
}}.end(); }}.end();
visible(()->GameState.is(State.menu)); visible(()-> GameState.is(State.menu));
}}.end(); }}.end();
}else{ }else{
new table(){{ new table(){{

59
core/src/io/anuke/mindustry/world/blocks/types/distribution/Sorter.java
View File

@ -1,21 +1,24 @@
package io.anuke.mindustry.world.blocks.types.distribution; package io.anuke.mindustry.world.blocks.types.distribution;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.types.Configurable; import io.anuke.mindustry.world.blocks.types.Configurable;
import io.anuke.ucore.core.Draw; import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.style.TextureRegionDrawable;
import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Tmp; import io.anuke.ucore.util.Tmp;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
public class Sorter extends Junction implements Configurable{ public class Sorter extends Junction implements Configurable{
public Sorter(String name) { public Sorter(String name) {
@ -91,27 +94,31 @@ public class Sorter extends Junction implements Configurable{
@Override @Override
public void buildTable(Tile tile, Table table){ public void buildTable(Tile tile, Table table){
SorterEntity entity = tile.entity(); SorterEntity entity = tile.entity();
table.addIButton("icon-arrow-left", 10*3, ()->{ Array<Item> items = Item.getAllItems();
int color = entity.sortItem.id;
ButtonGroup<ImageButton> group = new ButtonGroup<>();
color --; Table cont = new Table();
if(color < 0) cont.margin(4);
color += Item.getAllItems().size; cont.marginBottom(5);
entity.sortItem = Item.getAllItems().get(color); cont.add().colspan(4).height(105f);
}); cont.row();
table.add().size(40f); for(int i = 0; i < items.size; i ++){
final int f = i;
table.addIButton("icon-arrow-right", 10*3, ()->{ ImageButton button = cont.addIButton("white", "toggle", 24, () -> {
int color = entity.sortItem.id; entity.sortItem = items.get(f);
}).size(38, 42).padBottom(-5.1f).group(group).get();
color ++; button.getStyle().imageUp = new TextureRegionDrawable(new TextureRegion(Draw.region("icon-"+items.get(i).name)));
color %= Item.getAllItems().size; button.setChecked(entity.sortItem.id == f);
entity.sortItem = Item.getAllItems().get(color); if(i%4 == 3){
}); cont.row();
}
}
table.add(cont);
} }
@Override @Override

49
core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java
View File

@ -1,13 +1,8 @@
package io.anuke.mindustry.world.blocks.types.distribution; package io.anuke.mindustry.world.blocks.types.distribution;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.ObjectSet; import com.badlogic.gdx.utils.ObjectSet;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
@ -15,11 +10,17 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.types.Configurable; import io.anuke.mindustry.world.blocks.types.Configurable;
import io.anuke.ucore.core.Draw; import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
public class Teleporter extends Block implements Configurable{ public class Teleporter extends Block implements Configurable{
public static final Color[] colorArray = {Color.ROYAL, Color.ORANGE, Color.SCARLET, Color.FOREST, Color.PURPLE, Color.GOLD, Color.PINK}; public static final Color[] colorArray = {Color.ROYAL, Color.ORANGE, Color.SCARLET, Color.FOREST, Color.PURPLE, Color.GOLD, Color.PINK, Color.BLACK};
public static final int colors = colorArray.length; public static final int colors = colorArray.length;
private static ObjectSet<Tile>[] teleporters = new ObjectSet[colors]; private static ObjectSet<Tile>[] teleporters = new ObjectSet[colors];
@ -74,18 +75,30 @@ public class Teleporter extends Block implements Configurable{
@Override @Override
public void buildTable(Tile tile, Table table){ public void buildTable(Tile tile, Table table){
TeleporterEntity entity = tile.entity(); TeleporterEntity entity = tile.entity();
table.addIButton("icon-arrow-left", 10*3, ()->{ ButtonGroup<ImageButton> group = new ButtonGroup<>();
entity.color = (byte)Mathf.mod(entity.color - 1, colors); Table cont = new Table();
lastColor = entity.color; cont.margin(4);
}); cont.marginBottom(5);
table.add().size(40f); cont.add().colspan(4).height(105f);
cont.row();
table.addIButton("icon-arrow-right", 10*3, ()->{
entity.color = (byte)Mathf.mod(entity.color + 1, colors); for(int i = 0; i < colors; i ++){
lastColor = entity.color; final int f = i;
}); ImageButton button = cont.addIButton("white", "toggle", 24, () -> {
entity.color = (byte)f;
lastColor = (byte)f;
}).size(34, 38).padBottom(-5.1f).group(group).get();
button.getStyle().imageUpColor = colorArray[f];
button.setChecked(entity.color == f);
if(i%4 == 3){
cont.row();
}
}
table.add(cont);
} }
@Override @Override