mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-19 03:03:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added deselection, fixed pump placement and junction skipping

Browse Source
This commit is contained in:
Anuken 2018-06-21 10:20:37 -04:00
parent 21238e7376
commit 8c194398a9
15 changed files with 171 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/turrets/turrets/hail.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 372 B

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

@ -937,7 +937,7 @@ playerspawn
index: -1 index: -1
ripples ripples
rotate: false rotate: false
xy: 667, 203 xy: 667, 191
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -1621,16 +1621,30 @@ spectre
orig: 24, 24 orig: 24, 24
offset: 0, 0 offset: 0, 0
index: -1 index: -1
hail
rotate: false
xy: 267, 43
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
scatter
rotate: false
xy: 267, 43
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
lancer lancer
rotate: false rotate: false
xy: 685, 215 xy: 697, 215
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
lancer-heat lancer-heat
rotate: false rotate: false
xy: 697, 215 xy: 667, 203
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -1642,13 +1656,6 @@ meltdown
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scatter
rotate: false
xy: 667, 191
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
scatter-heat scatter-heat
rotate: false rotate: false
xy: 679, 203 xy: 679, 203
@ -2244,79 +2251,93 @@ grass1
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-ice block-icon-hail
rotate: false rotate: false
xy: 387, 53 xy: 387, 53
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-scatter
rotate: false
xy: 387, 53
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
block-icon-ice
rotate: false
xy: 397, 53
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
ice1 ice1
rotate: false rotate: false
xy: 387, 53 xy: 397, 53
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-icerock block-icon-icerock
rotate: false rotate: false
xy: 397, 53 xy: 407, 53
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icerock1 icerock1
rotate: false rotate: false
xy: 397, 53 xy: 407, 53
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-incinerator block-icon-incinerator
rotate: false rotate: false
xy: 407, 53 xy: 295, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
incinerator incinerator
rotate: false rotate: false
xy: 407, 53 xy: 295, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-iron block-icon-iron
rotate: false rotate: false
xy: 295, 43 xy: 305, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
iron1 iron1
rotate: false rotate: false
xy: 295, 43 xy: 305, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-irondrill block-icon-irondrill
rotate: false rotate: false
xy: 305, 43 xy: 315, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-ironwall block-icon-ironwall
rotate: false rotate: false
xy: 315, 43 xy: 325, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ironwall ironwall
rotate: false rotate: false
xy: 315, 43 xy: 325, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2337,42 +2358,42 @@ ironwall-large
index: -1 index: -1
block-icon-itemsource block-icon-itemsource
rotate: false rotate: false
xy: 325, 43 xy: 335, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
itemsource itemsource
rotate: false rotate: false
xy: 325, 43 xy: 335, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-itemvoid block-icon-itemvoid
rotate: false rotate: false
xy: 335, 43 xy: 345, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
itemvoid itemvoid
rotate: false rotate: false
xy: 335, 43 xy: 345, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-junction block-icon-junction
rotate: false rotate: false
xy: 345, 43 xy: 355, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
junction junction
rotate: false rotate: false
xy: 345, 43 xy: 355, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2400,28 +2421,28 @@ large-solar-panel
index: -1 index: -1
block-icon-laserconduit block-icon-laserconduit
rotate: false rotate: false
xy: 355, 43 xy: 365, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
laserconduit laserconduit
rotate: false rotate: false
xy: 355, 43 xy: 365, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-laserconveyor block-icon-laserconveyor
rotate: false rotate: false
xy: 365, 43 xy: 375, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
laserconveyor laserconveyor
rotate: false rotate: false
xy: 365, 43 xy: 375, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2435,63 +2456,63 @@ block-icon-laserdrill
index: -1 index: -1
block-icon-lava block-icon-lava
rotate: false rotate: false
xy: 375, 43 xy: 385, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
lava lava
rotate: false rotate: false
xy: 375, 43 xy: 385, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-lead block-icon-lead
rotate: false rotate: false
xy: 385, 43 xy: 395, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
lead1 lead1
rotate: false rotate: false
xy: 385, 43 xy: 395, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-liquidjunction block-icon-liquidjunction
rotate: false rotate: false
xy: 395, 43 xy: 405, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
liquidjunction liquidjunction
rotate: false rotate: false
xy: 395, 43 xy: 405, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-liquidrouter block-icon-liquidrouter
rotate: false rotate: false
xy: 405, 43 xy: 417, 53
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-liquidsource block-icon-liquidsource
rotate: false rotate: false
xy: 417, 53 xy: 415, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
liquidsource liquidsource
rotate: false rotate: false
xy: 417, 53 xy: 415, 43
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2526,14 +2547,14 @@ core-top
index: -1 index: -1
block-icon-mechanical-pump block-icon-mechanical-pump
rotate: false rotate: false
xy: 415, 43 xy: 427, 55
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
mechanical-pump mechanical-pump
rotate: false rotate: false
xy: 415, 43 xy: 427, 55
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2547,28 +2568,28 @@ block-icon-meltdown
index: -1 index: -1
block-icon-melter block-icon-melter
rotate: false rotate: false
xy: 427, 55 xy: 439, 71
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
melter melter
rotate: false rotate: false
xy: 427, 55 xy: 439, 71
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-metalfloor block-icon-metalfloor
rotate: false rotate: false
xy: 439, 71 xy: 439, 61
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
metalfloor1 metalfloor1
rotate: false rotate: false
xy: 439, 71 xy: 439, 61
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2610,14 +2631,14 @@ block-icon-nucleardrill
index: -1 index: -1
block-icon-oil block-icon-oil
rotate: false rotate: false
xy: 439, 61 xy: 437, 51
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
oil oil
rotate: false rotate: false
xy: 439, 61 xy: 437, 51
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2631,28 +2652,28 @@ block-icon-oilextractor
index: -1 index: -1
block-icon-oilrefinery block-icon-oilrefinery
rotate: false rotate: false
xy: 437, 51 xy: 427, 45
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
oilrefinery oilrefinery
rotate: false rotate: false
xy: 437, 51 xy: 427, 45
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-overflowgate block-icon-overflowgate
rotate: false rotate: false
xy: 427, 45 xy: 437, 41
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
overflowgate overflowgate
rotate: false rotate: false
xy: 427, 45 xy: 437, 41
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2680,14 +2701,14 @@ plasteel-compressor
index: -1 index: -1
block-icon-power-node block-icon-power-node
rotate: false rotate: false
xy: 437, 41 xy: 705, 339
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
power-node power-node
rotate: false rotate: false
xy: 437, 41 xy: 705, 339
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2708,56 +2729,56 @@ power-node-large
index: -1 index: -1
block-icon-poweredconveyor block-icon-poweredconveyor
rotate: false rotate: false
xy: 705, 339 xy: 715, 339
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
poweredconveyor poweredconveyor
rotate: false rotate: false
xy: 705, 339 xy: 715, 339
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-powerinfinite block-icon-powerinfinite
rotate: false rotate: false
xy: 715, 339 xy: 725, 339
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
powerinfinite powerinfinite
rotate: false rotate: false
xy: 715, 339 xy: 725, 339
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-powervoid block-icon-powervoid
rotate: false rotate: false
xy: 725, 339 xy: 843, 425
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
powervoid powervoid
rotate: false rotate: false
xy: 725, 339 xy: 843, 425
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-pulseconduit block-icon-pulseconduit
rotate: false rotate: false
xy: 843, 425 xy: 853, 425
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-pulverizer block-icon-pulverizer
rotate: false rotate: false
xy: 853, 425 xy: 863, 425
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2792,35 +2813,35 @@ walkerfactory
index: -1 index: -1
block-icon-reinforceddrill block-icon-reinforceddrill
rotate: false rotate: false
xy: 863, 425 xy: 873, 425
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-repairpoint block-icon-repairpoint
rotate: false rotate: false
xy: 873, 425 xy: 883, 425
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
repairpoint repairpoint
rotate: false rotate: false
xy: 873, 425 xy: 883, 425
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-resupplypoint block-icon-resupplypoint
rotate: false rotate: false
xy: 883, 425 xy: 893, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
resupplypoint resupplypoint
rotate: false rotate: false
xy: 883, 425 xy: 893, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2834,14 +2855,14 @@ block-icon-ripple
index: -1 index: -1
block-icon-rock block-icon-rock
rotate: false rotate: false
xy: 893, 427 xy: 903, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
rock1 rock1
rotate: false rotate: false
xy: 893, 427 xy: 903, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
@ -2862,47 +2883,40 @@ rotary-pump
index: -1 index: -1
block-icon-router block-icon-router
rotate: false rotate: false
xy: 903, 427 xy: 913, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
router router
rotate: false rotate: false
xy: 903, 427 xy: 913, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-rtg-generator block-icon-rtg-generator
rotate: false rotate: false
xy: 913, 427 xy: 923, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
rtg-generator rtg-generator
rotate: false rotate: false
xy: 913, 427 xy: 923, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
block-icon-sand block-icon-sand
rotate: false rotate: false
xy: 923, 427 xy: 933, 427
size: 8, 8 size: 8, 8
orig: 8, 8 orig: 8, 8
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand1 sand1
rotate: false
xy: 923, 427
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
block-icon-scatter
rotate: false rotate: false
xy: 933, 427 xy: 933, 427
size: 8, 8 size: 8, 8
@ -3893,7 +3907,7 @@ icon-admin-small
index: -1 index: -1
icon-areaDelete icon-areaDelete
rotate: false rotate: false
xy: 267, 43 xy: 251, 1
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -3914,28 +3928,28 @@ icon-arrow-16
index: -1 index: -1
icon-arrow-down icon-arrow-down
rotate: false rotate: false
xy: 251, 1 xy: 263, 1
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-arrow-left icon-arrow-left
rotate: false rotate: false
xy: 263, 1 xy: 463, 120
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-arrow-right icon-arrow-right
rotate: false rotate: false
xy: 463, 120 xy: 475, 120
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-arrow-up icon-arrow-up
rotate: false rotate: false
xy: 475, 120 xy: 487, 120
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -3970,7 +3984,7 @@ icon-cancel
index: -1 index: -1
icon-chat icon-chat
rotate: false rotate: false
xy: 487, 120 xy: 463, 108
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -3984,21 +3998,21 @@ icon-check
index: -1 index: -1
icon-crafting icon-crafting
rotate: false rotate: false
xy: 463, 108 xy: 475, 108
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-cursor icon-cursor
rotate: false rotate: false
xy: 475, 108 xy: 487, 108
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-defense icon-defense
rotate: false rotate: false
xy: 487, 108 xy: 499, 109
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4019,7 +4033,7 @@ icon-discord
index: -1 index: -1
icon-distribution icon-distribution
rotate: false rotate: false
xy: 499, 109 xy: 511, 109
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4152,14 +4166,14 @@ icon-grid
index: -1 index: -1
icon-hold icon-hold
rotate: false rotate: false
xy: 511, 109 xy: 523, 109
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-holdDelete icon-holdDelete
rotate: false rotate: false
xy: 523, 109 xy: 535, 109
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4180,7 +4194,7 @@ icon-host
index: -1 index: -1
icon-info icon-info
rotate: false rotate: false
xy: 535, 109 xy: 547, 109
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4215,7 +4229,7 @@ icon-link
index: -1 index: -1
icon-liquid icon-liquid
rotate: false rotate: false
xy: 547, 109 xy: 559, 109
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4250,14 +4264,14 @@ icon-loading
index: -1 index: -1
icon-logic icon-logic
rotate: false rotate: false
xy: 559, 109 xy: 571, 109
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-menu icon-menu
rotate: false rotate: false
xy: 571, 109 xy: 659, 229
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4271,14 +4285,14 @@ icon-menu-large
index: -1 index: -1
icon-none icon-none
rotate: false rotate: false
xy: 659, 229 xy: 671, 227
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-pause icon-pause
rotate: false rotate: false
xy: 671, 227 xy: 683, 227
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4306,7 +4320,7 @@ icon-pick
index: -1 index: -1
icon-play icon-play
rotate: false rotate: false
xy: 683, 227 xy: 695, 227
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4320,21 +4334,21 @@ icon-play-2
index: -1 index: -1
icon-players icon-players
rotate: false rotate: false
xy: 695, 227 xy: 651, 217
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-power icon-power
rotate: false rotate: false
xy: 651, 217 xy: 655, 205
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-production icon-production
rotate: false rotate: false
xy: 655, 205 xy: 655, 193
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4425,7 +4439,7 @@ icon-save-map
index: -1 index: -1
icon-settings icon-settings
rotate: false rotate: false
xy: 655, 193 xy: 655, 181
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4446,14 +4460,14 @@ icon-tools
index: -1 index: -1
icon-touch icon-touch
rotate: false rotate: false
xy: 655, 181 xy: 655, 169
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-touchDelete icon-touchDelete
rotate: false rotate: false
xy: 655, 169 xy: 655, 157
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
@ -4495,14 +4509,14 @@ icon-undo
index: -1 index: -1
icon-units icon-units
rotate: false rotate: false
xy: 655, 157 xy: 673, 215
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
icon-weapon icon-weapon
rotate: false rotate: false
xy: 673, 215 xy: 685, 215
size: 10, 10 size: 10, 10
orig: 10, 10 orig: 10, 10
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: 118 KiB

After

Width:  |  Height:  |  Size: 119 KiB

4
core/src/io/anuke/mindustry/content/blocks/Blocks.java
View File

@ -46,7 +46,6 @@ public class Blocks extends BlockList implements ContentList{
}}; }};
deepwater = new Floor("deepwater") {{ deepwater = new Floor("deepwater") {{
placeableOn = false;
liquidColor = Color.valueOf("546bb3"); liquidColor = Color.valueOf("546bb3");
speedMultiplier = 0.2f; speedMultiplier = 0.2f;
variants = 0; variants = 0;
@ -59,7 +58,6 @@ public class Blocks extends BlockList implements ContentList{
}}; }};
water = new Floor("water") {{ water = new Floor("water") {{
placeableOn = false;
liquidColor = Color.valueOf("546bb3"); liquidColor = Color.valueOf("546bb3");
speedMultiplier = 0.5f; speedMultiplier = 0.5f;
variants = 0; variants = 0;
@ -71,7 +69,6 @@ public class Blocks extends BlockList implements ContentList{
}}; }};
lava = new Floor("lava") {{ lava = new Floor("lava") {{
placeableOn = false;
liquidColor = Color.valueOf("ed5334"); liquidColor = Color.valueOf("ed5334");
speedMultiplier = 0.2f; speedMultiplier = 0.2f;
damageTaken = 0.1f; damageTaken = 0.1f;
@ -84,7 +81,6 @@ public class Blocks extends BlockList implements ContentList{
}}; }};
oil = new Floor("oil") {{ oil = new Floor("oil") {{
placeableOn = false;
liquidColor = Color.valueOf("292929"); liquidColor = Color.valueOf("292929");
status = StatusEffects.tarred; status = StatusEffects.tarred;
statusIntensity = 1f; statusIntensity = 1f;

9
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@ -9,10 +9,9 @@ import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Unit;
import io.anuke.mindustry.game.TeamInfo.TeamData; import io.anuke.mindustry.game.TeamInfo.TeamData;
import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.input.InputHandler;
import io.anuke.mindustry.world.meta.BlockBar;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockBar;
import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.function.Callable; import io.anuke.ucore.function.Callable;
@ -91,12 +90,6 @@ public class OverlayRenderer {
Draw.reset(); Draw.reset();
} }
if (Inputs.keyDown("block_info") && target.block().isAccessible()) {
Draw.color(Palette.accent);
Lines.crect(target.drawx(), target.drawy(), target.block().size * tilesize, target.block().size * tilesize);
Draw.color();
}
if (target.entity != null) { if (target.entity != null) {
int[] values = {0, 0}; int[] values = {0, 0};
Tile t = target; Tile t = target;

1
core/src/io/anuke/mindustry/input/DefaultKeybinds.java
View File

@ -33,7 +33,6 @@ public class DefaultKeybinds {
"menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE, "menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE,
"pause", Input.SPACE, "pause", Input.SPACE,
"toggle_menus", Input.C, "toggle_menus", Input.C,
"block_info", Input.CONTROL_LEFT,
"item_withdraw", Input.SHIFT_LEFT, "item_withdraw", Input.SHIFT_LEFT,
new Category("Multiplayer"), new Category("Multiplayer"),
"player_list", Input.TAB, "player_list", Input.TAB,

4
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@ -205,6 +205,10 @@ public class DesktopInput extends InputHandler{
selectY = cursor.y; selectY = cursor.y;
mode = breaking; mode = breaking;
}else if(button == Buttons.MIDDLE){ //middle button = cancel placing }else if(button == Buttons.MIDDLE){ //middle button = cancel placing
if(recipe == null){
player.clearBuilding();
}
recipe = null; recipe = null;
mode = none; mode = none;
} }

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

@ -161,6 +161,8 @@ public class BlocksFragment implements Fragment{
Element e = Core.scene.hit(Graphics.mouse().x, Graphics.mouse().y, true); Element e = Core.scene.hit(Graphics.mouse().x, Graphics.mouse().y, true);
if(e != null && e.isDescendantOf(pane)){ if(e != null && e.isDescendantOf(pane)){
Core.scene.setScrollFocus(pane); Core.scene.setScrollFocus(pane);
}else if(Core.scene.getScrollFocus() == pane){
Core.scene.setScrollFocus(null);
} }
if(lastCategory == cat){ if(lastCategory == cat){

18
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@ -11,6 +11,7 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.type.Recipe;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Inputs; import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
@ -20,6 +21,8 @@ import io.anuke.ucore.scene.actions.Actions;
import io.anuke.ucore.scene.builders.imagebutton; import io.anuke.ucore.scene.builders.imagebutton;
import io.anuke.ucore.scene.builders.label; import io.anuke.ucore.scene.builders.label;
import io.anuke.ucore.scene.builders.table; import io.anuke.ucore.scene.builders.table;
import io.anuke.ucore.scene.event.InputEvent;
import io.anuke.ucore.scene.event.InputListener;
import io.anuke.ucore.scene.event.Touchable; import io.anuke.ucore.scene.event.Touchable;
import io.anuke.ucore.scene.style.TextureRegionDrawable; import io.anuke.ucore.scene.style.TextureRegionDrawable;
import io.anuke.ucore.scene.ui.Image; import io.anuke.ucore.scene.ui.Image;
@ -130,6 +133,7 @@ public class HudFragment implements Fragment{
aright(); aright();
new table("button"){{ new table("button"){{
Table table = get();
margin(5); margin(5);
marginBottom(10); marginBottom(10);
TextureRegionDrawable draw = new TextureRegionDrawable(new TextureRegion()); TextureRegionDrawable draw = new TextureRegionDrawable(new TextureRegion());
@ -143,7 +147,21 @@ public class HudFragment implements Fragment{
} }
}; };
image.setDrawable(draw); image.setDrawable(draw);
table.addListener(new InputListener(){
public boolean scrolled (InputEvent event, float x, float y, int amount) {
renderer.minimap().zoomBy(amount);
return true;
}
});
image.update(() -> { image.update(() -> {
Element e = Core.scene.hit(Graphics.mouse().x, Graphics.mouse().y, true);
if(e != null && e.isDescendantOf(table)){
Core.scene.setScrollFocus(table);
}else if(Core.scene.getScrollFocus() == table){
Core.scene.setScrollFocus(null);
}
if (renderer.minimap().getTexture() == null) { if (renderer.minimap().getTexture() == null) {
draw.getRegion().setRegion(Draw.region("white")); draw.getRegion().setRegion(Draw.region("white"));
} else { } else {

2
core/src/io/anuke/mindustry/world/Block.java
View File

@ -74,6 +74,8 @@ public class Block extends BaseBlock implements UnlockableContent{
public float baseExplosiveness = 0f; public float baseExplosiveness = 0f;
/**whether to display a different shadow per variant*/ /**whether to display a different shadow per variant*/
public boolean varyShadow = false; public boolean varyShadow = false;
/**whether this block can be placed on liquids.*/
public boolean floating = true;
/**number of block variants, 0 to disable*/ /**number of block variants, 0 to disable*/
public int variants = 0; public int variants = 0;
/**stuff that drops when broken*/ /**stuff that drops when broken*/

11
core/src/io/anuke/mindustry/world/Build.java
View File

@ -191,15 +191,20 @@ public class Build {
for (int dx = 0; dx < type.size; dx++) { for (int dx = 0; dx < type.size; dx++) {
for (int dy = 0; dy < type.size; dy++) { for (int dy = 0; dy < type.size; dy++) {
Tile other = world.tile(x + dx + offsetx, y + dy + offsety); Tile other = world.tile(x + dx + offsetx, y + dy + offsety);
if (other == null || (other.block() != Blocks.air && !other.block().alwaysReplace) || !type.canPlaceOn(other) || other.cliffs != 0 || !other.floor().placeableOn) { if (other == null || (other.block() != Blocks.air && !other.block().alwaysReplace)
|| !type.canPlaceOn(other) || other.cliffs != 0 || !other.floor().placeableOn ||
(tile.floor().liquidDrop != null && !type.floating)) {
return false; return false;
} }
} }
} }
return true; return true;
} else { } else {
return (tile.getTeam() == Team.none || tile.getTeam() == team) && tile.floor().placeableOn && tile.cliffs == 0 return (tile.getTeam() == Team.none || tile.getTeam() == team)
&& ((type.canReplace(tile.block()) && !(type == tile.block() && rotation == tile.getRotation() && type.rotate)) || tile.block().alwaysReplace || tile.block() == Blocks.air) && (tile.floor().liquidDrop == null || type.floating)
&& tile.floor().placeableOn && tile.cliffs == 0
&& ((type.canReplace(tile.block())
&& !(type == tile.block() && rotation == tile.getRotation() && type.rotate)) || tile.block().alwaysReplace || tile.block() == Blocks.air)
&& tile.block().isMultiblock() == type.isMultiblock() && type.canPlaceOn(tile); && tile.block().isMultiblock() == type.isMultiblock() && type.canPlaceOn(tile);
} }
} }

9
core/src/io/anuke/mindustry/world/blocks/BreakBlock.java
View File

@ -15,6 +15,7 @@ import io.anuke.mindustry.gen.CallBlocks;
import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.graphics.Layer;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.graphics.Shaders;
import io.anuke.mindustry.input.CursorType;
import io.anuke.mindustry.net.In; import io.anuke.mindustry.net.In;
import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.type.Recipe;
@ -38,14 +39,16 @@ public class BreakBlock extends Block {
size = Integer.parseInt(name.charAt(name.length()-1) + ""); size = Integer.parseInt(name.charAt(name.length()-1) + "");
health = 1; health = 1;
layer = Layer.placement; layer = Layer.placement;
configurable = true;
consumesTap = true; consumesTap = true;
} }
@Override @Override
public void tapped(Tile tile, Player player) { public CursorType getCursor(Tile tile) {
BreakEntity entity = tile.entity(); return CursorType.hand;
}
@Override
public void tapped(Tile tile, Player player) {
player.clearBuilding(); player.clearBuilding();
player.addBuildRequest(new BuildRequest(tile.x, tile.y)); player.addBuildRequest(new BuildRequest(tile.x, tile.y));
} }

7
core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
View File

@ -14,6 +14,7 @@ import io.anuke.mindustry.gen.CallBlocks;
import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.graphics.Layer;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.graphics.Shaders;
import io.anuke.mindustry.input.CursorType;
import io.anuke.mindustry.net.In; import io.anuke.mindustry.net.In;
import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.type.Recipe;
import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.BarType;
@ -37,10 +38,14 @@ public class BuildBlock extends Block {
size = Integer.parseInt(name.charAt(name.length()-1) + ""); size = Integer.parseInt(name.charAt(name.length()-1) + "");
health = 1; health = 1;
layer = Layer.placement; layer = Layer.placement;
configurable = true;
consumesTap = true; consumesTap = true;
} }
@Override
public CursorType getCursor(Tile tile) {
return CursorType.hand;
}
@Override @Override
public void tapped(Tile tile, Player player) { public void tapped(Tile tile, Player player) {
BuildEntity entity = tile.entity(); BuildEntity entity = tile.entity();

2
core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
View File

@ -44,7 +44,7 @@ public class Junction extends Block{
Tile dest = tile.getNearby(direction); Tile dest = tile.getNearby(direction);
if(dest == null || !dest.block().acceptItem(item, dest, tile)){ if(dest == null || !dest.block().acceptItem(item, dest, tile)){
if(buffer.index > 1){ if(buffer.index > 1 && Bits.getRightShort(Bits.getRightInt(buffer.items[1])) != direction){
System.arraycopy(buffer.items, 1, buffer.items, 0, buffer.index - 1); System.arraycopy(buffer.items, 1, buffer.items, 0, buffer.index - 1);
buffer.index --; buffer.index --;
} }

1
core/src/io/anuke/mindustry/world/blocks/production/Pump.java
View File

@ -29,6 +29,7 @@ public class Pump extends LiquidBlock{
liquidFlowFactor = 3f; liquidFlowFactor = 3f;
group = BlockGroup.liquids; group = BlockGroup.liquids;
liquidRegion = "pump-liquid"; liquidRegion = "pump-liquid";
floating = true;
} }
@Override @Override