diff --git a/build.gradle b/build.gradle index 9a26b7ceda..4659e97573 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { gdxVersion = '1.9.8' roboVMVersion = '2.3.0' aiVersion = '1.8.1' - uCoreVersion = '2a244b3d35' + uCoreVersion = '6d1ef60c46' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets-raw/sprites/ui/icons/icon-generated.png b/core/assets-raw/sprites/ui/icons/icon-generated.png new file mode 100644 index 0000000000..15a0d6051e Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-generated.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-map.png b/core/assets-raw/sprites/ui/icons/icon-map.png new file mode 100644 index 0000000000..a3aa72fe12 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-map.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index d7c38d0691..118e68a91f 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -167,6 +167,7 @@ text.unknown=Unknown text.custom=Custom text.builtin=Built-In text.map.delete.confirm=Are you sure you want to delete this map? This action cannot be undone! +text.map.random=[accent]Random Map text.editor.slope=\\ text.editor.openin=Open In Editor text.editor.oregen=Ore Generation diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d1af0512ac..fce0412146 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,875 +13,875 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 393, 63 + xy: 895, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 393, 53 + xy: 905, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 393, 43 + xy: 905, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 948, 281 + xy: 526, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 958, 283 + xy: 526, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 968, 283 + xy: 526, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 warp-gate-top rotate: false - xy: 253, 113 + xy: 309, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 269, 139 + xy: 575, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 295, 139 + xy: 575, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 321, 141 + xy: 601, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 347, 141 + xy: 601, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 carbide-drill rotate: false - xy: 393, 33 + xy: 915, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 393, 23 + xy: 915, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 393, 13 + xy: 925, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 967, 369 + xy: 697, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 985, 387 + xy: 759, 380 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 967, 351 + xy: 777, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 583, 206 + xy: 309, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 609, 232 + xy: 335, 101 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 609, 206 + xy: 361, 101 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 635, 232 + xy: 387, 101 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plasma-drill rotate: false - xy: 119, 60 + xy: 868, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rim rotate: false - xy: 703, 386 + xy: 902, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rotator rotate: false - xy: 703, 352 + xy: 936, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-top rotate: false - xy: 757, 445 + xy: 970, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tungsten-drill rotate: false - xy: 802, 221 + xy: 576, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 812, 231 + xy: 576, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 822, 241 + xy: 576, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 305, 11 + xy: 957, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 269, 5 + xy: 975, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 251, 2 + xy: 1007, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 705, 334 + xy: 975, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 243, 165 + xy: 101, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 243, 165 + xy: 101, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 161, 1 + xy: 755, 398 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 171, 1 + xy: 765, 398 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 171, 1 + xy: 765, 398 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 251, 66 + xy: 671, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 251, 56 + xy: 416, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 647, 178 + xy: 993, 381 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 403, 87 + xy: 925, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 413, 87 + xy: 935, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 423, 87 + xy: 935, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 403, 57 + xy: 967, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 413, 67 + xy: 965, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 832, 311 + xy: 486, 147 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 413, 37 + xy: 825, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 403, 17 + xy: 835, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 413, 27 + xy: 845, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 413, 17 + xy: 855, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 413, 47 + xy: 805, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 403, 27 + xy: 815, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 902, 315 + xy: 620, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 423, 47 + xy: 885, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 423, 37 + xy: 895, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 423, 27 + xy: 905, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 423, 17 + xy: 915, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 423, 67 + xy: 865, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 423, 57 + xy: 875, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 930, 315 + xy: 648, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 413, 7 + xy: 925, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 423, 7 + xy: 935, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 423, 7 + xy: 935, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 431, 77 + xy: 945, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 431, 77 + xy: 945, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 846, 301 + xy: 676, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 958, 293 + xy: 466, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 968, 293 + xy: 416, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 978, 293 + xy: 159, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 712, 256 + xy: 516, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 722, 266 + xy: 516, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 742, 276 + xy: 756, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 712, 246 + xy: 766, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 722, 256 + xy: 776, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 930, 301 + xy: 479, 73 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 958, 303 + xy: 701, 294 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 697, 179 + xy: 546, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 707, 171 + xy: 545, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 782, 275 + xy: 545, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 782, 265 + xy: 549, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 782, 255 + xy: 551, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 709, 191 + xy: 546, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 707, 181 + xy: 545, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 986, 303 + xy: 706, 280 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 782, 225 + xy: 561, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 792, 261 + xy: 555, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 802, 271 + xy: 555, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 792, 251 + xy: 553, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 802, 261 + xy: 573, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 782, 215 + xy: 559, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 792, 271 + xy: 555, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 454, 156 + xy: 720, 280 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 468, 156 + xy: 719, 266 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 802, 251 + xy: 565, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 812, 261 + xy: 565, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 822, 271 + xy: 565, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 792, 231 + xy: 563, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 812, 271 + xy: 571, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 792, 241 + xy: 569, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 688, 265 + xy: 719, 252 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 802, 241 + xy: 556, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 812, 251 + xy: 556, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 822, 261 + xy: 556, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 832, 271 + xy: 556, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 792, 221 + xy: 583, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 802, 231 + xy: 566, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 822, 251 + xy: 566, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 832, 261 + xy: 566, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 842, 271 + xy: 573, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 832, 251 + xy: 576, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 842, 261 + xy: 575, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 852, 271 + xy: 575, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 812, 221 + xy: 575, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 697, 211 + xy: 717, 224 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 307, 1 + xy: 446, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 317, 1 + xy: 456, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 317, 1 + xy: 456, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 383, 51 + xy: 865, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 383, 51 + xy: 865, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 383, 41 + xy: 875, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 383, 31 + xy: 875, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 411, 77 + xy: 945, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 403, 67 + xy: 955, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 895, 365 + xy: 773, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 763, 367 + xy: 547, 179 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -895,112 +895,112 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 403, 37 + xy: 795, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor-shadow rotate: false - xy: 398, 167 + xy: 655, 301 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 978, 283 + xy: 536, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 988, 283 + xy: 536, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 367, 81 + xy: 345, 51 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 1003, 337 + xy: 921, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 279, 65 + xy: 939, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 297, 65 + xy: 957, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 261, 59 + xy: 777, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 201, 112 + xy: 439, 101 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 201, 112 + xy: 439, 101 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 379, 81 + xy: 381, 51 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 179, 72 + xy: 335, 81 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-3 rotate: false - xy: 426, 168 + xy: 586, 282 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 shadow-4 rotate: false - xy: 721, 454 + xy: 160, 136 size: 34, 34 orig: 34, 34 offset: 0, 0 index: -1 shadow-5 rotate: false - xy: 131, 128 + xy: 627, 329 size: 42, 42 orig: 42, 42 offset: 0, 0 @@ -1014,168 +1014,168 @@ shadow-6 index: -1 shadow-round-1 rotate: false - xy: 391, 93 + xy: 393, 51 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-2 rotate: false - xy: 199, 72 + xy: 355, 81 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-rounded-2 rotate: false - xy: 219, 72 + xy: 375, 81 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 383, 21 + xy: 885, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 383, 11 + xy: 885, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 387, 1 + xy: 895, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 401, 77 + xy: 945, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 421, 77 + xy: 955, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 712, 276 + xy: 506, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 722, 276 + xy: 496, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 712, 266 + xy: 506, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 732, 276 + xy: 513, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 763, 341 + xy: 700, 344 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 789, 341 + xy: 726, 344 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 815, 393 + xy: 231, 97 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 938, 291 + xy: 539, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 948, 291 + xy: 541, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 938, 281 + xy: 543, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-bottom rotate: false - xy: 998, 283 + xy: 536, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top rotate: false - xy: 687, 187 + xy: 526, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery rotate: false - xy: 165, 118 + xy: 91, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-battery rotate: false - xy: 165, 118 + xy: 91, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery-large rotate: false - xy: 243, 139 + xy: 598, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-battery-large rotate: false - xy: 243, 139 + xy: 598, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1224,49 +1224,49 @@ fusion-reactor-plasma-2 index: -1 fusion-reactor-plasma-3 rotate: false - xy: 489, 209 + xy: 766, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-top rotate: false - xy: 523, 209 + xy: 800, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 nuclear-reactor-center rotate: false - xy: 815, 341 + xy: 257, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclear-reactor-lights rotate: false - xy: 583, 232 + xy: 283, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 697, 169 + xy: 546, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alloy-fuser rotate: false - xy: 737, 352 + xy: 572, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-alloy-fuser rotate: false - xy: 737, 352 + xy: 572, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1301,238 +1301,238 @@ block-icon-arc-smelter index: -1 biomattercompressor rotate: false - xy: 1007, 459 + xy: 231, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 1007, 441 + xy: 283, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 165, 94 + xy: 415, 83 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 661, 241 + xy: 433, 83 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 661, 223 + xy: 623, 283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 661, 205 + xy: 641, 283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 179, 54 + xy: 633, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 179, 54 + xy: 633, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 913, 401 + xy: 773, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 913, 383 + xy: 809, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 931, 401 + xy: 791, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 895, 347 + xy: 827, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 913, 365 + xy: 809, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 931, 383 + xy: 845, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 913, 347 + xy: 827, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 828, 291 + xy: 456, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 985, 369 + xy: 795, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 967, 333 + xy: 813, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 985, 351 + xy: 831, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 985, 333 + xy: 849, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 1003, 391 + xy: 867, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 1003, 373 + xy: 885, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 1003, 373 + xy: 885, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 687, 177 + xy: 536, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 687, 167 + xy: 543, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 782, 245 + xy: 553, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core-open rotate: false - xy: 763, 393 + xy: 506, 161 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-1 rotate: false - xy: 287, 1 + xy: 426, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 297, 1 + xy: 436, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 197, 54 + xy: 659, 283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 215, 54 + xy: 651, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 373, 141 + xy: 250, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 399, 141 + xy: 276, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-4 rotate: false - xy: 175, 138 + xy: 196, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1546,1029 +1546,1029 @@ block-4-top index: -1 arc rotate: false - xy: 119, 95 + xy: 751, 331 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 131, 1 + xy: 562, 145 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cyclone rotate: false - xy: 789, 393 + xy: 573, 178 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mass-driver-turret rotate: false - xy: 789, 393 + xy: 573, 178 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 413, 57 + xy: 977, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 789, 367 + xy: 599, 178 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 789, 367 + xy: 599, 178 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 321, 129 + xy: 717, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter rotate: false - xy: 321, 129 + xy: 717, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 333, 129 + xy: 734, 282 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer rotate: false - xy: 985, 405 + xy: 699, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 967, 387 + xy: 699, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 meltdown rotate: false - xy: 131, 94 + xy: 834, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 635, 206 + xy: 413, 101 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 175, 112 + xy: 426, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 251, 38 + xy: 795, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 251, 20 + xy: 813, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 269, 41 + xy: 831, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 269, 23 + xy: 849, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scorch rotate: false - xy: 379, 93 + xy: 357, 51 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 391, 105 + xy: 369, 51 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 287, 47 + xy: 867, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 723, 334 + xy: 761, 346 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 741, 334 + xy: 779, 355 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top rotate: false - xy: 129, 42 + xy: 863, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top-open rotate: false - xy: 106, 24 + xy: 899, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory-top rotate: false - xy: 124, 24 + xy: 881, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory-top-open rotate: false - xy: 147, 39 + xy: 917, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mech-factory rotate: false - xy: 815, 367 + xy: 257, 109 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dart-ship-factory-open rotate: false - xy: 931, 365 + xy: 863, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory-open rotate: false - xy: 931, 347 + xy: 845, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory-open rotate: false - xy: 967, 405 + xy: 699, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 1003, 355 + xy: 903, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 697, 189 + xy: 546, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ship-factory rotate: false - xy: 227, 112 + xy: 283, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 111, 42 + xy: 881, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 403, 47 + xy: 965, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam rotate: false - xy: 486, 208 + xy: 1022, 443 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 beam-end rotate: false - xy: 234, 175 + xy: 466, 202 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blank rotate: false - xy: 234, 172 + xy: 572, 253 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 bullet rotate: false - xy: 757, 479 + xy: 692, 429 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 572, 247 + xy: 562, 168 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 847, 439 + xy: 230, 166 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 clear rotate: false - xy: 106, 42 + xy: 486, 219 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 403, 8 + xy: 716, 143 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 860, 315 + xy: 514, 147 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 laser rotate: false - xy: 1003, 409 + xy: 157, 95 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 299, 119 + xy: 302, 121 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 183, 92 + xy: 71, 4 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 minelaser rotate: false - xy: 1006, 409 + xy: 771, 316 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 203, 92 + xy: 680, 359 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 missile rotate: false - xy: 131, 13 + xy: 562, 157 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 694, 329 + xy: 695, 283 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 650, 258 + xy: 614, 283 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 694, 352 + xy: 671, 346 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 679, 252 + xy: 538, 186 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 679, 225 + xy: 752, 343 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 97, 18 + xy: 624, 256 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 shell rotate: false - xy: 1014, 310 + xy: 220, 93 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1014, 299 + xy: 220, 82 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 782, 235 + xy: 563, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 239, 78 + xy: 542, 144 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 812, 241 + xy: 566, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 659, 259 + xy: 395, 81 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 466, 202 + xy: 566, 290 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 243, 94 + xy: 451, 83 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-drill rotate: false - xy: 586, 284 + xy: 322, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-bridge-conduit rotate: false - xy: 319, 119 + xy: 466, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 319, 119 + xy: 466, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 329, 119 + xy: 493, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 329, 119 + xy: 493, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 331, 71 + xy: 746, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 403, 107 + xy: 746, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 403, 107 + xy: 746, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall-large rotate: false - xy: 261, 95 + xy: 1004, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 carbide-wall-large rotate: false - xy: 261, 95 + xy: 1004, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 279, 101 + xy: 335, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 279, 101 + xy: 335, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 391, 83 + xy: 756, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 391, 83 + xy: 756, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 341, 71 + xy: 756, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 403, 97 + xy: 766, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 403, 97 + xy: 766, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-core rotate: false - xy: 612, 284 + xy: 348, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core rotate: false - xy: 612, 284 + xy: 348, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-cryofluidmixer rotate: false - xy: 297, 101 + xy: 353, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 679, 207 + xy: 371, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cyclone rotate: false - xy: 314, 167 + xy: 627, 301 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 block-icon-dart-ship-factory rotate: false - xy: 847, 419 + xy: 389, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-factory rotate: false - xy: 847, 419 + xy: 389, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 413, 107 + xy: 766, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 413, 107 + xy: 766, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 351, 71 + xy: 157, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 351, 71 + xy: 157, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 351, 71 + xy: 157, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 351, 71 + xy: 157, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall-large rotate: false - xy: 865, 419 + xy: 633, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 865, 419 + xy: 633, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 865, 419 + xy: 633, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 865, 419 + xy: 633, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-delta-mech-factory rotate: false - xy: 883, 419 + xy: 651, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory rotate: false - xy: 883, 419 + xy: 651, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 413, 97 + xy: 157, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 413, 97 + xy: 157, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 423, 107 + xy: 167, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 423, 107 + xy: 167, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 901, 419 + xy: 627, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 901, 419 + xy: 627, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-drone-factory rotate: false - xy: 919, 419 + xy: 627, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-drop-point rotate: false - xy: 361, 71 + xy: 177, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 361, 71 + xy: 177, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 693, 340 + xy: 465, 101 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-fabricator-factory rotate: false - xy: 937, 419 + xy: 645, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-fuse rotate: false - xy: 342, 167 + xy: 703, 370 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 block-icon-fusion-reactor rotate: false - xy: 721, 420 + xy: 95, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-grass rotate: false - xy: 423, 97 + xy: 167, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 423, 97 + xy: 167, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 688, 225 + xy: 477, 101 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 371, 71 + xy: 177, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 371, 71 + xy: 177, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 381, 71 + xy: 522, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 381, 71 + xy: 522, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 391, 73 + xy: 532, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 391, 73 + xy: 532, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 323, 61 + xy: 231, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 323, 61 + xy: 231, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 323, 51 + xy: 241, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 323, 51 + xy: 241, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-javelin-ship-factory rotate: false - xy: 955, 423 + xy: 645, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory rotate: false - xy: 955, 423 + xy: 645, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 333, 61 + xy: 776, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 333, 61 + xy: 776, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 566, 290 + xy: 71, 24 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 block-icon-laser-drill rotate: false - xy: 973, 423 + xy: 669, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 323, 41 + xy: 776, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 323, 41 + xy: 776, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 333, 51 + xy: 542, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 333, 51 + xy: 542, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 343, 61 + xy: 552, 137 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-tank rotate: false - xy: 638, 285 + xy: 374, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 323, 31 + xy: 562, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 323, 31 + xy: 562, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mass-driver rotate: false - xy: 664, 279 + xy: 400, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 664, 279 + xy: 400, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-top rotate: false - xy: 664, 279 + xy: 400, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-mechanical-pump rotate: false - xy: 333, 41 + xy: 552, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 333, 41 + xy: 552, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2582,1659 +2582,1659 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 343, 51 + xy: 562, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 343, 51 + xy: 562, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 353, 61 + xy: 167, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 353, 61 + xy: 167, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-multiplexer rotate: false - xy: 991, 423 + xy: 669, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 991, 423 + xy: 669, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-nuclear-reactor rotate: false - xy: 454, 170 + xy: 91, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclear-reactor rotate: false - xy: 454, 170 + xy: 91, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-oil rotate: false - xy: 323, 21 + xy: 177, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 323, 21 + xy: 177, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-oil-extractor rotate: false - xy: 572, 258 + xy: 117, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-oilrefinery rotate: false - xy: 323, 11 + xy: 797, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 323, 11 + xy: 797, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-overflow-gate rotate: false - xy: 327, 1 + xy: 807, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 327, 1 + xy: 807, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 343, 41 + xy: 817, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 343, 41 + xy: 817, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 353, 51 + xy: 827, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 353, 51 + xy: 827, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 841, 401 + xy: 663, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-plasma-drill rotate: false - xy: 209, 138 + xy: 197, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-plastanium-compressor rotate: false - xy: 841, 383 + xy: 663, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 841, 383 + xy: 663, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 363, 61 + xy: 837, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 363, 61 + xy: 837, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 859, 401 + xy: 677, 283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 859, 401 + xy: 677, 283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 333, 31 + xy: 847, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 333, 31 + xy: 847, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 353, 41 + xy: 857, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 353, 41 + xy: 857, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 363, 51 + xy: 867, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 373, 61 + xy: 877, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 841, 365 + xy: 407, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 841, 365 + xy: 407, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 859, 383 + xy: 425, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory rotate: false - xy: 859, 383 + xy: 425, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory rotate: false - xy: 859, 383 + xy: 425, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 859, 383 + xy: 425, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 333, 21 + xy: 887, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 333, 21 + xy: 887, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupply-point rotate: false - xy: 333, 11 + xy: 897, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 333, 11 + xy: 897, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ripple rotate: false - xy: 370, 167 + xy: 731, 370 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 block-icon-rock rotate: false - xy: 337, 1 + xy: 907, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 337, 1 + xy: 907, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 877, 401 + xy: 443, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 877, 401 + xy: 443, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 363, 41 + xy: 917, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 363, 41 + xy: 917, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 373, 51 + xy: 927, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 373, 51 + xy: 927, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 755, 425 + xy: 1004, 457 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 343, 31 + xy: 937, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 343, 31 + xy: 937, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 700, 225 + xy: 489, 101 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 373, 41 + xy: 947, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 373, 41 + xy: 947, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 343, 21 + xy: 957, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 343, 21 + xy: 957, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 841, 347 + xy: 687, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 841, 347 + xy: 687, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 343, 11 + xy: 795, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 343, 11 + xy: 795, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 347, 1 + xy: 795, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 347, 1 + xy: 795, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 353, 31 + xy: 805, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 353, 31 + xy: 805, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel-large rotate: false - xy: 598, 258 + xy: 143, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 598, 258 + xy: 143, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-solidifer rotate: false - xy: 353, 21 + xy: 805, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 353, 21 + xy: 805, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sortedunloader rotate: false - xy: 353, 11 + xy: 815, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 353, 11 + xy: 815, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 357, 1 + xy: 815, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 357, 1 + xy: 815, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 363, 31 + xy: 825, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 363, 31 + xy: 825, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-spectre rotate: false - xy: 627, 337 + xy: 95, 71 size: 34, 34 orig: 34, 34 offset: 0, 0 index: -1 block-icon-splitter rotate: false - xy: 363, 21 + xy: 825, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 363, 21 + xy: 825, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 363, 11 + xy: 835, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 363, 11 + xy: 835, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 827, 425 + xy: 230, 141 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 859, 365 + xy: 687, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 859, 365 + xy: 687, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 877, 383 + xy: 681, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 877, 383 + xy: 681, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 367, 1 + xy: 835, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 367, 1 + xy: 835, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 895, 401 + xy: 681, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 895, 401 + xy: 681, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 373, 31 + xy: 845, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 373, 31 + xy: 845, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 373, 21 + xy: 845, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 373, 11 + xy: 855, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 373, 11 + xy: 855, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall-large rotate: false - xy: 859, 347 + xy: 461, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tungsten-wall-large rotate: false - xy: 859, 347 + xy: 461, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 877, 365 + xy: 755, 426 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 877, 365 + xy: 755, 426 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 377, 1 + xy: 855, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 377, 1 + xy: 855, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-vault rotate: false - xy: 624, 258 + xy: 486, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault rotate: false - xy: 624, 258 + xy: 486, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-warp-gate rotate: false - xy: 775, 419 + xy: 512, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 warp-gate rotate: false - xy: 775, 419 + xy: 512, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-water rotate: false - xy: 383, 61 + xy: 865, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 383, 61 + xy: 865, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 895, 383 + xy: 755, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 279, 119 + xy: 302, 141 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 702, 271 + xy: 476, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 702, 261 + xy: 486, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 702, 251 + xy: 486, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 702, 241 + xy: 496, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 860, 301 + xy: 690, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 874, 301 + xy: 704, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 888, 301 + xy: 528, 144 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 902, 301 + xy: 479, 113 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 902, 301 + xy: 479, 113 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 916, 301 + xy: 483, 87 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 916, 301 + xy: 483, 87 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 732, 266 + xy: 493, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 722, 246 + xy: 493, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 732, 256 + xy: 503, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 742, 266 + xy: 503, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 732, 246 + xy: 501, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 742, 256 + xy: 251, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 742, 246 + xy: 261, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 712, 236 + xy: 271, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 712, 226 + xy: 572, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 722, 236 + xy: 572, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 722, 226 + xy: 582, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 732, 236 + xy: 582, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 732, 226 + xy: 592, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 742, 236 + xy: 592, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 742, 226 + xy: 602, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 752, 269 + xy: 975, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 752, 259 + xy: 975, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 762, 269 + xy: 975, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 752, 249 + xy: 728, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 762, 259 + xy: 734, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 752, 239 + xy: 733, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 762, 249 + xy: 733, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 752, 229 + xy: 744, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 762, 239 + xy: 743, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 762, 229 + xy: 743, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 752, 219 + xy: 741, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 762, 219 + xy: 741, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 679, 197 + xy: 741, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 677, 187 + xy: 739, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 677, 177 + xy: 739, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 677, 167 + xy: 739, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 709, 201 + xy: 739, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 433, 107 + xy: 741, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 433, 97 + xy: 741, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 433, 87 + xy: 741, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 441, 77 + xy: 426, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 443, 67 + xy: 436, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 443, 57 + xy: 446, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 443, 47 + xy: 456, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 443, 37 + xy: 466, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 443, 27 + xy: 476, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 443, 17 + xy: 486, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 443, 7 + xy: 496, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 774, 285 + xy: 506, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 772, 275 + xy: 516, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 772, 265 + xy: 511, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 772, 255 + xy: 513, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 772, 245 + xy: 509, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 772, 235 + xy: 751, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 772, 225 + xy: 751, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 772, 215 + xy: 751, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 798, 281 + xy: 749, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 808, 281 + xy: 749, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 818, 281 + xy: 749, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 828, 281 + xy: 749, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 838, 291 + xy: 751, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 838, 281 + xy: 751, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 848, 291 + xy: 751, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 848, 281 + xy: 521, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 858, 291 + xy: 519, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass1 rotate: false - xy: 858, 281 + xy: 523, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass2 rotate: false - xy: 868, 291 + xy: 515, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass3 rotate: false - xy: 868, 281 + xy: 515, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice1 rotate: false - xy: 878, 291 + xy: 515, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice2 rotate: false - xy: 878, 281 + xy: 525, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice3 rotate: false - xy: 888, 291 + xy: 525, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand1 rotate: false - xy: 888, 281 + xy: 525, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand2 rotate: false - xy: 898, 291 + xy: 529, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand3 rotate: false - xy: 898, 281 + xy: 531, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow1 rotate: false - xy: 908, 291 + xy: 533, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow2 rotate: false - xy: 908, 281 + xy: 523, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow3 rotate: false - xy: 918, 291 + xy: 535, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone1 rotate: false - xy: 918, 281 + xy: 535, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone2 rotate: false - xy: 928, 291 + xy: 535, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone3 rotate: false - xy: 928, 281 + xy: 533, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-scout rotate: false - xy: 688, 251 + xy: 729, 294 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 287, 11 + xy: 939, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-vtol rotate: false - xy: 688, 237 + xy: 717, 238 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 688, 237 + xy: 717, 238 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 433, 57 + xy: 965, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 433, 47 + xy: 718, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 433, 37 + xy: 505, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 433, 27 + xy: 505, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 433, 17 + xy: 505, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 433, 7 + xy: 503, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 788, 299 + xy: 731, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 798, 301 + xy: 731, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 808, 301 + xy: 731, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 818, 301 + xy: 729, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 828, 301 + xy: 729, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 788, 289 + xy: 729, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 798, 291 + xy: 426, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 808, 291 + xy: 436, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 818, 291 + xy: 446, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 988, 293 + xy: 476, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-none rotate: false - xy: 988, 293 + xy: 476, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 165, 43 + xy: 989, 431 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 165, 29 + xy: 737, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 165, 29 + xy: 737, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 165, 29 + xy: 737, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 165, 29 + xy: 737, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 165, 29 + xy: 737, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 647, 192 + xy: 975, 395 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 647, 192 + xy: 975, 395 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 647, 192 + xy: 975, 395 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 647, 192 + xy: 975, 395 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 818, 311 + xy: 606, 148 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 758, 279 + xy: 465, 113 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 972, 303 + xy: 715, 294 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 972, 303 + xy: 715, 294 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 804, 311 + xy: 532, 158 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 916, 315 + xy: 634, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 916, 315 + xy: 634, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 944, 315 + xy: 662, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 944, 315 + xy: 662, 129 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4283,7 +4283,7 @@ shape-7 index: -1 border rotate: false - xy: 71, 2 + xy: 131, 67 size: 24, 40 split: 5, 5, 5, 10 orig: 24, 40 @@ -4291,7 +4291,7 @@ border index: -1 button rotate: false - xy: 877, 437 + xy: 350, 153 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -4299,7 +4299,7 @@ button index: -1 textarea rotate: false - xy: 877, 437 + xy: 350, 153 size: 24, 40 split: 10, 10, 9, 11 orig: 24, 40 @@ -4307,7 +4307,7 @@ textarea index: -1 button-down rotate: false - xy: 737, 378 + xy: 703, 398 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -4315,7 +4315,7 @@ button-down index: -1 button-over rotate: false - xy: 737, 378 + xy: 703, 398 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -4323,7 +4323,7 @@ button-over index: -1 button-map rotate: false - xy: 851, 437 + xy: 324, 153 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -4331,7 +4331,7 @@ button-map index: -1 button-map-down rotate: false - xy: 557, 201 + xy: 729, 398 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -4339,7 +4339,7 @@ button-map-down index: -1 button-map-over rotate: false - xy: 557, 201 + xy: 729, 398 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -4347,7 +4347,7 @@ button-map-over index: -1 button-select rotate: false - xy: 801, 419 + xy: 480, 161 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -4355,35 +4355,35 @@ button-select index: -1 check-off rotate: false - xy: 663, 339 + xy: 129, 33 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 664, 305 + xy: 234, 161 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 791, 445 + xy: 264, 161 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 821, 445 + xy: 294, 161 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 697, 199 + xy: 717, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -4411,686 +4411,700 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 877, 347 + xy: 791, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 1009, 425 + xy: 797, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 1009, 409 + xy: 813, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 97, 2 + xy: 829, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 958, 321 + xy: 249, 127 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 345, 129 + xy: 743, 300 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 179, 36 + xy: 899, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 179, 36 + xy: 899, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 357, 129 + xy: 755, 302 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 369, 129 + xy: 717, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 381, 129 + xy: 715, 176 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 393, 129 + xy: 717, 164 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 197, 36 + xy: 935, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 181, 2 + xy: 845, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 215, 36 + xy: 917, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 142, 21 + xy: 953, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 405, 129 + xy: 717, 152 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 113, 6 + xy: 935, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 339, 117 + xy: 718, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 351, 117 + xy: 160, 98 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 363, 117 + xy: 172, 98 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 197, 2 + xy: 861, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 213, 2 + xy: 877, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 375, 117 + xy: 184, 98 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 229, 2 + xy: 893, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 694, 313 + xy: 909, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 710, 318 + xy: 925, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 726, 318 + xy: 941, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 179, 18 + xy: 971, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 197, 18 + xy: 953, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 742, 318 + xy: 957, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 215, 18 + xy: 971, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 143, 3 + xy: 989, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 694, 297 + xy: 779, 339 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 161, 11 + xy: 1007, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 710, 302 + xy: 993, 351 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 233, 54 + xy: 1007, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 726, 302 + xy: 1009, 351 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 742, 302 + xy: 546, 163 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 +icon-generated + rotate: false + xy: 692, 440 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 icon-github rotate: false - xy: 690, 281 + xy: 573, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 583, 190 + xy: 589, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 233, 36 + xy: 989, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 387, 117 + xy: 196, 92 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 399, 117 + xy: 208, 92 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 599, 190 + xy: 605, 162 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 615, 190 + xy: 621, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 417, 129 + xy: 309, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 631, 190 + xy: 637, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 433, 67 + xy: 955, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 233, 18 + xy: 1007, 385 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 661, 189 + xy: 653, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 411, 117 + xy: 321, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 710, 286 + xy: 669, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 279, 83 + xy: 627, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 297, 83 + xy: 645, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 261, 77 + xy: 663, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 243, 76 + xy: 681, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 423, 117 + xy: 486, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +icon-map + rotate: false + xy: 685, 159 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 icon-menu rotate: false - xy: 331, 105 + xy: 498, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 841, 329 + xy: 625, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 331, 93 + xy: 510, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 343, 105 + xy: 497, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 859, 329 + xy: 643, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 726, 286 + xy: 701, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 877, 329 + xy: 661, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 331, 81 + xy: 493, 75 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 742, 286 + xy: 546, 147 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 343, 93 + xy: 493, 63 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 355, 105 + xy: 767, 302 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 343, 81 + xy: 727, 176 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 967, 317 + xy: 763, 330 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 895, 329 + xy: 679, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 983, 317 + xy: 779, 323 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 1003, 321 + xy: 755, 314 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 913, 329 + xy: 683, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 315, 103 + xy: 574, 146 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 315, 87 + xy: 590, 146 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 315, 71 + xy: 620, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 661, 173 + xy: 636, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 759, 325 + xy: 652, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 931, 329 + xy: 683, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 949, 401 + xy: 701, 326 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 355, 93 + xy: 729, 164 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 949, 383 + xy: 719, 326 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 775, 325 + xy: 668, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 367, 105 + xy: 729, 152 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 355, 81 + xy: 231, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 791, 325 + xy: 684, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 949, 365 + xy: 701, 308 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 807, 325 + xy: 700, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 823, 325 + xy: 452, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 949, 347 + xy: 719, 308 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 367, 93 + xy: 243, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 758, 309 + xy: 454, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 379, 105 + xy: 333, 51 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 758, 293 + xy: 470, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 949, 329 + xy: 737, 312 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 774, 309 + xy: 468, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5104,7 +5118,7 @@ logotext index: -1 pane rotate: false - xy: 981, 441 + xy: 549, 205 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -5112,7 +5126,7 @@ pane index: -1 pane-button rotate: false - xy: 955, 441 + xy: 428, 158 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -5120,7 +5134,7 @@ pane-button index: -1 scroll rotate: false - xy: 153, 57 + xy: 454, 159 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -5128,7 +5142,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 627, 311 + xy: 160, 110 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -5145,7 +5159,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 929, 437 + xy: 402, 153 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -5153,7 +5167,7 @@ scroll-knob-vertical index: -1 scroll-knob-vertical-black rotate: false - xy: 903, 437 + xy: 376, 153 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -5161,21 +5175,21 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 147, 57 + xy: 700, 376 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 160, 29 + xy: 766, 480 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 95, 61 + xy: 742, 444 size: 22, 44 orig: 22, 44 offset: 0, 0 @@ -5224,7 +5238,7 @@ text-sides-over index: -1 textfield rotate: false - xy: 284, 165 + xy: 519, 213 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -5232,7 +5246,7 @@ textfield index: -1 textfield-over rotate: false - xy: 254, 165 + xy: 489, 213 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -5240,14 +5254,14 @@ textfield-over index: -1 white rotate: false - xy: 705, 329 + xy: 1, 1 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window rotate: false - xy: 66, 44 + xy: 131, 109 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -5255,7 +5269,7 @@ window index: -1 window-empty rotate: false - xy: 692, 427 + xy: 66, 44 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -5263,119 +5277,119 @@ window-empty index: -1 drone rotate: false - xy: 846, 315 + xy: 500, 147 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 846, 315 + xy: 500, 147 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 fabricator rotate: false - xy: 95, 45 + xy: 761, 364 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 unit-icon-fabricator rotate: false - xy: 95, 45 + xy: 761, 364 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 monsoon rotate: false - xy: 223, 92 + xy: 680, 339 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 unit-icon-monsoon rotate: false - xy: 223, 92 + xy: 680, 339 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 scout rotate: false - xy: 1000, 307 + xy: 705, 266 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titan rotate: false - xy: 287, 29 + xy: 885, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 305, 47 + xy: 903, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 305, 29 + xy: 921, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 1014, 288 + xy: 405, 52 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 774, 295 + xy: 993, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 790, 311 + xy: 532, 172 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 874, 315 + xy: 469, 87 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 888, 315 + xy: 606, 134 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 944, 301 + xy: 479, 59 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1000, 293 + xy: 705, 252 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index e6e6545549..7e69d64dc2 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json index 229d0ac65e..e0a9de4731 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -65,10 +65,11 @@ io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: { static-down: {up: button-down }, toggle: {checked: button-down, down: button-down, up: button, imageDisabledColor: lightgray, imageUpColor: white }, togglemap: {down: button-map-down, up: button-map }, - select: {checked: button-select, up: clear } + select: {checked: button-select, up: clear }, + clear: {down: clear-down, up: clear, over: clear-over}, }, io.anuke.ucore.scene.ui.ScrollPane$ScrollPaneStyle: { - default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical}, + default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}, horizontal: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal}, volume: {background: button-map, vScroll: scroll, vScrollKnob: scroll-knob-vertical}, clear: {vScroll: scroll, vScrollKnob: scroll-knob-vertical}, diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java index 57e029b05d..28a8c74c86 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java @@ -1,16 +1,20 @@ package io.anuke.mindustry.ui.dialogs; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; +import com.badlogic.gdx.utils.Align; import io.anuke.mindustry.game.Difficulty; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.io.Map; +import io.anuke.mindustry.ui.BorderImage; import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Timers; +import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.*; -import io.anuke.ucore.scene.ui.layout.Stack; +import io.anuke.ucore.scene.ui.ButtonGroup; +import io.anuke.ucore.scene.ui.ImageButton; +import io.anuke.ucore.scene.ui.ScrollPane; +import io.anuke.ucore.scene.ui.TextButton; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.utils.Cursors; import io.anuke.ucore.scene.utils.Elements; @@ -31,7 +35,8 @@ public class LevelDialog extends FloatingDialog{ content().clear(); Table maps = new Table(); - ScrollPane pane = new ScrollPane(maps); + maps.marginRight(14); + ScrollPane pane = new ScrollPane(maps, "clear-black"); pane.setFadeScrollBars(false); int maxwidth = 4; @@ -80,6 +85,8 @@ public class LevelDialog extends FloatingDialog{ content().add(sdif); content().row(); + float images = 146f; + int i = 0; for(Map map : world.maps().all()){ @@ -87,38 +94,29 @@ public class LevelDialog extends FloatingDialog{ maps.row(); } - Table inset = new Table("pane-button"); - inset.add("[accent]" + Bundles.get("map."+map.name+".name", map.name)).pad(3f); - inset.row(); - inset.label((() -> Bundles.format("text.level.highscore", Settings.getInt("hiscore" + map.name, 0)))).pad(3f); - inset.pack(); - - float images = 154f; - - Stack stack = new Stack(); - - Image back = new Image("white"); - back.setColor(Color.valueOf("646464")); - - ImageButton image = new ImageButton(new TextureRegion(map.texture), "togglemap"); + ImageButton image = new ImageButton(new TextureRegion(map.texture), "clear"); + image.margin(5); + image.getImageCell().size(images); + image.top(); image.row(); - image.add(inset).width(images+6); + image.add("[accent]" + Bundles.get("map."+map.name+".name", map.name)).pad(3f).growX().wrap().get().setAlignment(Align.center, Align.center); + image.row(); + image.label((() -> Bundles.format("text.level.highscore", Settings.getInt("hiscore" + map.name, 0)))).pad(3f); + + BorderImage border = new BorderImage(map.texture, 3f); + image.replaceImage(border); image.clicked(() -> { hide(); control.playMap(map); }); - image.getImageCell().size(images); - stack.add(back); - stack.add(image); - - maps.add(stack).width(170).top().pad(4f); + maps.add(image).width(170).fillY().top().pad(4f); i ++; } - maps.addImageButton("icon-editor", 16*4, () -> { + ImageButton genb = maps.addImageButton("icon-editor", "clear", 16*3, () -> { hide(); ui.loadfrag.show(); @@ -131,7 +129,16 @@ public class LevelDialog extends FloatingDialog{ Gdx.app.postRunnable(ui.loadfrag::hide); }); }); - }).size(170, 154f + 73).pad(4f); + }).width(170).fillY().pad(4f).get(); + + genb.top(); + genb.margin(5); + genb.clearChildren(); + genb.add(new BorderImage(Draw.region("icon-generated"), 3f)).size(images); + genb.row(); + genb.add("$text.map.random").growX().wrap().pad(3f).get().setAlignment(Align.center, Align.center); + genb.row(); + genb.add("").pad(3f); content().add(pane).uniformX(); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 7e0f9c0c6f..df50e8daeb 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -33,7 +33,7 @@ public class MenuFragment implements Fragment{ add(new MenuButton("icon-editor", "$text.editor", () -> ui.loadAnd(ui.editor::show))); - add(new MenuButton("icon-menu", "$text.maps", ui.maps::show)); + add(new MenuButton("icon-map", "$text.maps", ui.maps::show)); row(); @@ -64,8 +64,10 @@ public class MenuFragment implements Fragment{ new imagebutton("icon-play-2", isize, ui.levels::show).text("$text.play").padTop(4f); - new imagebutton("icon-tutorial", isize, () -> ui.showInfo("The tutorial is currently not yet implemented.")) - .text("$text.tutorial").padTop(4f); + //new imagebutton("icon-tutorial", isize, () -> ui.showInfo("The tutorial is currently not yet implemented.")) + // .text("$text.tutorial").padTop(4f); + + new imagebutton("icon-map", isize, ui.maps::show).text("$text.maps").padTop(4f); new imagebutton("icon-load", isize, ui.load::show).text("$text.load").padTop(4f);