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

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 119 KiB