Various additions

core/assets/sprites/moment.atlas

@@ -6,14 +6,14 @@ filter: Nearest,Nearest
 repeat: none
 block
   rotate: false
-  xy: 105, 23
+  xy: 117, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 115, 23
+  xy: 127, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -27,77 +27,77 @@ circle
   index: -1
 coal1
   rotate: false
-  xy: 125, 23
+  xy: 137, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 135, 23
+  xy: 147, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 145, 23
+  xy: 157, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coaldrill
   rotate: false
-  xy: 155, 23
+  xy: 167, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor
   rotate: false
-  xy: 165, 23
+  xy: 177, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyormove
   rotate: false
-  xy: 175, 23
+  xy: 187, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 core
   rotate: false
-  xy: 185, 23
+  xy: 197, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 195, 23
+  xy: 207, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 205, 23
+  xy: 217, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 215, 23
+  xy: 227, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtblock
   rotate: false
-  xy: 225, 23
+  xy: 237, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -111,7 +111,7 @@ doubleturret
   index: -1
 drill
   rotate: false
-  xy: 235, 23
+  xy: 247, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -125,21 +125,21 @@ flameturret
   index: -1
 furnace
   rotate: false
-  xy: 245, 23
+  xy: 25, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 245, 23
+  xy: 25, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass
   rotate: false
-  xy: 25, 11
+  xy: 25, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -153,70 +153,70 @@ healturret
   index: -1
 icon-coal
   rotate: false
-  xy: 25, 1
+  xy: 35, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-iron
   rotate: false
-  xy: 35, 11
+  xy: 35, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-steel
   rotate: false
-  xy: 35, 1
+  xy: 45, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-stone
   rotate: false
-  xy: 45, 11
+  xy: 45, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron1
   rotate: false
-  xy: 45, 1
+  xy: 55, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron2
   rotate: false
-  xy: 55, 11
+  xy: 55, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron3
   rotate: false
-  xy: 55, 1
+  xy: 65, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill
   rotate: false
-  xy: 65, 11
+  xy: 65, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ironwall
   rotate: false
-  xy: 65, 1
+  xy: 75, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laser
   rotate: false
-  xy: 135, 9
+  xy: 115, 7
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
@@ -236,121 +236,135 @@ machineturret
   offset: 0, 0
   index: -1
 mech1
-  rotate: false
-  xy: 75, 11
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-player
   rotate: false
   xy: 75, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-router
-  rotate: false
-  xy: 85, 11
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-shadow
+megahealturret
   rotate: false
   xy: 57, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
-shotgunturret
+player
   rotate: false
-  xy: 69, 21
-  size: 10, 10
-  orig: 10, 10
+  xy: 85, 11
+  size: 8, 8
+  orig: 8, 8
   offset: 0, 0
   index: -1
-sniperturret
-  rotate: false
-  xy: 81, 21
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-steelconveyor
+router
   rotate: false
   xy: 85, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-steelconveyormove
+shadow
   rotate: false
-  xy: 95, 11
-  size: 8, 8
-  orig: 8, 8
+  xy: 69, 21
+  size: 10, 10
+  orig: 10, 10
   offset: 0, 0
   index: -1
-stone
+shotgunturret
   rotate: false
-  xy: 95, 1
-  size: 8, 8
-  orig: 8, 8
+  xy: 81, 21
+  size: 10, 10
+  orig: 10, 10
   offset: 0, 0
   index: -1
-stone1
-  rotate: false
-  xy: 105, 13
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-stone2
-  rotate: false
-  xy: 105, 3
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-stone3
-  rotate: false
-  xy: 115, 13
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-stoneblock
-  rotate: false
-  xy: 115, 3
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-stonedrill
-  rotate: false
-  xy: 125, 13
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-stonedrillhead
-  rotate: false
-  xy: 125, 13
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-stonewall
-  rotate: false
-  xy: 125, 3
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-turret
+sniperturret
   rotate: false
   xy: 93, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
+steelconveyor
+  rotate: false
+  xy: 95, 11
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+steelconveyormove
+  rotate: false
+  xy: 95, 1
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+steelwall
+  rotate: false
+  xy: 105, 11
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stone
+  rotate: false
+  xy: 105, 1
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stone1
+  rotate: false
+  xy: 118, 13
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stone2
+  rotate: false
+  xy: 128, 13
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stone3
+  rotate: false
+  xy: 138, 13
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stoneblock
+  rotate: false
+  xy: 148, 13
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stonedrill
+  rotate: false
+  xy: 158, 13
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stonedrillhead
+  rotate: false
+  xy: 158, 13
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+stonewall
+  rotate: false
+  xy: 168, 13
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+turret
+  rotate: false
+  xy: 105, 21
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1

core/assets/ui/uiskin.atlas

@@ -13,7 +13,7 @@ blank
   index: -1
 border
   rotate: false
-  xy: 651, 72
+  xy: 677, 72
   size: 12, 12
   split: 4, 4, 4, 4
   orig: 12, 12
@@ -69,8 +69,7 @@ button
   rotate: false
   xy: 823, 86
   size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
+  split: 10, 10, 8, 8
   orig: 24, 40
   offset: 0, 0
   index: -1
@@ -105,8 +104,7 @@ button-down
   rotate: false
   xy: 641, 86
   size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
+  split: 10, 10, 8, 8
   orig: 24, 40
   offset: 0, 0
   index: -1
@@ -132,8 +130,7 @@ button-over
   rotate: false
   xy: 719, 86
   size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
+  split: 10, 10, 8, 8
   orig: 24, 40
   offset: 0, 0
   index: -1
@@ -146,6 +143,14 @@ button-red
   orig: 24, 40
   offset: 0, 0
   index: -1
+button-select
+  rotate: false
+  xy: 563, 60
+  size: 24, 24
+  split: 4, 4, 4, 4
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
 button-window-bg
   rotate: false
   xy: 771, 86
@@ -193,6 +198,13 @@ check-on
   orig: 28, 28
   offset: 0, 0
   index: -1
+clear
+  rotate: false
+  xy: 691, 74
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
 color-picker-bar-selector
   rotate: false
   xy: 999, 98
@@ -202,7 +214,7 @@ color-picker-bar-selector
   index: -1
 color-picker-cross
   rotate: false
-  xy: 665, 74
+  xy: 703, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -230,14 +242,14 @@ cursor
   index: -1
 cursor-normal
   rotate: false
-  xy: 677, 74
+  xy: 715, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 default-pane
   rotate: false
-  xy: 130, 21
+  xy: 186, 2
   size: 5, 3
   split: 1, 1, 1, 1
   orig: 5, 3
@@ -261,7 +273,7 @@ default-select
   index: -1
 default-select-selection
   rotate: false
-  xy: 528, 80
+  xy: 180, 14
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -269,42 +281,42 @@ default-select-selection
   index: -1
 grey
   rotate: false
-  xy: 563, 62
+  xy: 589, 62
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 menu-bg
   rotate: false
-  xy: 563, 62
+  xy: 589, 62
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 689, 74
+  xy: 727, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 701, 74
+  xy: 739, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 713, 74
+  xy: 751, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 725, 74
+  xy: 763, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -332,35 +344,49 @@ icon-close-over
   index: -1
 icon-copy
   rotate: false
-  xy: 737, 74
+  xy: 775, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 749, 74
+  xy: 787, 74
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-defense
+  rotate: false
+  xy: 799, 74
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-distribution
+  rotate: false
+  xy: 811, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 761, 74
+  xy: 823, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dots-down
   rotate: false
-  xy: 773, 74
+  xy: 835, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-down
   rotate: false
-  xy: 785, 74
+  xy: 847, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -374,7 +400,7 @@ icon-drive
   index: -1
 icon-eraser
   rotate: false
-  xy: 797, 74
+  xy: 859, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -402,21 +428,21 @@ icon-file-pdf
   index: -1
 icon-file-text
   rotate: false
-  xy: 809, 74
+  xy: 871, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 821, 74
+  xy: 219, 42
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 833, 74
+  xy: 231, 42
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -430,7 +456,7 @@ icon-folder-new
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 845, 74
+  xy: 243, 42
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -444,14 +470,14 @@ icon-folder-star
   index: -1
 icon-grid
   rotate: false
-  xy: 857, 74
+  xy: 255, 42
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 869, 74
+  xy: 923, 86
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -465,84 +491,91 @@ icon-list-settings
   index: -1
 icon-load-1
   rotate: false
-  xy: 219, 42
+  xy: 935, 86
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load-2
   rotate: false
-  xy: 231, 42
+  xy: 947, 86
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load-3
   rotate: false
-  xy: 243, 42
+  xy: 959, 86
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-lock
   rotate: false
-  xy: 255, 42
+  xy: 971, 86
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-lock-open
   rotate: false
-  xy: 923, 86
+  xy: 983, 86
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-minus
   rotate: false
-  xy: 935, 86
+  xy: 995, 86
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-open
   rotate: false
-  xy: 947, 86
+  xy: 267, 42
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-open-gray
   rotate: false
-  xy: 959, 86
+  xy: 279, 44
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 971, 86
+  xy: 291, 44
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 983, 86
+  xy: 303, 44
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-plus
   rotate: false
-  xy: 995, 86
+  xy: 315, 44
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-production
+  rotate: false
+  xy: 327, 44
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 267, 42
+  xy: 178, 31
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -556,7 +589,7 @@ icon-refresh
   index: -1
 icon-rename
   rotate: false
-  xy: 279, 44
+  xy: 190, 31
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -577,49 +610,49 @@ icon-star-outline
   index: -1
 icon-tap
   rotate: false
-  xy: 291, 44
+  xy: 168, 14
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 303, 44
+  xy: 174, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 315, 44
+  xy: 180, 19
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-up
   rotate: false
-  xy: 327, 44
+  xy: 192, 19
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 178, 31
+  xy: 186, 7
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 list-selection
   rotate: false
-  xy: 605, 65
+  xy: 130, 23
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 vis-blue
   rotate: false
-  xy: 605, 65
+  xy: 130, 23
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -717,14 +750,14 @@ scroll-knob-vertical
   index: -1
 select-box-list-bg
   rotate: false
-  xy: 881, 83
+  xy: 631, 65
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 window-bg
   rotate: false
-  xy: 881, 83
+  xy: 631, 65
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -745,7 +778,7 @@ select-up
   index: -1
 selection
   rotate: false
-  xy: 205, 43
+  xy: 883, 83
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -785,13 +818,6 @@ slider-knob
   orig: 22, 44
   offset: 0, 0
   index: -1
-slider-knob-over
-  rotate: false
-  xy: 58, 8
-  size: 22, 44
-  orig: 22, 44
-  offset: 0, 0
-  index: -1
 slider-knob-disabled
   rotate: false
   xy: 82, 16
@@ -806,6 +832,13 @@ slider-knob-down
   orig: 22, 44
   offset: 0, 0
   index: -1
+slider-knob-over
+  rotate: false
+  xy: 106, 16
+  size: 22, 44
+  orig: 22, 44
+  offset: 0, 0
+  index: -1
 slider-vertical
   rotate: false
   xy: 70, 2
@@ -873,7 +906,7 @@ vis-check-over
   index: -1
 tooltip-bg
   rotate: false
-  xy: 528, 75
+  xy: 193, 2
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -888,21 +921,21 @@ touchpad-knob
   index: -1
 tree-minus
   rotate: false
-  xy: 190, 31
+  xy: 198, 7
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 tree-plus
   rotate: false
-  xy: 605, 68
+  xy: 631, 68
   size: 12, 16
   orig: 12, 16
   offset: 0, 0
   index: -1
 tree-selection
   rotate: false
-  xy: 528, 70
+  xy: 528, 80
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -917,14 +950,14 @@ vis-check-down
   index: -1
 vis-check-tick
   rotate: false
-  xy: 563, 65
+  xy: 589, 65
   size: 19, 19
   orig: 19, 19
   offset: 0, 0
   index: -1
 vis-check-tick-disabled
   rotate: false
-  xy: 584, 65
+  xy: 610, 65
   size: 19, 19
   orig: 19, 19
   offset: 0, 0
@@ -945,14 +978,14 @@ vis-radio-over
   index: -1
 vis-radio-tick
   rotate: false
-  xy: 619, 70
+  xy: 645, 70
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick-disabled
   rotate: false
-  xy: 635, 70
+  xy: 661, 70
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -966,7 +999,7 @@ vis-red
   index: -1
 white
   rotate: false
-  xy: 528, 65
+  xy: 198, 2
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -975,13 +1008,13 @@ window
   rotate: false
   xy: 401, 65
   size: 27, 61
-  split: 8, 8, 51, 4
+  split: 8, 8, 47, 8
   orig: 27, 61
   offset: 0, 0
   index: -1
 window-border-bg
   rotate: false
-  xy: 528, 60
+  xy: 528, 75
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3

core/assets/ui/uiskin.json

@@ -35,7 +35,8 @@ io.anuke.ucore.scene.ui.TextButton$TextButtonStyle: {
 io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: {
 	default: {down: button-down, up: button },
 	blue: {down: button-blue-down, up: button-blue },
-	toggle: {checked: button-down, down: button-down, up: button }
+	toggle: {checked: button-down, down: button-down, up: button },
+	select: {checked: button-select, down: button-select, up: clear },
 	gray: {down: button-down, up: button-gray, over: button-gray-over, disabled: button},
 	close-window: {up: button, imageUp: icon-close, imageOver: icon-close-over, imageDown: icon-close-down, disabled: button }
 },