diff --git a/build.gradle b/build.gradle index 6367e64024..147a1be3fb 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.9' roboVMVersion = '2.3.0' - uCoreVersion = 'f73e538757ac66ff62d7f25d93011142b6abb8df' + uCoreVersion = '7eb80a9765557d025d589f28fa1910dffa3fc8ed' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets-raw/sprites/pack.json b/core/assets-raw/sprites/pack.json index 490bc040eb..abd5ae6584 100644 --- a/core/assets-raw/sprites/pack.json +++ b/core/assets-raw/sprites/pack.json @@ -1,5 +1,6 @@ { duplicatePadding: true, combineSubdirectories: true, - flattenPaths: true + flattenPaths: true, + fast: true } diff --git a/core/assets-raw/sprites/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png index 9107880338..427b3a5fa9 100644 Binary files a/core/assets-raw/sprites/ui/button-down.9.png and b/core/assets-raw/sprites/ui/button-down.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-1.9.png b/core/assets-raw/sprites/ui/button-edge-1.9.png new file mode 100644 index 0000000000..5833e18f2f Binary files /dev/null and b/core/assets-raw/sprites/ui/button-edge-1.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-2.9.png b/core/assets-raw/sprites/ui/button-edge-2.9.png new file mode 100644 index 0000000000..40ef1bad93 Binary files /dev/null and b/core/assets-raw/sprites/ui/button-edge-2.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-3.9.png b/core/assets-raw/sprites/ui/button-edge-3.9.png new file mode 100644 index 0000000000..bc63ca5beb Binary files /dev/null and b/core/assets-raw/sprites/ui/button-edge-3.9.png differ diff --git a/core/assets-raw/sprites/ui/button-over.9.png b/core/assets-raw/sprites/ui/button-over.9.png index 9107880338..cb8cbfdba7 100644 Binary files a/core/assets-raw/sprites/ui/button-over.9.png and b/core/assets-raw/sprites/ui/button-over.9.png differ diff --git a/core/assets-raw/sprites/ui/button.9.png b/core/assets-raw/sprites/ui/button.9.png index d27ab20c12..f982c6939b 100644 Binary files a/core/assets-raw/sprites/ui/button.9.png and b/core/assets-raw/sprites/ui/button.9.png differ diff --git a/core/assets-raw/sprites/ui/pane-2.9.png b/core/assets-raw/sprites/ui/pane-2.9.png new file mode 100644 index 0000000000..bf9ca991b5 Binary files /dev/null and b/core/assets-raw/sprites/ui/pane-2.9.png differ diff --git a/core/assets-raw/sprites/ui/pane.9.png b/core/assets-raw/sprites/ui/pane.9.png index e82766bafc..4ca77c4d3d 100644 Binary files a/core/assets-raw/sprites/ui/pane.9.png and b/core/assets-raw/sprites/ui/pane.9.png differ diff --git a/core/assets-raw/sprites/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png index 4be43a4176..efb573acb3 100644 Binary files a/core/assets-raw/sprites/ui/slider-knob-down.png and b/core/assets-raw/sprites/ui/slider-knob-down.png differ diff --git a/core/assets-raw/sprites/ui/slider-knob-over.png b/core/assets-raw/sprites/ui/slider-knob-over.png index 4be43a4176..a8936dca95 100644 Binary files a/core/assets-raw/sprites/ui/slider-knob-over.png and b/core/assets-raw/sprites/ui/slider-knob-over.png differ diff --git a/core/assets-raw/sprites/ui/slider-knob.png b/core/assets-raw/sprites/ui/slider-knob.png index 6346d62c52..700f69c594 100644 Binary files a/core/assets-raw/sprites/ui/slider-knob.png and b/core/assets-raw/sprites/ui/slider-knob.png differ diff --git a/core/assets-raw/sprites/ui/slider.png b/core/assets-raw/sprites/ui/slider.png index 88dcd70693..904b8f2001 100644 Binary files a/core/assets-raw/sprites/ui/slider.png and b/core/assets-raw/sprites/ui/slider.png differ diff --git a/core/assets-raw/sprites/ui/underline-2.9.png b/core/assets-raw/sprites/ui/underline-2.9.png new file mode 100644 index 0000000000..bd2c4fbf18 Binary files /dev/null and b/core/assets-raw/sprites/ui/underline-2.9.png differ diff --git a/core/assets-raw/sprites/ui/underline.9.png b/core/assets-raw/sprites/ui/underline.9.png new file mode 100644 index 0000000000..2c764bd6b5 Binary files /dev/null and b/core/assets-raw/sprites/ui/underline.9.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 6cae7f175d..55a215f9cc 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -351,6 +351,7 @@ text.category.items = Items text.category.crafting = Crafting text.category.shooting = Shooting text.category.optional = Optional Enhancements +setting.indicators.name = Ally Indicators setting.autotarget.name = Auto-Target setting.fpscap.name = Max FPS setting.fpscap.none = None diff --git a/core/assets/shaders/menu.fragment b/core/assets/shaders/menu.fragment index 77acd0e031..397cf6dbc9 100644 --- a/core/assets/shaders/menu.fragment +++ b/core/assets/shaders/menu.fragment @@ -38,7 +38,7 @@ void main() { else if(m > 0.35) gl_FragColor.rgb = p4; else gl_FragColor.rgb = vec3(0.0); - gl_FragColor.rgb *= 0.75; + gl_FragColor.rgb *= 0.5; gl_FragColor.a = mod(abs(float(coords.x)) + abs(float(coords.y)), 110.0) < 35.0 ? 1.0 : 0.0; } \ No newline at end of file diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index e144699c38..131ccbbd35 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -6,1239 +6,1239 @@ filter: Nearest,Nearest repeat: none force-projector-top rotate: false - xy: 724, 453 + xy: 269, 218 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 261, 166 + xy: 310, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 243, 152 + xy: 317, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 473, 389 + xy: 622, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 483, 399 + xy: 632, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 603, 399 + xy: 492, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 603, 389 + xy: 1014, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 613, 399 + xy: 462, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 613, 389 + xy: 472, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 623, 399 + xy: 482, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 623, 389 + xy: 492, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 633, 389 + xy: 331, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 643, 389 + xy: 341, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 653, 389 + xy: 351, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 663, 389 + xy: 504, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 673, 389 + xy: 504, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 683, 389 + xy: 514, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 693, 389 + xy: 504, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 703, 389 + xy: 514, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 713, 389 + xy: 524, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 723, 389 + xy: 504, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 733, 389 + xy: 514, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 743, 389 + xy: 524, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 753, 389 + xy: 534, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 681, 359 + xy: 672, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 691, 369 + xy: 672, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 691, 359 + xy: 672, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 701, 369 + xy: 672, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 701, 359 + xy: 672, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 711, 369 + xy: 672, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 711, 359 + xy: 672, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 721, 369 + xy: 672, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 721, 359 + xy: 672, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 731, 369 + xy: 672, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 731, 359 + xy: 672, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 741, 369 + xy: 672, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 741, 359 + xy: 662, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 751, 369 + xy: 672, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 751, 359 + xy: 341, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 761, 369 + xy: 351, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 761, 359 + xy: 361, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 771, 369 + xy: 335, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 771, 359 + xy: 345, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mass-driver-turret rotate: false - xy: 958, 453 + xy: 762, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 953, 383 + xy: 361, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 963, 383 + xy: 361, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 973, 383 + xy: 592, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 warp-gate rotate: false - xy: 584, 427 + xy: 66, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 warp-gate-top rotate: false - xy: 610, 427 + xy: 92, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 204, 283 + xy: 204, 296 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 233, 346 + xy: 230, 296 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 30, 80 + xy: 344, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 285, 402 + xy: 370, 384 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 205, 159 + xy: 310, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 205, 141 + xy: 310, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 261, 184 + xy: 310, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 243, 170 + xy: 310, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 225, 165 + xy: 310, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 223, 147 + xy: 310, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 984, 453 + xy: 788, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 350, 425 + xy: 814, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 376, 425 + xy: 840, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 402, 425 + xy: 866, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plasma-drill rotate: false - xy: 25, 46 + xy: 89, 208 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rim rotate: false - xy: 59, 46 + xy: 123, 208 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rotator rotate: false - xy: 27, 12 + xy: 157, 208 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-top rotate: false - xy: 61, 12 + xy: 269, 432 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 225, 77 + xy: 328, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 259, 112 + xy: 464, 432 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 243, 82 + xy: 461, 414 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 315, 206 + xy: 528, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 297, 170 + xy: 528, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 315, 188 + xy: 510, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 297, 152 + xy: 528, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 214, 55 + xy: 43, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 214, 55 + xy: 43, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 219, 21 + xy: 551, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 219, 11 + xy: 561, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 219, 11 + xy: 561, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 219, 1 + xy: 464, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 229, 49 + xy: 319, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 283, 98 + xy: 264, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 483, 389 + xy: 592, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 493, 399 + xy: 602, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 493, 389 + xy: 612, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 763, 389 + xy: 514, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 773, 389 + xy: 524, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 783, 389 + xy: 534, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 853, 393 + xy: 534, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 863, 393 + xy: 502, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 966, 403 + xy: 354, 320 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 933, 393 + xy: 502, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 933, 393 + xy: 502, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 943, 393 + xy: 512, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 943, 393 + xy: 512, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 953, 393 + xy: 522, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 953, 393 + xy: 522, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 963, 393 + xy: 532, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 963, 393 + xy: 532, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 993, 393 + xy: 582, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 1003, 393 + xy: 592, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 1013, 393 + xy: 602, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 357, 38 + xy: 612, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 973, 393 + xy: 562, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 983, 393 + xy: 572, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 95, 2 + xy: 368, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 351, 376 + xy: 632, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 351, 366 + xy: 642, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 345, 118 + xy: 382, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 351, 356 + xy: 321, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 361, 377 + xy: 321, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 361, 377 + xy: 321, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 371, 377 + xy: 321, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 371, 377 + xy: 321, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 345, 76 + xy: 396, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 352, 346 + xy: 592, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 352, 336 + xy: 602, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 352, 326 + xy: 612, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 372, 337 + xy: 602, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 362, 327 + xy: 612, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 392, 347 + xy: 622, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 382, 337 + xy: 632, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 372, 327 + xy: 642, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 109, 2 + xy: 396, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 471, 359 + xy: 652, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 481, 359 + xy: 652, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 491, 369 + xy: 652, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 117, 49 + xy: 410, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 541, 359 + xy: 660, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 551, 369 + xy: 670, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 551, 359 + xy: 661, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 145, 49 + xy: 424, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 159, 49 + xy: 424, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 611, 359 + xy: 662, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 621, 369 + xy: 662, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 621, 359 + xy: 662, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 631, 369 + xy: 662, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 601, 359 + xy: 662, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 611, 369 + xy: 662, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 113, 35 + xy: 368, 286 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 taredge rotate: false - xy: 127, 35 + xy: 396, 286 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 651, 359 + xy: 672, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 661, 369 + xy: 672, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 661, 359 + xy: 672, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 671, 369 + xy: 672, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 671, 359 + xy: 672, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 681, 369 + xy: 672, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 781, 359 + xy: 365, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 791, 369 + xy: 346, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 791, 359 + xy: 346, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 801, 369 + xy: 356, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 155, 21 + xy: 438, 302 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 239, 26 + xy: 474, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 259, 36 + xy: 319, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 259, 36 + xy: 319, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 443, 389 + xy: 602, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 443, 389 + xy: 602, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 453, 399 + xy: 612, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 453, 389 + xy: 622, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 563, 399 + xy: 642, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 793, 389 + xy: 524, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 924, 417 + xy: 166, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 672, 453 + xy: 282, 286 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cross-4 rotate: false - xy: 644, 479 + xy: 798, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 nuclearreactor-shadow rotate: false - xy: 66, 199 + xy: 288, 370 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 983, 383 + xy: 602, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 207, 17 + xy: 324, 281 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 243, 64 + xy: 479, 414 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 261, 82 + xy: 474, 396 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 261, 64 + xy: 500, 432 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 243, 46 + xy: 497, 414 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 480, 427 + xy: 970, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 480, 427 + xy: 970, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 207, 5 + xy: 336, 280 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 716, 433 + xy: 784, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-3 rotate: false - xy: 112, 135 + xy: 316, 373 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 shadow-4 rotate: false - xy: 334, 477 + xy: 53, 204 size: 34, 34 orig: 34, 34 offset: 0, 0 @@ -1252,4011 +1252,4011 @@ shadow-5 index: -1 shadow-6 rotate: false - xy: 204, 414 + xy: 1, 188 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 shadow-corner rotate: false - xy: 217, 43 + xy: 348, 280 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 217, 31 + xy: 319, 269 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-2 rotate: false - xy: 736, 433 + xy: 804, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-round-3 rotate: false - xy: 141, 165 + xy: 38, 8 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 shadow-round-4 rotate: false - xy: 370, 477 + xy: 524, 477 size: 34, 34 orig: 34, 34 offset: 0, 0 index: -1 shadow-rounded-2 rotate: false - xy: 756, 433 + xy: 824, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-shock-mine rotate: false - xy: 531, 359 + xy: 652, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 463, 399 + xy: 592, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 463, 399 + xy: 592, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 463, 389 + xy: 602, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 473, 399 + xy: 612, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 523, 399 + xy: 622, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 523, 389 + xy: 632, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 533, 399 + xy: 612, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 533, 389 + xy: 622, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 543, 399 + xy: 632, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 543, 389 + xy: 622, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 553, 399 + xy: 632, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 553, 389 + xy: 632, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 563, 389 + xy: 642, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 573, 399 + xy: 642, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 573, 389 + xy: 642, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 583, 399 + xy: 642, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 583, 389 + xy: 642, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 593, 399 + xy: 472, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 593, 389 + xy: 482, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 372, 347 + xy: 572, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 362, 337 + xy: 582, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 382, 347 + xy: 592, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 880, 453 + xy: 684, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 906, 453 + xy: 710, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 932, 453 + xy: 736, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 923, 383 + xy: 361, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 933, 383 + xy: 361, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 943, 383 + xy: 361, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 993, 383 + xy: 612, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1003, 383 + xy: 622, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1013, 383 + xy: 632, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 441, 369 + xy: 642, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 441, 359 + xy: 650, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 451, 369 + xy: 651, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 451, 359 + xy: 652, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alpha-mech-pad rotate: false - xy: 814, 435 + xy: 19, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-alpha-mech-pad rotate: false - xy: 814, 435 + xy: 19, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 battery rotate: false - xy: 81, 2 + xy: 882, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-battery rotate: false - xy: 81, 2 + xy: 882, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery-large rotate: false - xy: 178, 284 + xy: 254, 338 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-battery-large rotate: false - xy: 178, 284 + xy: 254, 338 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 fusion-reactor rotate: false - xy: 712, 479 + xy: 866, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-bottom rotate: false - xy: 746, 479 + xy: 900, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-light rotate: false - xy: 780, 479 + xy: 934, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-0 rotate: false - xy: 814, 479 + xy: 968, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-1 rotate: false - xy: 848, 479 + xy: 92, 276 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-2 rotate: false - xy: 882, 479 + xy: 126, 276 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-3 rotate: false - xy: 916, 479 + xy: 160, 276 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-top rotate: false - xy: 950, 479 + xy: 87, 242 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 481, 369 + xy: 652, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 506, 427 + xy: 295, 218 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 532, 427 + xy: 295, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 297, 206 + xy: 533, 411 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 332, 433 + xy: 1, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-alloy-smelter rotate: false - xy: 332, 433 + xy: 1, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 796, 435 + xy: 864, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter rotate: false - xy: 832, 435 + xy: 1002, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-arc-smelter rotate: false - xy: 832, 435 + xy: 1002, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter-top rotate: false - xy: 850, 435 + xy: 918, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 850, 435 + xy: 918, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 868, 435 + xy: 936, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 886, 435 + xy: 954, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 904, 435 + xy: 972, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 922, 435 + xy: 996, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 940, 435 + xy: 83, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 958, 435 + xy: 94, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 976, 435 + xy: 94, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 976, 435 + xy: 94, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 888, 417 + xy: 299, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 942, 417 + xy: 166, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 960, 417 + xy: 166, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 978, 417 + xy: 166, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 996, 417 + xy: 166, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 112, 117 + xy: 166, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 117, 99 + xy: 184, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 431, 357 + xy: 582, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 372, 317 + xy: 592, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 241, 134 + xy: 328, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 259, 130 + xy: 328, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 241, 116 + xy: 328, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 225, 95 + xy: 328, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 461, 369 + xy: 652, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 461, 359 + xy: 652, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 531, 369 + xy: 652, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core-open rotate: false - xy: 620, 453 + xy: 280, 338 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-top rotate: false - xy: 646, 453 + xy: 282, 312 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 581, 369 + xy: 662, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 239, 36 + xy: 562, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 249, 36 + xy: 464, 330 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 994, 435 + xy: 94, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 325, 388 + xy: 94, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 311, 406 + xy: 396, 384 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 289, 356 + xy: 344, 364 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-4 rotate: false - xy: 406, 479 + xy: 560, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-4-top rotate: false - xy: 440, 479 + xy: 594, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc rotate: false - xy: 1010, 454 + xy: 272, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 71, 2 + xy: 194, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cyclone rotate: false - xy: 698, 453 + xy: 267, 244 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 923, 393 + xy: 532, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 828, 453 + xy: 606, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 357, 28 + xy: 622, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 141, 153 + xy: 43, 162 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer rotate: false - xy: 225, 183 + xy: 292, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 207, 177 + xy: 292, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 meltdown rotate: false - xy: 984, 479 + xy: 121, 242 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-heat rotate: false - xy: 56, 80 + xy: 155, 242 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 428, 427 + xy: 918, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 454, 427 + xy: 944, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 261, 46 + xy: 474, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 279, 220 + xy: 492, 396 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 279, 202 + xy: 492, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 279, 184 + xy: 474, 360 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 511, 359 + xy: 652, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 521, 369 + xy: 652, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 521, 359 + xy: 652, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spectre rotate: false - xy: 77, 159 + xy: 337, 416 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 277, 130 + xy: 536, 429 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 315, 170 + xy: 572, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 315, 152 + xy: 590, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 130, 117 + xy: 184, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-factory-top-open rotate: false - xy: 135, 99 + xy: 184, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-factory rotate: false - xy: 750, 453 + xy: 269, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 fortress-factory-top rotate: false - xy: 776, 453 + xy: 554, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ghoul-factory-top rotate: false - xy: 776, 453 + xy: 554, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-factory-top rotate: false - xy: 776, 453 + xy: 554, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 fortress-factory-top-open rotate: false - xy: 802, 453 + xy: 580, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ghoul-factory-top-open rotate: false - xy: 802, 453 + xy: 580, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-factory-top-open rotate: false - xy: 802, 453 + xy: 580, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ghoul-factory rotate: false - xy: 854, 453 + xy: 632, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phantom-factory-top rotate: false - xy: 261, 148 + xy: 328, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phantom-factory-top-open rotate: false - xy: 223, 129 + xy: 328, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 225, 59 + xy: 482, 432 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 471, 369 + xy: 652, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 revenant-factory rotate: false - xy: 66, 227 + xy: 269, 398 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-top rotate: false - xy: 100, 227 + xy: 303, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-top-open rotate: false - xy: 134, 227 + xy: 303, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-top rotate: false - xy: 279, 166 + xy: 492, 360 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 spirit-factory-top-open rotate: false - xy: 279, 148 + xy: 518, 429 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-factory rotate: false - xy: 558, 427 + xy: 68, 27 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wraith-factory-top rotate: false - xy: 279, 80 + xy: 608, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wraith-factory-top-open rotate: false - xy: 279, 62 + xy: 626, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 843, 393 + xy: 524, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 117, 81 + xy: 184, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 135, 81 + xy: 184, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 913, 393 + xy: 522, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam rotate: false - xy: 1018, 499 + xy: 334, 470 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 beam-end rotate: false - xy: 285, 382 + xy: 1002, 493 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blank rotate: false - xy: 256, 417 + xy: 515, 429 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 bullet rotate: false - xy: 82, 114 + xy: 220, 1 size: 13, 13 orig: 13, 13 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 1010, 464 + xy: 235, 1 size: 13, 13 orig: 13, 13 offset: 0, 0 index: -1 casing rotate: false - xy: 329, 146 + xy: 169, 202 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 clear rotate: false - xy: 256, 414 + xy: 300, 466 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 command-attack rotate: false - xy: 503, 399 + xy: 622, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 503, 389 + xy: 632, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 513, 399 + xy: 602, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 513, 389 + xy: 612, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 289, 1 + xy: 532, 276 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 980, 403 + xy: 354, 306 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 laser rotate: false - xy: 111, 56 + xy: 1022, 499 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 656, 433 + xy: 724, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 676, 433 + xy: 744, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 minelaser rotate: false - xy: 114, 56 + xy: 1022, 485 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 696, 433 + xy: 764, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 missile rotate: false - xy: 27, 1 + xy: 118, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 38, 1 + xy: 129, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 337, 406 + xy: 346, 133 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 90, 87 + xy: 346, 106 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 162, 200 + xy: 346, 79 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 99, 88 + xy: 346, 52 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 108, 88 + xy: 355, 133 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 shell rotate: false - xy: 49, 1 + xy: 140, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 60, 1 + xy: 151, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 541, 369 + xy: 652, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 187, 49 + xy: 337, 402 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 781, 369 + xy: 355, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 776, 433 + xy: 844, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blackstone-cliff-edge rotate: false - xy: 229, 39 + xy: 162, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 229, 29 + xy: 172, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 229, 19 + xy: 882, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 229, 9 + xy: 571, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 239, 16 + xy: 182, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 346, 407 + xy: 94, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-drill rotate: false - xy: 290, 330 + xy: 370, 358 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-bridge-conduit rotate: false - xy: 249, 26 + xy: 562, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 249, 26 + xy: 562, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 269, 36 + xy: 464, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 269, 36 + xy: 464, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 364, 407 + xy: 94, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 364, 407 + xy: 94, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 249, 16 + xy: 474, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 249, 16 + xy: 474, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 382, 407 + xy: 94, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 382, 407 + xy: 94, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 259, 26 + xy: 484, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-container rotate: false - xy: 400, 407 + xy: 94, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 container rotate: false - xy: 400, 407 + xy: 94, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 279, 36 + xy: 192, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 279, 36 + xy: 192, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 259, 16 + xy: 562, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 259, 16 + xy: 562, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall-large rotate: false - xy: 418, 407 + xy: 101, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 418, 407 + xy: 101, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-core rotate: false - xy: 290, 304 + xy: 396, 358 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core rotate: false - xy: 290, 304 + xy: 396, 358 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-cryofluidmixer rotate: false - xy: 436, 409 + xy: 112, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 454, 409 + xy: 112, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cyclone rotate: false - xy: 290, 278 + xy: 194, 270 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-dagger-factory rotate: false - xy: 472, 409 + xy: 112, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dart-ship-pad rotate: false - xy: 490, 409 + xy: 112, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-pad rotate: false - xy: 490, 409 + xy: 112, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 269, 26 + xy: 464, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 269, 26 + xy: 464, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-delta-mech-pad rotate: false - xy: 508, 409 + xy: 112, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 508, 409 + xy: 112, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dense-alloy-wall rotate: false - xy: 269, 16 + xy: 474, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dense-alloy-wall rotate: false - xy: 269, 16 + xy: 474, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-dense-alloy-wall-large rotate: false - xy: 526, 409 + xy: 112, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dense-alloy-wall-large rotate: false - xy: 526, 409 + xy: 112, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 279, 26 + xy: 484, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 279, 26 + xy: 484, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-distributor rotate: false - xy: 544, 409 + xy: 112, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 distributor rotate: false - xy: 544, 409 + xy: 112, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 279, 16 + xy: 494, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 279, 16 + xy: 494, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 562, 409 + xy: 112, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 562, 409 + xy: 112, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 239, 6 + xy: 202, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-force-projector rotate: false - xy: 315, 356 + xy: 220, 270 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 force-projector rotate: false - xy: 315, 356 + xy: 220, 270 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-fortress-factory rotate: false - xy: 316, 330 + xy: 189, 244 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-fuse rotate: false - xy: 316, 304 + xy: 215, 244 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-fusion-reactor rotate: false - xy: 474, 479 + xy: 628, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-ghoul-factory rotate: false - xy: 316, 278 + xy: 191, 218 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-glaive-ship-pad rotate: false - xy: 334, 451 + xy: 217, 218 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 glaive-ship-pad rotate: false - xy: 334, 451 + xy: 217, 218 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-grass rotate: false - xy: 249, 6 + xy: 562, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 249, 6 + xy: 562, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 259, 6 + xy: 464, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 269, 6 + xy: 462, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 269, 6 + xy: 462, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 279, 6 + xy: 474, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 279, 6 + xy: 474, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 289, 30 + xy: 484, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 289, 30 + xy: 484, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 299, 30 + xy: 494, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 299, 30 + xy: 494, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 289, 20 + xy: 562, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 289, 20 + xy: 562, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-javelin-ship-pad rotate: false - xy: 580, 409 + xy: 119, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-pad rotate: false - xy: 580, 409 + xy: 119, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 309, 30 + xy: 462, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 309, 30 + xy: 462, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 598, 409 + xy: 118, 12 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-laser-drill rotate: false - xy: 616, 409 + xy: 130, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 289, 10 + xy: 484, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 289, 10 + xy: 484, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 299, 20 + xy: 494, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 299, 20 + xy: 494, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 299, 10 + xy: 562, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-tank rotate: false - xy: 360, 451 + xy: 246, 270 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 309, 20 + xy: 494, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 309, 20 + xy: 494, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mass-driver rotate: false - xy: 386, 451 + xy: 241, 244 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 386, 451 + xy: 241, 244 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-mechanical-drill rotate: false - xy: 168, 243 + xy: 130, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-mechanical-pump rotate: false - xy: 309, 10 + xy: 581, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 309, 10 + xy: 581, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-meltdown rotate: false - xy: 508, 479 + xy: 662, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-melter rotate: false - xy: 343, 396 + xy: 572, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 343, 396 + xy: 572, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mend-projector rotate: false - xy: 171, 209 + xy: 130, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 171, 209 + xy: 130, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 353, 397 + xy: 572, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 353, 397 + xy: 572, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-oil-extractor rotate: false - xy: 412, 453 + xy: 243, 218 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-omega-mech-pad rotate: false - xy: 438, 453 + xy: 191, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 omega-mech-pad rotate: false - xy: 438, 453 + xy: 191, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-overdrive-projector rotate: false - xy: 180, 266 + xy: 130, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 180, 266 + xy: 130, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-overflow-gate rotate: false - xy: 363, 397 + xy: 572, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 363, 397 + xy: 572, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phantom-factory rotate: false - xy: 198, 265 + xy: 130, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 373, 397 + xy: 572, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 373, 397 + xy: 572, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 383, 397 + xy: 572, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 383, 397 + xy: 572, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 393, 397 + xy: 572, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 393, 397 + xy: 572, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 171, 191 + xy: 130, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 171, 191 + xy: 130, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 169, 173 + xy: 130, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-plasma-drill rotate: false - xy: 542, 479 + xy: 696, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-plastanium-compressor rotate: false - xy: 230, 260 + xy: 130, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 230, 260 + xy: 130, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-pneumatic-drill rotate: false - xy: 248, 260 + xy: 136, 12 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 403, 397 + xy: 582, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 403, 397 + xy: 582, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 266, 262 + xy: 137, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 266, 262 + xy: 137, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 413, 397 + xy: 582, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 413, 397 + xy: 582, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 423, 397 + xy: 582, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 423, 397 + xy: 582, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 343, 386 + xy: 582, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 353, 387 + xy: 582, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 284, 260 + xy: 148, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 284, 260 + xy: 148, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 302, 260 + xy: 148, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 302, 260 + xy: 148, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 302, 260 + xy: 148, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 302, 260 + xy: 148, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 302, 260 + xy: 148, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 302, 260 + xy: 148, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 363, 387 + xy: 582, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 363, 387 + xy: 582, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-revenant-factory rotate: false - xy: 576, 479 + xy: 730, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-ripple rotate: false - xy: 464, 453 + xy: 217, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-rock rotate: false - xy: 373, 387 + xy: 892, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 373, 387 + xy: 892, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 320, 260 + xy: 148, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 320, 260 + xy: 148, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 383, 387 + xy: 902, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 383, 387 + xy: 902, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 169, 155 + xy: 148, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 169, 155 + xy: 148, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 636, 415 + xy: 148, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 393, 387 + xy: 474, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 393, 387 + xy: 474, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 403, 387 + xy: 484, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 413, 387 + xy: 494, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 413, 387 + xy: 494, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 423, 387 + xy: 591, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 423, 387 + xy: 591, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 341, 376 + xy: 601, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 341, 376 + xy: 601, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 654, 415 + xy: 148, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 654, 415 + xy: 148, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 341, 366 + xy: 611, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 341, 366 + xy: 611, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 341, 356 + xy: 621, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 341, 356 + xy: 621, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 342, 346 + xy: 631, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 342, 346 + xy: 631, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel-large rotate: false - xy: 490, 453 + xy: 243, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 490, 453 + xy: 243, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-solidifer rotate: false - xy: 342, 336 + xy: 641, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 342, 336 + xy: 641, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 342, 326 + xy: 472, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 342, 326 + xy: 472, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 342, 316 + xy: 482, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 342, 316 + xy: 482, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-spawn rotate: false - xy: 342, 306 + xy: 492, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spawn rotate: false - xy: 342, 306 + xy: 492, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-spectre rotate: false - xy: 610, 479 + xy: 764, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-spirit-factory rotate: false - xy: 672, 415 + xy: 148, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 342, 296 + xy: 592, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 342, 296 + xy: 592, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 342, 286 + xy: 592, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 342, 286 + xy: 592, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall-large rotate: false - xy: 690, 415 + xy: 148, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 690, 415 + xy: 148, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 708, 415 + xy: 154, 12 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-tar rotate: false - xy: 1014, 432 + xy: 602, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tar rotate: false - xy: 1014, 432 + xy: 602, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tau-mech-pad rotate: false - xy: 726, 415 + xy: 155, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tau-mech-pad rotate: false - xy: 726, 415 + xy: 155, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 744, 415 + xy: 173, 190 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 744, 415 + xy: 173, 190 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 762, 415 + xy: 173, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 762, 415 + xy: 173, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-reactor rotate: false - xy: 516, 453 + xy: 422, 384 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 516, 453 + xy: 422, 384 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 1014, 422 + xy: 592, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1014, 422 + xy: 592, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 780, 415 + xy: 191, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 780, 415 + xy: 191, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titan-factory rotate: false - xy: 542, 453 + xy: 422, 358 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 433, 397 + xy: 602, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 433, 397 + xy: 602, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-trident-ship-pad rotate: false - xy: 798, 417 + xy: 209, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 798, 417 + xy: 209, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 816, 417 + xy: 227, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 816, 417 + xy: 227, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 433, 387 + xy: 612, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 433, 387 + xy: 612, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-vault rotate: false - xy: 568, 453 + xy: 448, 388 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault rotate: false - xy: 568, 453 + xy: 448, 388 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-water rotate: false - xy: 443, 399 + xy: 592, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 443, 399 + xy: 592, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 834, 417 + xy: 245, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 852, 417 + xy: 263, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wraith-factory rotate: false - xy: 870, 417 + xy: 281, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deepwater-cliff-edge rotate: false - xy: 803, 389 + xy: 534, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 813, 391 + xy: 534, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 823, 391 + xy: 504, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 833, 393 + xy: 514, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 873, 393 + xy: 502, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 883, 393 + xy: 512, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 893, 393 + xy: 512, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 903, 393 + xy: 522, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 421, 367 + xy: 642, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 411, 357 + xy: 552, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 431, 367 + xy: 562, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 421, 357 + xy: 572, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 352, 306 + xy: 632, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 352, 296 + xy: 642, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 352, 286 + xy: 552, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 362, 347 + xy: 562, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 345, 62 + xy: 382, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 345, 48 + xy: 396, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 343, 34 + xy: 410, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 311, 40 + xy: 322, 341 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 329, 130 + xy: 324, 325 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 329, 114 + xy: 324, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 329, 114 + xy: 324, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 362, 317 + xy: 552, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 402, 347 + xy: 562, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 392, 337 + xy: 572, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 382, 327 + xy: 582, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 362, 307 + xy: 602, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 412, 347 + xy: 612, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 402, 337 + xy: 622, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 392, 327 + xy: 632, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 382, 317 + xy: 642, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 372, 307 + xy: 552, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 362, 297 + xy: 552, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 422, 347 + xy: 562, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 412, 337 + xy: 552, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 402, 327 + xy: 562, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 392, 317 + xy: 572, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 382, 307 + xy: 552, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 372, 297 + xy: 562, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 362, 287 + xy: 572, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 422, 337 + xy: 582, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 412, 327 + xy: 592, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 402, 317 + xy: 572, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 392, 307 + xy: 582, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 382, 297 + xy: 592, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 372, 287 + xy: 602, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 422, 327 + xy: 582, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 412, 317 + xy: 592, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 402, 307 + xy: 602, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 392, 297 + xy: 612, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 382, 287 + xy: 602, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 422, 317 + xy: 612, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 412, 307 + xy: 622, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 402, 297 + xy: 612, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 392, 287 + xy: 622, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 422, 307 + xy: 632, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 412, 297 + xy: 622, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 402, 287 + xy: 632, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 422, 297 + xy: 642, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 412, 287 + xy: 632, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 422, 287 + xy: 642, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 432, 347 + xy: 642, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 432, 337 + xy: 562, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 432, 327 + xy: 572, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 432, 317 + xy: 582, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 432, 307 + xy: 592, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 432, 297 + xy: 602, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 432, 287 + xy: 612, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 443, 379 + xy: 622, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 453, 379 + xy: 632, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 463, 379 + xy: 642, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 473, 379 + xy: 552, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 483, 379 + xy: 562, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 493, 379 + xy: 572, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 503, 379 + xy: 582, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 513, 379 + xy: 592, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 523, 379 + xy: 602, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 533, 379 + xy: 612, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 543, 379 + xy: 622, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 553, 379 + xy: 632, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 563, 379 + xy: 642, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 573, 379 + xy: 329, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 583, 379 + xy: 329, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 593, 379 + xy: 339, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 603, 379 + xy: 349, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 613, 379 + xy: 339, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 623, 379 + xy: 349, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 633, 379 + xy: 331, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 643, 379 + xy: 331, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 653, 379 + xy: 331, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 663, 379 + xy: 331, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 673, 379 + xy: 331, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 683, 379 + xy: 341, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 693, 379 + xy: 341, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 703, 379 + xy: 341, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 713, 379 + xy: 341, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 723, 379 + xy: 341, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 733, 379 + xy: 351, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 743, 379 + xy: 351, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 753, 379 + xy: 351, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 763, 379 + xy: 351, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 773, 379 + xy: 351, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 783, 379 + xy: 532, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 793, 379 + xy: 542, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 803, 379 + xy: 552, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 813, 381 + xy: 562, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 823, 381 + xy: 572, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 833, 383 + xy: 582, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 843, 383 + xy: 592, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 853, 383 + xy: 602, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 863, 383 + xy: 612, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 873, 383 + xy: 622, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 883, 383 + xy: 632, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 893, 383 + xy: 642, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 903, 383 + xy: 359, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 913, 383 + xy: 359, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 491, 359 + xy: 652, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 501, 369 + xy: 652, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 501, 359 + xy: 652, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 511, 369 + xy: 652, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 561, 369 + xy: 671, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 561, 359 + xy: 662, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 571, 369 + xy: 662, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 571, 359 + xy: 662, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 581, 359 + xy: 662, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 591, 369 + xy: 662, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 591, 359 + xy: 662, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 601, 369 + xy: 662, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tar-cliff-edge rotate: false - xy: 631, 359 + xy: 662, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tar-cliff-edge-1 rotate: false - xy: 641, 369 + xy: 662, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tar-cliff-edge-2 rotate: false - xy: 641, 359 + xy: 662, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tar-cliff-side rotate: false - xy: 651, 369 + xy: 662, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 141, 21 + xy: 438, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 315, 224 + xy: 510, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 297, 188 + xy: 510, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-wraith rotate: false - xy: 155, 35 + xy: 438, 316 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 wraith rotate: false - xy: 155, 35 + xy: 438, 316 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 371, 367 + xy: 362, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 361, 357 + xy: 990, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 391, 377 + xy: 864, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 381, 367 + xy: 542, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 371, 357 + xy: 542, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 401, 377 + xy: 542, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 391, 367 + xy: 552, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 381, 357 + xy: 562, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 411, 377 + xy: 572, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 401, 367 + xy: 582, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 391, 357 + xy: 592, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 421, 377 + xy: 602, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 411, 367 + xy: 612, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 401, 357 + xy: 622, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 431, 377 + xy: 632, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 352, 316 + xy: 622, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 166, 261 + xy: 242, 324 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 216, 269 + xy: 434, 344 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 216, 255 + xy: 448, 348 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 924, 403 + xy: 340, 320 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 938, 403 + xy: 354, 334 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 952, 403 + xy: 340, 306 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 329, 98 + xy: 324, 293 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 329, 82 + xy: 338, 348 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 329, 66 + xy: 354, 348 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 329, 50 + xy: 370, 342 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 810, 401 + xy: 418, 342 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 127, 21 + xy: 410, 286 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 141, 35 + xy: 424, 286 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 910, 403 + xy: 340, 334 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 glaive-ship rotate: false - xy: 168, 227 + xy: 272, 270 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 168, 227 + xy: 272, 270 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 345, 104 + xy: 368, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 345, 104 + xy: 368, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 345, 90 + xy: 382, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5270,14 +5270,14 @@ circle index: -1 shape-3 rotate: false - xy: 1, 198 + xy: 204, 401 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 border rotate: false - xy: 204, 309 + xy: 256, 296 size: 24, 40 split: 5, 5, 5, 10 orig: 24, 40 @@ -5285,39 +5285,55 @@ border index: -1 button rotate: false - xy: 30, 106 - size: 24, 40 - split: 10, 10, 6, 10 - orig: 24, 40 - offset: 0, 0 - index: -1 -textarea - rotate: false - xy: 30, 106 - size: 24, 40 - split: 10, 10, 9, 11 - orig: 24, 40 + xy: 410, 484 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 offset: 0, 0 index: -1 button-down rotate: false - xy: 233, 372 - size: 24, 40 - split: 10, 10, 6, 10 - orig: 24, 40 + xy: 204, 322 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 +button-edge-1 + rotate: false + xy: 334, 484 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 +button-edge-2 + rotate: false + xy: 1, 133 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 +button-edge-3 + rotate: false + xy: 372, 484 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 offset: 0, 0 index: -1 button-over rotate: false - xy: 233, 372 - size: 24, 40 - split: 10, 10, 6, 10 - orig: 24, 40 + xy: 1, 104 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 offset: 0, 0 index: -1 button-select rotate: false - xy: 594, 453 + xy: 448, 362 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -5325,854 +5341,854 @@ button-select index: -1 check-off rotate: false - xy: 230, 312 + xy: 464, 450 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 230, 278 + xy: 494, 450 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 260, 314 + xy: 371, 410 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 260, 280 + xy: 401, 410 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 166, 275 + xy: 242, 339 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cursor rotate: false - xy: 325, 382 + xy: 83, 198 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 discord-banner rotate: false - xy: 1, 263 + xy: 204, 466 size: 84, 45 orig: 84, 45 offset: 0, 0 index: -1 empty-sector rotate: false - xy: 678, 479 + xy: 832, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 153, 81 + xy: 202, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 153, 63 + xy: 220, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 171, 99 + xy: 238, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 171, 81 + xy: 256, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 189, 101 + xy: 256, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 207, 195 + xy: 292, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 218, 237 + xy: 220, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 225, 201 + xy: 274, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 243, 206 + xy: 256, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 261, 202 + xy: 292, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 controller-cursor rotate: false - xy: 906, 417 + xy: 166, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 153, 149 + xy: 166, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 153, 133 + xy: 89, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 148, 117 + xy: 105, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 186, 243 + xy: 212, 6 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 140, 141 + xy: 55, 162 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 135, 63 + xy: 202, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 135, 63 + xy: 202, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 272, 250 + xy: 462, 350 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 272, 238 + xy: 438, 290 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 259, 100 + xy: 474, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 271, 100 + xy: 486, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 95, 34 + xy: 220, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 164, 117 + xy: 121, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 95, 16 + xy: 202, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 169, 137 + xy: 220, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 1012, 442 + xy: 498, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 153, 99 + xy: 238, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 169, 37 + xy: 510, 345 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 184, 227 + xy: 137, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 200, 249 + xy: 153, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 225, 113 + xy: 182, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 243, 100 + xy: 172, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 279, 46 + xy: 188, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 333, 226 + xy: 198, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 171, 63 + xy: 202, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 189, 209 + xy: 220, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 333, 210 + xy: 214, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 189, 191 + xy: 238, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 187, 173 + xy: 256, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 333, 194 + xy: 230, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 187, 155 + xy: 274, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 333, 178 + xy: 246, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 187, 137 + xy: 202, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 333, 162 + xy: 262, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 333, 146 + xy: 278, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-generated rotate: false - xy: 1, 148 + xy: 204, 351 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-github rotate: false - xy: 634, 399 + xy: 294, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 650, 399 + xy: 310, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 180, 119 + xy: 220, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 169, 25 + xy: 522, 345 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 123, 9 + xy: 534, 345 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 666, 399 + xy: 326, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 682, 399 + xy: 204, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 135, 9 + xy: 452, 336 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 698, 399 + xy: 220, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 147, 9 + xy: 452, 324 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 361, 367 + xy: 321, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 200, 231 + xy: 238, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 714, 399 + xy: 236, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 159, 9 + xy: 452, 312 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 730, 399 + xy: 252, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 189, 83 + xy: 274, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 189, 65 + xy: 292, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 198, 119 + xy: 202, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 207, 101 + xy: 220, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 181, 37 + xy: 452, 300 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 746, 399 + xy: 268, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 181, 25 + xy: 450, 288 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 207, 83 + xy: 238, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 171, 13 + xy: 438, 278 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-background rotate: false - xy: 636, 433 + xy: 704, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 icon-mission-battle rotate: false - xy: 171, 1 + xy: 450, 276 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 183, 13 + xy: 1006, 445 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 183, 1 + xy: 1006, 433 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 190, 53 + xy: 554, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 381, 377 + xy: 321, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 202, 53 + xy: 566, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 207, 65 + xy: 256, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 762, 399 + xy: 284, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 207, 213 + xy: 274, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 193, 41 + xy: 578, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 778, 399 + xy: 300, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 193, 29 + xy: 590, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 205, 41 + xy: 602, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 338, 262 + xy: 316, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 236, 242 + xy: 238, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 338, 246 + xy: 332, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 297, 136 + xy: 342, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 254, 242 + xy: 256, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 313, 136 + xy: 348, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 295, 120 + xy: 990, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 311, 120 + xy: 546, 395 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 297, 104 + xy: 546, 379 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 297, 88 + xy: 546, 363 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 284, 242 + xy: 274, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 302, 242 + xy: 292, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 205, 29 + xy: 614, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 320, 242 + xy: 238, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 297, 72 + xy: 546, 347 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 195, 17 + xy: 626, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 195, 5 + xy: 638, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 313, 104 + xy: 306, 354 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 225, 219 + xy: 256, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 313, 88 + xy: 306, 338 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 313, 72 + xy: 308, 322 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 243, 224 + xy: 292, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 261, 220 + xy: 274, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 297, 56 + xy: 308, 306 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 313, 56 + xy: 308, 290 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 243, 188 + xy: 274, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 295, 40 + xy: 322, 357 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 info-banner rotate: false - xy: 204, 466 + xy: 1, 240 size: 84, 45 orig: 84, 45 offset: 0, 0 index: -1 inventory rotate: false - xy: 259, 378 + xy: 658, 437 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -6180,22 +6196,30 @@ inventory index: -1 logotext rotate: false - xy: 87, 287 + xy: 1, 287 size: 89, 21 orig: 89, 21 offset: 0, 0 index: -1 pane rotate: false - xy: 280, 428 - size: 24, 36 - split: 10, 10, 5, 5 - orig: 24, 36 + xy: 448, 484 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 +pane-2 + rotate: false + xy: 1, 75 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 offset: 0, 0 index: -1 pane-button rotate: false - xy: 1, 1 + xy: 892, 441 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -6203,7 +6227,7 @@ pane-button index: -1 scroll rotate: false - xy: 306, 432 + xy: 68, 53 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -6211,7 +6235,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 129, 261 + xy: 1, 20 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -6219,7 +6243,7 @@ scroll-horizontal index: -1 scroll-knob-horizontal rotate: false - xy: 87, 261 + xy: 1, 162 size: 40, 24 split: 10, 6, 0, 24 pad: -1, -1, 10, 10 @@ -6228,7 +6252,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 56, 114 + xy: 68, 90 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -6236,7 +6260,7 @@ scroll-knob-vertical index: -1 scroll-knob-vertical-black rotate: false - xy: 51, 156 + xy: 68, 132 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -6244,51 +6268,51 @@ scroll-knob-vertical-black index: -1 sector-edge rotate: false - xy: 94, 193 + xy: 254, 364 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sector-select rotate: false - xy: 128, 193 + xy: 337, 450 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 230, 348 + xy: 254, 398 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 1020, 454 + xy: 461, 434 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 256, 420 - size: 22, 44 - orig: 22, 44 + xy: 371, 444 + size: 29, 38 + orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1, 39 - size: 22, 44 - orig: 22, 44 + xy: 402, 444 + size: 29, 38 + orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1, 39 - size: 22, 44 - orig: 22, 44 + xy: 433, 444 + size: 29, 38 + orig: 29, 38 offset: 0, 0 index: -1 slider-vertical @@ -6298,9 +6322,17 @@ slider-vertical orig: 8, 1 offset: 0, 0 index: -1 +textarea + rotate: false + xy: 293, 244 + size: 24, 40 + split: 10, 10, 9, 11 + orig: 24, 40 + offset: 0, 0 + index: -1 textfield rotate: false - xy: 82, 129 + xy: 53, 174 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -6308,22 +6340,38 @@ textfield index: -1 textfield-over rotate: false - xy: 111, 163 + xy: 524, 447 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 offset: 0, 0 index: -1 +underline + rotate: false + xy: 486, 484 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 +underline-2 + rotate: false + xy: 1, 46 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 white rotate: false - xy: 25, 80 + xy: 87, 282 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window rotate: false - xy: 1, 85 + xy: 39, 36 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -6331,7 +6379,7 @@ window index: -1 window-empty rotate: false - xy: 204, 351 + xy: 39, 99 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -6339,210 +6387,210 @@ window-empty index: -1 alpha-drone rotate: false - xy: 97, 115 + xy: 644, 439 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-alpha-drone rotate: false - xy: 97, 115 + xy: 644, 439 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger rotate: false - xy: 868, 403 + xy: 320, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 882, 403 + xy: 334, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 896, 403 + xy: 348, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 fortress rotate: false - xy: 99, 70 + xy: 184, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 93, 52 + xy: 184, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 93, 52 + xy: 184, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 117, 63 + xy: 202, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ghoul rotate: false - xy: 305, 382 + xy: 684, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 unit-icon-ghoul rotate: false - xy: 305, 382 + xy: 684, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 phantom rotate: false - xy: 327, 34 + xy: 386, 342 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 unit-icon-phantom rotate: false - xy: 327, 34 + xy: 386, 342 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 power-cell rotate: false - xy: 794, 399 + xy: 402, 342 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 revenant rotate: false - xy: 259, 348 + xy: 431, 414 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 unit-icon-revenant rotate: false - xy: 259, 348 + xy: 431, 414 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 spirit rotate: false - xy: 173, 49 + xy: 424, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-spirit rotate: false - xy: 173, 49 + xy: 424, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titan rotate: false - xy: 277, 112 + xy: 554, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 297, 224 + xy: 515, 411 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 186, 251 + xy: 250, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 826, 403 + xy: 278, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 840, 403 + xy: 292, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 840, 403 + xy: 292, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 854, 403 + xy: 306, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 994, 403 + xy: 340, 292 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 1008, 403 + xy: 354, 292 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 345, 132 + xy: 368, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 131, 49 + xy: 410, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 113, 21 + xy: 382, 286 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 205363eea1..873ffa3f2f 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 ab630372a6..2e12d5ad2b 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -12,22 +12,23 @@ TintedDrawable: { invis: {name: white, color: {r: 0, g: 0, b: 0, a: 0} } loadDim: {name: white, color: {r: 0, g: 0, b: 0, a: 0.8} }, chatfield: {name: white, color: {r: 0, g: 0, b: 0, a: 0.2}}, - clear: {name: white, color: {r: 0.1, g: 0.1, b: 0.1, a: 0.75}}, + dark: {name: white, color: {hex: "#000000ff"}}, none: {name: white, color: {r: 0, g: 0, b: 0, a: 0}}, - clear-over: {name: white, color: { hex: "#ffffff82" }}, - clear-alpha: {name: white, color: { hex: "#ffd37fff" }}, - clear-down: {name: white, color: { hex: "#ffd37fff" }} + flat: {name: white, color: {r: 0.0, g: 0.0, b: 0.0, a: 0.42}}, + flat-over: {name: white, color: { hex: "#ffffff82" }}, + flat-alpha: {name: white, color: { hex: "#ffd37fff" }}, + flat-down: {name: white, color: { hex: "#ffd37fff" }} }, ButtonStyle: { default: {down: button-down, up: button }, toggle: {checked: button-down, down: button-down, up: button } }, TextButtonStyle: { - default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: gray, down: button-down, up: button, transition: 0 }, + default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: gray, down: button-down, up: button}, + clear: {over: flat-over, font: default-font, fontColor: white, disabledFontColor: gray, down: pane, up: flat}, discord: {font: default-font, fontColor: white, up: discord-banner}, info: {font: default-font, fontColor: white, up: info-banner}, - clear: {down: clear-down, up: clear, over: clear-over, font: default-font, fontColor: white, disabledFontColor: gray }, - clear-partial: {down: white, up: button-select, over: clear-down, font: default-font, fontColor: white, disabledFontColor: gray }, + clear-partial: {down: white, up: button-select, over: flat-down, font: default-font, fontColor: white, disabledFontColor: gray }, empty: {font: default-font}, toggle: {font: default-font, fontColor: white, checked: button-down, down: button-down, up: button, over: button-over, disabled: button, disabledFontColor: gray } }, @@ -39,24 +40,22 @@ ImageButtonStyle: { static-down: {up: button-down }, toggle: {checked: button-down, down: button-down, up: button, imageDisabledColor: gray, imageUpColor: white }, select: {checked: button-select, up: none }, - clear: {down: clear-down, up: clear, over: clear-over}, - clear-partial: {down: clear-down, up: none, over: clear-over}, - clear-toggle: {down: clear-down, checked: clear-down, up: clear, over: clear-over}, - clear-toggle-partial: {down: clear-down, checked: clear-down, up: none, over: clear-over}, + clear: {down: flat-down, up: flat, over: flat-over}, + clear-full: {down: white, up: button-select, over: flat-down}, + clear-partial: {down: flat-down, up: none, over: flat-over}, + clear-toggle: {down: flat-down, checked: flat-down, up: flat, over: flat-over}, + clear-toggle-partial: {down: flat-down, checked: flat-down, up: none, over: flat-over}, }, ScrollPaneStyle: { - 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, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}, - clear: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}, - clear-black: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black} + default: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}, + horizontal: {vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal}, }, WindowStyle: { default: {titleFont: default-font, titleFontColor: accent }, dialog: {stageBackground: dialogDim, titleFont: default-font, background: window-empty, titleFontColor: accent } }, KeybindDialogStyle: { - default: {keyColor: accent, keyNameColor: white, controllerColor: lightgray, paneStyle: clear}, + default: {keyColor: accent, keyNameColor: white, controllerColor: lightgray}, }, SliderStyle: { default-horizontal: {background: slider, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down}, @@ -67,8 +66,8 @@ LabelStyle: { small: {font: default-font, fontColor: white } }, TextFieldStyle: { - default: {font: default-font-chat, fontColor: white, disabledFontColor: gray, selection: selection, background: button, cursor: cursor, messageFont: default-font, messageFontColor: gray } - textarea: {font: default-font-chat, fontColor: white, disabledFontColor: gray, selection: selection, background: textarea, cursor: cursor, messageFont: default-font, messageFontColor: gray } + default: {font: default-font-chat, fontColor: white, disabledFontColor: gray, selection: selection, background: underline, cursor: cursor, messageFont: default-font, messageFontColor: gray } + textarea: {font: default-font-chat, fontColor: white, disabledFontColor: gray, selection: selection, background: underline, cursor: cursor, messageFont: default-font, messageFontColor: gray } }, CheckBoxStyle: { default: {checkboxOn: check-on, checkboxOff: check-off, checkboxOnOver: check-on-over, checkboxOver: check-over, font: default-font, fontColor: white, disabledFontColor: gray } diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index 6420c70daa..cd96e8344b 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -14,7 +14,7 @@ public class AmmoTypes implements ContentList{ bulletDenseBig, bulletPyratiteBig, bulletThoriumBig, shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, healBlaster, bulletGlaive, - /*flakCopper, */flakExplosive, flakPlastic, flakSurge, + flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, unitArtillery, basicFlame, lancerLaser, lightning, meltdownLaser, burstLaser, diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index b36f02f535..516d50d5f4 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Pixmap; +import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; @@ -58,7 +59,9 @@ public class MapEditorDialog extends Dialog implements Disposable{ private ButtonGroup blockgroup; public MapEditorDialog(){ - super("$text.mapeditor", "dialog"); + super("", "dialog"); + + background("dark"); editor = new MapEditor(); view = new MapView(editor); @@ -227,6 +230,11 @@ public class MapEditorDialog extends Dialog implements Disposable{ }); } + @Override + protected void drawBackground(Batch batch, float parentAlpha, float x, float y){ + drawDefaultBackground(batch, parentAlpha, x, y); + } + private void save(){ String name = editor.getTags().get("name", ""); @@ -352,7 +360,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ table(cont -> { cont.left(); - cont.table("button", mid -> { + cont.table(mid -> { mid.top(); Table tools = new Table().top(); @@ -360,7 +368,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ ButtonGroup group = new ButtonGroup<>(); Consumer addTool = tool -> { - ImageButton button = new ImageButton("icon-" + tool.name(), "toggle"); + ImageButton button = new ImageButton("icon-" + tool.name(), "clear-toggle"); button.clicked(() -> view.setTool(tool)); button.resizeImage(16 * 2f); button.update(() -> button.setChecked(view.getTool() == tool)); @@ -368,21 +376,21 @@ public class MapEditorDialog extends Dialog implements Disposable{ if(tool == EditorTool.pencil) button.setChecked(true); - tools.add(button).padBottom(-5.1f); + tools.add(button); }; - tools.defaults().size(size, size + 4f).padBottom(-5.1f); + tools.defaults().size(size, size + 4f); - tools.addImageButton("icon-menu-large", 16 * 2f, menu::show); + tools.addImageButton("icon-menu-large", "clear", 16 * 2f, menu::show); - ImageButton grid = tools.addImageButton("icon-grid", "toggle", 16 * 2f, () -> view.setGrid(!view.isGrid())).get(); + ImageButton grid = tools.addImageButton("icon-grid", "clear-toggle", 16 * 2f, () -> view.setGrid(!view.isGrid())).get(); addTool.accept(EditorTool.zoom); tools.row(); - ImageButton undo = tools.addImageButton("icon-undo", 16 * 2f, () -> view.undo()).get(); - ImageButton redo = tools.addImageButton("icon-redo", 16 * 2f, () -> view.redo()).get(); + ImageButton undo = tools.addImageButton("icon-undo", "clear", 16 * 2f, () -> view.undo()).get(); + ImageButton redo = tools.addImageButton("icon-redo", "clear", 16 * 2f, () -> view.redo()).get(); addTool.accept(EditorTool.pick); @@ -404,7 +412,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ addTool.accept(EditorTool.fill); addTool.accept(EditorTool.elevation); - ImageButton rotate = tools.addImageButton("icon-arrow-16", 16 * 2f, () -> editor.setDrawRotation((editor.getDrawRotation() + 1) % 4)).get(); + ImageButton rotate = tools.addImageButton("icon-arrow-16", "clear", 16 * 2f, () -> editor.setDrawRotation((editor.getDrawRotation() + 1) % 4)).get(); rotate.getImage().update(() -> { rotate.getImage().setRotation(editor.getDrawRotation() * 90); rotate.getImage().setOrigin(Align.center); @@ -412,8 +420,8 @@ public class MapEditorDialog extends Dialog implements Disposable{ tools.row(); - tools.table("button", t -> t.add("$text.editor.teams")) - .colspan(3).height(40).width(size * 3f); + tools.table("underline", t -> t.add("$text.editor.teams")) + .colspan(3).height(40).width(size * 3f).padBottom(3); tools.row(); @@ -422,14 +430,14 @@ public class MapEditorDialog extends Dialog implements Disposable{ int i = 0; for(Team team : Team.all){ - ImageButton button = new ImageButton("white", "toggle"); - button.margin(4f, 4f, 10f, 4f); + ImageButton button = new ImageButton("white", "clear-toggle-partial"); + button.margin(4f); button.getImageCell().grow(); button.getStyle().imageUpColor = team.color; button.clicked(() -> editor.setDrawTeam(team)); button.update(() -> button.setChecked(editor.getDrawTeam() == team)); teamgroup.add(button); - tools.add(button).padBottom(-5.1f); + tools.add(button); if(i++ % 3 == 2) tools.row(); } @@ -438,7 +446,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ mid.row(); - mid.table("button", t -> { + mid.table("underline", t -> { Slider slider = new Slider(0, MapEditor.brushSizes.length - 1, 1, false); slider.moved(f -> editor.setBrushSize(MapEditor.brushSizes[(int) (float) f])); @@ -450,28 +458,27 @@ public class MapEditorDialog extends Dialog implements Disposable{ mid.row(); - mid.table("button", t -> t.add("$text.editor.elevation")) + mid.table("underline", t -> t.add("$text.editor.elevation")) .colspan(3).height(40).width(size * 3f); mid.row(); - mid.table("button", t -> { + mid.table("underline", t -> { t.margin(0); - t.addImageButton("icon-arrow-left", 16 * 2f, () -> editor.setDrawElevation(editor.getDrawElevation() - 1)) + t.addImageButton("icon-arrow-left", "clear-partial", 16 * 2f, () -> editor.setDrawElevation(editor.getDrawElevation() - 1)) .disabled(b -> editor.getDrawElevation() <= -1).size(size); t.label(() -> editor.getDrawElevation() == -1 ? "$text.editor.slope" : (editor.getDrawElevation() + "")) .size(size).get().setAlignment(Align.center, Align.center); - t.addImageButton("icon-arrow-right", 16 * 2f, () -> editor.setDrawElevation(editor.getDrawElevation() + 1)) + t.addImageButton("icon-arrow-right", "clear-partial", 16 * 2f, () -> editor.setDrawElevation(editor.getDrawElevation() + 1)) .disabled(b -> editor.getDrawElevation() >= 63).size(size); - }).colspan(3).height(size).padTop(-5).width(size * 3f); + }).colspan(3).height(size).width(size * 3f); }).margin(0).left().growY(); - cont.table("button", t -> t.add(view).grow()) - .margin(5).marginBottom(10).grow(); + cont.table(t -> t.add(view).grow()).grow(); cont.table(this::addBlockSelection).right().growY(); @@ -525,7 +532,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ private void addBlockSelection(Table table){ Table content = new Table(); - pane = new ScrollPane(content, "volume"); + pane = new ScrollPane(content); pane.setFadeScrollBars(false); pane.setOverscroll(true, false); ButtonGroup group = new ButtonGroup<>(); @@ -552,7 +559,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ stack.add(new Image(region)); } - ImageButton button = new ImageButton("white", "toggle"); + ImageButton button = new ImageButton("white", "clear-toggle"); button.clicked(() -> editor.setDrawBlock(block)); button.resizeImage(8 * 4f); button.getImageCell().setActor(stack); @@ -560,7 +567,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ button.getImage().remove(); button.update(() -> button.setChecked(editor.getDrawBlock() == block)); group.add(button); - content.add(button).pad(4f).size(53f, 58f); + content.add(button).size(60f); if(i++ % 3 == 2){ content.row(); @@ -569,9 +576,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ group.getButtons().get(2).setChecked(true); - Table extra = new Table("button"); - extra.labelWrap(() -> editor.getDrawBlock().formalName).width(220f).center(); - table.add(extra).growX(); + table.table("underline", extra -> extra.labelWrap(() -> editor.getDrawBlock().formalName).width(220f).center()).growX(); table.row(); table.add(pane).growY().fillX(); } diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/io/anuke/mindustry/editor/MapView.java index fca223c3fe..baa0edca5c 100644 --- a/core/src/io/anuke/mindustry/editor/MapView.java +++ b/core/src/io/anuke/mindustry/editor/MapView.java @@ -270,8 +270,8 @@ public class MapView extends Element implements GestureListener{ Graphics.beginClip(x, y, width, height); - Draw.color(Color.LIGHT_GRAY); - Lines.stroke(-2f); + Draw.color(Palette.remove); + Lines.stroke(2f); Lines.rect(centerx - sclwidth / 2 - 1, centery - sclheight / 2 - 1, sclwidth + 2, sclheight + 2); editor.renderer().draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index 51d65dfbb8..c1ece11c93 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.graphics; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.MathUtils; +import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.content.blocks.Blocks; @@ -12,16 +13,21 @@ import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockBar; +import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Graphics; +import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Mathf; +import io.anuke.ucore.util.Tmp; import static io.anuke.mindustry.Vars.*; public class OverlayRenderer{ + private static final float indicatorLength = 14f; + private static final Rectangle rect = new Rectangle(); private float buildFadeTime; public void drawBottom(){ @@ -45,6 +51,21 @@ public class OverlayRenderer{ public void drawTop(){ + for(Player player : playerGroup.all()){ + if(Settings.getBool("indicators") && player != players[0] && player.getTeam() == players[0].getTeam()){ + if(!rect.setSize(Core.camera.viewportWidth * Core.camera.zoom * 0.9f, Core.camera.viewportHeight * Core.camera.zoom * 0.9f) + .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){ + + Tmp.v1.set(player.x, player.y).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength); + + Draw.color(player.getTeam().color); + Lines.stroke(2f); + Lines.lineAngle(Core.camera.position.x + Tmp.v1.x, Core.camera.position.y + Tmp.v1.y, Tmp.v1.angle(), 4f); + Draw.reset(); + } + } + } + for(Player player : players){ if(player.isDead()) continue; //dead players don't draw diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index bdf55a0888..0e152cb18e 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -356,13 +356,12 @@ public class Net{ Gdx.net.sendHttpRequest(req, new HttpResponseListener(){ @Override public void handleHttpResponse(HttpResponse httpResponse){ - String result = httpResponse.getResultAsString(); - Gdx.app.postRunnable(() -> listener.accept(result)); + listener.accept(httpResponse.getResultAsString()); } @Override public void failed(Throwable t){ - Gdx.app.postRunnable(() -> failure.accept(t)); + failure.accept(t); } @Override diff --git a/core/src/io/anuke/mindustry/ui/MenuButton.java b/core/src/io/anuke/mindustry/ui/MenuButton.java index 3f84649a93..7dd3d16cd1 100644 --- a/core/src/io/anuke/mindustry/ui/MenuButton.java +++ b/core/src/io/anuke/mindustry/ui/MenuButton.java @@ -22,7 +22,7 @@ public class MenuButton extends TextButton{ table(t -> { t.addImage(icon).size(14 * 3); - t.update(() -> t.setBackground(getClickListener().isOver() || getClickListener().isVisualPressed() ? "button-over" : "button")); + t.update(() -> t.setBackground(getClickListener().isVisualPressed() ? "button-down" : getClickListener().isOver() ? "button-over" : "button")); }).size(s - 5, s); diff --git a/core/src/io/anuke/mindustry/ui/Minimap.java b/core/src/io/anuke/mindustry/ui/Minimap.java index 3ee65de5e3..69be4be5b4 100644 --- a/core/src/io/anuke/mindustry/ui/Minimap.java +++ b/core/src/io/anuke/mindustry/ui/Minimap.java @@ -16,10 +16,9 @@ import static io.anuke.mindustry.Vars.*; public class Minimap extends Table{ public Minimap(){ - super("button"); + super("pane"); margin(5); - marginBottom(10); TextureRegion r = new TextureRegion(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index 3b27bcc252..11bf00e2d1 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -42,14 +42,14 @@ public class AboutDialog extends FloatingDialog{ float w = UIUtils.portrait() ? 330f : 600f; Table in = new Table(); - ScrollPane pane = new ScrollPane(in, "clear"); + ScrollPane pane = new ScrollPane(in); for(LinkEntry link : Links.getLinks()){ if((ios || OS.isMac) && bannedItems.contains(link.name)){ //because Apple doesn't like me mentioning things continue; } - Table table = new Table("button"); + Table table = new Table("underline-2"); table.margin(0); table.table(img -> { img.addImage("white").height(h - 5).width(40f).color(link.color); @@ -58,7 +58,7 @@ public class AboutDialog extends FloatingDialog{ }).expandY(); table.table(i -> { - i.background("button"); + i.background("button-edge-3"); i.addImage("icon-" + link.name).size(14 * 3f); }).size(h - 5, h); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java index c2917a0654..e1c9001874 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java @@ -24,7 +24,7 @@ public class AdminsDialog extends FloatingDialog{ Table table = new Table(); - ScrollPane pane = new ScrollPane(table, "clear"); + ScrollPane pane = new ScrollPane(table); pane.setFadeScrollBars(false); if(netServer.admins.getAdmins().size == 0){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java index 9045c6e7cc..1a3d8369d7 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java @@ -25,7 +25,7 @@ public class BansDialog extends FloatingDialog{ Table table = new Table(); - ScrollPane pane = new ScrollPane(table, "clear"); + ScrollPane pane = new ScrollPane(table); pane.setFadeScrollBars(false); if(netServer.admins.getBanned().size == 0){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java index 57c992baea..9d2e094eb1 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java @@ -38,7 +38,7 @@ public class ChangelogDialog extends FloatingDialog{ void setup(){ Table table = new Table(); - ScrollPane pane = new ScrollPane(table, "clear"); + ScrollPane pane = new ScrollPane(table); content().clear(); content().add(pane).grow(); @@ -60,7 +60,7 @@ public class ChangelogDialog extends FloatingDialog{ desc = desc.replace("Android", "Mobile"); - Table in = new Table("clear"); + Table in = new Table("underline"); in.top().left().margin(10); in.add("[accent]" + info.name + "[LIGHT_GRAY] | " + info.date); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java index 5a06b32a73..a9c282b065 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java @@ -25,10 +25,10 @@ public class ColorPickDialog extends Dialog{ for(int i = 0; i < playerColors.length; i++){ Color color = playerColors[i]; - ImageButton button = table.addImageButton("white", "toggle", 34, () -> { + ImageButton button = table.addImageButton("white", "clear-toggle", 34, () -> { cons.accept(color); hide(); - }).size(44, 48).pad(0).padBottom(-5.1f).get(); + }).size(48).get(); button.setChecked(players[0].color.equals(color)); button.getStyle().imageUpColor = color; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java index fe791c4030..50a2f4cf78 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java @@ -20,7 +20,7 @@ public class ContentInfoDialog extends FloatingDialog{ content.displayInfo(table); - ScrollPane pane = new ScrollPane(table, "clear-black"); + ScrollPane pane = new ScrollPane(table); content().add(pane); show(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index 220d0fad6f..1a5f218489 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -23,7 +23,7 @@ import static io.anuke.mindustry.Vars.*; public class CustomGameDialog extends FloatingDialog{ public CustomGameDialog(){ - super("$text.level.select"); + super("$text.customgame"); addCloseButton(); shown(this::setup); @@ -35,7 +35,7 @@ public class CustomGameDialog extends FloatingDialog{ Table maps = new Table(); maps.marginRight(14); - ScrollPane pane = new ScrollPane(maps, "clear-black"); + ScrollPane pane = new ScrollPane(maps); pane.setFadeScrollBars(false); int maxwidth = (Gdx.graphics.getHeight() > Gdx.graphics.getHeight() ? 2 : 4); @@ -52,7 +52,7 @@ public class CustomGameDialog extends FloatingDialog{ if(mode.hidden) continue; modes.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode) - .update(b -> b.setChecked(state.mode == mode)).group(group).size(140f, 54f).padBottom(-5); + .update(b -> b.setChecked(state.mode == mode)).group(group).size(140f, 54f); if(i++ % 2 == 1) modes.row(); } selmode.add(modes); @@ -139,7 +139,7 @@ public class CustomGameDialog extends FloatingDialog{ d.setFillParent(false); Table table = new Table(); table.defaults().pad(1f); - ScrollPane pane = new ScrollPane(table, "clear"); + ScrollPane pane = new ScrollPane(table); pane.setFadeScrollBars(false); table.row(); for(GameMode mode : GameMode.values()){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java index 2c9bf76d3b..b896ec75fd 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java @@ -34,13 +34,13 @@ public class HostDialog extends FloatingDialog{ ui.listfrag.rebuild(); }).grow().pad(8).get().setMaxLength(40); - ImageButton button = t.addImageButton("white", 40, () -> { + ImageButton button = t.addImageButton("white", "clear-full", 40, () -> { new ColorPickDialog().show(color -> { player.color.set(color); Settings.putInt("color-0", Color.rgba8888(color)); Settings.save(); }); - }).size(50f, 54f).get(); + }).size(54f).get(); button.update(() -> button.getStyle().imageUpColor = player.color); }).width(w).height(70f).pad(4).colspan(3); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index d844d18c5d..a05dc70e5d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -96,7 +96,7 @@ public class JoinDialog extends FloatingDialog{ //why are java lambdas this bad TextButton[] buttons = {null}; - TextButton button = buttons[0] = remote.addButton("[accent]" + server.displayIP(), "clear", () -> { + TextButton button = buttons[0] = remote.addButton("[accent]" + server.displayIP(), () -> { if(!buttons[0].childrenPressed()){ connect(server.ip, server.port); } @@ -194,7 +194,7 @@ public class JoinDialog extends FloatingDialog{ hosts.row(); hosts.add(local).width(w); - ScrollPane pane = new ScrollPane(hosts, "clear"); + ScrollPane pane = new ScrollPane(hosts); pane.setFadeScrollBars(false); pane.setScrollingDisabled(true, false); @@ -210,19 +210,19 @@ public class JoinDialog extends FloatingDialog{ Settings.save(); }).grow().pad(8).get().setMaxLength(maxNameLength); - ImageButton button = t.addImageButton("white", 40, () -> { + ImageButton button = t.addImageButton("white", "clear-full", 40, () -> { new ColorPickDialog().show(color -> { player.color.set(color); Settings.putInt("color-0", Color.rgba8888(color)); Settings.save(); }); - }).size(50f, 54f).get(); + }).size(54f).get(); button.update(() -> button.getStyle().imageUpColor = player.color); }).width(w).height(70f).pad(4); content().row(); content().add(pane).width(w + 38).pad(0); content().row(); - content().addCenteredImageTextButton("$text.server.add", "icon-add", "clear", 14 * 3, () -> { + content().addCenteredImageTextButton("$text.server.add", "icon-add", 14 * 3, () -> { renaming = null; add.show(); }).marginLeft(6).width(w).height(80f).update(button -> { @@ -273,7 +273,7 @@ public class JoinDialog extends FloatingDialog{ local.row(); - TextButton button = local.addButton("[accent]" + host.name, "clear", () -> connect(host.address, port)) + TextButton button = local.addButton("[accent]" + host.name, () -> connect(host.address, port)) .width(w).height(80f).pad(4f).get(); button.left(); button.row(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java index ee4ea6397c..a7a05f4433 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java @@ -24,7 +24,7 @@ public class LanguageDialog extends FloatingDialog{ private void setup(){ Table langs = new Table(); langs.marginRight(24f).marginLeft(24f); - ScrollPane pane = new ScrollPane(langs, "clear"); + ScrollPane pane = new ScrollPane(langs); pane.setFadeScrollBars(false); ButtonGroup group = new ButtonGroup<>(); @@ -38,7 +38,7 @@ public class LanguageDialog extends FloatingDialog{ Log.info("Setting locale: {0}", loc.toString()); ui.showInfo("$text.language.restart"); }); - langs.add(button).group(group).update(t -> t.setChecked(loc.equals(getLocale()))).size(400f, 50f).row(); + langs.add(button).group(group).update(t -> t.setChecked(loc.equals(getLocale()))).size(400f, 50f).pad(2).row(); } content().add(pane); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java index 8452cab889..facfcab706 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java @@ -45,7 +45,7 @@ public class LoadDialog extends FloatingDialog{ content().clear(); slots = new Table(); - pane = new ScrollPane(slots, "clear-black"); + pane = new ScrollPane(slots); pane.setFadeScrollBars(false); pane.setScrollingDisabled(true, false); @@ -146,7 +146,7 @@ public class LoadDialog extends FloatingDialog{ if(!valids){ slots.row(); - slots.addButton("$text.save.none", "clear", () -> { + slots.addButton("$text.save.none", () -> { }).disabled(true).fillX().margin(20f).minWidth(340f).height(80f).pad(4f); } @@ -154,7 +154,7 @@ public class LoadDialog extends FloatingDialog{ if(ios) return; - slots.addImageTextButton("$text.save.import", "icon-add", "clear", 14 * 3, () -> { + slots.addImageTextButton("$text.save.import", "icon-add", 14 * 3, () -> { Platform.instance.showFileChooser(Bundles.get("text.save.import"), "Mindustry Save", file -> { if(SaveIO.isSaveValid(file)){ try{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index 8308424f10..dbce472347 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -4,8 +4,8 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Scaling; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; -import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.io.MapIO; +import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.MapMeta; import io.anuke.mindustry.maps.MapTileData; import io.anuke.mindustry.ui.BorderImage; @@ -73,7 +73,7 @@ public class MapsDialog extends FloatingDialog{ Table maps = new Table(); maps.marginRight(24); - ScrollPane pane = new ScrollPane(maps, "clear-black"); + ScrollPane pane = new ScrollPane(maps); pane.setFadeScrollBars(false); int maxwidth = 4; @@ -88,7 +88,7 @@ public class MapsDialog extends FloatingDialog{ TextButton button = maps.addButton("", "clear", () -> showMapInfo(map)).width(mapsize).pad(8).get(); button.clearChildren(); - button.margin(6); + button.margin(9); button.add(map.meta.tags.get("name", map.name)).growX().center().get().setEllipsis(true); button.row(); button.addImage("white").growX().pad(4).color(Color.GRAY); @@ -121,7 +121,7 @@ public class MapsDialog extends FloatingDialog{ Table t = new Table(); t.margin(6); - ScrollPane pane = new ScrollPane(t, "clear-black"); + ScrollPane pane = new ScrollPane(t); desc.add(pane).grow(); t.top(); @@ -146,7 +146,7 @@ public class MapsDialog extends FloatingDialog{ table.row(); - table.addImageTextButton("$text.editor.openin", "icon-load-map", "clear", 16 * 2, () -> { + table.addImageTextButton("$text.editor.openin", "icon-load-map", 16 * 2, () -> { try{ Vars.ui.editor.beginEditMap(map.stream.get()); dialog.hide(); @@ -155,15 +155,15 @@ public class MapsDialog extends FloatingDialog{ e.printStackTrace(); ui.showError("$text.error.mapnotfound"); } - }).fillX().height(50f).marginLeft(6); + }).fillX().height(54f).marginLeft(10); - table.addImageTextButton("$text.delete", "icon-trash-16", "clear", 16 * 2, () -> { + table.addImageTextButton("$text.delete", "icon-trash-16", 16 * 2, () -> { ui.showConfirm("$text.confirm", Bundles.format("text.map.delete", map.name), () -> { world.maps.removeMap(map); dialog.hide(); setup(); }); - }).fillX().height(50f).marginLeft(6).disabled(!map.custom).touchable(map.custom ? Touchable.enabled : Touchable.disabled); + }).fillX().height(54f).marginLeft(10).disabled(!map.custom).touchable(map.custom ? Touchable.enabled : Touchable.disabled); dialog.show(); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java index 05acd4af7a..92ffff5f7a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java @@ -22,7 +22,7 @@ public class SaveDialog extends LoadDialog{ public void addSetup(){ slots.row(); - slots.addImageTextButton("$text.save.new", "icon-add", "clear", 14 * 3, () -> + slots.addImageTextButton("$text.save.new", "icon-add",14 * 3, () -> ui.showTextInput("$text.save", "$text.save.newslot", "", text -> { ui.loadGraphics("$text.saving", () -> { control.saves.addSave(text); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index a8931f70a7..c088808401 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -95,7 +95,7 @@ public class SettingsMenuDialog extends SettingsDialog{ prefs.clearChildren(); prefs.add(menu); - ScrollPane pane = new ScrollPane(prefs, "clear"); + ScrollPane pane = new ScrollPane(prefs); pane.addCaptureListener(new InputListener(){ @Override public boolean touchDown(InputEvent event, float x, float y, int pointer, int button){ @@ -148,21 +148,21 @@ public class SettingsMenuDialog extends SettingsDialog{ dialog.setFillParent(false); dialog.content().defaults().size(230f, 60f).pad(3); dialog.addCloseButton(); - dialog.content().addButton("$text.settings.clearsectors", "clear", () -> { + dialog.content().addButton("$text.settings.clearsectors", () -> { ui.showConfirm("$text.confirm", "$text.settings.clear.confirm", () -> { world.sectors.clear(); dialog.hide(); }); }); dialog.content().row(); - dialog.content().addButton("$text.settings.clearunlocks", "clear", () -> { + dialog.content().addButton("$text.settings.clearunlocks", () -> { ui.showConfirm("$text.confirm", "$text.settings.clear.confirm", () -> { control.unlocks.reset(); dialog.hide(); }); }); dialog.content().row(); - dialog.content().addButton("$text.settings.clearall", "clear", () -> { + dialog.content().addButton("$text.settings.clearall", () -> { ui.showConfirm("$text.confirm", "$text.settings.clearall.confirm", () -> { Map map = new HashMap<>(); for(String value : Settings.prefs().get().keySet()){ @@ -208,6 +208,7 @@ public class SettingsMenuDialog extends SettingsDialog{ } graphics.checkPref("fps", false); + graphics.checkPref("indicators", true); graphics.checkPref("lasers", true); graphics.checkPref("minimap", !mobile); //minimap is disabled by default on mobile devices } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java index 8b46947740..a1d58ea766 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java @@ -32,7 +32,7 @@ public class UnlocksDialog extends FloatingDialog{ Table table = new Table(); table.margin(20); - ScrollPane pane = new ScrollPane(table, "clear-black"); + ScrollPane pane = new ScrollPane(table); Array[] allContent = content.getContentMap(); @@ -65,9 +65,8 @@ public class UnlocksDialog extends FloatingDialog{ if(control.unlocks.isUnlocked(unlock)){ image.clicked(() -> Vars.ui.content.show(unlock)); - image.addListener(new Tooltip<>(new Table("clear"){{ + image.addListener(new Tooltip<>(new Table("button"){{ add(unlock.localizedName()); - margin(4); }})); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 6388b3ee28..699cd3369e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -106,7 +106,7 @@ public class PlacementFragment extends Fragment{ }; //top table with hover info - frame.table("clear", top -> { + frame.table("button-edge-2", top -> { topTable = top; top.add(new Table()).growX().update(topTable -> { if((tileDisplayBlock() == null && lastDisplay == getSelected()) || @@ -160,16 +160,15 @@ public class PlacementFragment extends Fragment{ topTable.labelWrap(lastDisplay.getDisplayName(hoverTile)).left().width(190f).padLeft(5); } }); - top.row(); - top.addImage("blank").growX().color(Palette.accent).height(3f); }).colspan(3).fillX().visible(() -> getSelected() != null || tileDisplayBlock() != null).touchable(Touchable.enabled); frame.row(); - frame.table("clear", blocksSelect -> { + frame.addImage("blank").color(Palette.accent).colspan(3).height(3*2).growX(); + frame.row(); + frame.table("pane-2", blocksSelect -> { blocksSelect.table(blocks -> blockTable = blocks).grow(); blocksSelect.row(); blocksSelect.table(input::buildUI).growX(); }).fillY().bottom().touchable(Touchable.enabled); - frame.addImage("blank").width(3f).fillY().color(Palette.accent); frame.table(categories -> { categories.defaults().size(50f); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index 80a96b3ffb..4c5ce941b4 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -45,10 +45,10 @@ public class PlayerListFragment extends Fragment{ } }); - cont.table("pane", pane -> { + cont.table("clear", pane -> { pane.label(() -> Bundles.format(playerGroup.size() == 1 ? "text.players.single" : "text.players", playerGroup.size())); pane.row(); - pane.pane("clear", content).grow().get().setScrollingDisabled(true, false); + pane.pane(content).grow().get().setScrollingDisabled(true, false); pane.row(); pane.table("pane", menu -> {