diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index 3f75f746fe..28426c356d 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -146,7 +146,7 @@ public class AndroidLauncher extends AndroidApplication{ InputStream inStream; if(myFile != null) inStream = new FileInputStream(myFile); else inStream = getContentResolver().openInputStream(uri); - Core.app.post(() -> { + Core.app.post(() -> Core.app.post(() -> { if(save){ //open save System.out.println("Opening save."); FileHandle file = Core.files.local("temp-save." + saveExtension); @@ -172,7 +172,7 @@ public class AndroidLauncher extends AndroidApplication{ ui.editor.beginEditMap(file); }); } - }); + })); } }catch(IOException e){ e.printStackTrace(); diff --git a/core/assets-raw/sprites/blocks/environment/cliffs1.png b/core/assets-raw/sprites/blocks/environment/cliffs1.png index 52b99e2de6..087e3065e2 100644 Binary files a/core/assets-raw/sprites/blocks/environment/cliffs1.png and b/core/assets-raw/sprites/blocks/environment/cliffs1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow1.png b/core/assets-raw/sprites/blocks/environment/ice-snow1.png index d671587375..fa26a7eb94 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow1.png and b/core/assets-raw/sprites/blocks/environment/ice-snow1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow2.png b/core/assets-raw/sprites/blocks/environment/ice-snow2.png index 115a8a08a2..b1b895af0a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow2.png and b/core/assets-raw/sprites/blocks/environment/ice-snow2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow3.png b/core/assets-raw/sprites/blocks/environment/ice-snow3.png index 944fb54588..6448172835 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow3.png and b/core/assets-raw/sprites/blocks/environment/ice-snow3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks-large.png b/core/assets-raw/sprites/blocks/environment/icerocks-large.png index 4a9ffd8e52..0a2f8b5d40 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks-large.png and b/core/assets-raw/sprites/blocks/environment/icerocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks1.png b/core/assets-raw/sprites/blocks/environment/icerocks1.png index 8e11fd1ddf..c690d8d2f8 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks1.png and b/core/assets-raw/sprites/blocks/environment/icerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles1.png b/core/assets-raw/sprites/blocks/environment/pebbles1.png index 825833c5b6..cac9429ba0 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles1.png and b/core/assets-raw/sprites/blocks/environment/pebbles1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles2.png b/core/assets-raw/sprites/blocks/environment/pebbles2.png index 075f05dfcd..a909715845 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles2.png and b/core/assets-raw/sprites/blocks/environment/pebbles2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles3.png b/core/assets-raw/sprites/blocks/environment/pebbles3.png index 846f5fbc3f..b8585099aa 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles3.png and b/core/assets-raw/sprites/blocks/environment/pebbles3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pine.png b/core/assets-raw/sprites/blocks/environment/pine.png index 1642bbbfd0..8a4dcd9ad2 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pine.png and b/core/assets-raw/sprites/blocks/environment/pine.png differ diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png b/core/assets-raw/sprites/blocks/environment/saltrocks-large.png index f0ec9c74f3..3bf4af2ec1 100644 Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png and b/core/assets-raw/sprites/blocks/environment/saltrocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks1.png b/core/assets-raw/sprites/blocks/environment/shalerocks1.png index f489ee1d03..ff8b482bb7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shalerocks1.png and b/core/assets-raw/sprites/blocks/environment/shalerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks2.png b/core/assets-raw/sprites/blocks/environment/shalerocks2.png index 356255acb4..50d0f74c0c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shalerocks2.png and b/core/assets-raw/sprites/blocks/environment/shalerocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png index 01cfa406f8..b881f006f3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png and b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-pine.png b/core/assets-raw/sprites/blocks/environment/spore-pine.png index 661c4caeb7..802248118a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-pine.png and b/core/assets-raw/sprites/blocks/environment/spore-pine.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png index 4153ac2798..d02f83cdff 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png and b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks1.png b/core/assets-raw/sprites/blocks/environment/sporerocks1.png index 9672003dfb..6f937d4613 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks1.png and b/core/assets-raw/sprites/blocks/environment/sporerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks2.png b/core/assets-raw/sprites/blocks/environment/sporerocks2.png index 668e3d2cc6..cebda293b9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks2.png and b/core/assets-raw/sprites/blocks/environment/sporerocks2.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png index e1fcabc496..0cf01f72a9 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png differ diff --git a/core/assets-raw/sprites/items/item-biomatter.png b/core/assets-raw/sprites/items/item-biomatter.png deleted file mode 100644 index 6dae991e87..0000000000 Binary files a/core/assets-raw/sprites/items/item-biomatter.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/button-disabled.9.png b/core/assets-raw/sprites/ui/button-disabled.9.png index b2e4d7eb25..a4602889e8 100644 Binary files a/core/assets-raw/sprites/ui/button-disabled.9.png and b/core/assets-raw/sprites/ui/button-disabled.9.png differ diff --git a/core/assets-raw/sprites/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png index b26d54d0a1..1cc0db6249 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 index b91afee83a..98f588a553 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-1.9.png 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 index 063dfa6c69..745c279f10 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-2.9.png 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 index a182e728a6..344cfc07a9 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-3.9.png and b/core/assets-raw/sprites/ui/button-edge-3.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-4.9.png b/core/assets-raw/sprites/ui/button-edge-4.9.png index c8e554c5e3..831e94fd5e 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-4.9.png and b/core/assets-raw/sprites/ui/button-edge-4.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 fe5f260ce5..7effe30ffa 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-red.9.png b/core/assets-raw/sprites/ui/button-red.9.png new file mode 100644 index 0000000000..621dda2ca6 Binary files /dev/null and b/core/assets-raw/sprites/ui/button-red.9.png differ diff --git a/core/assets-raw/sprites/ui/button-right-down.9.png b/core/assets-raw/sprites/ui/button-right-down.9.png index efbabad92d..c410ca7f44 100644 Binary files a/core/assets-raw/sprites/ui/button-right-down.9.png and b/core/assets-raw/sprites/ui/button-right-down.9.png differ diff --git a/core/assets-raw/sprites/ui/button-right-over.9.png b/core/assets-raw/sprites/ui/button-right-over.9.png index 1f6d0fa234..2f4a6a05bb 100644 Binary files a/core/assets-raw/sprites/ui/button-right-over.9.png and b/core/assets-raw/sprites/ui/button-right-over.9.png differ diff --git a/core/assets-raw/sprites/ui/button-right.9.png b/core/assets-raw/sprites/ui/button-right.9.png index cd3d8d52e1..dc88b76b54 100644 Binary files a/core/assets-raw/sprites/ui/button-right.9.png and b/core/assets-raw/sprites/ui/button-right.9.png differ diff --git a/core/assets-raw/sprites/ui/button-select.9.png b/core/assets-raw/sprites/ui/button-select.9.png index 73c217fc2b..a437c5b58d 100644 Binary files a/core/assets-raw/sprites/ui/button-select.9.png and b/core/assets-raw/sprites/ui/button-select.9.png differ diff --git a/core/assets-raw/sprites/ui/button.9.png b/core/assets-raw/sprites/ui/button.9.png index b88439e267..19e13554cf 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/check-disabled.png b/core/assets-raw/sprites/ui/check-disabled.png index 68f22ed90e..53d7724049 100644 Binary files a/core/assets-raw/sprites/ui/check-disabled.png and b/core/assets-raw/sprites/ui/check-disabled.png differ diff --git a/core/assets-raw/sprites/ui/check-off.png b/core/assets-raw/sprites/ui/check-off.png index 79b86aabc1..31f800e66f 100644 Binary files a/core/assets-raw/sprites/ui/check-off.png and b/core/assets-raw/sprites/ui/check-off.png differ diff --git a/core/assets-raw/sprites/ui/check-on-disabled.png b/core/assets-raw/sprites/ui/check-on-disabled.png index bd65bb214f..8eadb568e9 100644 Binary files a/core/assets-raw/sprites/ui/check-on-disabled.png and b/core/assets-raw/sprites/ui/check-on-disabled.png differ diff --git a/core/assets-raw/sprites/ui/check-on-over.png b/core/assets-raw/sprites/ui/check-on-over.png index 716e6fffb7..5911e9ea4e 100644 Binary files a/core/assets-raw/sprites/ui/check-on-over.png and b/core/assets-raw/sprites/ui/check-on-over.png differ diff --git a/core/assets-raw/sprites/ui/check-on.png b/core/assets-raw/sprites/ui/check-on.png index e4a8d11538..424e7c324f 100644 Binary files a/core/assets-raw/sprites/ui/check-on.png and b/core/assets-raw/sprites/ui/check-on.png differ diff --git a/core/assets-raw/sprites/ui/check-over.png b/core/assets-raw/sprites/ui/check-over.png index 5f618e5c86..39611ce341 100644 Binary files a/core/assets-raw/sprites/ui/check-over.png and b/core/assets-raw/sprites/ui/check-over.png differ diff --git a/core/assets-raw/sprites/ui/content-background-locked.9.png b/core/assets-raw/sprites/ui/content-background-locked.9.png deleted file mode 100644 index 60e1941d4f..0000000000 Binary files a/core/assets-raw/sprites/ui/content-background-locked.9.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/content-background-noitems.9.png b/core/assets-raw/sprites/ui/content-background-noitems.9.png deleted file mode 100644 index f612ec98d4..0000000000 Binary files a/core/assets-raw/sprites/ui/content-background-noitems.9.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/content-background-over.9.png b/core/assets-raw/sprites/ui/content-background-over.9.png deleted file mode 100644 index 7e1a6e6c2d..0000000000 Binary files a/core/assets-raw/sprites/ui/content-background-over.9.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/content-background.9.png b/core/assets-raw/sprites/ui/content-background.9.png deleted file mode 100644 index cdd8df0abc..0000000000 Binary files a/core/assets-raw/sprites/ui/content-background.9.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/discord-banner.png b/core/assets-raw/sprites/ui/discord-banner.png index ac4d3b1ec9..d73d665602 100644 Binary files a/core/assets-raw/sprites/ui/discord-banner.png and b/core/assets-raw/sprites/ui/discord-banner.png differ diff --git a/core/assets-raw/sprites/ui/empty-sector.png b/core/assets-raw/sprites/ui/empty-sector.png deleted file mode 100644 index a0bad794cd..0000000000 Binary files a/core/assets-raw/sprites/ui/empty-sector.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/flat-down-base.9.png b/core/assets-raw/sprites/ui/flat-down-base.9.png new file mode 100644 index 0000000000..10de55d3af Binary files /dev/null and b/core/assets-raw/sprites/ui/flat-down-base.9.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-changelog.png b/core/assets-raw/sprites/ui/icons/icon-changelog.png new file mode 100644 index 0000000000..e6fbf8d3c1 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-changelog.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-crafting.png b/core/assets-raw/sprites/ui/icons/icon-crafting.png index 40fed85b68..3f7022e87b 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-crafting.png and b/core/assets-raw/sprites/ui/icons/icon-crafting.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-defense.png b/core/assets-raw/sprites/ui/icons/icon-defense.png index fda87cc342..2ae509685e 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-defense.png and b/core/assets-raw/sprites/ui/icons/icon-defense.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-distribution.png b/core/assets-raw/sprites/ui/icons/icon-distribution.png index c8f2aa899f..3a202b38e8 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-distribution.png and b/core/assets-raw/sprites/ui/icons/icon-distribution.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-effect.png b/core/assets-raw/sprites/ui/icons/icon-effect.png index e04b7d7d89..212034645b 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-effect.png and b/core/assets-raw/sprites/ui/icons/icon-effect.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-info.png b/core/assets-raw/sprites/ui/icons/icon-info.png index 2ea8dcb014..7e2bb40037 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-info.png and b/core/assets-raw/sprites/ui/icons/icon-info.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-liquid.png b/core/assets-raw/sprites/ui/icons/icon-liquid.png index 903a3a0c7a..1306834469 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-liquid.png and b/core/assets-raw/sprites/ui/icons/icon-liquid.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-map.png b/core/assets-raw/sprites/ui/icons/icon-map.png index 54f6a56169..92ff76d74f 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-map.png and b/core/assets-raw/sprites/ui/icons/icon-map.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-production.png b/core/assets-raw/sprites/ui/icons/icon-production.png index 8d037a43a2..fe6c3523c0 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-production.png and b/core/assets-raw/sprites/ui/icons/icon-production.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-turret.png b/core/assets-raw/sprites/ui/icons/icon-turret.png index 4c061fe38a..32fd01b464 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-turret.png and b/core/assets-raw/sprites/ui/icons/icon-turret.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-units.png b/core/assets-raw/sprites/ui/icons/icon-units.png index a9fec2ff64..1ee9cd9f55 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-units.png and b/core/assets-raw/sprites/ui/icons/icon-units.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-upgrade.png b/core/assets-raw/sprites/ui/icons/icon-upgrade.png index 9eb2842b60..80e416aebe 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-upgrade.png and b/core/assets-raw/sprites/ui/icons/icon-upgrade.png differ diff --git a/core/assets-raw/sprites/ui/info-banner.png b/core/assets-raw/sprites/ui/info-banner.png index 3568944de5..0ee4c4ad83 100644 Binary files a/core/assets-raw/sprites/ui/info-banner.png and b/core/assets-raw/sprites/ui/info-banner.png differ diff --git a/core/assets-raw/sprites/ui/inventory.9.png b/core/assets-raw/sprites/ui/inventory.9.png index 53a5632587..7d6bd10d44 100644 Binary files a/core/assets-raw/sprites/ui/inventory.9.png and b/core/assets-raw/sprites/ui/inventory.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 index e2fe497574..417dcd02fd 100644 Binary files a/core/assets-raw/sprites/ui/pane-2.9.png 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 a21c4607aa..885a5c45f3 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/scroll-knob-horizontal-black.9.png b/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png index 7f5dd4137f..7a3bac9b10 100644 Binary files a/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png and b/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png differ diff --git a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png index 1b5c9d39d8..17d9dcf726 100644 Binary files a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png and b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png differ diff --git a/core/assets-raw/sprites/ui/sector-select.png b/core/assets-raw/sprites/ui/sector-select.png deleted file mode 100644 index 79987b507f..0000000000 Binary files a/core/assets-raw/sprites/ui/sector-select.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png index 2822be93af..32fd414a91 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 2822be93af..d0dde09ecc 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 4d98387c78..1c40347ea0 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 278674e9a0..71b354ccc9 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.9.png b/core/assets-raw/sprites/ui/underline.9.png index e42d29c78f..ce0a093570 100644 Binary files a/core/assets-raw/sprites/ui/underline.9.png 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 7ec5e567cd..6f17bdde78 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -4,6 +4,7 @@ contributors = Translators and Contributors discord = Join the Mindustry Discord! link.discord.description = The official Mindustry Discord chatroom link.github.description = Game source code +link.changelog.description = List of update changes link.dev-builds.description = Unstable development builds link.trello.description = Official Trello board for planned features link.itch.io.description = itch.io page with PC downloads and web version @@ -195,6 +196,7 @@ editor.description = Description: editor.waves = Waves: editor.rules = Rules: editor.ingame = Edit In-Game +editor.newmap = New Map waves.title = Waves waves.remove = Remove waves.never = @@ -298,6 +300,7 @@ width = Width: height = Height: menu = Menu play = Play +campaign = Campaign load = Load save = Save fps = FPS: {0} @@ -378,6 +381,7 @@ blocks.booster = Booster block.unknown = [LIGHT_GRAY]??? blocks.powercapacity = Power Capacity blocks.powershot = Power/Shot +blocks.damage = Damage blocks.targetsair = Targets Air blocks.targetsground = Targets Ground blocks.itemsmoved = Move Speed diff --git a/core/assets/maps/caldera.msav b/core/assets/maps/caldera.msav index ecf899bca0..b8cd96df57 100644 Binary files a/core/assets/maps/caldera.msav and b/core/assets/maps/caldera.msav differ diff --git a/core/assets/maps/tendrils.msav b/core/assets/maps/tendrils.msav index c222bf61e2..cacf6d8476 100644 Binary files a/core/assets/maps/tendrils.msav and b/core/assets/maps/tendrils.msav differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 0146860318..69bee62d95 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/logo.png b/core/assets/sprites/logo.png new file mode 100644 index 0000000000..eee1e0e658 Binary files /dev/null and b/core/assets/sprites/logo.png differ diff --git a/core/assets/sprites/logotext.png b/core/assets/sprites/logotext.png deleted file mode 100644 index 64976a6c47..0000000000 Binary files a/core/assets/sprites/logotext.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 5f32e414aa..42ff667dd5 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,378 +20,378 @@ force-projector-top index: -1 mend-projector rotate: false - xy: 653, 1026 + xy: 1256, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 719, 1092 + xy: 1256, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1583, 808 + xy: 1907, 452 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1609, 842 + xy: 1941, 458 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 653, 960 + xy: 1247, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 719, 1026 + xy: 1322, 1368 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1761, 638 + xy: 1099, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 2002, 1122 + xy: 453, 535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 2013, 1816 + xy: 487, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 2013, 1782 + xy: 521, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 2009, 1748 + xy: 555, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 2009, 1714 + xy: 521, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 503, 519 + xy: 479, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 495, 485 + xy: 513, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 495, 451 + xy: 479, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1999, 908 + xy: 513, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1991, 874 + xy: 547, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 423, 409 + xy: 547, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 457, 409 + xy: 2013, 1884 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 529, 485 + xy: 2013, 1850 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 529, 451 + xy: 2013, 1816 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 495, 417 + xy: 2013, 1782 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 529, 417 + xy: 2013, 1748 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 419, 375 + xy: 2013, 1714 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 453, 375 + xy: 2013, 1680 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 409, 341 + xy: 589, 552 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 409, 307 + xy: 589, 518 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 443, 341 + xy: 589, 484 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 409, 273 + xy: 589, 450 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 443, 307 + xy: 581, 416 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 409, 239 + xy: 581, 382 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 443, 273 + xy: 1855, 1064 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1705, 502 + xy: 955, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1739, 536 + xy: 921, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1603, 366 + xy: 955, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1637, 400 + xy: 989, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1671, 434 + xy: 955, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1705, 468 + xy: 989, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1739, 502 + xy: 1023, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1603, 332 + xy: 989, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1637, 366 + xy: 1023, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1671, 400 + xy: 1057, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1705, 434 + xy: 1023, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1739, 468 + xy: 1057, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1637, 332 + xy: 1091, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1671, 366 + xy: 1057, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1705, 400 + xy: 1091, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1739, 434 + xy: 1125, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1671, 332 + xy: 1091, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1705, 366 + xy: 1125, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1739, 400 + xy: 1159, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1705, 332 + xy: 1125, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 1486, 1260 + xy: 1124, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 junction rotate: false - xy: 547, 35 + xy: 1915, 594 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -405,49 +405,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1787, 808 + xy: 1983, 900 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1991, 840 + xy: 1983, 696 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1821, 836 + xy: 1983, 662 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1821, 802 + xy: 1983, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1855, 814 + xy: 1983, 594 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1625, 706 + xy: 649, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1671, 604 + xy: 1303, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -496,35 +496,35 @@ laser-drill-rim index: -1 laser-drill-rotator rotate: false - xy: 1491, 1466 + xy: 1493, 1466 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 1589, 1462 + xy: 1591, 1462 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 785, 1224 + xy: 1115, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 719, 1158 + xy: 1181, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 851, 1224 + xy: 1181, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -559,77 +559,77 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 851, 1026 + xy: 983, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 719, 828 + xy: 1115, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 785, 894 + xy: 1181, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1181, 1034 + xy: 1652, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 983, 770 + xy: 1784, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 1049, 836 + xy: 1850, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1115, 902 + xy: 1916, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 2002, 1224 + xy: 453, 569 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 2002, 1190 + xy: 385, 501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 2002, 1156 + xy: 419, 501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 553, 569 + xy: 521, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -643,28 +643,28 @@ place-arrow index: -1 rubble-1-0 rotate: false - xy: 851, 894 + xy: 563, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 653, 630 + xy: 629, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 719, 696 + xy: 695, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 785, 762 + xy: 563, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -685,196 +685,196 @@ rubble-3-1 index: -1 rubble-4-0 rotate: false - xy: 1103, 1626 + xy: 1363, 1662 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 rubble-4-1 rotate: false - xy: 1103, 1626 + xy: 1363, 1662 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 2002, 1088 + xy: 453, 501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 2002, 1054 + xy: 487, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 2002, 1054 + xy: 487, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 2013, 1884 + xy: 521, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 2013, 1850 + xy: 487, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1905, 944 + xy: 419, 467 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1939, 942 + xy: 453, 467 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1897, 910 + xy: 487, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1931, 908 + xy: 521, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1931, 908 + xy: 521, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1931, 908 + xy: 521, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1931, 908 + xy: 521, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1973, 942 + xy: 555, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 587, 563 + xy: 555, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1855, 882 + xy: 1916, 1206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1889, 876 + xy: 377, 433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1923, 874 + xy: 411, 433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1923, 874 + xy: 411, 433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1957, 874 + xy: 445, 433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 427, 443 + xy: 377, 399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 461, 477 + xy: 411, 399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1405, 910 + xy: 1949, 1002 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1439, 910 + xy: 1949, 934 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1473, 910 + xy: 1949, 866 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1464, 876 + xy: 1949, 832 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 1785, 1462 + xy: 1787, 1462 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -895,105 +895,105 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1515, 808 + xy: 1949, 594 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1855, 848 + xy: 1983, 832 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1889, 842 + xy: 1983, 798 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1923, 840 + xy: 1983, 764 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1957, 840 + xy: 1983, 730 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1523, 740 + xy: 1705, 460 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1557, 740 + xy: 1739, 460 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1591, 774 + xy: 2014, 1178 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1591, 740 + xy: 2007, 1144 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1625, 774 + xy: 2007, 1110 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1625, 740 + xy: 623, 544 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 719, 762 + xy: 563, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 489, 1127 + xy: 1787, 1364 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dart-mech-pad rotate: false - xy: 1486, 1326 + xy: 992, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 1420, 1260 + xy: 1058, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1007,7 +1007,7 @@ glaive-ship-pad index: -1 javelin-ship-pad rotate: false - xy: 587, 729 + xy: 917, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1021,21 +1021,21 @@ omega-mech-pad index: -1 tau-mech-pad rotate: false - xy: 1247, 1232 + xy: 1025, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 1049, 968 + xy: 1223, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 battery rotate: false - xy: 385, 397 + xy: 385, 569 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1049,14 +1049,14 @@ battery-large index: -1 combustion-generator rotate: false - xy: 1989, 1020 + xy: 555, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1989, 986 + xy: 385, 467 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1084,161 +1084,161 @@ differential-generator-top index: -1 impact-reactor rotate: false - xy: 1883, 1788 + xy: 163, 1151 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-bottom rotate: false - xy: 163, 1151 + xy: 163, 1021 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-light rotate: false - xy: 163, 891 + xy: 163, 761 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-0 rotate: false - xy: 163, 761 + xy: 163, 631 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-1 rotate: false - xy: 163, 631 + xy: 155, 501 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-2 rotate: false - xy: 155, 501 + xy: 155, 371 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-3 rotate: false - xy: 155, 371 + xy: 131, 241 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 power-node rotate: false - xy: 1923, 772 + xy: 1991, 1070 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 851, 960 + xy: 1247, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1991, 772 + xy: 1941, 424 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1523, 774 + xy: 1975, 424 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 785, 828 + xy: 629, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1659, 706 + xy: 717, 442 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1603, 536 + xy: 1235, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 489, 1225 + xy: 1689, 1364 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 1181, 1232 + xy: 959, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 983, 968 + xy: 1091, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 489, 1029 + xy: 1885, 1364 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 489, 931 + xy: 261, 273 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 489, 833 + xy: 261, 175 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 1115, 1034 + xy: 1157, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 1181, 1100 + xy: 1223, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1247, 1166 + xy: 1223, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1252,7 +1252,7 @@ alloy-smelter index: -1 alloy-smelter-top rotate: false - xy: 1491, 1564 + xy: 1493, 1564 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1266,112 +1266,112 @@ blast-mixer index: -1 coal-centrifuge rotate: false - xy: 916, 1364 + xy: 1983, 1526 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 892, 1290 + xy: 992, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1024, 1298 + xy: 1124, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1090, 1298 + xy: 1190, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1156, 1298 + xy: 596, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1288, 1298 + xy: 728, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1354, 1302 + xy: 794, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 587, 795 + xy: 851, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 513, 35 + xy: 1881, 724 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 579, 281 + xy: 1915, 832 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 589, 111 + xy: 1915, 662 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 587, 663 + xy: 917, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 587, 597 + xy: 983, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 587, 597 + xy: 983, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1507, 910 + xy: 1949, 764 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1549, 808 + xy: 1949, 526 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1385,140 +1385,140 @@ multi-press index: -1 phase-weaver rotate: false - xy: 719, 960 + xy: 587, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 785, 1026 + xy: 653, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 653, 828 + xy: 785, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 719, 894 + xy: 851, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 785, 960 + xy: 917, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1659, 774 + xy: 623, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1693, 774 + xy: 623, 476 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1693, 740 + xy: 657, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 653, 696 + xy: 563, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 917, 960 + xy: 761, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 917, 894 + xy: 827, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 917, 828 + xy: 893, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 917, 630 + xy: 893, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 983, 1232 + xy: 959, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1049, 1232 + xy: 1025, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 983, 1166 + xy: 893, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 983, 1100 + xy: 1025, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1049, 1166 + xy: 1091, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container rotate: false - xy: 982, 1364 + xy: 1983, 1460 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation rotate: false - xy: 713, 1756 + xy: 843, 1756 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -1539,49 +1539,49 @@ core-shard index: -1 launch-pad rotate: false - xy: 1687, 1462 + xy: 1689, 1462 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large rotate: false - xy: 131, 241 + xy: 131, 111 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unloader rotate: false - xy: 1773, 502 + xy: 1193, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 596, 1332 + xy: 489, 1127 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 469, 519 + xy: 385, 603 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 2002, 1258 + xy: 419, 535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 513, 1649 + xy: 1983, 1592 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1595,28 +1595,28 @@ block-3 index: -1 block-4 rotate: false - xy: 1753, 1658 - size: 126, 128 - orig: 126, 128 + xy: 323, 1715 + size: 128, 128 + orig: 128, 128 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 1371, 1194 + xy: 1805, 1006 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 719, 1224 + xy: 1049, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 meltdown-heat rotate: false - xy: 583, 1626 + xy: 713, 1626 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -1630,98 +1630,98 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 719, 630 + xy: 695, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 851, 762 + xy: 629, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 785, 630 + xy: 695, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1659, 672 + xy: 759, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 983, 704 + xy: 1289, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory rotate: false - xy: 694, 1290 + xy: 794, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 694, 1290 + xy: 794, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory rotate: false - xy: 694, 1290 + xy: 794, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 694, 1290 + xy: 794, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 694, 1290 + xy: 794, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 694, 1290 + xy: 794, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory-top rotate: false - xy: 826, 1290 + xy: 926, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 1461, 1392 + xy: 926, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory-top rotate: false - xy: 587, 1257 + xy: 653, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1763,266 +1763,266 @@ ghoul-factory index: -1 phantom-factory-top rotate: false - xy: 851, 1158 + xy: 1388, 1368 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1761, 774 + xy: 691, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory rotate: false - xy: 713, 1626 + xy: 973, 1626 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 revenant-factory-top rotate: false - xy: 973, 1626 + xy: 1233, 1626 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spirit-factory-top rotate: false - xy: 917, 696 + xy: 827, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-factory rotate: false - xy: 489, 735 + xy: 498, 1323 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 wraith-factory-top rotate: false - xy: 1115, 836 + xy: 1289, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 409, 205 + xy: 1855, 1030 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1048, 1364 + xy: 1983, 1394 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 487, 103 + xy: 1905, 1104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1354, 1236 + xy: 1190, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1420, 1194 + xy: 587, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 479, 35 + xy: 1889, 1036 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1889, 808 + xy: 1983, 560 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 653, 894 + xy: 1388, 1302 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-gigantic rotate: false - xy: 1233, 1626 + xy: 1493, 1662 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 261, 273 + xy: 1395, 1434 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 261, 175 + xy: 1493, 1368 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 498, 1323 + xy: 1591, 1364 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 917, 1224 + xy: 695, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 917, 1158 + xy: 761, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 917, 1092 + xy: 827, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 917, 1026 + xy: 893, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1727, 706 + xy: 827, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1693, 672 + xy: 861, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1659, 638 + xy: 895, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1761, 706 + xy: 929, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1761, 706 + xy: 929, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1671, 536 + xy: 785, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 983, 1034 + xy: 1025, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1739, 570 + xy: 887, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 1049, 1034 + xy: 1157, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster rotate: false - xy: 1493, 1662 + xy: 1883, 1658 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 1739, 366 + xy: 1159, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 983, 902 + xy: 1157, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 1817, 1408 + xy: 1610, 1244 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 1871, 1408 + xy: 1664, 1244 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 639, 224 + xy: 1763, 442 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2036,35 +2036,35 @@ circle-shadow index: -1 error rotate: false - xy: 1253, 526 + xy: 655, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 2043, 1732 + xy: 2043, 476 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 694, 1356 + xy: 489, 979 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 2043, 1682 + xy: 2043, 426 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 768, 1356 + xy: 489, 905 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -2078,7 +2078,7 @@ missile index: -1 missile-back rotate: false - xy: 1313, 1260 + xy: 1454, 1396 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2092,35 +2092,35 @@ scale_marker index: -1 scorch1 rotate: false - xy: 1795, 666 + xy: 2017, 934 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1825, 666 + xy: 2017, 832 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1855, 678 + xy: 2017, 730 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1885, 672 + xy: 2017, 628 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1915, 670 + xy: 2017, 526 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -2134,42 +2134,42 @@ shell index: -1 shell-back rotate: false - xy: 385, 431 + xy: 1878, 1210 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1603, 604 + xy: 1133, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2043, 1410 + xy: 2043, 376 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1773, 604 + xy: 1159, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 842, 1356 + xy: 489, 831 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 white rotate: false - xy: 1547, 1189 + xy: 563, 831 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2183,77 +2183,77 @@ alloy-smelter-icon-large index: -1 alloy-smelter-icon-medium rotate: false - xy: 553, 603 + xy: 343, 437 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alloy-smelter-icon-small rotate: false - xy: 1829, 776 + xy: 623, 450 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 arc rotate: false - xy: 427, 477 + xy: 343, 403 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 511, 561 + xy: 419, 603 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-large rotate: false - xy: 653, 580 + xy: 1868, 1248 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 arc-icon-small rotate: false - xy: 2023, 1028 + xy: 725, 476 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-icon-large rotate: false - xy: 753, 580 + xy: 1378, 1194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-icon-small rotate: false - xy: 2023, 1002 + xy: 1336, 1896 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-large-icon-large rotate: false - xy: 803, 580 + xy: 1428, 1194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-large-icon-medium rotate: false - xy: 653, 1298 + xy: 453, 603 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 1336, 1896 + xy: 1297, 1534 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2267,147 +2267,147 @@ blast-drill-icon-full index: -1 blast-drill-icon-large rotate: false - xy: 853, 580 + xy: 1478, 1194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-drill-icon-medium rotate: false - xy: 2002, 1326 + xy: 419, 569 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 1297, 1534 + xy: 1454, 1370 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-mixer-icon-large rotate: false - xy: 903, 580 + xy: 1371, 1144 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-mixer-icon-medium rotate: false - xy: 2002, 1292 + xy: 385, 535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 1521, 1168 + xy: 343, 377 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conduit-icon-large rotate: false - xy: 1003, 546 + xy: 1371, 1094 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conduit-icon-small rotate: false - xy: 1821, 1128 + xy: 1773, 468 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conveyor-icon-large rotate: false - xy: 1181, 795 + xy: 1421, 1094 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conveyor-icon-small rotate: false - xy: 1871, 1082 + xy: 2018, 1236 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 char-icon-large rotate: false - xy: 293, 589 + xy: 1355, 1044 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 char-icon-small rotate: false - xy: 621, 571 + xy: 725, 552 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cliffs-icon-large rotate: false - xy: 285, 539 + xy: 1355, 994 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cliffs-icon-small rotate: false - xy: 1481, 782 + xy: 751, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 coal-centrifuge-icon-large rotate: false - xy: 285, 489 + xy: 1405, 1044 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 coal-centrifuge-icon-medium rotate: false - xy: 2009, 1680 + xy: 555, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal-centrifuge-icon-small rotate: false - xy: 1795, 640 + xy: 1295, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustion-generator-icon-large rotate: false - xy: 285, 439 + xy: 1355, 944 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 combustion-generator-icon-small rotate: false - xy: 1945, 746 + xy: 2017, 500 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1965, 908 + xy: 487, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-large rotate: false - xy: 285, 389 + xy: 1405, 994 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2421,245 +2421,245 @@ conduit-icon-small index: -1 container-icon-large rotate: false - xy: 1247, 926 + xy: 1455, 1044 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 container-icon-medium rotate: false - xy: 461, 443 + xy: 445, 399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 1821, 640 + xy: 777, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conveyor-icon-large rotate: false - xy: 1246, 876 + xy: 1355, 894 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conveyor-icon-small rotate: false - xy: 1945, 720 + xy: 1295, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-icon-large rotate: false - xy: 1239, 826 + xy: 1405, 944 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-icon-small rotate: false - xy: 1971, 746 + xy: 803, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-large-icon-large rotate: false - xy: 1231, 776 + xy: 1455, 994 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-large-icon-medium rotate: false - xy: 443, 239 + xy: 1847, 996 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1945, 694 + xy: 829, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-foundation-icon-large rotate: false - xy: 1223, 726 + xy: 1355, 844 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-foundation-icon-medium rotate: false - xy: 443, 205 + xy: 1847, 962 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-small rotate: false - xy: 1971, 720 + xy: 855, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-nucleus-icon-large rotate: false - xy: 1305, 984 + xy: 1405, 894 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-nucleus-icon-medium rotate: false - xy: 419, 171 + xy: 1847, 928 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-small rotate: false - xy: 1997, 746 + xy: 881, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-shard-icon-large rotate: false - xy: 1355, 990 + xy: 1455, 944 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-shard-icon-medium rotate: false - xy: 419, 137 + xy: 1847, 894 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 2023, 746 + xy: 907, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 419, 103 + xy: 1847, 860 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 453, 171 + xy: 1847, 826 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 453, 137 + xy: 1847, 792 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 453, 103 + xy: 1847, 758 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 419, 69 + xy: 1847, 724 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 453, 69 + xy: 1847, 690 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 411, 35 + xy: 1847, 656 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 445, 35 + xy: 1847, 622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1114, 1364 + xy: 1983, 1328 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1180, 1364 + xy: 513, 1649 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1246, 1364 + xy: 489, 765 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1312, 1368 + xy: 489, 699 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1981, 1592 + xy: 489, 633 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1981, 1526 + xy: 596, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 1981, 1460 + xy: 662, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 1395, 1392 + xy: 728, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2687,28 +2687,28 @@ cracks-3-2 index: -1 cracks-3-3 rotate: false - xy: 1589, 1560 + xy: 1591, 1560 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 1687, 1560 + xy: 1689, 1560 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 1785, 1560 + xy: 1787, 1560 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 1883, 1560 + xy: 1885, 1560 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2722,56 +2722,56 @@ cracks-3-7 index: -1 cracks-4-0 rotate: false - xy: 843, 1756 + xy: 973, 1756 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-1 rotate: false - xy: 973, 1756 + xy: 1103, 1756 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-2 rotate: false - xy: 1103, 1756 + xy: 1233, 1756 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-3 rotate: false - xy: 1233, 1756 + xy: 1363, 1792 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-4 rotate: false - xy: 1363, 1792 + xy: 1493, 1792 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-5 rotate: false - xy: 1493, 1792 + xy: 1623, 1788 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-6 rotate: false - xy: 1623, 1788 + xy: 1753, 1788 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-7 rotate: false - xy: 1753, 1788 + xy: 1883, 1788 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -2834,98 +2834,98 @@ cracks-5-7 index: -1 craters-icon-large rotate: false - xy: 319, 75 + xy: 1405, 844 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 craters-icon-small rotate: false - xy: 1971, 694 + xy: 933, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 crawler-factory-icon-full rotate: false - xy: 760, 1290 + xy: 860, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory-icon-large rotate: false - xy: 1053, 604 + xy: 1528, 1190 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-factory-icon-medium rotate: false - xy: 477, 341 + xy: 1847, 588 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 crawler-factory-icon-small rotate: false - xy: 1997, 720 + xy: 959, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cryofluidmixer-icon-full rotate: false - xy: 958, 1298 + xy: 1058, 1364 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-icon-large rotate: false - xy: 753, 530 + xy: 1521, 1090 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cryofluidmixer-icon-medium rotate: false - xy: 477, 307 + xy: 1847, 554 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-small rotate: false - xy: 2023, 720 + xy: 985, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cultivator-icon-full rotate: false - xy: 1222, 1298 + xy: 662, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-large rotate: false - xy: 803, 530 + xy: 1505, 1040 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cultivator-icon-medium rotate: false - xy: 477, 273 + xy: 1847, 520 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1997, 694 + xy: 1011, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2946,413 +2946,413 @@ cyclone-icon-full index: -1 cyclone-icon-large rotate: false - xy: 853, 530 + xy: 1505, 990 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone-icon-medium rotate: false - xy: 477, 239 + xy: 1847, 486 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 2023, 694 + xy: 1037, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dagger-factory-icon-full rotate: false - xy: 1420, 1326 + xy: 860, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-icon-large rotate: false - xy: 1003, 496 + xy: 1505, 840 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-factory-icon-medium rotate: false - xy: 477, 205 + xy: 1878, 1176 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1807, 614 + xy: 1063, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-metal-icon-large rotate: false - xy: 1107, 720 + xy: 1571, 1140 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-metal-icon-small rotate: false - xy: 1807, 588 + xy: 1089, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-1-icon-large rotate: false - xy: 1157, 695 + xy: 1571, 1090 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-1-icon-small rotate: false - xy: 1807, 562 + xy: 1115, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-2-icon-large rotate: false - xy: 1107, 670 + xy: 1555, 1040 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-2-icon-small rotate: false - xy: 1807, 536 + xy: 1141, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-3-icon-large rotate: false - xy: 1103, 620 + xy: 1555, 990 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-3-icon-small rotate: false - xy: 1807, 510 + xy: 1167, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-4-icon-large rotate: false - xy: 1103, 570 + xy: 1555, 940 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-4-icon-small rotate: false - xy: 1807, 484 + xy: 1193, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-5-icon-large rotate: false - xy: 1103, 520 + xy: 1555, 890 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-5-icon-small rotate: false - xy: 1807, 458 + xy: 1219, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-6-icon-large rotate: false - xy: 1157, 645 + xy: 1555, 840 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-6-icon-small rotate: false - xy: 1807, 432 + xy: 1245, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-icon-large rotate: false - xy: 1153, 595 + xy: 1628, 1194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-icon-small rotate: false - xy: 1807, 406 + xy: 1271, 374 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-tainted-water-icon-large rotate: false - xy: 1153, 545 + xy: 1678, 1194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-tainted-water-icon-small rotate: false - xy: 1807, 380 + xy: 1329, 476 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-water-icon-large rotate: false - xy: 1207, 676 + xy: 1728, 1198 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-water-icon-small rotate: false - xy: 1807, 354 + xy: 1355, 468 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dart-mech-pad-icon-large rotate: false - xy: 1207, 626 + xy: 1778, 1198 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-mech-pad-icon-medium rotate: false - xy: 487, 375 + xy: 1871, 1142 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dart-mech-pad-icon-small rotate: false - xy: 1945, 668 + xy: 1381, 468 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 deepwater-icon-large rotate: false - xy: 1203, 526 + xy: 1605, 1040 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 deepwater-icon-small rotate: false - xy: 1971, 668 + xy: 1407, 468 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 delta-mech-pad-icon-large rotate: false - xy: 1203, 476 + xy: 1605, 840 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-pad-icon-medium rotate: false - xy: 521, 383 + xy: 1871, 1108 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1997, 668 + xy: 1433, 468 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 differential-generator-icon-large rotate: false - xy: 1153, 445 + xy: 555, 781 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 differential-generator-icon-medium rotate: false - xy: 487, 171 + xy: 1912, 1172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-small rotate: false - xy: 2023, 668 + xy: 1459, 468 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 distributor-icon-large rotate: false - xy: 1103, 420 + xy: 555, 731 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 distributor-icon-medium rotate: false - xy: 487, 137 + xy: 1905, 1138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1807, 328 + xy: 1329, 450 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-icon-large rotate: false - xy: 1203, 426 + xy: 555, 681 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-icon-small rotate: false - xy: 1833, 614 + xy: 1321, 424 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-icon-large rotate: false - xy: 1153, 395 + xy: 555, 631 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-large-icon-medium rotate: false - xy: 487, 69 + xy: 1889, 1070 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1833, 588 + xy: 1355, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 draug-factory-icon-full rotate: false - xy: 1486, 1194 + xy: 587, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory-icon-large rotate: false - xy: 1257, 676 + xy: 605, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug-factory-icon-medium rotate: false - xy: 411, 1 + xy: 1923, 1070 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 draug-factory-icon-small rotate: false - xy: 1833, 562 + xy: 1381, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dunerocks-icon-large rotate: false - xy: 1257, 626 + xy: 655, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dunerocks-icon-small rotate: false - xy: 1833, 536 + xy: 1407, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 445, 1 + xy: 1923, 1036 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 479, 1 + xy: 615, 416 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-large rotate: false - xy: 1253, 576 + xy: 605, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo-icon-small rotate: false - xy: 1833, 510 + xy: 1433, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 force-projector-icon-large rotate: false - xy: 1273, 726 + xy: 705, 728 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 force-projector-icon-medium rotate: false - xy: 511, 341 + xy: 615, 382 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1833, 484 + xy: 1459, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3366,21 +3366,21 @@ fortress-factory-icon-full index: -1 fortress-factory-icon-large rotate: false - xy: 1281, 776 + xy: 755, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-factory-icon-medium rotate: false - xy: 511, 307 + xy: 1881, 996 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1833, 458 + xy: 369, 373 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3401,21 +3401,21 @@ fuse-icon-full index: -1 fuse-icon-large rotate: false - xy: 1289, 826 + xy: 705, 678 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fuse-icon-medium rotate: false - xy: 511, 273 + xy: 1881, 962 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1833, 432 + xy: 395, 373 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3429,798 +3429,798 @@ ghoul-factory-icon-full index: -1 ghoul-factory-icon-large rotate: false - xy: 1296, 876 + xy: 755, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ghoul-factory-icon-medium rotate: false - xy: 511, 239 + xy: 1881, 928 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1833, 406 + xy: 421, 373 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 glaive-ship-pad-icon-large rotate: false - xy: 1297, 926 + xy: 805, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 511, 205 + xy: 1881, 894 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1833, 380 + xy: 447, 373 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 graphite-press-icon-large rotate: false - xy: 1307, 676 + xy: 755, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 graphite-press-icon-medium rotate: false - xy: 521, 171 + xy: 1881, 860 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 1833, 354 + xy: 473, 369 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 grass-icon-large rotate: false - xy: 1307, 626 + xy: 805, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 grass-icon-small rotate: false - xy: 1833, 328 + xy: 499, 369 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 521, 137 + xy: 1881, 826 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 521, 103 + xy: 1881, 792 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-large rotate: false - xy: 1303, 576 + xy: 855, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hail-icon-small rotate: false - xy: 1847, 640 + xy: 359, 347 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 holostone-icon-large rotate: false - xy: 1303, 476 + xy: 855, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 holostone-icon-small rotate: false - xy: 1859, 614 + xy: 359, 321 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hotrock-icon-large rotate: false - xy: 1303, 426 + xy: 905, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hotrock-icon-small rotate: false - xy: 1859, 588 + xy: 385, 347 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-icon-large rotate: false - xy: 1303, 376 + xy: 855, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-icon-small rotate: false - xy: 1859, 562 + xy: 359, 295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-snow-icon-large rotate: false - xy: 1323, 726 + xy: 905, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-snow-icon-small rotate: false - xy: 1859, 536 + xy: 385, 321 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icerocks-icon-large rotate: false - xy: 1331, 776 + xy: 955, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icerocks-icon-small rotate: false - xy: 1859, 510 + xy: 411, 347 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ignarock-icon-large rotate: false - xy: 1339, 826 + xy: 905, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ignarock-icon-small rotate: false - xy: 1859, 484 + xy: 359, 269 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 impact-reactor-icon-full rotate: false - xy: 163, 1021 + xy: 163, 891 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-icon-large rotate: false - xy: 1346, 876 + xy: 955, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 impact-reactor-icon-medium rotate: false - xy: 521, 69 + xy: 1881, 758 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 1859, 458 + xy: 385, 295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 incinerator-icon-large rotate: false - xy: 1303, 326 + xy: 1005, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 incinerator-icon-small rotate: false - xy: 1859, 432 + xy: 437, 347 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1859, 406 + xy: 411, 321 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 285, 371 + xy: 1950, 1222 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 343, 597 + xy: 1805, 964 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-xxlarge rotate: false - xy: 1357, 676 + xy: 955, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1859, 380 + xy: 359, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 985, 512 + xy: 1337, 518 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1855, 916 + xy: 1805, 922 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-xxlarge rotate: false - xy: 1357, 626 + xy: 1005, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1859, 354 + xy: 385, 269 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 303, 371 + xy: 1485, 446 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1905, 1020 + xy: 1805, 880 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-xxlarge rotate: false - xy: 1353, 576 + xy: 1055, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1859, 328 + xy: 437, 321 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 321, 371 + xy: 513, 1631 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1905, 978 + xy: 1805, 838 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-xxlarge rotate: false - xy: 1353, 526 + xy: 1005, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 621, 545 + xy: 411, 295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 339, 371 + xy: 563, 1109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1947, 1018 + xy: 1805, 796 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-xxlarge rotate: false - xy: 1353, 476 + xy: 1055, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 537, 519 + xy: 359, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 675, 510 + xy: 564, 1868 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1947, 976 + xy: 1805, 754 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-xxlarge rotate: false - xy: 1353, 426 + xy: 1105, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 647, 554 + xy: 385, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 985, 494 + xy: 2013, 1662 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 385, 595 + xy: 1805, 712 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-xxlarge rotate: false - xy: 1353, 376 + xy: 1055, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 673, 554 + xy: 437, 295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 513, 1631 + xy: 2031, 1662 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 427, 595 + xy: 1805, 670 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-xxlarge rotate: false - xy: 1353, 326 + xy: 1105, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 699, 546 + xy: 411, 269 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1469, 1514 + xy: 2018, 1218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 469, 595 + xy: 1805, 628 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-xxlarge rotate: false - xy: 1373, 726 + xy: 1155, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 725, 546 + xy: 359, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1902, 1390 + xy: 525, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 511, 595 + xy: 1805, 586 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-xxlarge rotate: false - xy: 1381, 776 + xy: 1105, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 647, 528 + xy: 385, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 564, 1868 + xy: 377, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 385, 553 + xy: 1805, 544 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-xxlarge rotate: false - xy: 1389, 826 + xy: 1155, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 673, 528 + xy: 437, 269 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1313, 1242 + xy: 531, 1631 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 385, 511 + xy: 1805, 502 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-xxlarge rotate: false - xy: 1407, 676 + xy: 1205, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-source-icon-large rotate: false - xy: 1407, 626 + xy: 1155, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-source-icon-small rotate: false - xy: 699, 520 + xy: 411, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 725, 520 + xy: 385, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 2025, 1442 + xy: 564, 1850 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 427, 553 + xy: 343, 597 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-xxlarge rotate: false - xy: 1403, 576 + xy: 1205, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1873, 646 + xy: 437, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 2009, 1662 + xy: 395, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 385, 469 + xy: 343, 555 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-xxlarge rotate: false - xy: 1403, 526 + xy: 1255, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 751, 504 + xy: 411, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1821, 1110 + xy: 549, 1631 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 427, 511 + xy: 343, 513 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-xxlarge rotate: false - xy: 1403, 476 + xy: 1205, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 777, 504 + xy: 437, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1871, 1064 + xy: 543, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 469, 553 + xy: 343, 471 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-xxlarge rotate: false - xy: 1403, 426 + xy: 1255, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-void-icon-large rotate: false - xy: 1403, 376 + xy: 1305, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-void-icon-small rotate: false - xy: 803, 504 + xy: 411, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 javelin-ship-pad-icon-large rotate: false - xy: 1423, 726 + xy: 1255, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 589, 77 + xy: 1915, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 829, 504 + xy: 437, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction-icon-large rotate: false - xy: 1457, 676 + xy: 1355, 744 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 junction-icon-small rotate: false - xy: 855, 504 + xy: 463, 343 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 kiln-icon-large rotate: false - xy: 1457, 626 + xy: 1405, 794 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 kiln-icon-medium rotate: false - xy: 547, 1 + xy: 1915, 560 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 881, 504 + xy: 463, 317 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 lancer rotate: false - xy: 653, 1224 + xy: 983, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 653, 1158 + xy: 1049, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-large rotate: false - xy: 1453, 576 + xy: 1455, 794 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer-icon-medium rotate: false - xy: 581, 43 + xy: 1915, 526 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 907, 504 + xy: 489, 343 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4234,154 +4234,154 @@ laser-drill-icon-full index: -1 laser-drill-icon-large rotate: false - xy: 1453, 526 + xy: 1305, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser-drill-icon-medium rotate: false - xy: 581, 9 + xy: 1915, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 933, 504 + xy: 463, 291 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 launch-pad-icon-large rotate: false - xy: 1453, 476 + xy: 1355, 694 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-icon-medium rotate: false - xy: 615, 43 + xy: 1805, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 959, 504 + xy: 489, 317 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 launch-pad-large-icon-large rotate: false - xy: 1453, 426 + xy: 1405, 744 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-large-icon-medium rotate: false - xy: 615, 9 + xy: 1839, 452 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-large-icon-small rotate: false - xy: 1885, 620 + xy: 463, 265 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-junction-icon-large rotate: false - xy: 1453, 326 + xy: 1455, 744 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-junction-icon-small rotate: false - xy: 1885, 594 + xy: 489, 291 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1430, 876 + xy: 1949, 900 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-large rotate: false - xy: 1473, 726 + xy: 1505, 790 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-router-icon-small rotate: false - xy: 1885, 568 + xy: 463, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-source-icon-large rotate: false - xy: 1507, 676 + xy: 1455, 694 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-source-icon-small rotate: false - xy: 1885, 542 + xy: 489, 265 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-icon-full rotate: false - xy: 1883, 1462 + xy: 1885, 1462 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-icon-large rotate: false - xy: 1507, 626 + xy: 1505, 740 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-tank-icon-medium rotate: false - xy: 1498, 876 + xy: 1949, 730 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1885, 516 + xy: 463, 213 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 magmarock-icon-large rotate: false - xy: 1503, 576 + xy: 1555, 790 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 magmarock-icon-small rotate: false - xy: 1885, 490 + xy: 489, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4402,308 +4402,308 @@ mass-driver-icon-full index: -1 mass-driver-icon-large rotate: false - xy: 1503, 526 + xy: 1555, 740 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver-icon-medium rotate: false - xy: 1507, 842 + xy: 1949, 662 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1885, 464 + xy: 489, 213 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 1503, 476 + xy: 1605, 790 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 1503, 426 + xy: 1605, 740 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 1503, 376 + xy: 1505, 690 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 1247, 976 + xy: 1313, 1175 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 1503, 326 + xy: 1555, 690 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 983, 646 + xy: 285, 435 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 1049, 712 + xy: 1313, 1117 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 1115, 778 + xy: 285, 377 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mechanical-drill-icon-full rotate: false - xy: 653, 1092 + xy: 1115, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-icon-large rotate: false - xy: 335, 539 + xy: 1605, 690 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-drill-icon-medium rotate: false - xy: 1481, 808 + xy: 1949, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1885, 438 + xy: 463, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-pump-icon-large rotate: false - xy: 335, 489 + xy: 655, 628 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-pump-icon-small rotate: false - xy: 1885, 412 + xy: 489, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 meltdown rotate: false - xy: 131, 111 + xy: 583, 1626 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 meltdown-icon-full rotate: false - xy: 1881, 1658 - size: 126, 128 - orig: 126, 128 + xy: 843, 1626 + size: 128, 128 + orig: 128, 128 offset: 0, 0 index: -1 meltdown-icon-large rotate: false - xy: 335, 439 + xy: 705, 628 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 meltdown-icon-medium rotate: false - xy: 1541, 842 + xy: 1949, 560 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1885, 386 + xy: 1347, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 melter-icon-large rotate: false - xy: 335, 389 + xy: 755, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 melter-icon-small rotate: false - xy: 1885, 360 + xy: 1373, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-icon-large rotate: false - xy: 361, 25 + xy: 805, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mend-projector-icon-medium rotate: false - xy: 1575, 842 + xy: 1949, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1885, 334 + xy: 1399, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mender-icon-large rotate: false - xy: 359, 339 + xy: 855, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mender-icon-small rotate: false - xy: 1603, 306 + xy: 1425, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-2-icon-large rotate: false - xy: 359, 289 + xy: 905, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-2-icon-small rotate: false - xy: 1629, 306 + xy: 1451, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-3-icon-large rotate: false - xy: 359, 239 + xy: 955, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-3-icon-small rotate: false - xy: 1655, 306 + xy: 1321, 398 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-5-icon-large rotate: false - xy: 359, 189 + xy: 1005, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-5-icon-small rotate: false - xy: 1681, 306 + xy: 1347, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-damaged-icon-large rotate: false - xy: 369, 139 + xy: 1055, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-damaged-icon-small rotate: false - xy: 1707, 306 + xy: 1373, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-icon-large rotate: false - xy: 369, 89 + xy: 1105, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-icon-small rotate: false - xy: 1733, 306 + xy: 1399, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 moss-icon-large rotate: false - xy: 1925, 1362 + xy: 1155, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 moss-icon-small rotate: false - xy: 1759, 306 + xy: 1425, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multi-press-icon-large rotate: false - xy: 1975, 1360 + xy: 1205, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 multi-press-icon-medium rotate: false - xy: 1617, 808 + xy: 1975, 458 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 1885, 308 + xy: 1451, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4717,623 +4717,623 @@ oil-extractor-icon-full index: -1 oil-extractor-icon-large rotate: false - xy: 1355, 940 + xy: 1255, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oil-extractor-icon-medium rotate: false - xy: 1643, 842 + xy: 1939, 1138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1532, 878 + xy: 515, 343 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 omega-mech-pad-icon-large rotate: false - xy: 1552, 1354 + xy: 1305, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1651, 808 + xy: 1939, 1104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1558, 878 + xy: 515, 317 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-icon-full rotate: false - xy: 1677, 842 + xy: 1946, 1172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-medium rotate: false - xy: 1677, 842 + xy: 1946, 1172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-large rotate: false - xy: 1602, 1354 + xy: 1355, 644 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-icon-small rotate: false - xy: 1584, 878 + xy: 515, 291 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-icon-full rotate: false - xy: 1685, 808 + xy: 1980, 1178 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-medium rotate: false - xy: 1685, 808 + xy: 1980, 1178 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-large rotate: false - xy: 1552, 1304 + xy: 1405, 644 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-icon-small rotate: false - xy: 1610, 878 + xy: 515, 265 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-icon-full rotate: false - xy: 1711, 842 + xy: 1957, 1070 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-medium rotate: false - xy: 1711, 842 + xy: 1957, 1070 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-large rotate: false - xy: 1652, 1354 + xy: 1455, 644 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-icon-small rotate: false - xy: 1636, 878 + xy: 515, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-icon-full rotate: false - xy: 1719, 808 + xy: 1957, 1036 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-medium rotate: false - xy: 1719, 808 + xy: 1957, 1036 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-large rotate: false - xy: 1552, 1254 + xy: 1505, 640 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-icon-small rotate: false - xy: 1662, 878 + xy: 515, 213 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-icon-full rotate: false - xy: 1745, 842 + xy: 1983, 1002 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-medium rotate: false - xy: 1745, 842 + xy: 1983, 1002 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-large rotate: false - xy: 1602, 1304 + xy: 1555, 640 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-icon-small rotate: false - xy: 1688, 878 + xy: 515, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-icon-full rotate: false - xy: 1753, 808 + xy: 1983, 968 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-medium rotate: false - xy: 1753, 808 + xy: 1983, 968 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-large rotate: false - xy: 1702, 1354 + xy: 1605, 640 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-icon-small rotate: false - xy: 1714, 878 + xy: 377, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overdrive-projector-icon-large rotate: false - xy: 1552, 1204 + xy: 605, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overdrive-projector-icon-medium rotate: false - xy: 1779, 842 + xy: 1983, 934 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1740, 878 + xy: 377, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overflow-gate-icon-large rotate: false - xy: 1602, 1254 + xy: 655, 578 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overflow-gate-icon-small rotate: false - xy: 1766, 878 + xy: 403, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pebbles-icon-large rotate: false - xy: 1652, 1304 + xy: 705, 578 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pebbles-icon-small rotate: false - xy: 1792, 878 + xy: 429, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phantom-factory-icon-full rotate: false - xy: 785, 1092 + xy: 1322, 1302 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory-icon-large rotate: false - xy: 1752, 1354 + xy: 755, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phantom-factory-icon-medium rotate: false - xy: 1821, 870 + xy: 1983, 866 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 563, 470 + xy: 403, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-icon-large rotate: false - xy: 1602, 1204 + xy: 805, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conduit-icon-small rotate: false - xy: 563, 444 + xy: 429, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-icon-large rotate: false - xy: 1652, 1254 + xy: 855, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conveyor-icon-small rotate: false - xy: 563, 418 + xy: 455, 161 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-icon-large rotate: false - xy: 1702, 1304 + xy: 905, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-icon-small rotate: false - xy: 589, 470 + xy: 481, 161 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-large-icon-large rotate: false - xy: 1652, 1204 + xy: 955, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-large-icon-medium rotate: false - xy: 1923, 806 + xy: 1983, 526 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 589, 444 + xy: 507, 161 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 851, 1092 + xy: 719, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-large rotate: false - xy: 1702, 1254 + xy: 1005, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-weaver-icon-medium rotate: false - xy: 1957, 806 + xy: 1983, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 589, 418 + xy: 455, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pine-icon-medium rotate: false - xy: 1991, 806 + xy: 2009, 458 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 589, 392 + xy: 481, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plastanium-compressor-icon-large rotate: false - xy: 1752, 1304 + xy: 1055, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1855, 780 + xy: 1973, 1138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 613, 350 + xy: 507, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pneumatic-drill-icon-full rotate: false - xy: 653, 762 + xy: 1049, 1100 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-icon-large rotate: false - xy: 1702, 1204 + xy: 1105, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1889, 774 + xy: 1973, 1104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 613, 324 + xy: 1773, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-icon-large rotate: false - xy: 1752, 1254 + xy: 1155, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-icon-small rotate: false - xy: 613, 298 + xy: 1799, 442 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-large-icon-large rotate: false - xy: 1752, 1204 + xy: 1205, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-large-icon-medium rotate: false - xy: 1957, 772 + xy: 1991, 1036 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 613, 272 + xy: 1477, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-source-icon-large rotate: false - xy: 1802, 1354 + xy: 1255, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-source-icon-small rotate: false - xy: 613, 246 + xy: 1477, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-void-icon-large rotate: false - xy: 1802, 1304 + xy: 1305, 586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-void-icon-small rotate: false - xy: 613, 220 + xy: 533, 161 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1557, 774 + xy: 2009, 424 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-large rotate: false - xy: 1802, 1254 + xy: 1355, 594 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulse-conduit-icon-small rotate: false - xy: 623, 194 + xy: 533, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1659, 740 + xy: 657, 544 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-large rotate: false - xy: 1802, 1204 + xy: 1405, 594 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulverizer-icon-small rotate: false - xy: 623, 168 + xy: 1485, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pyratite-mixer-icon-large rotate: false - xy: 1852, 1358 + xy: 1455, 594 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1727, 774 + xy: 691, 544 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 623, 142 + xy: 1511, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1727, 740 + xy: 657, 476 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1761, 740 + xy: 691, 476 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-large rotate: false - xy: 1852, 1258 + xy: 1555, 590 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 repair-point-icon-small rotate: false - xy: 623, 116 + xy: 1537, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 revenant-factory-icon-full rotate: false - xy: 843, 1626 + xy: 1103, 1626 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 revenant-factory-icon-large rotate: false - xy: 1852, 1208 + xy: 1605, 590 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-factory-icon-medium rotate: false - xy: 1557, 706 + xy: 649, 442 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 623, 90 + xy: 1563, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5354,1148 +5354,1148 @@ ripple-icon-full index: -1 ripple-icon-large rotate: false - xy: 1902, 1262 + xy: 369, 17 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ripple-icon-medium rotate: false - xy: 1557, 672 + xy: 649, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 649, 502 + xy: 1589, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rock-icon-medium rotate: false - xy: 1591, 706 + xy: 683, 442 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock-icon-small rotate: false - xy: 1785, 302 + xy: 1615, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-large rotate: false - xy: 1902, 1212 + xy: 1968, 1212 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 1811, 302 + xy: 1641, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-large rotate: false - xy: 1952, 1310 + xy: 755, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rotary-pump-icon-medium rotate: false - xy: 1557, 638 + xy: 683, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1837, 302 + xy: 1667, 464 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-large rotate: false - xy: 1952, 1260 + xy: 805, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 563, 519 + xy: 419, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-large rotate: false - xy: 1952, 1210 + xy: 855, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rtg-generator-icon-medium rotate: false - xy: 1591, 672 + xy: 683, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 589, 537 + xy: 419, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salt-icon-large rotate: false - xy: 1552, 1154 + xy: 905, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salt-icon-small rotate: false - xy: 589, 511 + xy: 419, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 saltrocks-icon-large rotate: false - xy: 1602, 1154 + xy: 955, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 saltrocks-icon-small rotate: false - xy: 615, 519 + xy: 419, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 851, 828 + xy: 629, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 785, 696 + xy: 761, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-large rotate: false - xy: 1652, 1154 + xy: 1005, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salvo-icon-medium rotate: false - xy: 1625, 672 + xy: 717, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 615, 493 + xy: 419, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-icon-large rotate: false - xy: 1702, 1154 + xy: 1055, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 615, 467 + xy: 445, 109 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-water-icon-large rotate: false - xy: 1752, 1154 + xy: 1105, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-water-icon-small rotate: false - xy: 615, 441 + xy: 445, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sandrocks-icon-large rotate: false - xy: 1802, 1154 + xy: 1155, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sandrocks-icon-small rotate: false - xy: 615, 415 + xy: 471, 109 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scatter rotate: false - xy: 851, 696 + xy: 761, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-full rotate: false - xy: 851, 630 + xy: 827, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-large rotate: false - xy: 1852, 1158 + xy: 1205, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scatter-icon-medium rotate: false - xy: 1591, 638 + xy: 717, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter-icon-small rotate: false - xy: 615, 389 + xy: 445, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scorch rotate: false - xy: 1693, 706 + xy: 725, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-full rotate: false - xy: 1625, 638 + xy: 793, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-large rotate: false - xy: 1902, 1162 + xy: 1255, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scorch-icon-small rotate: false - xy: 641, 476 + xy: 471, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-large rotate: false - xy: 1952, 1160 + xy: 1305, 536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1727, 672 + xy: 963, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 641, 450 + xy: 497, 109 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-huge-icon-large rotate: false - xy: 1902, 1112 + xy: 1355, 544 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1693, 638 + xy: 997, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 641, 424 + xy: 445, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-icon-large rotate: false - xy: 1852, 1108 + xy: 1405, 544 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-icon-small rotate: false - xy: 641, 398 + xy: 471, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-large-icon-large rotate: false - xy: 1952, 1110 + xy: 1455, 544 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1761, 672 + xy: 1031, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 641, 372 + xy: 497, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 1902, 1062 + xy: 1505, 540 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 1727, 638 + xy: 1065, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 639, 346 + xy: 523, 109 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shale-boulder-icon-large rotate: false - xy: 1952, 1060 + xy: 1555, 540 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shale-boulder-icon-small rotate: false - xy: 639, 320 + xy: 471, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shale-icon-large rotate: false - xy: 1553, 576 + xy: 1605, 540 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shale-icon-small rotate: false - xy: 639, 294 + xy: 497, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shalerocks-icon-large rotate: false - xy: 1553, 526 + xy: 1355, 494 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shalerocks-icon-small rotate: false - xy: 639, 268 + xy: 523, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 1553, 476 + xy: 1405, 494 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 639, 242 + xy: 497, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shrubs-icon-large rotate: false - xy: 1553, 376 + xy: 1505, 490 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shrubs-icon-small rotate: false - xy: 667, 476 + xy: 523, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 1553, 326 + xy: 1555, 490 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 1603, 570 + xy: 1167, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 667, 450 + xy: 523, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snow-icon-large rotate: false - xy: 1371, 1144 + xy: 1605, 490 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 667, 424 + xy: 445, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrock-icon-medium rotate: false - xy: 1637, 604 + xy: 1201, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock-icon-small rotate: false - xy: 667, 398 + xy: 471, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrocks-icon-large rotate: false - xy: 1421, 1144 + xy: 1621, 1140 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-small rotate: false - xy: 667, 372 + xy: 497, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 1371, 1094 + xy: 1621, 1090 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 665, 346 + xy: 523, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large-icon-large rotate: false - xy: 1471, 1144 + xy: 1671, 1144 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 1637, 570 + xy: 1269, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 665, 320 + xy: 549, 109 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 1371, 1044 + xy: 1671, 1094 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 665, 294 + xy: 549, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 1421, 1094 + xy: 1655, 1040 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 665, 268 + xy: 549, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 1363, 1662 + xy: 1623, 1658 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spectre-icon-full rotate: false - xy: 1363, 1532 - size: 126, 128 - orig: 126, 128 + xy: 1753, 1658 + size: 128, 128 + orig: 128, 128 offset: 0, 0 index: -1 spectre-icon-large rotate: false - xy: 1471, 1094 + xy: 1655, 990 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1603, 502 + xy: 751, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 665, 242 + xy: 549, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spirit-factory-icon-full rotate: false - xy: 917, 762 + xy: 959, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-icon-large rotate: false - xy: 1471, 1044 + xy: 1655, 890 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1637, 536 + xy: 751, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 649, 216 + xy: 549, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 1405, 994 + xy: 1655, 840 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 1671, 570 + xy: 785, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 649, 190 + xy: 1503, 438 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-moss-icon-large rotate: false - xy: 1405, 944 + xy: 1655, 790 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-moss-icon-small rotate: false - xy: 649, 164 + xy: 1503, 412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-pine-icon-medium rotate: false - xy: 1705, 604 + xy: 751, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine-icon-small rotate: false - xy: 649, 138 + xy: 1529, 438 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-press-icon-full rotate: false - xy: 1115, 1232 + xy: 959, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-icon-large rotate: false - xy: 1455, 994 + xy: 1655, 740 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-medium rotate: false - xy: 1603, 468 + xy: 785, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-press-icon-small rotate: false - xy: 649, 112 + xy: 1529, 412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sporerocks-icon-large rotate: false - xy: 1455, 944 + xy: 1655, 690 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sporerocks-icon-small rotate: false - xy: 649, 86 + xy: 1555, 438 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stone-icon-large rotate: false - xy: 1521, 1104 + xy: 1655, 640 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 649, 60 + xy: 1555, 412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 1571, 1104 + xy: 1655, 590 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 1637, 502 + xy: 819, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 649, 34 + xy: 1581, 438 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 1521, 1054 + xy: 1655, 540 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 649, 8 + xy: 1581, 412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 1621, 1104 + xy: 1655, 490 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 1705, 570 + xy: 819, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 675, 216 + xy: 1607, 438 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1049, 1100 + xy: 1091, 968 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-full rotate: false - xy: 1115, 1166 + xy: 1157, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-large rotate: false - xy: 1671, 1104 + xy: 1705, 994 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 1739, 604 + xy: 853, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 675, 190 + xy: 1607, 412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tainted-water-icon-large rotate: false - xy: 1621, 1054 + xy: 1705, 944 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tainted-water-icon-small rotate: false - xy: 675, 164 + xy: 1633, 438 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tar-icon-large rotate: false - xy: 1721, 1104 + xy: 1705, 894 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 675, 138 + xy: 1633, 412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 1721, 1054 + xy: 1705, 744 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1603, 434 + xy: 819, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 675, 112 + xy: 1659, 438 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tendrils-icon-large rotate: false - xy: 1771, 1054 + xy: 1705, 694 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tendrils-icon-small rotate: false - xy: 675, 86 + xy: 1659, 412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 1821, 1058 + xy: 1705, 644 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 1637, 468 + xy: 853, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 675, 60 + xy: 1503, 386 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 1505, 994 + xy: 1705, 594 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 1671, 502 + xy: 887, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 675, 34 + xy: 1529, 386 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 1505, 944 + xy: 1705, 544 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 1705, 536 + xy: 853, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 675, 8 + xy: 1555, 386 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 1555, 1004 + xy: 1705, 494 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 693, 494 + xy: 1581, 386 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 1605, 1004 + xy: 1721, 1144 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1603, 400 + xy: 921, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 719, 494 + xy: 1607, 386 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 1555, 954 + xy: 1721, 1094 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 1637, 434 + xy: 887, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 693, 468 + xy: 1633, 386 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-factory-icon-full rotate: false - xy: 489, 637 + xy: 489, 1225 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 titan-factory-icon-large rotate: false - xy: 1655, 1004 + xy: 1771, 1148 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 1671, 468 + xy: 921, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 693, 442 + xy: 1659, 386 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1605, 954 + xy: 1771, 1098 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 719, 468 + xy: 1685, 434 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 1705, 1004 + xy: 1821, 1148 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 693, 416 + xy: 1685, 408 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 1655, 954 + xy: 1821, 1098 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1739, 332 + xy: 1193, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 719, 442 + xy: 1711, 434 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 1755, 1004 + xy: 1755, 1044 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1773, 570 + xy: 1193, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 693, 390 + xy: 1711, 408 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 1705, 954 + xy: 1755, 994 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 1773, 536 + xy: 1227, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 719, 416 + xy: 1737, 434 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-icon-chaos-array rotate: false - xy: 1623, 1658 + xy: 1363, 1532 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unit-icon-crawler rotate: false - xy: 1755, 954 + xy: 1755, 944 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1805, 1004 + xy: 1755, 894 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6509,448 +6509,441 @@ unit-icon-eradicator index: -1 unit-icon-eruptor rotate: false - xy: 983, 836 + xy: 1454, 1302 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 1049, 902 + xy: 1520, 1302 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 1115, 968 + xy: 1586, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader-icon-large rotate: false - xy: 1805, 954 + xy: 1755, 844 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 719, 390 + xy: 1737, 408 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 1855, 1008 + xy: 1755, 794 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 1773, 468 + xy: 1227, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 745, 478 + xy: 1685, 382 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-extractor-icon-full rotate: false - xy: 1247, 1100 + xy: 1718, 1298 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-icon-large rotate: false - xy: 1855, 958 + xy: 1755, 744 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 1773, 434 + xy: 1261, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 771, 478 + xy: 1711, 382 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1555, 904 + xy: 1755, 694 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 745, 452 + xy: 1737, 382 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wave rotate: false - xy: 1181, 968 + xy: 1982, 1262 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-full rotate: false - xy: 1247, 1034 + xy: 1289, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-large rotate: false - xy: 1605, 904 + xy: 1755, 644 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 1773, 400 + xy: 1227, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 797, 478 + xy: 1763, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 1655, 904 + xy: 1755, 594 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 1773, 366 + xy: 1261, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 745, 426 + xy: 1789, 416 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 1705, 904 + xy: 1755, 544 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 1773, 332 + xy: 1295, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 771, 452 + xy: 1763, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wraith-factory-icon-full rotate: false - xy: 1049, 770 + xy: 1289, 902 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-icon-large rotate: false - xy: 1805, 904 + xy: 1805, 1048 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 1795, 768 + xy: 1261, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 823, 478 + xy: 1789, 390 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -item-biomatter - rotate: false - xy: 513, 1 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 item-blast-compound rotate: false - xy: 555, 383 + xy: 1881, 690 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 545, 349 + xy: 1881, 656 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 545, 315 + xy: 1881, 622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 545, 281 + xy: 1881, 588 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 545, 247 + xy: 1881, 554 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 545, 213 + xy: 1881, 520 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 555, 179 + xy: 1881, 486 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 555, 145 + xy: 1915, 1002 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 555, 111 + xy: 1915, 968 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 555, 77 + xy: 1915, 934 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 579, 349 + xy: 1915, 900 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 579, 315 + xy: 1915, 866 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 579, 247 + xy: 1915, 798 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 579, 213 + xy: 1915, 764 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 589, 179 + xy: 1915, 730 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 589, 145 + xy: 1915, 696 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 2007, 952 + xy: 1873, 452 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1396, 876 + xy: 1949, 968 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1439, 842 + xy: 1949, 798 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1473, 842 + xy: 1949, 696 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 1925, 1412 + xy: 1718, 1248 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 1975, 1410 + xy: 1768, 1248 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 319, 125 + xy: 1818, 1248 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 1153, 495 + xy: 1605, 990 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 1103, 470 + xy: 1605, 940 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 1053, 454 + xy: 1605, 890 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 1181, 845 + xy: 1378, 1244 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 785, 1158 + xy: 1247, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 1313, 1040 + xy: 1436, 1244 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 1527, 1408 + xy: 1494, 1244 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 1701, 1404 + xy: 311, 1 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 1671, 1054 + xy: 1705, 844 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1771, 1104 + xy: 1705, 794 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 1203, 576 + xy: 1828, 1198 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6964,21 +6957,21 @@ glaive-ship index: -1 javelin-ship rotate: false - xy: 1403, 326 + xy: 1355, 794 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 1431, 776 + xy: 1305, 736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 1759, 1404 + xy: 1552, 1240 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -6999,77 +6992,77 @@ circle index: -1 shape-3 rotate: false - xy: 1181, 903 + xy: 1313, 1233 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 chaos-array rotate: false - xy: 323, 1715 + xy: 453, 1715 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 chaos-array-base rotate: false - xy: 453, 1715 + xy: 583, 1756 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 chaos-array-leg rotate: false - xy: 583, 1756 + xy: 713, 1756 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 crawler rotate: false - xy: 311, 25 + xy: 1455, 894 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1041, 654 + xy: 1455, 844 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 1053, 554 + xy: 1521, 1140 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 903, 530 + xy: 1505, 940 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 953, 530 + xy: 1505, 890 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1053, 504 + xy: 1578, 1190 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug rotate: false - xy: 1203, 376 + xy: 605, 786 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7097,56 +7090,56 @@ eradicator-leg index: -1 eruptor rotate: false - xy: 587, 1191 + xy: 653, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 587, 1125 + xy: 719, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 587, 1059 + xy: 719, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 587, 993 + xy: 785, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 587, 927 + xy: 785, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 587, 927 + xy: 785, 1166 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 587, 861 + xy: 851, 1232 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ghoul rotate: false - xy: 1395, 1458 + xy: 489, 1053 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -7160,14 +7153,14 @@ lich index: -1 phantom rotate: false - xy: 1585, 1404 + xy: 319, 117 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1643, 1404 + xy: 311, 59 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -7188,70 +7181,70 @@ revenant index: -1 spirit rotate: false - xy: 1421, 1044 + xy: 1655, 940 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 1115, 1100 + xy: 1223, 1034 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 1181, 1166 + xy: 1091, 836 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith rotate: false - xy: 1755, 904 + xy: 1755, 494 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 703, 572 + xy: 1918, 1240 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 953, 580 + xy: 1421, 1144 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 1003, 596 + xy: 1471, 1144 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 1003, 596 + xy: 1471, 1144 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 1173, 745 + xy: 1471, 1094 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos-equip rotate: false - xy: 1313, 1098 + xy: 285, 493 size: 56, 136 orig: 56, 136 offset: 0, 0 @@ -7265,63 +7258,63 @@ eradication-equip index: -1 eruption-equip rotate: false - xy: 1253, 468 + xy: 705, 778 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 1253, 418 + xy: 605, 636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 1253, 360 + xy: 655, 678 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 1303, 526 + xy: 805, 686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles-equip rotate: false - xy: 1453, 376 + xy: 1405, 694 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-gun-equip rotate: false - xy: 1852, 1308 + xy: 1505, 590 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles-equip rotate: false - xy: 1902, 1312 + xy: 369, 67 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1553, 426 + xy: 1455, 494 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1571, 1054 + xy: 1705, 1044 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7334,1946 +7327,1946 @@ filter: Nearest,Nearest repeat: none alloy-smelter-icon-editor rotate: false - xy: 1, 19 + xy: 1, 21 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-icon-editor rotate: false - xy: 941, 791 + xy: 261, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-icon-editor rotate: false - xy: 975, 791 + xy: 427, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-editor rotate: false - xy: 745, 923 + xy: 745, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-drill-icon-editor rotate: false - xy: 1, 247 + xy: 1, 249 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-mixer-icon-editor rotate: false - xy: 1039, 857 + xy: 745, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border-editor rotate: false - xy: 453, 593 + xy: 569, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-icon-editor rotate: false - xy: 487, 593 + xy: 461, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-icon-editor rotate: false - xy: 521, 593 + xy: 603, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char-icon-editor rotate: false - xy: 555, 593 + xy: 495, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char1 rotate: false - xy: 555, 593 + xy: 495, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 clear-editor rotate: false - xy: 261, 374 + xy: 261, 376 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 cliffs-icon-editor rotate: false - xy: 589, 593 + xy: 637, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal-centrifuge-icon-editor rotate: false - xy: 1105, 857 + xy: 811, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 combustion-generator-icon-editor rotate: false - xy: 623, 593 + xy: 671, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-editor rotate: false - xy: 657, 593 + xy: 427, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-editor rotate: false - xy: 1171, 857 + xy: 877, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 conveyor-icon-editor rotate: false - xy: 451, 559 + xy: 461, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-icon-editor rotate: false - xy: 451, 525 + xy: 495, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-editor rotate: false - xy: 1237, 857 + xy: 943, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation-icon-editor rotate: false - xy: 323, 729 + xy: 323, 731 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-nucleus-icon-editor rotate: false - xy: 323, 859 + xy: 323, 861 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 core-shard-icon-editor rotate: false - xy: 99, 19 + xy: 99, 21 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 craters-icon-editor rotate: false - xy: 485, 559 + xy: 529, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters1 rotate: false - xy: 485, 559 + xy: 529, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 crawler-factory-icon-editor rotate: false - xy: 1303, 857 + xy: 1009, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-icon-editor rotate: false - xy: 1369, 857 + xy: 1075, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-editor rotate: false - xy: 1435, 857 + xy: 1141, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cyclone-icon-editor rotate: false - xy: 843, 923 + xy: 843, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dagger-factory-icon-editor rotate: false - xy: 1501, 857 + xy: 1207, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal-icon-editor rotate: false - xy: 519, 559 + xy: 529, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1-icon-editor rotate: false - xy: 451, 491 + xy: 295, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-1 rotate: false - xy: 451, 491 + xy: 295, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-2-icon-editor rotate: false - xy: 485, 525 + xy: 329, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-2 rotate: false - xy: 485, 525 + xy: 329, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-3-icon-editor rotate: false - xy: 519, 525 + xy: 569, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-3 rotate: false - xy: 519, 525 + xy: 569, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-4-icon-editor rotate: false - xy: 553, 559 + xy: 603, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-4 rotate: false - xy: 553, 559 + xy: 603, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-5-icon-editor rotate: false - xy: 485, 491 + xy: 637, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-5 rotate: false - xy: 485, 491 + xy: 637, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-6-icon-editor rotate: false - xy: 519, 491 + xy: 671, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-6 rotate: false - xy: 519, 491 + xy: 671, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-icon-editor rotate: false - xy: 587, 559 + xy: 555, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand1 rotate: false - xy: 587, 559 + xy: 555, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water-icon-editor rotate: false - xy: 553, 525 + xy: 555, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-tainted-water rotate: false - xy: 553, 525 + xy: 555, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water-icon-editor rotate: false - xy: 621, 559 + xy: 589, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-water rotate: false - xy: 621, 559 + xy: 589, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dart-mech-pad-icon-editor rotate: false - xy: 1567, 857 + xy: 1273, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 deepwater-icon-editor rotate: false - xy: 587, 525 + xy: 555, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-deepwater rotate: false - xy: 587, 525 + xy: 555, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-editor rotate: false - xy: 1633, 857 + xy: 1339, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 differential-generator-icon-editor rotate: false - xy: 941, 923 + xy: 941, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 distributor-icon-editor rotate: false - xy: 1699, 857 + xy: 1405, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-icon-editor rotate: false - xy: 553, 491 + xy: 589, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-editor rotate: false - xy: 1765, 857 + xy: 1471, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory-icon-editor rotate: false - xy: 1831, 857 + xy: 1537, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks-icon-editor rotate: false - xy: 655, 559 + xy: 623, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-editor rotate: false - xy: 621, 525 + xy: 555, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char2 rotate: false - xy: 587, 491 + xy: 589, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char3 rotate: false - xy: 655, 525 + xy: 623, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-clear rotate: false - xy: 733, 879 + xy: 733, 881 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 editor-craters2 rotate: false - xy: 621, 491 + xy: 657, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters3 rotate: false - xy: 655, 491 + xy: 555, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand2 rotate: false - xy: 261, 239 + xy: 589, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand3 rotate: false - xy: 295, 239 + xy: 623, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass1 rotate: false - xy: 329, 239 + xy: 657, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-icon-editor rotate: false - xy: 329, 239 + xy: 657, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass2 rotate: false - xy: 363, 239 + xy: 589, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass3 rotate: false - xy: 397, 239 + xy: 623, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-holostone1 rotate: false - xy: 431, 239 + xy: 657, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone-icon-editor rotate: false - xy: 431, 239 + xy: 657, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-holostone2 rotate: false - xy: 465, 239 + xy: 623, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-holostone3 rotate: false - xy: 499, 239 + xy: 657, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock1 rotate: false - xy: 259, 205 + xy: 657, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock-icon-editor rotate: false - xy: 259, 205 + xy: 657, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock2 rotate: false - xy: 259, 171 + xy: 563, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock3 rotate: false - xy: 293, 205 + xy: 563, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow1 rotate: false - xy: 361, 205 + xy: 631, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow-icon-editor rotate: false - xy: 361, 205 + xy: 631, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow2 rotate: false - xy: 327, 171 + xy: 665, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow3 rotate: false - xy: 293, 137 + xy: 665, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice1 rotate: false - xy: 259, 137 + xy: 597, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-icon-editor rotate: false - xy: 259, 137 + xy: 597, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice2 rotate: false - xy: 327, 205 + xy: 597, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice3 rotate: false - xy: 293, 171 + xy: 631, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ignarock1 rotate: false - xy: 395, 205 + xy: 563, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock-icon-editor rotate: false - xy: 395, 205 + xy: 563, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ignarock2 rotate: false - xy: 361, 171 + xy: 597, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ignarock3 rotate: false - xy: 327, 137 + xy: 631, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock1 rotate: false - xy: 429, 205 + xy: 665, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock-icon-editor rotate: false - xy: 429, 205 + xy: 665, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock2 rotate: false - xy: 395, 171 + xy: 691, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock3 rotate: false - xy: 361, 137 + xy: 691, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor rotate: false - xy: 463, 205 + xy: 691, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-icon-editor rotate: false - xy: 463, 205 + xy: 691, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-2 rotate: false - xy: 429, 171 + xy: 691, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2-icon-editor rotate: false - xy: 429, 171 + xy: 691, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-3 rotate: false - xy: 395, 137 + xy: 691, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3-icon-editor rotate: false - xy: 395, 137 + xy: 691, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-5 rotate: false - xy: 497, 205 + xy: 699, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5-icon-editor rotate: false - xy: 497, 205 + xy: 699, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged1 rotate: false - xy: 463, 171 + xy: 699, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged-icon-editor rotate: false - xy: 463, 171 + xy: 699, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged2 rotate: false - xy: 429, 137 + xy: 699, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged3 rotate: false - xy: 497, 171 + xy: 705, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss1 rotate: false - xy: 463, 137 + xy: 705, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss-icon-editor rotate: false - xy: 463, 137 + xy: 705, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss2 rotate: false - xy: 497, 137 + xy: 725, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss3 rotate: false - xy: 691, 593 + xy: 725, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal1 rotate: false - xy: 689, 559 + xy: 725, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal2 rotate: false - xy: 689, 525 + xy: 725, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal3 rotate: false - xy: 689, 491 + xy: 725, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper1 rotate: false - xy: 533, 239 + xy: 733, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper2 rotate: false - xy: 531, 205 + xy: 733, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper3 rotate: false - xy: 531, 171 + xy: 733, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead1 rotate: false - xy: 531, 137 + xy: 363, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead2 rotate: false - xy: 725, 609 + xy: 363, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead3 rotate: false - xy: 767, 659 + xy: 403, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap1 rotate: false - xy: 833, 725 + xy: 437, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap2 rotate: false - xy: 725, 575 + xy: 471, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap3 rotate: false - xy: 723, 541 + xy: 505, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium1 rotate: false - xy: 723, 507 + xy: 397, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium2 rotate: false - xy: 767, 625 + xy: 397, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium3 rotate: false - xy: 759, 591 + xy: 431, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium1 rotate: false - xy: 801, 675 + xy: 431, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium2 rotate: false - xy: 801, 641 + xy: 465, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium3 rotate: false - xy: 867, 741 + xy: 465, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles1 rotate: false - xy: 901, 749 + xy: 499, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles2 rotate: false - xy: 723, 473 + xy: 499, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles3 rotate: false - xy: 759, 557 + xy: 533, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-salt rotate: false - xy: 757, 523 + xy: 533, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-icon-editor rotate: false - xy: 757, 523 + xy: 533, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand-water rotate: false - xy: 801, 607 + xy: 601, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-icon-editor rotate: false - xy: 801, 607 + xy: 601, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand1 rotate: false - xy: 757, 489 + xy: 567, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-icon-editor rotate: false - xy: 757, 489 + xy: 567, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand2 rotate: false - xy: 835, 691 + xy: 567, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand3 rotate: false - xy: 835, 657 + xy: 601, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale1 rotate: false - xy: 835, 623 + xy: 635, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-icon-editor rotate: false - xy: 835, 623 + xy: 635, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale2 rotate: false - xy: 793, 573 + xy: 635, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale3 rotate: false - xy: 757, 455 + xy: 669, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow1 rotate: false - xy: 869, 707 + xy: 669, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-icon-editor rotate: false - xy: 869, 707 + xy: 669, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow2 rotate: false - xy: 869, 673 + xy: 703, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow3 rotate: false - xy: 869, 639 + xy: 703, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spawn rotate: false - xy: 903, 715 + xy: 737, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss1 rotate: false - xy: 903, 681 + xy: 737, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss-icon-editor rotate: false - xy: 903, 681 + xy: 737, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss2 rotate: false - xy: 903, 647 + xy: 733, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss3 rotate: false - xy: 835, 589 + xy: 767, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone1 rotate: false - xy: 869, 605 + xy: 801, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-editor rotate: false - xy: 869, 605 + xy: 801, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone2 rotate: false - xy: 903, 613 + xy: 835, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone3 rotate: false - xy: 793, 539 + xy: 869, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tainted-water rotate: false - xy: 791, 505 + xy: 903, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-icon-editor rotate: false - xy: 791, 505 + xy: 903, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tar rotate: false - xy: 791, 471 + xy: 937, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-editor rotate: false - xy: 791, 471 + xy: 937, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils1 rotate: false - xy: 827, 555 + xy: 971, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils2 rotate: false - xy: 869, 571 + xy: 1005, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils3 rotate: false - xy: 903, 579 + xy: 1039, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-water rotate: false - xy: 791, 437 + xy: 1073, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-editor rotate: false - xy: 791, 437 + xy: 1073, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-editor rotate: false - xy: 1039, 923 + xy: 1039, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-icon-editor rotate: false - xy: 1137, 923 + xy: 1137, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fuse-icon-editor rotate: false - xy: 1235, 923 + xy: 1235, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory-icon-editor rotate: false - xy: 1333, 923 + xy: 1333, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 glaive-ship-pad-icon-editor rotate: false - xy: 1431, 923 + xy: 1431, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 graphite-press-icon-editor rotate: false - xy: 1897, 857 + xy: 1603, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 hail-icon-editor rotate: false - xy: 827, 521 + xy: 1107, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-icon-editor rotate: false - xy: 825, 487 + xy: 1141, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-editor rotate: false - xy: 485, 891 + xy: 485, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 incinerator-icon-editor rotate: false - xy: 825, 453 + xy: 1175, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-editor rotate: false - xy: 861, 537 + xy: 1209, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-editor rotate: false - xy: 825, 419 + xy: 1243, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-editor rotate: false - xy: 1963, 857 + xy: 1669, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 junction-icon-editor rotate: false - xy: 861, 503 + xy: 1277, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-editor rotate: false - xy: 485, 825 + xy: 1735, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-editor rotate: false - xy: 551, 825 + xy: 1801, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill-icon-editor rotate: false - xy: 1529, 923 + xy: 1529, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-icon-editor rotate: false - xy: 1627, 923 + xy: 1627, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large-icon-editor rotate: false - xy: 1, 117 + xy: 1, 119 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 liquid-junction-icon-editor rotate: false - xy: 859, 469 + xy: 1311, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-editor rotate: false - xy: 859, 435 + xy: 1345, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 859, 401 + xy: 1379, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-editor rotate: false - xy: 1725, 923 + xy: 1725, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-editor rotate: false - xy: 1823, 923 + xy: 1823, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill-icon-editor rotate: false - xy: 617, 825 + xy: 1867, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-pump-icon-editor rotate: false - xy: 295, 103 + xy: 1413, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-editor rotate: false - xy: 131, 117 - size: 126, 128 - orig: 126, 128 + xy: 131, 249 + size: 128, 128 + orig: 128, 128 offset: 0, 0 index: -1 melter-icon-editor rotate: false - xy: 295, 69 + xy: 1447, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-editor rotate: false - xy: 453, 759 + xy: 1933, 859 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender-icon-editor rotate: false - xy: 329, 103 + xy: 1481, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-editor rotate: false - xy: 1921, 923 + xy: 1921, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-editor rotate: false - xy: 323, 371 + xy: 323, 373 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 omega-mech-pad-icon-editor rotate: false - xy: 197, 19 + xy: 197, 21 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-projector-icon-editor rotate: false - xy: 519, 759 + xy: 485, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overflow-gate-icon-editor rotate: false - xy: 295, 35 + xy: 1515, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles-icon-editor rotate: false - xy: 329, 69 + xy: 1549, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-editor rotate: false - xy: 453, 693 + xy: 551, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-conduit-icon-editor rotate: false - xy: 363, 103 + xy: 1583, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 329, 35 + xy: 1617, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 363, 69 + xy: 1651, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-editor rotate: false - xy: 519, 693 + xy: 617, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-editor rotate: false - xy: 585, 759 + xy: 453, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pine-icon-editor rotate: false - xy: 683, 841 + xy: 1999, 875 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-editor rotate: false - xy: 453, 627 + xy: 519, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-icon-editor rotate: false - xy: 519, 627 + xy: 453, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-node-icon-editor rotate: false - xy: 397, 103 + xy: 1685, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-editor rotate: false - xy: 585, 693 + xy: 519, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source-icon-editor rotate: false - xy: 363, 35 + xy: 1719, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 397, 69 + xy: 1753, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 431, 103 + xy: 1787, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 397, 35 + xy: 1821, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-editor rotate: false - xy: 585, 627 + xy: 585, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-icon-editor rotate: false - xy: 431, 69 + xy: 1855, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-editor rotate: false - xy: 131, 247 + xy: 323, 601 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ripple-icon-editor rotate: false - xy: 261, 273 + xy: 261, 275 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rock-icon-editor rotate: false - xy: 717, 643 + xy: 1999, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-editor rotate: false - xy: 465, 103 + xy: 1889, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-editor rotate: false - xy: 1039, 791 + xy: 453, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 router-icon-editor rotate: false - xy: 431, 35 + xy: 1923, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-editor rotate: false - xy: 1105, 791 + xy: 519, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 saltrocks-icon-editor rotate: false - xy: 465, 69 + xy: 1957, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-editor rotate: false - xy: 1171, 791 + xy: 585, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sandrocks-icon-editor rotate: false - xy: 499, 103 + xy: 717, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter-icon-editor rotate: false - xy: 1237, 791 + xy: 453, 563 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-icon-editor rotate: false - xy: 465, 35 + xy: 717, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-editor rotate: false - xy: 323, 599 + xy: 615, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge-icon-editor rotate: false - xy: 359, 273 + xy: 261, 177 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-icon-editor rotate: false - xy: 499, 69 + xy: 751, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-editor rotate: false - xy: 1303, 791 + xy: 519, 563 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-icon-editor rotate: false - xy: 1369, 791 + xy: 585, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shale-boulder-icon-editor rotate: false - xy: 499, 35 + xy: 717, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-icon-editor rotate: false - xy: 533, 103 + xy: 785, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 533, 69 + xy: 751, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 533, 35 + xy: 717, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-editor rotate: false - xy: 1435, 791 + xy: 453, 497 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snowrock-icon-editor rotate: false - xy: 783, 709 + xy: 519, 381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-editor rotate: false - xy: 295, 1 + xy: 819, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 329, 1 + xy: 785, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-editor rotate: false - xy: 421, 371 + xy: 359, 275 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 sorter-icon-editor rotate: false - xy: 363, 1 + xy: 751, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 397, 1 + xy: 717, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-editor rotate: false - xy: 323, 469 - size: 126, 128 - orig: 126, 128 + xy: 131, 119 + size: 128, 128 + orig: 128, 128 offset: 0, 0 index: -1 spirit-factory-icon-editor rotate: false - xy: 1501, 791 + xy: 519, 497 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-cluster-icon-editor rotate: false - xy: 899, 783 + xy: 361, 69 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-pine-icon-editor rotate: false - xy: 849, 775 + xy: 683, 843 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-editor rotate: false - xy: 1567, 791 + xy: 585, 563 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sporerocks-icon-editor rotate: false - xy: 431, 1 + xy: 853, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-editor rotate: false - xy: 1633, 791 + xy: 585, 497 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall-icon-editor rotate: false - xy: 465, 1 + xy: 819, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-editor rotate: false - xy: 1699, 791 + xy: 519, 431 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-editor rotate: false - xy: 1765, 791 + xy: 585, 431 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 tau-mech-pad-icon-editor rotate: false - xy: 1831, 791 + xy: 651, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 tendrils-icon-editor rotate: false - xy: 499, 1 + xy: 785, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-editor rotate: false - xy: 1897, 791 + xy: 651, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump-icon-editor rotate: false - xy: 457, 273 + xy: 359, 177 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-icon-editor rotate: false - xy: 745, 825 + xy: 421, 373 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-wall-icon-editor rotate: false - xy: 533, 1 + xy: 751, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-editor rotate: false - xy: 1963, 791 + xy: 651, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster-icon-editor rotate: false - xy: 615, 891 + xy: 323, 471 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titan-factory-icon-editor rotate: false - xy: 843, 825 + xy: 457, 275 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 titanium-conveyor-icon-editor rotate: false - xy: 519, 457 + xy: 717, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 553, 457 + xy: 887, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-editor rotate: false - xy: 651, 759 + xy: 651, 563 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad-icon-editor rotate: false - xy: 651, 693 + xy: 651, 497 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-icon-editor rotate: false - xy: 651, 627 + xy: 651, 431 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader-icon-editor rotate: false - xy: 519, 423 + xy: 853, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-editor rotate: false - xy: 941, 825 + xy: 457, 177 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 water-extractor-icon-editor rotate: false - xy: 717, 759 + xy: 295, 111 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-editor rotate: false - xy: 717, 693 + xy: 295, 45 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 white-tree-dead-icon-editor rotate: false - xy: 1, 699 + xy: 1, 701 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 white-tree-icon-editor rotate: false - xy: 1, 377 + xy: 1, 379 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 wraith-factory-icon-editor rotate: false - xy: 783, 759 + xy: 361, 111 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -10643,7 +10636,7 @@ filter: Nearest,Nearest repeat: none bar rotate: false - xy: 265, 41 + xy: 805, 240 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -10651,7 +10644,7 @@ bar index: -1 bar-top rotate: false - xy: 265, 79 + xy: 776, 240 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -10659,7 +10652,7 @@ bar-top index: -1 button rotate: false - xy: 1303, 340 + xy: 331, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10667,7 +10660,7 @@ button index: -1 button-disabled rotate: false - xy: 2011, 384 + xy: 51, 131 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10675,7 +10668,7 @@ button-disabled index: -1 button-down rotate: false - xy: 2011, 355 + xy: 101, 181 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10683,7 +10676,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 993, 296 + xy: 151, 231 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10691,7 +10684,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 1037, 340 + xy: 201, 281 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10699,7 +10692,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 1075, 340 + xy: 251, 355 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10707,7 +10700,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 1113, 340 + xy: 51, 102 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10715,7 +10708,15 @@ button-edge-4 index: -1 button-over rotate: false - xy: 1151, 340 + xy: 251, 326 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 +button-red + rotate: false + xy: 51, 73 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10723,7 +10724,7 @@ button-over index: -1 button-right rotate: false - xy: 1265, 340 + xy: 293, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10731,7 +10732,7 @@ button-right index: -1 button-right-down rotate: false - xy: 1189, 340 + xy: 51, 44 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10739,7 +10740,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 1227, 340 + xy: 51, 15 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -10747,7 +10748,7 @@ button-right-over index: -1 button-select rotate: false - xy: 197, 1 + xy: 863, 252 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -10755,2209 +10756,2199 @@ button-select index: -1 check-disabled rotate: false - xy: 1758, 335 + xy: 289, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-off rotate: false - xy: 1792, 335 + xy: 323, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1826, 335 + xy: 357, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-disabled rotate: false - xy: 1860, 335 + xy: 391, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1894, 335 + xy: 425, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1928, 335 + xy: 459, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 2037, 501 + xy: 89, 148 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -content-background - rotate: false - xy: 1455, 340 - size: 36, 27 - split: 12, 12, 12, 12 - orig: 36, 27 - offset: 0, 0 - index: -1 -content-background-locked - rotate: false - xy: 1341, 340 - size: 36, 27 - split: 12, 12, 12, 12 - orig: 36, 27 - offset: 0, 0 - index: -1 -content-background-noitems - rotate: false - xy: 1379, 340 - size: 36, 27 - split: 12, 12, 12, 12 - orig: 36, 27 - offset: 0, 0 - index: -1 -content-background-over - rotate: false - xy: 1417, 340 - size: 36, 27 - split: 12, 12, 12, 12 - orig: 36, 27 - offset: 0, 0 - index: -1 cursor rotate: false - xy: 51, 413 + xy: 51, 410 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 discord-banner rotate: false - xy: 1, 466 + xy: 1, 463 size: 84, 45 orig: 84, 45 offset: 0, 0 index: -1 -empty-sector +flat-down-base rotate: false - xy: 1962, 335 - size: 32, 32 - orig: 32, 32 + xy: 369, 381 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 offset: 0, 0 index: -1 icon-about rotate: false - xy: 87, 463 + xy: 87, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-about-med rotate: false - xy: 201, 319 - size: 42, 42 - orig: 42, 42 + xy: 1173, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-about-small rotate: false - xy: 949, 221 + xy: 493, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-add rotate: false - xy: 1, 369 + xy: 1, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-add-med rotate: false - xy: 251, 369 - size: 42, 42 - orig: 42, 42 + xy: 1205, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-add-small rotate: false - xy: 993, 262 + xy: 527, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 137, 463 + xy: 137, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-admin-med rotate: false - xy: 51, 119 - size: 42, 42 - orig: 42, 42 + xy: 1237, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 1, 319 + xy: 1, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-admin-small-med rotate: false - xy: 101, 169 - size: 42, 42 - orig: 42, 42 + xy: 1269, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-admin-small-small rotate: false - xy: 1037, 306 + xy: 561, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 187, 463 + xy: 187, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 187, 463 + xy: 187, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-arrow-16-med rotate: false - xy: 151, 219 - size: 42, 42 - orig: 42, 42 + xy: 1301, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-arrow-med rotate: false - xy: 151, 219 - size: 42, 42 - orig: 42, 42 + xy: 1301, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-arrow-16-small rotate: false - xy: 1071, 306 + xy: 595, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-arrow-small rotate: false - xy: 1071, 306 + xy: 595, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 1, 269 + xy: 1, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-arrow-down-med rotate: false - xy: 201, 275 - size: 42, 42 - orig: 42, 42 + xy: 1333, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-arrow-down-small rotate: false - xy: 1105, 306 + xy: 672, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 237, 463 + xy: 237, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-arrow-left-med rotate: false - xy: 295, 369 - size: 42, 42 - orig: 42, 42 + xy: 1365, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-arrow-left-small rotate: false - xy: 1139, 306 + xy: 706, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 1, 219 + xy: 1, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-arrow-right-med rotate: false - xy: 51, 75 - size: 42, 42 - orig: 42, 42 + xy: 1397, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-arrow-right-small rotate: false - xy: 1173, 306 + xy: 740, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 287, 463 + xy: 287, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-arrow-up-med rotate: false - xy: 339, 369 - size: 42, 42 - orig: 42, 42 + xy: 1429, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-arrow-up-small rotate: false - xy: 1207, 306 + xy: 774, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-back rotate: false - xy: 1, 169 + xy: 1, 166 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-back-med rotate: false - xy: 51, 31 - size: 42, 42 - orig: 42, 42 + xy: 1461, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-back-small rotate: false - xy: 1241, 306 + xy: 808, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 337, 463 + xy: 337, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-ban-med rotate: false - xy: 383, 369 - size: 42, 42 - orig: 42, 42 + xy: 1493, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-ban-small rotate: false - xy: 1275, 306 + xy: 842, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-break rotate: false - xy: 1, 119 + xy: 1, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-break-med rotate: false - xy: 427, 369 - size: 42, 42 - orig: 42, 42 + xy: 1525, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-break-small rotate: false - xy: 1309, 306 + xy: 876, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 387, 463 + xy: 387, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-cancel-med rotate: false - xy: 471, 369 - size: 42, 42 - orig: 42, 42 + xy: 1557, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-cancel-small rotate: false - xy: 1343, 306 + xy: 910, 376 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +icon-changelog + rotate: false + xy: 1, 66 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +icon-changelog-med + rotate: false + xy: 1589, 344 + size: 30, 30 + orig: 30, 30 + offset: 0, 0 + index: -1 +icon-changelog-small + rotate: false + xy: 944, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 1, 69 + xy: 437, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-chat-med rotate: false - xy: 515, 369 - size: 42, 42 - orig: 42, 42 + xy: 1621, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-chat-small rotate: false - xy: 1377, 306 + xy: 978, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-check rotate: false - xy: 437, 463 + xy: 1, 16 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-check-med rotate: false - xy: 559, 369 - size: 42, 42 - orig: 42, 42 + xy: 1653, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-check-small rotate: false - xy: 1411, 306 + xy: 1012, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 1, 19 + xy: 487, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-copy-med rotate: false - xy: 603, 369 - size: 42, 42 - orig: 42, 42 + xy: 1685, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-copy-small rotate: false - xy: 1445, 306 + xy: 1046, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 487, 463 + xy: 537, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-crafting-med rotate: false - xy: 647, 369 - size: 42, 42 - orig: 42, 42 + xy: 1717, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-crafting-small rotate: false - xy: 1479, 306 + xy: 1080, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 537, 463 + xy: 587, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-cursor-med rotate: false - xy: 691, 369 - size: 42, 42 - orig: 42, 42 + xy: 1749, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-cursor-small rotate: false - xy: 1513, 306 + xy: 1114, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-database rotate: false - xy: 587, 463 + xy: 637, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-database-med rotate: false - xy: 735, 369 - size: 42, 42 - orig: 42, 42 + xy: 1781, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-database-small rotate: false - xy: 1547, 306 + xy: 1148, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 637, 463 + xy: 687, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-defense-med rotate: false - xy: 779, 369 - size: 42, 42 - orig: 42, 42 + xy: 1813, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-defense-small rotate: false - xy: 1581, 306 + xy: 1182, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 687, 463 + xy: 737, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-dev-builds-med rotate: false - xy: 823, 369 - size: 42, 42 - orig: 42, 42 + xy: 1845, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-dev-builds-small rotate: false - xy: 1615, 306 + xy: 1216, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-diagonal rotate: false - xy: 737, 463 + xy: 787, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-diagonal-med rotate: false - xy: 867, 369 - size: 42, 42 - orig: 42, 42 + xy: 1877, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-diagonal-small rotate: false - xy: 1649, 306 + xy: 1250, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 787, 463 + xy: 837, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-discord-med rotate: false - xy: 911, 369 - size: 42, 42 - orig: 42, 42 + xy: 1909, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-discord-small rotate: false - xy: 1683, 306 + xy: 1284, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 837, 463 + xy: 887, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-distribution-med rotate: false - xy: 955, 369 - size: 42, 42 - orig: 42, 42 + xy: 1941, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-distribution-small rotate: false - xy: 983, 221 + xy: 1318, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 887, 463 + xy: 937, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-donate-med rotate: false - xy: 999, 369 - size: 42, 42 - orig: 42, 42 + xy: 1973, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-donate-small rotate: false - xy: 95, 129 + xy: 1352, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 937, 463 + xy: 987, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-dots-med rotate: false - xy: 1043, 369 - size: 42, 42 - orig: 42, 42 + xy: 663, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-dots-small rotate: false - xy: 95, 95 + xy: 1386, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 987, 463 + xy: 1037, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-editor-med rotate: false - xy: 1087, 369 - size: 42, 42 - orig: 42, 42 + xy: 695, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-editor-small rotate: false - xy: 95, 61 + xy: 1420, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 1037, 463 + xy: 1087, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-effect-med rotate: false - xy: 1131, 369 - size: 42, 42 - orig: 42, 42 + xy: 727, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-effect-small rotate: false - xy: 95, 27 + xy: 1454, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 1087, 463 + xy: 1137, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-elevation-med rotate: false - xy: 1175, 369 - size: 42, 42 - orig: 42, 42 + xy: 759, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-elevation-small rotate: false - xy: 129, 135 + xy: 1488, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 1137, 463 + xy: 1187, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-eraser-med rotate: false - xy: 1219, 369 - size: 42, 42 - orig: 42, 42 + xy: 791, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-eraser-small rotate: false - xy: 129, 101 + xy: 1522, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 1187, 463 + xy: 1237, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-exit-med rotate: false - xy: 1263, 369 - size: 42, 42 - orig: 42, 42 + xy: 823, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-exit-small rotate: false - xy: 129, 67 + xy: 1556, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-file rotate: false - xy: 1237, 463 + xy: 1287, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 1287, 463 + xy: 1337, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-file-image-med rotate: false - xy: 1307, 369 - size: 42, 42 - orig: 42, 42 + xy: 855, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-file-image-small rotate: false - xy: 129, 33 + xy: 1590, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-file-med rotate: false - xy: 1351, 369 - size: 42, 42 - orig: 42, 42 + xy: 887, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-file-small rotate: false - xy: 195, 197 + xy: 1624, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 1337, 463 + xy: 1387, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-file-text-med rotate: false - xy: 1395, 369 - size: 42, 42 - orig: 42, 42 + xy: 919, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-file-text-small rotate: false - xy: 229, 197 + xy: 1658, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 1387, 463 + xy: 1437, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-fill-med rotate: false - xy: 1439, 369 - size: 42, 42 - orig: 42, 42 + xy: 951, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-fill-small rotate: false - xy: 263, 197 + xy: 1692, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 1437, 463 + xy: 1487, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 1487, 463 + xy: 1537, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-floppy-16-med rotate: false - xy: 1483, 369 - size: 42, 42 - orig: 42, 42 + xy: 983, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-floppy-16-small rotate: false - xy: 297, 203 + xy: 1726, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-floppy-med rotate: false - xy: 1527, 369 - size: 42, 42 - orig: 42, 42 + xy: 1015, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-floppy-small rotate: false - xy: 331, 203 + xy: 1760, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 1537, 463 + xy: 1587, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-folder-med rotate: false - xy: 1571, 369 - size: 42, 42 - orig: 42, 42 + xy: 1047, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 1587, 463 + xy: 1637, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-folder-parent-med rotate: false - xy: 1615, 369 - size: 42, 42 - orig: 42, 42 + xy: 1079, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-folder-parent-small rotate: false - xy: 365, 203 + xy: 1794, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-folder-small rotate: false - xy: 399, 203 + xy: 1828, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-github rotate: false - xy: 1637, 463 + xy: 1687, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-github-med rotate: false - xy: 1659, 369 - size: 42, 42 - orig: 42, 42 + xy: 1111, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-github-small rotate: false - xy: 433, 203 + xy: 1862, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 1687, 463 + xy: 1737, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-google-play-med rotate: false - xy: 1703, 369 - size: 42, 42 - orig: 42, 42 + xy: 1143, 310 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-google-play-small rotate: false - xy: 467, 203 + xy: 1896, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 1737, 463 + xy: 1787, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-grid-med rotate: false - xy: 1747, 369 - size: 42, 42 - orig: 42, 42 + xy: 1175, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-grid-small rotate: false - xy: 501, 203 + xy: 1930, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1787, 463 + xy: 1837, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-home-med rotate: false - xy: 1791, 369 - size: 42, 42 - orig: 42, 42 + xy: 1207, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-home-small rotate: false - xy: 535, 203 + xy: 1964, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1837, 463 + xy: 1887, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-host-med rotate: false - xy: 1835, 369 - size: 42, 42 - orig: 42, 42 + xy: 1239, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-host-small rotate: false - xy: 569, 203 + xy: 1998, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1887, 463 + xy: 1937, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-info-med rotate: false - xy: 1879, 369 - size: 42, 42 - orig: 42, 42 + xy: 1271, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-info-small rotate: false - xy: 603, 203 + xy: 101, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 1937, 463 + xy: 1987, 460 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-itch.io-med rotate: false - xy: 1923, 369 - size: 42, 42 - orig: 42, 42 + xy: 1303, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-itch.io-small rotate: false - xy: 637, 203 + xy: 89, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1987, 463 + xy: 87, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-item-med rotate: false - xy: 1967, 369 - size: 42, 42 - orig: 42, 42 + xy: 1335, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-item-small rotate: false - xy: 671, 203 + xy: 89, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-line rotate: false - xy: 87, 413 + xy: 137, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-line-med rotate: false - xy: 201, 231 - size: 42, 42 - orig: 42, 42 + xy: 1367, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-line-small rotate: false - xy: 705, 203 + xy: 89, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-link rotate: false - xy: 137, 413 + xy: 187, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-link-med rotate: false - xy: 245, 319 - size: 42, 42 - orig: 42, 42 + xy: 1399, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-link-small rotate: false - xy: 739, 203 + xy: 89, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 187, 413 + xy: 237, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-liquid-consume rotate: false - xy: 237, 413 + xy: 287, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-liquid-consume-med rotate: false - xy: 245, 275 - size: 42, 42 - orig: 42, 42 + xy: 1431, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-liquid-consume-small rotate: false - xy: 773, 203 + xy: 151, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-liquid-med rotate: false - xy: 245, 231 - size: 42, 42 - orig: 42, 42 + xy: 1463, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 807, 203 + xy: 201, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-load rotate: false - xy: 287, 413 + xy: 337, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 337, 413 + xy: 387, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-load-image-med rotate: false - xy: 289, 325 - size: 42, 42 - orig: 42, 42 + xy: 1495, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-load-image-small rotate: false - xy: 841, 203 + xy: 289, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 387, 413 + xy: 437, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-load-map-med rotate: false - xy: 289, 281 - size: 42, 42 - orig: 42, 42 + xy: 1527, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-load-map-small rotate: false - xy: 875, 203 + xy: 323, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-load-med rotate: false - xy: 333, 325 - size: 42, 42 - orig: 42, 42 + xy: 1559, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-load-small rotate: false - xy: 909, 203 + xy: 357, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 437, 413 + xy: 487, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-loading-med rotate: false - xy: 289, 237 - size: 42, 42 - orig: 42, 42 + xy: 1591, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-loading-small rotate: false - xy: 943, 187 + xy: 391, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 487, 413 + xy: 537, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-locked-med rotate: false - xy: 333, 281 - size: 42, 42 - orig: 42, 42 + xy: 1623, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-locked-small rotate: false - xy: 977, 187 + xy: 425, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-map rotate: false - xy: 537, 413 + xy: 587, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-map-med rotate: false - xy: 377, 325 - size: 42, 42 - orig: 42, 42 + xy: 1655, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-map-small rotate: false - xy: 145, 179 + xy: 459, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 587, 413 + xy: 637, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 637, 413 + xy: 687, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-menu-large-med rotate: false - xy: 333, 237 - size: 42, 42 - orig: 42, 42 + xy: 1687, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-menu-large-small rotate: false - xy: 297, 169 + xy: 493, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-menu-med rotate: false - xy: 377, 281 - size: 42, 42 - orig: 42, 42 + xy: 1719, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-menu-small rotate: false - xy: 331, 169 + xy: 527, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 687, 413 + xy: 737, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-missing-med rotate: false - xy: 421, 325 - size: 42, 42 - orig: 42, 42 + xy: 1751, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-missing-small rotate: false - xy: 365, 169 + xy: 561, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-none rotate: false - xy: 737, 413 + xy: 787, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-none-med rotate: false - xy: 377, 237 - size: 42, 42 - orig: 42, 42 + xy: 1783, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-none-small rotate: false - xy: 399, 169 + xy: 595, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 787, 413 + xy: 837, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-paste-med rotate: false - xy: 421, 281 - size: 42, 42 - orig: 42, 42 + xy: 1815, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-paste-small rotate: false - xy: 433, 169 + xy: 251, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 837, 413 + xy: 887, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-pause-med rotate: false - xy: 465, 325 - size: 42, 42 - orig: 42, 42 + xy: 1847, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-pause-small rotate: false - xy: 467, 169 + xy: 285, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 887, 413 + xy: 937, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-pencil-med rotate: false - xy: 421, 237 - size: 42, 42 - orig: 42, 42 + xy: 1879, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 501, 169 + xy: 319, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 937, 413 + xy: 987, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-pick-med rotate: false - xy: 465, 281 - size: 42, 42 - orig: 42, 42 + xy: 1911, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-pick-small rotate: false - xy: 535, 169 + xy: 353, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-play rotate: false - xy: 987, 413 + xy: 1037, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 1037, 413 + xy: 1087, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-play-2-med rotate: false - xy: 509, 325 - size: 42, 42 - orig: 42, 42 + xy: 1943, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-play-2-small rotate: false - xy: 569, 169 + xy: 387, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 1087, 413 + xy: 1137, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-play-custom-med rotate: false - xy: 465, 237 - size: 42, 42 - orig: 42, 42 + xy: 1975, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-play-custom-small rotate: false - xy: 603, 169 + xy: 421, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-play-med rotate: false - xy: 509, 281 - size: 42, 42 - orig: 42, 42 + xy: 2005, 344 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-play-small rotate: false - xy: 637, 169 + xy: 455, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-players rotate: false - xy: 1137, 413 + xy: 1187, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-players-med rotate: false - xy: 553, 325 - size: 42, 42 - orig: 42, 42 + xy: 2007, 312 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-players-small rotate: false - xy: 671, 169 + xy: 489, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-power rotate: false - xy: 1187, 413 + xy: 1237, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-power-med rotate: false - xy: 509, 237 - size: 42, 42 - orig: 42, 42 + xy: 659, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 705, 169 + xy: 523, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-production rotate: false - xy: 1237, 413 + xy: 1287, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-production-med rotate: false - xy: 553, 281 - size: 42, 42 - orig: 42, 42 + xy: 691, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-production-small rotate: false - xy: 739, 169 + xy: 557, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 1287, 413 + xy: 1337, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-quit-med rotate: false - xy: 597, 325 - size: 42, 42 - orig: 42, 42 + xy: 723, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-quit-small rotate: false - xy: 773, 169 + xy: 591, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 1337, 413 + xy: 1387, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-redo-med rotate: false - xy: 553, 237 - size: 42, 42 - orig: 42, 42 + xy: 755, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-redo-small rotate: false - xy: 807, 169 + xy: 123, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 1387, 413 + xy: 1437, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-refresh-med rotate: false - xy: 597, 281 - size: 42, 42 - orig: 42, 42 + xy: 787, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-refresh-small rotate: false - xy: 841, 169 + xy: 123, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 1437, 413 + xy: 1487, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-rename-med rotate: false - xy: 641, 325 - size: 42, 42 - orig: 42, 42 + xy: 819, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-rename-small rotate: false - xy: 875, 169 + xy: 123, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 1487, 413 + xy: 1537, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-resize-med rotate: false - xy: 597, 237 - size: 42, 42 - orig: 42, 42 + xy: 851, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-resize-small rotate: false - xy: 909, 169 + xy: 123, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 1537, 413 + xy: 1587, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 1587, 413 + xy: 1637, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-rotate-arrow-med rotate: false - xy: 641, 281 - size: 42, 42 - orig: 42, 42 + xy: 883, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-rotate-arrow-small rotate: false - xy: 943, 153 + xy: 135, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 1637, 413 + xy: 1687, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-rotate-left-med rotate: false - xy: 685, 325 - size: 42, 42 - orig: 42, 42 + xy: 915, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-rotate-left-small rotate: false - xy: 977, 153 + xy: 157, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-rotate-med rotate: false - xy: 641, 237 - size: 42, 42 - orig: 42, 42 + xy: 947, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 1687, 413 + xy: 1737, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-rotate-right-med rotate: false - xy: 685, 281 - size: 42, 42 - orig: 42, 42 + xy: 979, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-rotate-right-small rotate: false - xy: 1011, 187 + xy: 157, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-rotate-small rotate: false - xy: 1011, 153 + xy: 157, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-save rotate: false - xy: 1737, 413 + xy: 1787, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 1787, 413 + xy: 1837, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-save-image-med rotate: false - xy: 729, 325 - size: 42, 42 - orig: 42, 42 + xy: 1011, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-save-image-small rotate: false - xy: 163, 145 + xy: 157, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 1837, 413 + xy: 1887, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-save-map-med rotate: false - xy: 685, 237 - size: 42, 42 - orig: 42, 42 + xy: 1043, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-save-map-small rotate: false - xy: 163, 111 + xy: 629, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-save-med rotate: false - xy: 729, 281 - size: 42, 42 - orig: 42, 42 + xy: 1075, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-save-small rotate: false - xy: 163, 77 + xy: 629, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 1887, 413 + xy: 1937, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-settings-med rotate: false - xy: 773, 325 - size: 42, 42 - orig: 42, 42 + xy: 1107, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-settings-small rotate: false - xy: 163, 43 + xy: 625, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 1937, 413 + xy: 1987, 410 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-spray-med rotate: false - xy: 729, 237 - size: 42, 42 - orig: 42, 42 + xy: 1139, 278 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-spray-small rotate: false - xy: 197, 163 + xy: 663, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 1987, 413 + xy: 51, 360 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-terrain-med rotate: false - xy: 773, 281 - size: 42, 42 - orig: 42, 42 + xy: 235, 249 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-terrain-small rotate: false - xy: 231, 163 + xy: 697, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 51, 363 + xy: 51, 310 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-tools-med rotate: false - xy: 817, 325 - size: 42, 42 - orig: 42, 42 + xy: 267, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-tools-small rotate: false - xy: 197, 129 + xy: 731, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 51, 313 + xy: 101, 360 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 101, 363 + xy: 51, 260 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-trash-16-med rotate: false - xy: 773, 237 - size: 42, 42 - orig: 42, 42 + xy: 299, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-trash-16-small rotate: false - xy: 197, 95 + xy: 765, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trash-med rotate: false - xy: 817, 281 - size: 42, 42 - orig: 42, 42 + xy: 331, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-trash-small rotate: false - xy: 231, 129 + xy: 799, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 51, 263 + xy: 101, 310 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-tree-med rotate: false - xy: 861, 325 - size: 42, 42 - orig: 42, 42 + xy: 363, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-tree-small rotate: false - xy: 197, 61 + xy: 833, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 101, 313 + xy: 151, 360 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-trello-med rotate: false - xy: 817, 237 - size: 42, 42 - orig: 42, 42 + xy: 395, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-trello-small rotate: false - xy: 231, 95 + xy: 867, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 151, 363 + xy: 51, 210 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-turret-med rotate: false - xy: 861, 281 - size: 42, 42 - orig: 42, 42 + xy: 427, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-turret-small rotate: false - xy: 231, 61 + xy: 901, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 51, 213 + xy: 101, 260 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-tutorial-med rotate: false - xy: 905, 325 - size: 42, 42 - orig: 42, 42 + xy: 459, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-tutorial-small rotate: false - xy: 197, 27 + xy: 935, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 101, 263 + xy: 151, 310 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-undo-med rotate: false - xy: 861, 237 - size: 42, 42 - orig: 42, 42 + xy: 491, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-undo-small rotate: false - xy: 231, 27 + xy: 969, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-units rotate: false - xy: 151, 313 + xy: 201, 360 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-units-med rotate: false - xy: 905, 281 - size: 42, 42 - orig: 42, 42 + xy: 523, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-units-small rotate: false - xy: 163, 9 + xy: 1003, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 201, 363 + xy: 51, 160 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-unlocks-med rotate: false - xy: 949, 325 - size: 42, 42 - orig: 42, 42 + xy: 555, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-unlocks-small rotate: false - xy: 1996, 321 + xy: 1037, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 51, 163 + xy: 101, 210 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-upgrade-med rotate: false - xy: 905, 237 - size: 42, 42 - orig: 42, 42 + xy: 587, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-upgrade-small rotate: false - xy: 1717, 306 + xy: 1071, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 101, 213 + xy: 151, 260 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-wiki-med rotate: false - xy: 949, 281 - size: 42, 42 - orig: 42, 42 + xy: 619, 247 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-wiki-small rotate: false - xy: 1751, 301 + xy: 1105, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 151, 263 + xy: 201, 310 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-zoom-med rotate: false - xy: 993, 325 - size: 42, 42 - orig: 42, 42 + xy: 651, 246 + size: 30, 30 + orig: 30, 30 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1785, 301 + xy: 1139, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 info-banner rotate: false - xy: 1, 419 + xy: 1, 416 size: 84, 45 orig: 84, 45 offset: 0, 0 index: -1 inventory rotate: false - xy: 325, 127 + xy: 863, 210 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -12965,7 +12956,7 @@ inventory index: -1 pane rotate: false - xy: 1531, 340 + xy: 445, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -12973,7 +12964,7 @@ pane index: -1 pane-2 rotate: false - xy: 1493, 340 + xy: 407, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -12981,7 +12972,7 @@ pane-2 index: -1 scroll rotate: false - xy: 377, 132 + xy: 915, 241 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -12989,7 +12980,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 1721, 343 + xy: 635, 384 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -12997,7 +12988,7 @@ scroll-horizontal index: -1 scroll-knob-horizontal-black rotate: false - xy: 949, 255 + xy: 251, 384 size: 40, 24 split: 11, 10, 10, 10 orig: 40, 24 @@ -13005,64 +12996,57 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 351, 127 + xy: 889, 236 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 offset: 0, 0 index: -1 -sector-select - rotate: false - xy: 1819, 301 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 selection rotate: false - xy: 1731, 340 + xy: 289, 381 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 145, 169 + xy: 1, 1 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 265, 157 + xy: 683, 238 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 265, 117 + xy: 714, 238 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 265, 117 + xy: 745, 238 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 1721, 340 + xy: 635, 381 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 1683, 340 + xy: 597, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -13070,7 +13054,7 @@ underline index: -1 underline-2 rotate: false - xy: 1569, 340 + xy: 483, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -13078,7 +13062,7 @@ underline-2 index: -1 underline-disabled rotate: false - xy: 1607, 340 + xy: 521, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -13086,7 +13070,7 @@ underline-disabled index: -1 underline-red rotate: false - xy: 1645, 340 + xy: 559, 381 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -13094,14 +13078,14 @@ underline-red index: -1 whiteui rotate: false - xy: 251, 364 + xy: 1, 11 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 296, 106 + xy: 834, 215 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 24d15f72c0..e46e8052d8 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 596ce1cd88..cb846cb23e 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 0b6736346e..68bba1e639 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index e38cbc3578..730a5c7f8e 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/uiskin.json b/core/assets/sprites/uiskin.json index e8a4530e3e..c9dad7d9ba 100644 --- a/core/assets/sprites/uiskin.json +++ b/core/assets/sprites/uiskin.json @@ -36,17 +36,17 @@ name: whiteui, color: { r: 0, g: 0, b: 0, a: 0 } }, - flat: { + flat-trans: { name: whiteui, color: { r: 0.0, g: 0.0, b: 0.0, a: 0.6 } }, + flat: { + name: whiteui, + color: { r: 0.0, g: 0.0, b: 0.0, a: 1 } + }, flat-over: { name: whiteui, - color: { hex: "#ffffff82" } - }, - flat-down: { - name: whiteui, - color: { hex: "#ffd37fff" } + color: { hex: "#454545ff" } } }, ButtonStyle: { @@ -71,12 +71,12 @@ up: button }, node: { - disabled: content-background-locked, + disabled: button, font: default-font, fontColor: white, disabledFontColor: gray, - up: content-background, - over: content-background-over + up: button-over, + over: button-down }, right: { over: button-right-over, @@ -112,7 +112,7 @@ }, clear-partial: { down: whiteui, - up: button-select, + up: pane, over: flat-down, font: default-font, fontColor: white, @@ -138,6 +138,16 @@ over: flat-over, disabled: flat, disabledFontColor: gray + }, + clear-toggle-menu: { + font: default-font, + fontColor: white, + checked: flat-down, + down: flat-down, + up: clear, + over: flat-over, + disabled: flat, + disabledFontColor: gray } toggle: { font: default-font, @@ -159,8 +169,8 @@ imageUpColor: white }, node: { - up: content-background, - over: content-background-over + up: button-over, + over: button-down }, right: { over: button-right-over, @@ -200,7 +210,7 @@ }, clear-full: { down: whiteui, - up: button-select, + up: pane, over: flat-down }, clear-partial: { @@ -214,6 +224,17 @@ up: flat, over: flat-over }, + clear-trans: { + down: flat-down, + up: flat-trans, + over: flat-over + }, + clear-toggle-trans: { + down: flat-down, + checked: flat-down, + up: flat-trans, + over: flat-over + }, clear-toggle-partial: { down: flat-down, checked: flat-down, diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index a9922c9259..5680b3aedd 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -62,7 +62,7 @@ public class Vars{ /** size of UI icons (small)*/ public static final int iconsizesmall = 32; /** size of UI icons (medium)*/ - public static final int iconsizemed = 42; + public static final int iconsizemed = 30; /** units outside of this bound will simply die instantly */ public static final float finalWorldBounds = worldBounds + 500; /** ticks spent out of bound until self destruct. */ diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index 8700ec6761..ee37db7460 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java @@ -5,7 +5,8 @@ import io.anuke.arc.collection.IntArray; import io.anuke.arc.collection.IntQueue; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Point2; -import io.anuke.arc.util.*; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.Time; import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent; import io.anuke.mindustry.game.Team; @@ -95,7 +96,7 @@ public class Pathfinder{ */ private void update(Tile tile, Team team){ //make sure team exists - if(paths != null && paths[team.ordinal()] != null && paths[team.ordinal()].weights != null){ + if(paths != null && paths[team.ordinal()] != null && paths[team.ordinal()].weights != null && Structs.inBounds(tile.x, tile.y, paths[team.ordinal()].weights)){ PathData path = paths[team.ordinal()]; if(path.weights[tile.x][tile.y] <= 0.1f){ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 3b9ea32a3b..361ae465d9 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -13,8 +13,7 @@ import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.defense.*; import io.anuke.mindustry.world.blocks.defense.turrets.*; @@ -310,11 +309,11 @@ public class Blocks implements ContentList{ saltRocks = new StaticWall("saltrocks"){{ }}; - sporePine = new StaticWall("spore-pine"){{ + sporePine = new StaticTree("spore-pine"){{ variants = 0; }}; - pine = new StaticWall("pine"){{ + pine = new StaticTree("pine"){{ variants = 0; }}; diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 7a234521b3..593f094f30 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -6,26 +6,28 @@ import io.anuke.arc.Graphics.Cursor.SystemCursor; import io.anuke.arc.freetype.FreeTypeFontGenerator; import io.anuke.arc.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; import io.anuke.arc.function.Consumer; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.Colors; -import io.anuke.arc.graphics.g2d.BitmapFont; +import io.anuke.arc.graphics.*; +import io.anuke.arc.graphics.g2d.*; +import io.anuke.arc.graphics.g2d.TextureAtlas.AtlasRegion; import io.anuke.arc.input.KeyCode; import io.anuke.arc.math.Interpolation; import io.anuke.arc.scene.*; import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.style.*; import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.TextField.TextFieldFilter; import io.anuke.arc.scene.ui.Tooltip.Tooltips; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.util.*; +import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.editor.MapEditorDialog; import io.anuke.mindustry.game.EventType.ResizeEvent; import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.ui.dialogs.*; import io.anuke.mindustry.ui.fragments.*; -import static io.anuke.arc.scene.actions.Actions.*; +import static io.anuke.arc.scene.actions.Actions.sequence; import static io.anuke.mindustry.Vars.*; public class UI implements ApplicationListener{ @@ -35,9 +37,10 @@ public class UI implements ApplicationListener{ public HudFragment hudfrag; public ChatFragment chatfrag; public PlayerListFragment listfrag; - public BackgroundFragment backfrag; public LoadingFragment loadfrag; + public WidgetGroup menuGroup, hudGroup; + public AboutDialog about; public GameOverDialog restart; public CustomGameDialog custom; @@ -54,7 +57,6 @@ public class UI implements ApplicationListener{ public BansDialog bans; public AdminsDialog admins; public TraceDialog traces; - public ChangelogDialog changelog; public DatabaseDialog database; public ContentInfoDialog content; public DeployDialog deploy; @@ -66,6 +68,7 @@ public class UI implements ApplicationListener{ public UI(){ Skin skin = new Skin(Core.atlas); generateFonts(skin); + loadExtraStyle(skin); skin.load(Core.files.internal("sprites/uiskin.json")); for(BitmapFont font : skin.getAll(BitmapFont.class).values()){ @@ -75,23 +78,8 @@ public class UI implements ApplicationListener{ Core.scene = new Scene(skin); Core.input.addProcessor(Core.scene); - Dialog.setShowAction(() -> sequence( - alpha(0f), - originCenter(), - moveToAligned(Core.graphics.getWidth() / 2f, Core.graphics.getHeight() / 2f, Align.center), - scaleTo(0.0f, 1f), - parallel( - scaleTo(1f, 1f, 0.1f, Interpolation.fade), - fadeIn(0.1f, Interpolation.fade) - ) - )); - - Dialog.setHideAction(() -> sequence( - parallel( - scaleTo(0.01f, 0.01f, 0.1f, Interpolation.fade), - fadeOut(0.1f, Interpolation.fade) - ) - )); + Dialog.setShowAction(() -> sequence()); + Dialog.setHideAction(() -> sequence()); Tooltips.getInstance().animations = false; @@ -106,6 +94,25 @@ public class UI implements ApplicationListener{ loadCursors(); } + void loadExtraStyle(Skin skin){ + AtlasRegion region = Core.atlas.find("flat-down-base"); + int[] splits = region.splits; + + ScaledNinePatchDrawable copy = new ScaledNinePatchDrawable(new NinePatch(region, splits[0], splits[1], splits[2], splits[3])){ + public float getLeftWidth(){ return 0; } + public float getRightWidth(){ return 0; } + public float getTopHeight(){ return 0; } + public float getBottomHeight(){ return 0; } + }; + copy.setMinWidth(0); + copy.setMinHeight(0); + copy.setTopHeight(0); + copy.setRightWidth(0); + copy.setBottomHeight(0); + copy.setLeftWidth(0); + skin.add("flat-down", copy, Drawable.class); + } + void loadCursors(){ int cursorScaling = 1, outlineThickness = 3; Color outlineColor = Color.valueOf("444444"); @@ -143,11 +150,13 @@ public class UI implements ApplicationListener{ @Override public void init(){ + menuGroup = new WidgetGroup(); + hudGroup = new WidgetGroup(); + menufrag = new MenuFragment(); hudfrag = new HudFragment(); chatfrag = new ChatFragment(); listfrag = new PlayerListFragment(); - backfrag = new BackgroundFragment(); loadfrag = new LoadingFragment(); editor = new MapEditorDialog(); @@ -162,7 +171,6 @@ public class UI implements ApplicationListener{ settings = new SettingsMenuDialog(); host = new HostDialog(); paused = new PausedDialog(); - changelog = new ChangelogDialog(); about = new AboutDialog(); bans = new BansDialog(); admins = new AdminsDialog(); @@ -175,12 +183,21 @@ public class UI implements ApplicationListener{ Group group = Core.scene.root; - backfrag.build(group); - control.input().getFrag().build(group); - hudfrag.build(group); - menufrag.build(group); - chatfrag.container().build(group); - listfrag.build(group); + menuGroup.setFillParent(true); + menuGroup.touchable(Touchable.childrenOnly); + menuGroup.visible(() -> state.is(State.menu)); + hudGroup.setFillParent(true); + hudGroup.touchable(Touchable.childrenOnly); + hudGroup.visible(() -> !state.is(State.menu)); + + Core.scene.add(menuGroup); + Core.scene.add(hudGroup); + + control.input().getFrag().build(hudGroup); + hudfrag.build(hudGroup); + menufrag.build(menuGroup); + chatfrag.container().build(hudGroup); + listfrag.build(hudGroup); loadfrag.build(group); } diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index 97447f43a9..abc89b19df 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/core/src/io/anuke/mindustry/editor/EditorTool.java @@ -9,6 +9,7 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.*; +import io.anuke.mindustry.world.blocks.BlockPart; public enum EditorTool{ zoom, @@ -107,6 +108,11 @@ public enum EditorTool{ //mode 0 or 1, fill everything with the floor/tile or replace it if(mode == 0 || mode == -1){ + //can't fill parts or multiblocks + if(tile.block() instanceof BlockPart || tile.block().isMultiblock()){ + return; + } + Predicate tester; Consumer setter; diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index dd1cecd4d3..466f513318 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -15,7 +15,6 @@ import io.anuke.mindustry.io.MapIO; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.BlockPart; -import io.anuke.mindustry.world.blocks.Floor; import static io.anuke.mindustry.Vars.world; @@ -238,71 +237,6 @@ public class MapEditor{ } } - public void draw_DEPRECATED(int x, int y, boolean paint, Block drawBlock, double chance){ - boolean isfloor = drawBlock instanceof Floor && drawBlock != Blocks.air; - Tile[][] tiles = world.getTiles(); - - if(drawBlock.isMultiblock()){ - x = Mathf.clamp(x, (drawBlock.size - 1) / 2, width() - drawBlock.size / 2 - 1); - y = Mathf.clamp(y, (drawBlock.size - 1) / 2, height() - drawBlock.size / 2 - 1); - - int offsetx = -(drawBlock.size - 1) / 2; - int offsety = -(drawBlock.size - 1) / 2; - - for(int dx = 0; dx < drawBlock.size; dx++){ - for(int dy = 0; dy < drawBlock.size; dy++){ - int worldx = dx + offsetx + x; - int worldy = dy + offsety + y; - - if(Structs.inBounds(worldx, worldy, width(), height())){ - Tile tile = tiles[worldx][worldy]; - - Block block = tile.block(); - - //bail out if there's anything blocking the way - if(block.isMultiblock() || block instanceof BlockPart){ - return; - } - - renderer.updatePoint(worldx, worldy); - } - } - } - - world.setBlock(tiles[x][y], drawBlock, drawTeam); - }else{ - for(int rx = -brushSize; rx <= brushSize; rx++){ - for(int ry = -brushSize; ry <= brushSize; ry++){ - if(Mathf.dst(rx, ry) <= brushSize - 0.5f && (chance >= 0.999 || Mathf.chance(chance))){ - int wx = x + rx, wy = y + ry; - - if(wx < 0 || wy < 0 || wx >= width() || wy >= height() || (paint && !isfloor && tiles[wx][wy].block() == Blocks.air)){ - continue; - } - - Tile tile = tiles[wx][wy]; - - if(!isfloor && (tile.isLinked() || tile.block().isMultiblock())){ - world.removeBlock(tile.link()); - } - - if(isfloor){ - tile.setFloor((Floor)drawBlock); - }else{ - tile.setBlock(drawBlock); - if(drawBlock.synthetic()){ - tile.setTeam(drawTeam); - } - if(drawBlock.rotate){ - tile.rotation((byte)rotation); - } - } - } - } - } - } - } - public MapRenderer renderer(){ return renderer; } diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index a84b987e77..e363ecfa03 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -263,6 +263,8 @@ public class MapEditorDialog extends Dialog implements Disposable{ private void save(){ String name = editor.getTags().get("name", "").trim(); editor.getTags().put("rules", JsonIO.write(state.rules)); + editor.getTags().remove("width"); + editor.getTags().remove("height"); player.dead = true; if(name.isEmpty()){ diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index 292e5d7dae..b9885f5a20 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java @@ -286,7 +286,9 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai @Override public void removed(){ - map.remove(tile.pos()); + if(tile != null){ + map.remove(tile.pos()); + } reset(); } diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index fc32a530d4..595a094097 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -47,9 +47,10 @@ public interface BuilderTrait extends Entity, TeamTrait{ buildQueue().clear(); for(BuildRequest request : removal){ - if(!((request.breaking && world.tile(request.x, request.y).block() == Blocks.air) || - (!request.breaking && (world.tile(request.x, request.y).rotation() == request.rotation || !request.block.rotate) - && world.tile(request.x, request.y).block() == request.block))){ + Tile tile = world.tile(request.x, request.y); + + if(!(tile == null || (request.breaking && tile.block() == Blocks.air) || + (!request.breaking && (tile.rotation() == request.rotation || !request.block.rotate) && tile.block() == request.block))){ buildQueue().addLast(request); } } diff --git a/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java index e0a95b7866..6620f20c60 100644 --- a/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java @@ -41,7 +41,7 @@ public abstract class FlyingUnit extends BaseUnit{ if(target == null){ setState(patrol); } - }; + } if(target != null){ attack(type.attackLength); diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java new file mode 100644 index 0000000000..a6097b77ab --- /dev/null +++ b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java @@ -0,0 +1,302 @@ +package io.anuke.mindustry.graphics; + +import io.anuke.arc.Core; +import io.anuke.arc.collection.Array; +import io.anuke.arc.function.PositionConsumer; +import io.anuke.arc.graphics.Camera; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.*; +import io.anuke.arc.graphics.glutils.FrameBuffer; +import io.anuke.arc.math.*; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.*; +import io.anuke.arc.util.noise.RidgedPerlin; +import io.anuke.arc.util.noise.Simplex; +import io.anuke.mindustry.content.Blocks; +import io.anuke.mindustry.content.UnitTypes; +import io.anuke.mindustry.type.UnitType; +import io.anuke.mindustry.world.*; +import io.anuke.mindustry.world.blocks.Floor; +import io.anuke.mindustry.world.blocks.OreBlock; + +import static io.anuke.mindustry.Vars.*; + +public class MenuRenderer implements Disposable{ + private static final float darkness = 0.3f; + private final int width = !mobile ? 100 : 60, height = !mobile ? 50 : 40; + + private int cacheFloor, cacheWall; + private Camera camera = new Camera(); + private Matrix3 mat = new Matrix3(); + private FrameBuffer shadows; + private CacheBatch batch; + private float time = 0f; + private float flyerRot = 45f; + private int flyers = Mathf.chance(0.2) ? Mathf.random(30) : Mathf.random(12); + private UnitType flyerType = Structs.select(UnitTypes.wraith, UnitTypes.wraith, UnitTypes.ghoul, UnitTypes.phantom, UnitTypes.phantom, UnitTypes.revenant); + + public MenuRenderer(){ + Time.mark(); + generate(); + cache(); + Log.info("Time to generate menu: {0}", Time.elapsed()); + } + + private void generate(){ + Tile[][] tiles = world.createTiles(width, height); + Array ores = content.blocks().select(b -> b instanceof OreBlock); + shadows = new FrameBuffer(width, height); + int offset = Mathf.random(100000); + Simplex s1 = new Simplex(offset); + Simplex s2 = new Simplex(offset + 1); + Simplex s3 = new Simplex(offset + 2); + RidgedPerlin rid = new RidgedPerlin(1 + offset, 1); + Block[] selected = Structs.select( + new Block[]{Blocks.sand, Blocks.sandRocks}, + new Block[]{Blocks.shale, Blocks.shaleRocks}, + new Block[]{Blocks.ice, Blocks.icerocks}, + new Block[]{Blocks.sand, Blocks.sandRocks}, + new Block[]{Blocks.shale, Blocks.shaleRocks}, + new Block[]{Blocks.ice, Blocks.icerocks}, + new Block[]{Blocks.moss, Blocks.sporePine} + ); + Block[] selected2 = Structs.select( + new Block[]{Blocks.ignarock, Blocks.duneRocks}, + new Block[]{Blocks.ignarock, Blocks.duneRocks}, + new Block[]{Blocks.stone, Blocks.rocks}, + new Block[]{Blocks.stone, Blocks.rocks}, + new Block[]{Blocks.moss, Blocks.sporerocks}, + new Block[]{Blocks.salt, Blocks.saltRocks} + ); + + Block ore1 = ores.random(); + ores.remove(ore1); + Block ore2 = ores.random(); + + double tr1 = Mathf.random(0.65f, 0.85f); + double tr2 = Mathf.random(0.65f, 0.85f); + boolean doheat = Mathf.chance(0.25); + boolean tendrils = Mathf.chance(0.25); + boolean tech = Mathf.chance(0.25); + int secSize = 10; + + Block floord = selected[0], walld = selected[1]; + Block floord2 = selected2[0], walld2 = selected2[1]; + + for(int x = 0; x < width; x++){ + for(int y = 0; y < height; y++){ + Block floor = floord; + Block ore = Blocks.air; + Block wall = Blocks.air; + + if(s1.octaveNoise2D(3, 0.5, 1/20.0, x, y) > 0.5){ + wall = walld; + } + + if(s3.octaveNoise2D(3, 0.5, 1/20.0, x, y) > 0.5){ + floor = floord2; + if(wall != Blocks.air){ + wall = walld2; + } + } + + if(s2.octaveNoise2D(3, 0.3, 1/30.0, x, y) > tr1){ + ore = ore1; + } + + if(s2.octaveNoise2D(2, 0.2, 1/15.0, x, y+99999) > tr2){ + ore = ore2; + } + + if(doheat){ + double heat = s3.octaveNoise2D(4, 0.6, 1 / 50.0, x, y + 9999); + double base = 0.65; + + if(heat > base){ + ore = Blocks.air; + wall = Blocks.air; + floor = Blocks.ignarock; + + if(heat > base + 0.1){ + floor = Blocks.hotrock; + + if(heat > base + 0.15){ + floor = Blocks.magmarock; + } + } + } + } + + if(tech){ + int mx = x % secSize, my = y % secSize; + int sclx = x / secSize, scly = y / secSize; + if(s1.octaveNoise2D(2, 1f / 10f, 0.5f, sclx, scly) > 0.4f && (mx == 0 || my == 0 || mx == secSize - 1 || my == secSize - 1)){ + floor = Blocks.darkPanel3; + if(Mathf.dst(mx, my, secSize/2, secSize/2) > secSize/2f + 1){ + floor = Blocks.darkPanel4; + } + + + if(wall != Blocks.air && Mathf.chance(0.7)){ + wall = Blocks.darkMetal; + } + } + } + + if(tendrils){ + if(rid.getValue(x, y, 1f / 17f) > 0f){ + floor = Mathf.chance(0.2) ? Blocks.sporeMoss : Blocks.moss; + + if(wall != Blocks.air){ + wall = Blocks.sporerocks; + } + } + } + + Tile tile; + tiles[x][y] = (tile = new CachedTile()); + tile.x = (short)x; + tile.y = (short)y; + tile.setFloor((Floor) floor); + tile.setBlock(wall); + tile.setOverlay(ore); + } + } + } + + private void cache(){ + + //draw shadows + Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight()); + shadows.beginDraw(Color.CLEAR); + Draw.color(Color.BLACK); + for(int x = 0; x < width; x++){ + for(int y = 0; y < height; y++){ + if(world.rawTile(x, y).block() != Blocks.air){ + Fill.rect(x + 0.5f, y + 0.5f, 1, 1); + } + } + } + Draw.color(); + shadows.endDraw(); + + SpriteBatch prev = Core.batch; + + Core.batch = batch = new CacheBatch(new SpriteCache(width * height * 6, false)); + batch.beginCache(); + + for(int x = 0; x < width; x++){ + for(int y = 0; y < height; y++){ + Tile tile = world.rawTile(x, y); + tile.floor().draw(tile); + } + } + + for(int x = 0; x < width; x++){ + for(int y = 0; y < height; y++){ + Tile tile = world.rawTile(x, y); + if(tile.overlay() != Blocks.air){ + tile.overlay().draw(tile); + } + } + } + + cacheFloor = batch.endCache(); + batch.beginCache(); + + for(int x = 0; x < width; x++){ + for(int y = 0; y < height; y++){ + Tile tile = world.rawTile(x, y); + if(tile.block() != Blocks.air){ + tile.block().draw(tile); + } + } + } + + //Draw.rect("error", world.width() * tilesize/2f, world.height() * tilesize/2f, 100f, 100f); + + cacheWall = batch.endCache(); + + Core.batch = prev; + } + + public void render(){ + time += Time.delta(); + float scaling = Math.max(Unit.dp.scl(4f), Math.max(Core.graphics.getWidth() / ((width - 1f) * tilesize), Core.graphics.getHeight() / ((height - 1f) * tilesize))); + camera.position.set(width * tilesize / 2f, height * tilesize / 2f); + camera.resize(Core.graphics.getWidth() / scaling, + Core.graphics.getHeight() / scaling); + + mat.set(Draw.proj()); + Draw.flush(); + Draw.proj(camera.projection()); + batch.setProjection(camera.projection()); + batch.beginDraw(); + batch.drawCache(cacheFloor); + batch.endDraw(); + Draw.rect(Draw.wrap(shadows.getTexture()), + width * tilesize / 2f - 4f, height * tilesize / 2f - 4f, + width * tilesize, -height * tilesize); + Draw.flush(); + batch.beginDraw(); + batch.drawCache(cacheWall); + batch.endDraw(); + + drawFlyers(); + + Draw.proj(mat); + Draw.color(0f, 0f, 0f, darkness); + Fill.crect(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight()); + Draw.color(); + } + + private void drawFlyers(){ + Draw.color(0f, 0f, 0f, 0.4f); + + float size = Math.max(flyerType.iconRegion.getWidth(), flyerType.iconRegion.getHeight()) * Draw.scl * 1.6f; + + flyers((x, y) -> { + Draw.rect(flyerType.region, x - 12f, y - 13f, flyerRot - 90); + }); + + flyers((x, y) -> { + Draw.rect("circle-shadow", x, y, size, size); + }); + Draw.color(); + + flyers((x, y) -> { + float engineOffset = flyerType.engineOffset, engineSize = flyerType.engineSize, rotation = flyerRot; + + Draw.color(Pal.engine); + Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset), y + Angles.trnsy(rotation + 180, engineOffset), + engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)); + + Draw.color(Color.WHITE); + Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset - 1f), y + Angles.trnsy(rotation + 180, engineOffset - 1f), + (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f); + Draw.color(); + + Draw.rect(flyerType.region, x, y, flyerRot - 90); + }); + } + + private void flyers(PositionConsumer cons){ + float tw = width * tilesize * 2; + float th = height * tilesize * 2; + float range = 500f; + float offset = -600f; + + for(int i = 0; i < flyers; i++){ + Tmp.v1.trns(flyerRot, time * (2.5f + flyerType.speed)); + + cons.accept((Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % tw, + (Mathf.randomSeedRange(i + 1, range) + Tmp.v1.y + Mathf.absin(time + Mathf.randomSeedRange(i + 3, 500), 10f, 3.4f) + offset) % th); + } + } + + @Override + public void dispose(){ + batch.dispose(); + shadows.dispose(); + } +} diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java index 9777f4e833..2c95552f27 100644 --- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java @@ -129,6 +129,7 @@ public class MinimapRenderer implements Disposable{ } private int colorFor(Tile tile){ + if(tile == null) return 0; tile = tile.link(); return MapIO.colorFor(tile.floor(), tile.block(), tile.overlay(), tile.getTeam()); } diff --git a/core/src/io/anuke/mindustry/graphics/Pal.java b/core/src/io/anuke/mindustry/graphics/Pal.java index 29614a7cd3..2647ab068c 100644 --- a/core/src/io/anuke/mindustry/graphics/Pal.java +++ b/core/src/io/anuke/mindustry/graphics/Pal.java @@ -52,7 +52,7 @@ public class Pal{ bar = Color.SLATE, accent = Color.valueOf("ffd37f"), stat = Color.valueOf("ffd37f"), - locked = Color.valueOf("989aa4"), + gray = Color.valueOf("454545"), accentBack = Color.valueOf("d4816b"), place = Color.valueOf("6335f8"), remove = Color.valueOf("e55454"), diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index f69c9331a6..cdcc9b7e9d 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -42,7 +42,7 @@ public abstract class InputHandler implements InputProcessor{ /** Distance on the back from where items originate. */ final static float backTrns = 3f; - public final OverlayFragment frag = new OverlayFragment(this); + public final OverlayFragment frag = new OverlayFragment(); public Block block; public int rotation; diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index f334d79c08..912c6a7277 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -261,7 +261,7 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public void buildUI(Table table){ - table.addImage("blank").color(Pal.accent).height(3f).colspan(4).growX(); + table.addImage("whiteui").color(Pal.gray).height(4f).colspan(4).growX(); table.row(); table.left().margin(0f).defaults().size(48f); diff --git a/core/src/io/anuke/mindustry/io/Changelogs.java b/core/src/io/anuke/mindustry/io/Changelogs.java deleted file mode 100644 index 10605e7550..0000000000 --- a/core/src/io/anuke/mindustry/io/Changelogs.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.anuke.mindustry.io; - -import io.anuke.arc.Core; -import io.anuke.arc.collection.Array; -import io.anuke.arc.function.Consumer; -import io.anuke.arc.util.serialization.JsonReader; -import io.anuke.arc.util.serialization.JsonValue; - -import static io.anuke.mindustry.Vars.releasesURL; - -public class Changelogs{ - - public static void getChangelog(Consumer> success, Consumer fail){ - Core.net.httpGet(releasesURL, result -> { - JsonReader reader = new JsonReader(); - JsonValue value = reader.parse(result.getResultAsString()).child; - Array out = new Array<>(); - - while(value != null){ - String name = value.getString("name"); - String description = value.getString("body").replace("\r", ""); - int id = value.getInt("id"); - int build = Integer.parseInt(value.getString("tag_name").substring(1)); - out.add(new VersionInfo(name, description, id, build, value.getString("published_at"))); - value = value.next; - } - - success.accept(out); - }, fail); - } - - public static class VersionInfo{ - public final String name, description, date; - public final int id, build; - - public VersionInfo(String name, String description, int id, int build, String date){ - this.name = name; - this.description = description; - this.id = id; - this.build = build; - this.date = date; - } - - @Override - public String toString(){ - return "VersionInfo{" + - "name='" + name + '\'' + - ", description='" + description + '\'' + - ", id=" + id + - ", build=" + build + - '}'; - } - } -} diff --git a/core/src/io/anuke/mindustry/io/SaveVersion.java b/core/src/io/anuke/mindustry/io/SaveVersion.java index 87c096b5b3..7d11548d3c 100644 --- a/core/src/io/anuke/mindustry/io/SaveVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveVersion.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.io; import io.anuke.arc.collection.*; +import io.anuke.arc.util.Log; import io.anuke.arc.util.Time; import io.anuke.arc.util.io.CounterInputStream; import io.anuke.mindustry.entities.Entities; @@ -253,7 +254,6 @@ public abstract class SaveVersion extends SaveFileReader{ } public void readContentHeader(DataInput stream) throws IOException{ - byte mapped = stream.readByte(); MappableContent[][] map = new MappableContent[ContentType.values().length][0]; diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java index 032b539f45..b3ae589254 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/io/anuke/mindustry/type/Item.java @@ -69,7 +69,7 @@ public class Item extends UnlockableContent implements Comparable{ @Override public TextureRegion getContentIcon(){ - return icon(Icon.xxlarge); + return icon(Icon.large); } @Override diff --git a/core/src/io/anuke/mindustry/type/UnitType.java b/core/src/io/anuke/mindustry/type/UnitType.java index 485ee7d818..bfe6042e23 100644 --- a/core/src/io/anuke/mindustry/type/UnitType.java +++ b/core/src/io/anuke/mindustry/type/UnitType.java @@ -65,11 +65,8 @@ public class UnitType extends UnlockableContent{ weapon.load(); iconRegion = Core.atlas.find("unit-icon-" + name, Core.atlas.find(name)); region = Core.atlas.find(name); - - if(!isFlying){ - legRegion = Core.atlas.find(name + "-leg"); - baseRegion = Core.atlas.find(name + "-base"); - } + legRegion = Core.atlas.find(name + "-leg"); + baseRegion = Core.atlas.find(name + "-base"); } @Override diff --git a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java index 684cc07aa1..97208b54ab 100644 --- a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java @@ -26,7 +26,7 @@ public class ItemsDisplay extends Table{ top().left(); margin(0); - table("flat", t -> { + table("button", t -> { t.margin(10).marginLeft(15).marginTop(15f); t.add("$launcheditems").colspan(3).left().padBottom(5); t.row(); diff --git a/core/src/io/anuke/mindustry/ui/Links.java b/core/src/io/anuke/mindustry/ui/Links.java index 41a1196d70..a0c0cae0f9 100644 --- a/core/src/io/anuke/mindustry/ui/Links.java +++ b/core/src/io/anuke/mindustry/ui/Links.java @@ -2,19 +2,22 @@ package io.anuke.mindustry.ui; import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; +import io.anuke.mindustry.graphics.Pal; public class Links{ private static LinkEntry[] links; private static void createLinks(){ links = new LinkEntry[]{ - new LinkEntry("discord", "https://discord.gg/mindustry", Color.valueOf("7289da")), - new LinkEntry("trello", "https://trello.com/b/aE2tcUwF", Color.valueOf("026aa7")), - new LinkEntry("wiki", "https://mindustrygame.github.io/wiki/", Color.valueOf("0f142f")), - new LinkEntry("itch.io", "https://anuke.itch.io/mindustry", Color.valueOf("fa5c5c")), - new LinkEntry("google-play", "https://play.google.com/store/apps/details?id=io.anuke.mindustry", Color.valueOf("689f38")), - new LinkEntry("github", "https://github.com/Anuken/Mindustry/", Color.valueOf("24292e")), - new LinkEntry("dev-builds", "https://jenkins.hellomouse.net/job/mindustry/", Color.valueOf("fafbfc")) + new LinkEntry("discord", "https://discord.gg/mindustry", Color.valueOf("7289da")), + new LinkEntry("changelog", "https://github.com/Anuken/Mindustry/releases", Pal.accent.cpy()), + new LinkEntry("trello", "https://trello.com/b/aE2tcUwF", Color.valueOf("026aa7")), + new LinkEntry("wiki", "https://mindustrygame.github.io/wiki/", Color.valueOf("0f142f")), + new LinkEntry("itch.io", "https://anuke.itch.io/mindustry", Color.valueOf("fa5c5c")), + new LinkEntry("google-play", "https://play.google.com/store/apps/details?id=io.anuke.mindustry", Color.valueOf("689f38")), + new LinkEntry("github", "https://github.com/Anuken/Mindustry/", Color.valueOf("24292e")), + new LinkEntry("dev-builds", "https://jenkins.hellomouse.net/job/mindustry/", Color.valueOf("fafbfc")) + }; } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index 33da06571e..c0be24d7a6 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -80,10 +80,6 @@ public class AboutDialog extends FloatingDialog{ buttons.addButton("$credits", this::showCredits).size(200f, 64f); - if(!ios && !OS.isMac){ - buttons.addButton("$changelog.title", ui.changelog::show).size(200f, 64f); - } - if(Core.graphics.isPortrait()){ for(Cell cell : buttons.getCells()){ cell.width(140f); @@ -98,7 +94,7 @@ public class AboutDialog extends FloatingDialog{ dialog.cont.add("$credits.text"); dialog.cont.row(); if(!contributors.isEmpty()){ - dialog.cont.addImage("blank").color(Pal.accent).fillX().height(3f).pad(3f); + dialog.cont.addImage("whiteui").color(Pal.accent).fillX().height(3f).pad(3f); dialog.cont.row(); dialog.cont.add("$contributors"); dialog.cont.row(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java deleted file mode 100644 index 9bea180562..0000000000 --- a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java +++ /dev/null @@ -1,89 +0,0 @@ -package io.anuke.mindustry.ui.dialogs; - -import io.anuke.arc.Core; -import io.anuke.arc.collection.Array; -import io.anuke.arc.scene.ui.ScrollPane; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.OS; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.game.Version; -import io.anuke.mindustry.io.Changelogs; -import io.anuke.mindustry.io.Changelogs.VersionInfo; - -import static io.anuke.mindustry.Vars.ios; - -public class ChangelogDialog extends FloatingDialog{ - private final float vw = 600; - private Array versions; - - public ChangelogDialog(){ - super("$changelog.title"); - - addCloseButton(); - - cont.add("$changelog.loading"); - - shown(() -> { - if(!ios && !OS.isMac){ - Changelogs.getChangelog(result -> { - versions = result; - Core.app.post(this::setup); - }, t -> { - Log.err(t); - Core.app.post(this::setup); - }); - } - }); - } - - void setup(){ - Table table = new Table(); - ScrollPane pane = new ScrollPane(table); - - cont.clear(); - cont.add(pane).grow(); - - if(versions == null){ - table.add("$changelog.error"); - if(Vars.android){ - table.row(); - table.add("$changelog.error.android").padTop(8); - } - - if(ios){ - table.row(); - table.add("$changelog.error.ios").padTop(8); - } - }else{ - for(VersionInfo info : versions){ - String desc = info.description; - - desc = desc.replace("Android", "Mobile"); - - Table in = new Table("underline"); - in.top().left().margin(10); - - in.add("[accent]" + info.name + "[LIGHT_GRAY] | " + info.date); - if(info.build == Version.build){ - in.row(); - in.add("$changelog.current"); - }else if(info == versions.first()){ - in.row(); - in.add("$changelog.latest"); - } - in.row(); - in.labelWrap("[lightgray]" + desc).width(vw - 20).padTop(12); - - table.add(in).width(vw).pad(8).row(); - } - - int lastid = Core.settings.getInt("lastBuild"); - if(lastid != 0 && versions.peek().build > lastid){ - Core.settings.put("lastBuild", versions.peek().build); - Core.settings.save(); - show(); - } - } - } -} diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java index 7b351de0ec..99b05d1ea4 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java @@ -2,9 +2,12 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.arc.Core; import io.anuke.arc.collection.Array; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.scene.event.ClickListener; import io.anuke.arc.scene.event.HandCursorListener; import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Content; @@ -46,16 +49,20 @@ public class DatabaseDialog extends FloatingDialog{ list.left(); int maxWidth = Core.graphics.isPortrait() ? 7 : 13; - float size = Vars.iconsize; int count = 0; for(int i = 0; i < array.size; i++){ UnlockableContent unlock = (UnlockableContent)array.get(i); - Image image = unlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-locked"); + Image image = unlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-locked", Pal.gray); image.addListener(new HandCursorListener()); - list.add(image).size(size).pad(3); + list.add(image).size(unlocked(unlock) ? 8*4 : Vars.iconsize).pad(3); + ClickListener listener = new ClickListener(); + image.addListener(listener); + if(!Vars.mobile){ + image.update(() -> image.getColor().lerp(!listener.isOver() ? Color.LIGHT_GRAY : Color.WHITE, 0.4f * Time.delta())); + } if(unlocked(unlock)){ image.clicked(() -> Vars.ui.content.show(unlock)); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index ab54131619..4d13e1411e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -8,8 +8,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.scene.Group; import io.anuke.arc.scene.ui.TextButton; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.util.Align; import io.anuke.arc.util.Structs; import io.anuke.mindustry.content.Zones; @@ -57,48 +56,53 @@ public class DeployDialog extends FloatingDialog{ Core.settings.save(); } - cont.stack(control.saves.getZoneSlot() == null ? new View() : new Table(){{ - SaveSlot slot = control.saves.getZoneSlot(); + Stack stack = new Stack(); - TextButton[] b = {null}; + if(control.saves.getZoneSlot() != null){ + stack.add(new Table(t -> { + SaveSlot slot = control.saves.getZoneSlot(); - TextButton button = addButton(Core.bundle.format("resume", slot.getZone().localizedName()), () -> { - if(b[0].childrenPressed()) return; + TextButton button = t.addButton(Core.bundle.format("resume", slot.getZone().localizedName()), () -> { - hide(); - ui.loadAnd(() -> { - try{ - control.saves.getZoneSlot().load(); - state.set(State.playing); - }catch(SaveException e){ //make sure to handle any save load errors! - e.printStackTrace(); - if(control.saves.getZoneSlot() != null) control.saves.getZoneSlot().delete(); - Core.app.post(() -> ui.showInfo("$save.corrupted")); - show(); - } - }); - }).size(230f).get(); - b[0] = button; + hide(); + ui.loadAnd(() -> { + try{ + control.saves.getZoneSlot().load(); + state.set(State.playing); + }catch(SaveException e){ //make sure to handle any save load errors! + e.printStackTrace(); + if(control.saves.getZoneSlot() != null) control.saves.getZoneSlot().delete(); + Core.app.post(() -> ui.showInfo("$save.corrupted")); + show(); + } + }); + }).size(230f).get(); - String color = "[lightgray]"; + String color = "[lightgray]"; - button.defaults().colspan(2); - button.row(); - button.add(Core.bundle.format("save.wave", color + slot.getWave())); - button.row(); - button.label(() -> Core.bundle.format("save.playtime", color + slot.getPlayTime())); - button.row(); - button.add().grow(); - button.row(); + button.defaults().colspan(2); + button.row(); + button.add(Core.bundle.format("save.wave", color + slot.getWave())); + button.row(); + button.label(() -> Core.bundle.format("save.playtime", color + slot.getPlayTime())); + button.row(); - button.addButton("$abandon", () -> { - ui.showConfirm("$warning", "$abandon.text", () -> { - slot.delete(); - setup(); - }); - }).growX().height(50f).pad(-12).padTop(10); + t.row(); - }}, new ItemsDisplay()).grow(); + t.addButton("$abandon", () -> { + ui.showConfirm("$warning", "$abandon.text", () -> { + slot.delete(); + setup(); + }); + }).width(230f).height(50f).padTop(3); + })); + }else{ + stack.add(new View()); + } + + stack.add(new ItemsDisplay()); + + cont.add(stack).grow(); //set up direct and indirect children for(ZoneNode node : nodes){ @@ -169,7 +173,7 @@ public class DeployDialog extends FloatingDialog{ for(ZoneNode node : nodes){ for(ZoneNode child : node.allChildren){ - Lines.stroke(Unit.dp.scl(3f), node.zone.locked() || child.zone.locked() ? Pal.locked : Pal.accent); + Lines.stroke(Unit.dp.scl(3f), node.zone.locked() || child.zone.locked() ? Pal.gray : Pal.accent); Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java index 25040a0a03..f1a1a15ac2 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java @@ -29,7 +29,7 @@ public class LanguageDialog extends FloatingDialog{ ButtonGroup group = new ButtonGroup<>(); for(Locale loc : locales){ - TextButton button = new TextButton(Strings.capitalize(loc.getDisplayName(loc)), "toggle"); + TextButton button = new TextButton(Strings.capitalize(loc.getDisplayName(loc)), "clear-toggle"); button.clicked(() -> { if(getLocale().equals(loc)) return; Core.settings.put("locale", loc.toString()); @@ -37,7 +37,7 @@ public class LanguageDialog extends FloatingDialog{ Log.info("Setting locale: {0}", loc.toString()); ui.showInfo("$language.restart"); }); - langs.add(button).group(group).update(t -> t.setChecked(loc.equals(getLocale()))).size(400f, 50f).pad(2).row(); + langs.add(button).group(group).update(t -> t.setChecked(loc.equals(getLocale()))).size(400f, 50f).row(); } cont.add(pane); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index 270f4b6073..a8cf4708b9 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; +import io.anuke.arc.input.KeyCode; import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.layout.Table; @@ -20,8 +21,43 @@ public class MapsDialog extends FloatingDialog{ public MapsDialog(){ super("$maps"); - addCloseButton(); - buttons.addImageTextButton("$editor.importmap", "icon-add", iconsize, () -> { + buttons.remove(); + + keyDown(key -> { + if(key == KeyCode.ESCAPE || key == KeyCode.BACK){ + Core.app.post(this::hide); + } + }); + + shown(this::setup); + onResize(() -> { + if(dialog != null){ + dialog.hide(); + } + setup(); + }); + } + + void setup(){ + buttons.clearChildren(); + + if(Core.graphics.isPortrait()){ + buttons.addImageTextButton("$back", "icon-arrow-left", iconsize, this::hide).size(210f*2f, 64f).colspan(2); + buttons.row(); + }else{ + buttons.addImageTextButton("$back", "icon-arrow-left", iconsize, this::hide).size(210f, 64f); + } + + buttons.addImageTextButton("$editor.newmap", "icon-add", iconsize, () -> { + ui.showTextInput("$editor.newmap", "$name", "", text -> { + ui.loadAnd(() -> { + ui.editor.show(); + ui.editor.editor.getTags().put("name", text); + }); + }); + }).size(210f, 64f); + + buttons.addImageTextButton("$editor.importmap", "icon-load", iconsize, () -> { Platform.instance.showFileChooser("$editor.importmap", "Map File", file -> { world.maps.tryCatchMapError(() -> { if(MapIO.isImage(file)){ @@ -60,17 +96,8 @@ public class MapsDialog extends FloatingDialog{ }); }, true, FileChooser.anyMapFiles); - }).size(230f, 64f); + }).size(210f, 64f); - shown(this::setup); - onResize(() -> { - if(dialog != null){ - dialog.hide(); - } - }); - } - - void setup(){ cont.clear(); Table maps = new Table(); @@ -107,6 +134,8 @@ public class MapsDialog extends FloatingDialog{ maps.add("$maps.none"); } + cont.add(buttons).growX(); + cont.row(); cont.add(pane).uniformX(); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index f87f33c118..4cbdbbbf0b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -43,6 +43,8 @@ public class SettingsMenuDialog extends SettingsDialog{ wasPaused = state.is(State.paused); state.set(State.paused); } + + rebuildMenu(); }); setFillParent(true); @@ -54,7 +56,7 @@ public class SettingsMenuDialog extends SettingsDialog{ cont.remove(); buttons.remove(); - menu = new Table(); + menu = new Table("button"); Consumer s = table -> { table.row(); @@ -69,16 +71,7 @@ public class SettingsMenuDialog extends SettingsDialog{ prefs.top(); prefs.margin(14f); - menu.defaults().size(300f, 60f).pad(3f); - menu.addButton("$settings.game", () -> visible(0)); - menu.row(); - menu.addButton("$settings.graphics", () -> visible(1)); - menu.row(); - menu.addButton("$settings.sound", () -> visible(2)); - menu.row(); - menu.addButton("$settings.language", ui.language::show); - menu.row(); - menu.addButton("$settings.controls", ui.controls::show).visible(() -> !mobile || Core.settings.getBool("keyboard")); + rebuildMenu(); prefs.clearChildren(); prefs.add(menu); @@ -114,6 +107,25 @@ public class SettingsMenuDialog extends SettingsDialog{ addSettings(); } + void rebuildMenu(){ + menu.clearChildren(); + + String style = "clear"; + + menu.defaults().size(300f, 60f); + menu.addButton("$settings.game", style, () -> visible(0)); + menu.row(); + menu.addButton("$settings.graphics", style, () -> visible(1)); + menu.row(); + menu.addButton("$settings.sound", style, () -> visible(2)); + menu.row(); + menu.addButton("$settings.language", style, ui.language::show); + if(!mobile || Core.settings.getBool("keyboard")){ + menu.row(); + menu.addButton("$settings.controls", style, ui.controls::show); + } + } + void addSettings(){ //TODO add when sound works again //sound.volumePrefs(); @@ -237,6 +249,7 @@ public class SettingsMenuDialog extends SettingsDialog{ } private void back(){ + rebuildMenu(); prefs.clearChildren(); prefs.add(menu); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index 854fa02ba0..4fb91b6e7c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -192,7 +192,7 @@ public class TechTreeDialog extends FloatingDialog{ button.update(() -> { float offset = (Core.graphics.getHeight() % 2) / 2f; button.setPosition(node.x + panX + width / 2f, node.y + panY + height / 2f + offset, Align.center); - button.getStyle().up = Core.scene.skin.getDrawable(!locked(node.node) ? "content-background" : !data.hasItems(node.node.requirements) ? "content-background-noitems" : "content-background-locked"); + button.getStyle().up = Core.scene.skin.getDrawable(!locked(node.node) ? "button-over" : !data.hasItems(node.node.requirements) ? "button-red" : "button"); ((TextureRegionDrawable)button.getStyle().imageUp) .setRegion(node.visible ? node.node.block.icon(Icon.medium) : Core.atlas.find("icon-locked")); button.getImage().setColor(!locked(node.node) ? Color.WHITE : Color.GRAY); @@ -249,11 +249,12 @@ public class TechTreeDialog extends FloatingDialog{ infoTable.update(() -> infoTable.setPosition(button.getX() + button.getWidth(), button.getY() + button.getHeight(), Align.topLeft)); infoTable.left(); + infoTable.background("button").margin(8f); - infoTable.table("content-background", b -> { + infoTable.table(b -> { b.margin(0).left().defaults().left(); - b.addImageButton("icon-info", "node", iconsize, () -> ui.content.show(node.block)).growY().width(50f); + b.addImageButton("icon-info-small", "clear", iconsizesmall, () -> ui.content.show(node.block)).growY().width(50f); b.add().grow(); b.table(desc -> { desc.left().defaults().left(); @@ -280,14 +281,14 @@ public class TechTreeDialog extends FloatingDialog{ if(mobile && locked(node)){ b.row(); - b.addImageTextButton("$research", "icon-check", "node", iconsize, () -> unlock(node)) + b.addImageTextButton("$research", "icon-check-small", "node", iconsizesmall, () -> unlock(node)) .disabled(i -> !data.hasItems(node.requirements)).growX().height(44f).colspan(3); } }); infoTable.row(); if(node.block.description != null){ - infoTable.table("dialogDim", t -> t.margin(3f).left().labelWrap(node.block.description).color(Color.LIGHT_GRAY).growX()).fillX(); + infoTable.table(t -> t.margin(3f).left().labelWrap(node.block.description).color(Color.LIGHT_GRAY).growX()).fillX(); } @@ -305,7 +306,7 @@ public class TechTreeDialog extends FloatingDialog{ for(TechTreeNode child : node.children){ if(!child.visible) continue; - Lines.stroke(Unit.dp.scl(3f), locked(node.node) || locked(child.node) ? Pal.locked : Pal.accent); + Lines.stroke(Unit.dp.scl(4f), locked(node.node) || locked(child.node) ? Pal.gray : Pal.accent); Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY); } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java deleted file mode 100644 index 1914fbf8fa..0000000000 --- a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.anuke.mindustry.ui.fragments; - -import io.anuke.arc.Core; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.Group; -import io.anuke.arc.scene.ui.layout.Unit; -import io.anuke.mindustry.core.GameState.State; -import io.anuke.mindustry.graphics.Shaders; - -import static io.anuke.mindustry.Vars.state; - -public class BackgroundFragment extends Fragment{ - - @Override - public void build(Group parent){ - Core.scene.table().addRect((a, b, w, h) -> { - Draw.colorl(0.1f); - Fill.crect(0, 0, w, h); - Draw.shader(Shaders.menu); - Fill.crect(0, 0, w, h); - Draw.shader(); - - boolean portrait = Core.graphics.getWidth() < Core.graphics.getHeight(); - float logoscl = (int)Unit.dp.scl(1); - TextureRegion logo = Core.atlas.find("logotext"); - float logow = logo.getWidth() * logoscl; - float logoh = logo.getHeight() * logoscl; - - Draw.color(); - Draw.rect(logo, (int)(w / 2), (int)(h - 10 - logoh - Unit.dp.scl(portrait ? 30f : 0)) + logoh / 2, logow, logoh); - }).visible(() -> state.is(State.menu)).grow(); - } -} diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index 392a73c352..b41dd8ea40 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -24,6 +24,19 @@ public class BlockConfigFragment extends Fragment{ public void build(Group parent){ table.visible(false); parent.addChild(table); + + //hacky way to hide block config when in menu + //TODO remove? + Core.scene.add(new Element(){ + @Override + public void act(float delta){ + super.act(delta); + if(state.is(State.menu)){ + table.visible(false); + configTile = null; + } + } + }); } public boolean isShown(){ @@ -47,11 +60,6 @@ public class BlockConfigFragment extends Fragment{ Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out)); table.update(() -> { - if(state.is(State.menu)){ - hideConfig(); - return; - } - if(configTile != null && configTile.block().shouldHideConfigure(configTile, player)){ hideConfig(); return; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 4092fbd804..949c6f2736 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -52,7 +52,6 @@ public class BlockInventoryFragment extends Fragment{ @Override public void build(Group parent){ table = new Table(); - table.visible(() -> !state.is(State.menu)); table.setTransform(true); parent.setTransform(true); parent.addChild(table); diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java index f2bcf3ea48..28b1eff9ba 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java @@ -15,14 +15,14 @@ import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.Align; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.net.Net; import static io.anuke.arc.Core.input; import static io.anuke.arc.Core.scene; -import static io.anuke.mindustry.Vars.*; +import static io.anuke.mindustry.Vars.maxTextLength; +import static io.anuke.mindustry.Vars.mobile; public class ChatFragment extends Table{ private final static int messagesShown = 10; @@ -61,7 +61,7 @@ public class ChatFragment extends Table{ } } - return !state.is(State.menu) && Net.active(); + return Net.active(); }); update(() -> { diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 011791814b..2a34a372fb 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -58,21 +58,22 @@ public class HudFragment extends Fragment{ //menu at top left parent.fill(cont -> { - cont.top().left().visible(() -> !state.is(State.menu)); + cont.top().left(); if(mobile){ { Table select = new Table(); - select.visible(() -> !state.is(State.menu)); select.left(); select.defaults().size(dsize).left(); - select.addImageButton("icon-menu-large", "clear", iconsize, ui.paused::show); - flip = select.addImageButton("icon-arrow-up", "clear", iconsize, this::toggleMenus).get(); + String style = "clear-trans"; - select.addImageButton("icon-pause", "clear", iconsize, () -> { + select.addImageButton("icon-menu-large", style, iconsize, ui.paused::show); + flip = select.addImageButton("icon-arrow-up", style, iconsize, this::toggleMenus).get(); + + select.addImageButton("icon-pause", style, iconsize, () -> { if(Net.active()){ ui.listfrag.toggle(); }else{ @@ -87,7 +88,7 @@ public class HudFragment extends Fragment{ } }).get(); - select.addImageButton("icon-settings", "clear", iconsize, () -> { + select.addImageButton("icon-settings", style, iconsize, () -> { if(Net.active() && mobile){ if(ui.chatfrag.chatOpen()){ ui.chatfrag.hide(); @@ -107,7 +108,7 @@ public class HudFragment extends Fragment{ } }).get(); - select.addImage("blank").color(Pal.accent).width(3f).fillY(); + select.addImage("whiteui").color(Pal.gray).width(4f).fillY(); float size = Unit.dp.scl(dsize); Array children = new Array<>(select.getChildren()); @@ -116,15 +117,15 @@ public class HudFragment extends Fragment{ int index = 0; for(Element elem : children){ int fi = index++; - Core.scene.add(elem); + parent.addChild(elem); elem.visible(() -> { if(fi < 4){ elem.setSize(size); }else{ - elem.setSize(Unit.dp.scl(3f), size); + elem.setSize(Unit.dp.scl(4f), size); } elem.setPosition(fi * size, Core.graphics.getHeight(), Align.topLeft); - return !state.is(State.menu); + return true; }); } @@ -132,7 +133,7 @@ public class HudFragment extends Fragment{ } cont.row(); - cont.addImage("blank").height(3f).color(Pal.accent).fillX(); + cont.addImage("whiteui").height(4f).color(Pal.gray).fillX(); cont.row(); } @@ -165,7 +166,7 @@ public class HudFragment extends Fragment{ addWaveTable(waves); addPlayButton(btable); - wavesMain.add(stack).width(dsize * 4 + 3f); + wavesMain.add(stack).width(dsize * 4 + 4f); wavesMain.row(); wavesMain.table("button", t -> t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.WHITE)) .grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get(); @@ -215,9 +216,7 @@ public class HudFragment extends Fragment{ float[] position = {0, 0}; t.row(); - t.addImageTextButton("$editor.removeunit", "icon-quit", "toggle", iconsize, () -> { - - }).fillX().update(b -> { + t.addImageTextButton("$editor.removeunit", "icon-quit", "toggle", iconsize, () -> {}).fillX().update(b -> { boolean[] found = {false}; if(b.isChecked()){ Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true); @@ -247,7 +246,7 @@ public class HudFragment extends Fragment{ } }); } - }).width(dsize * 4 + 3f); + }).width(dsize * 4 + 4f); editorMain.visible(() -> shown && state.isEditor()); } @@ -265,12 +264,11 @@ public class HudFragment extends Fragment{ }); //minimap - parent.fill(t -> t.top().right().add(new Minimap()).visible(() -> !state.is(State.menu) && Core.settings.getBool("minimap"))); + parent.fill(t -> t.top().right().add(new Minimap()).visible(() -> Core.settings.getBool("minimap"))); //spawner warning parent.fill(t -> { t.touchable(Touchable.disabled); - t.visible(() -> !state.is(State.menu)); t.table("flat", c -> c.add("$nearpoint") .update(l -> l.setColor(Tmp.c1.set(Color.WHITE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 10f, 1f)))) .get().setAlignment(Align.center, Align.center)) @@ -278,7 +276,7 @@ public class HudFragment extends Fragment{ }); parent.fill(t -> { - t.visible(() -> netServer.isWaitingForPlayers() && !state.is(State.menu)); + t.visible(() -> netServer.isWaitingForPlayers()); t.table("button", c -> c.add("$waiting.players")); }); @@ -331,7 +329,7 @@ public class HudFragment extends Fragment{ //launch button parent.fill(t -> { - t.top().right().visible(() -> !state.is(State.menu)); + t.top().right(); TextButton[] testb = {null}; TextButton button = Elements.newButton("$launch", () -> { FloatingDialog dialog = new FloatingDialog("$launch"); @@ -390,11 +388,11 @@ public class HudFragment extends Fragment{ //'saving' indicator parent.fill(t -> { - t.bottom().visible(() -> !state.is(State.menu) && control.saves.isSaving()); + t.bottom().visible(() -> control.saves.isSaving()); t.add("$saveload"); }); - blockfrag.build(Core.scene.root); + blockfrag.build(parent); } @Remote(targets = Loc.both, forward = true, called = Loc.both) diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 5548a40ed0..147aa6ea18 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -2,30 +2,45 @@ package io.anuke.mindustry.ui.fragments; import io.anuke.arc.Core; import io.anuke.arc.Events; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.math.Interpolation; import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.Button; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Strings; -import io.anuke.mindustry.core.GameState.State; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Align; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.EventType.ResizeEvent; import io.anuke.mindustry.game.Version; -import io.anuke.mindustry.ui.MenuButton; +import io.anuke.mindustry.graphics.MenuRenderer; import io.anuke.mindustry.ui.MobileButton; -import io.anuke.mindustry.ui.dialogs.FloatingDialog; import static io.anuke.mindustry.Vars.*; public class MenuFragment extends Fragment{ - private Table container; + private Texture logo = new Texture("sprites/logo.png"); + private Table container, submenu; + private Button currentMenu; + private MenuRenderer renderer; @Override public void build(Group parent){ + renderer = new MenuRenderer(); + + parent.fill((x, y, w, h) -> { + renderer.render(); + }); + parent.fill(c -> { container = c; - container.visible(() -> state.is(State.menu)); if(!mobile){ buildDesktop(); + Events.on(ResizeEvent.class, event -> buildDesktop()); }else{ buildMobile(); Events.on(ResizeEvent.class, event -> buildMobile()); @@ -33,19 +48,29 @@ public class MenuFragment extends Fragment{ }); //discord icon in top right - parent.fill(c -> c.top().right().addButton("", "discord", ui.discord::show).size(84, 45) - .visible(() -> state.is(State.menu))); + //parent.fill(c -> c.top().right().addButton("", "discord", ui.discord::show).size(84, 45) + //.visible(() -> state.is(State.menu))); //info icon if(mobile){ - parent.fill(c -> c.top().left().addButton("", "info", ui.about::show).size(84, 45) - .visible(() -> state.is(State.menu))); + parent.fill(c -> c.bottom().left().addButton("", "info", ui.about::show).size(84, 45)); } - //version info - parent.fill(c -> c.bottom().left().add(Strings.format("Mindustry v{0} {1}-{2} {3}{4}", Version.number, Version.modifier, Version.type, - (Version.build == -1 ? "custom build" : "build " + Version.build), Version.revision == 0 ? "" : "." + Version.revision)) - .visible(() -> state.is(State.menu))); + String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : Version.modifier + " build " + Version.build); + + parent.fill((x, y, w, h) -> { + float logoscl = (int)Unit.dp.scl(1); + float logow = Math.min(logo.getWidth() * logoscl, Core.graphics.getWidth() - Unit.dp.scl(20)); + float logoh = logow * (float)logo.getHeight() / logo.getWidth(); + + float fx = (int)(Core.graphics.getWidth() / 2f); + float fy = (int)(Core.graphics.getHeight() - 6 - logoh) + logoh / 2 - (Core.graphics.isPortrait() ? Unit.dp.scl(30f) : 0f); + + Draw.color(); + Draw.rect(Draw.wrap(logo), fx, fy, logow, logoh); + Core.scene.skin.font().setColor(Color.WHITE); + Core.scene.skin.font().draw(versionText, fx, fy - logoh/2f, Align.center); + }).touchable(Touchable.disabled); } private void buildMobile(){ @@ -57,16 +82,17 @@ public class MenuFragment extends Fragment{ container.defaults().size(size).pad(5).padTop(4f); MobileButton - play = new MobileButton("icon-play-2", isize, "$play", ui.deploy::show), - maps = new MobileButton("icon-map", isize, "$maps", ui.maps::show), - custom = new MobileButton("icon-play-custom", isize, "$customgame", this::showCustomSelect), + play = new MobileButton("icon-play-2", isize, "$campaign", ui.deploy::show), + custom = new MobileButton("icon-play-custom", isize, "$customgame", ui.custom::show), + maps = new MobileButton("icon-load", isize, "$loadgame", ui.load::show), join = new MobileButton("icon-add", isize, "$joingame", ui.join::show), - editor = new MobileButton("icon-editor", isize, "$editor", () -> ui.loadAnd(ui.editor::show)), + editor = new MobileButton("icon-editor", isize, "$editor", ui.maps::show), tools = new MobileButton("icon-tools", isize, "$settings", ui.settings::show), donate = new MobileButton("icon-donate", isize, "$donate", () -> Core.net.openURI(donationURL)), exit = new MobileButton("icon-exit", isize, "$quit", () -> Core.app.exit()); if(!Core.graphics.isPortrait()){ + container.marginTop(60f); container.add(play); container.add(join); container.add(custom); @@ -83,6 +109,7 @@ public class MenuFragment extends Fragment{ table.add(exit); }).colspan(4); }else{ + container.marginTop(0f); container.add(play); container.add(maps); container.row(); @@ -103,54 +130,105 @@ public class MenuFragment extends Fragment{ } private void buildDesktop(){ - container.table(out -> { + container.clear(); + container.setSize(Core.graphics.getWidth(), Core.graphics.getHeight()); - float w = 200f; - float bw = w * 2f + 10f; - out.margin(16); - out.defaults().size(w, 66f).padTop(5).padRight(5); + float width = 230f; + String background = "flat"; - out.add(new MenuButton("icon-play-2", "$play", ui.deploy::show)).width(bw).colspan(2); + container.left(); + container.add().width(Core.graphics.getWidth()/10f); + container.table(background, t -> { + t.defaults().width(width).height(70f); - out.row(); + buttons(t, + new Buttoni("$play", "icon-play-2", + new Buttoni("$campaign", "icon-play-2", ui.deploy::show), + new Buttoni("$joingame", "icon-add", ui.join::show), + new Buttoni("$customgame", "icon-terrain", ui.custom::show), + new Buttoni("$loadgame", "icon-load", ui.load::show) + ), + new Buttoni("$editor", "icon-editor", ui.maps::show), + new Buttoni("$settings", "icon-tools", ui.settings::show), + new Buttoni("$about.button", "icon-info", ui.about::show), + new Buttoni("$quit", "icon-exit", Core.app::exit) + ); - out.add(new MenuButton("icon-add", "$joingame", ui.join::show)); + }).width(width).growY(); - out.add(new MenuButton("icon-play-custom", "$customgame", this::showCustomSelect)); + container.table(background, t -> { + submenu = t; + t.getColor().a = 0f; + t.top(); + t.defaults().width(width).height(70f); + t.visible(() -> !t.getChildren().isEmpty()); - out.row(); - - out.add(new MenuButton("icon-editor", "$editor", () -> ui.loadAnd(ui.editor::show))); - - out.add(new MenuButton("icon-map", "$maps", ui.maps::show)); - - out.row(); - - out.add(new MenuButton("icon-info", "$about.button", ui.about::show)); - - out.add(new MenuButton("icon-tools", "$settings", ui.settings::show)); - - out.row(); - - out.add(new MenuButton("icon-exit", "$quit", Core.app::exit)).width(bw).colspan(2); - }); + }).width(width).growY(); } - private void showCustomSelect(){ - FloatingDialog dialog = new FloatingDialog("$play"); - dialog.setFillParent(false); - dialog.addCloseButton(); - dialog.cont.defaults().size(210f, 64f); - dialog.cont.add(new MenuButton("icon-editor", "$newgame", () -> { - dialog.hide(); - ui.custom.show(); - })); - dialog.cont.row(); - dialog.cont.add(new MenuButton("icon-load", "$loadgame", () -> { - ui.load.show(); - dialog.hide(); - })); - dialog.show(); + private void fadeInMenu(){ + submenu.clearActions(); + submenu.actions(Actions.alpha(1f, 0.15f, Interpolation.fade)); + } + + private void fadeOutMenu(){ + //nothing to fade out + if(submenu.getChildren().isEmpty()){ + return; + } + + submenu.clearActions(); + submenu.actions(Actions.alpha(1f), Actions.alpha(0f, 0.2f, Interpolation.fade), Actions.run(() -> submenu.clearChildren())); + } + + private void buttons(Table t, Buttoni... buttons){ + for(Buttoni b : buttons){ + Button[] out = {null}; + out[0] = t.addImageTextButton(b.text, b.icon + "-small", "clear-toggle-menu", + iconsizesmall, () -> { + if(currentMenu == out[0]){ + currentMenu = null; + fadeOutMenu(); + }else{ + if(b.submenu != null){ + currentMenu = out[0]; + submenu.clearChildren(); + fadeInMenu(); + //correctly offset the button + submenu.add().height(Core.graphics.getHeight() - out[0].getY(Align.topLeft)); + submenu.row(); + buttons(submenu, b.submenu); + }else{ + currentMenu = null; + fadeOutMenu(); + b.runnable.run(); + } + } + }).marginLeft(11f).get(); + out[0].update(() -> out[0].setChecked(currentMenu == out[0])); + t.row(); + } + } + + private class Buttoni{ + final String icon; + final String text; + final Runnable runnable; + final Buttoni[] submenu; + + public Buttoni(String text, String icon, Runnable runnable){ + this.icon = icon; + this.text = text; + this.runnable = runnable; + this.submenu = null; + } + + public Buttoni(String text, String icon, Buttoni... buttons){ + this.icon = icon; + this.text = text; + this.runnable = () -> {}; + this.submenu = buttons; + } } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java b/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java index f67ce612fb..c2e3ccd086 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java @@ -3,16 +3,15 @@ package io.anuke.mindustry.ui.fragments; import io.anuke.arc.scene.Group; import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.scene.ui.layout.WidgetGroup; -import io.anuke.mindustry.input.InputHandler; /** Fragment for displaying overlays such as block inventories. */ public class OverlayFragment extends Fragment{ public final BlockInventoryFragment inv; public final BlockConfigFragment config; - private Group group = new WidgetGroup(); + private WidgetGroup group = new WidgetGroup(); - public OverlayFragment(InputHandler input){ + public OverlayFragment(){ group.touchable(Touchable.childrenOnly); inv = new BlockInventoryFragment(); config = new BlockConfigFragment(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index bfb760eab0..9fe42faa45 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -11,7 +11,6 @@ import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.scene.style.TextureRegionDrawable; import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.game.EventType.UnlockEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent; @@ -117,7 +116,7 @@ public class PlacementFragment extends Fragment{ public void build(Group parent){ parent.fill(full -> { toggler = full; - full.bottom().right().visible(() -> !state.is(State.menu) && ui.hudfrag.shown()); + full.bottom().right().visible(() -> ui.hudfrag.shown()); full.table(frame -> { InputHandler input = control.input(); @@ -246,7 +245,7 @@ public class PlacementFragment extends Fragment{ }); }).colspan(3).fillX().visible(() -> getSelected() != null || tileDisplayBlock() != null).touchable(Touchable.enabled); frame.row(); - frame.addImage("blank").color(Pal.accent).colspan(3).height(3).growX(); + frame.addImage("whiteui").color(Pal.gray).colspan(3).height(4).growX(); frame.row(); frame.table("pane-2", blocksSelect -> { blocksSelect.margin(4).marginTop(0); @@ -270,11 +269,11 @@ public class PlacementFragment extends Fragment{ if(f++ % 2 == 0) categories.row(); if(categoryEmpty[cat.ordinal()]){ - categories.addImage("flat"); + categories.addImage("flat-trans"); continue; } - categories.addImageButton("icon-" + cat.name() + "-med", "clear-toggle", iconsizemed, () -> { + categories.addImageButton("icon-" + cat.name() + "-med", "clear-toggle-trans", iconsizemed, () -> { currentCategory = cat; rebuildCategory.run(); }).group(group).update(i -> i.setChecked(currentCategory == cat)); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index cf0d365894..27456f21be 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -135,7 +135,7 @@ public class PlayerListFragment extends Fragment{ content.add(button).padBottom(-6).width(350f).maxHeight(h + 14); content.row(); - content.addImage("blank").height(3f).color(state.rules.pvp ? user.getTeam().color : Pal.accent).growX(); + content.addImage("whiteui").height(3f).color(state.rules.pvp ? user.getTeam().color : Pal.accent).growX(); content.row(); }); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index a274a08810..28e22648e8 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -301,7 +301,7 @@ public class Block extends BlockStorage{ @Override public TextureRegion getContentIcon(){ - return icon(Icon.large); + return icon(Icon.medium); } @Override diff --git a/core/src/io/anuke/mindustry/world/StaticTree.java b/core/src/io/anuke/mindustry/world/StaticTree.java new file mode 100644 index 0000000000..be6b6c4c76 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/StaticTree.java @@ -0,0 +1,44 @@ +package io.anuke.mindustry.world; + +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.util.Tmp; +import io.anuke.mindustry.world.blocks.StaticWall; + +import static io.anuke.mindustry.Vars.tilesize; + +public class StaticTree extends StaticWall{ + + public StaticTree(String name){ + super(name); + } + + @Override + public void draw(Tile tile){ + TextureRegion r = Tmp.tr1; + r.set(region); + int crop = (region.getWidth() - tilesize*4) / 2; + float ox = 0; + float oy = 0; + + for(int i = 0; i < 4; i++){ + if(tile.getNearby(i) != null && tile.getNearby(i).block() instanceof StaticWall){ + + if(i == 0){ + r.setWidth(r.getWidth() - crop); + ox -= crop /2f; + }else if(i == 1){ + r.setY(r.getY() + crop); + oy -= crop /2f; + }else if(i == 2){ + r.setX(r.getX() + crop); + ox += crop /2f; + }else{ + r.setHeight(r.getHeight() - crop); + oy += crop /2f; + } + } + } + Draw.rect(r, tile.drawx() + ox * Draw.scl, tile.drawy() + oy * Draw.scl); + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/StaticWall.java b/core/src/io/anuke/mindustry/world/blocks/StaticWall.java index b645abb3b5..79a9b6f1d7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/StaticWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/StaticWall.java @@ -1,15 +1,12 @@ package io.anuke.mindustry.world.blocks; import io.anuke.arc.Core; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.graphics.CacheLayer; -import io.anuke.mindustry.world.Pos; -import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Vars.tilesize; -import static io.anuke.mindustry.Vars.world; +import static io.anuke.mindustry.Vars.*; public class StaticWall extends Rock{ TextureRegion large; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java index f619d1727f..e7196e2140 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -11,6 +11,7 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.*; import io.anuke.mindustry.world.meta.BlockStat; +import io.anuke.mindustry.world.meta.StatUnit; import static io.anuke.mindustry.Vars.tilesize; @@ -30,6 +31,9 @@ public class LaserTurret extends PowerTurret{ super.setStats(); stats.remove(BlockStat.boostEffect); + stats.remove(BlockStat.damage); + //damages every 5 ticks, at least in meltdown's case + stats.add(BlockStat.damage, shootType.damage * 60f / 5f, StatUnit.perSecond); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java index 1c11cd3da2..b8b0055096 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -2,6 +2,8 @@ package io.anuke.mindustry.world.blocks.defense.turrets; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.meta.BlockStat; +import io.anuke.mindustry.world.meta.StatUnit; public abstract class PowerTurret extends CooledTurret{ protected BulletType shootType; @@ -12,6 +14,13 @@ public abstract class PowerTurret extends CooledTurret{ hasPower = true; } + @Override + public void setStats(){ + super.setStats(); + + stats.add(BlockStat.damage, shootType.damage, StatUnit.none); + } + @Override public void init(){ consumes.powerCond(powerUse, entity -> ((TurretEntity)entity).target != null); diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index 364f0cd3c3..4845e4936e 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -39,6 +39,7 @@ public enum BlockStat{ powerShot(StatCategory.shooting), targetsAir(StatCategory.shooting), targetsGround(StatCategory.shooting), + damage(StatCategory.shooting), ammo(StatCategory.shooting), booster(StatCategory.optional), diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 4cccab941f..9af5f3f323 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -14,7 +14,7 @@ public class DesktopLauncher{ config.setTitle("Mindustry"); config.setMaximized(true); config.setBackBufferConfig(8, 8, 8, 8, 0, 0, 0); - config.setWindowedMode(960, 540); + config.setWindowedMode(900, 600); config.setWindowIcon("sprites/icon.png"); Platform.instance = new DesktopPlatform(arg); diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2bf61..b0acbdcd73 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists