diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-3.png index 7fbb9243b4..8b87059487 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-3.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/tar.png b/core/assets-raw/sprites/blocks/environment/tar.png index 8ad3f8ec68..d959f6df4b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/tar.png and b/core/assets-raw/sprites/blocks/environment/tar.png differ diff --git a/core/assets-raw/sprites/blocks/storage/container-team.png b/core/assets-raw/sprites/blocks/storage/container-team.png new file mode 100644 index 0000000000..5ee1dd3226 Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/container-team.png differ diff --git a/core/assets-raw/sprites/blocks/storage/container.png b/core/assets-raw/sprites/blocks/storage/container.png index 368cec3a21..959e2b6edf 100644 Binary files a/core/assets-raw/sprites/blocks/storage/container.png and b/core/assets-raw/sprites/blocks/storage/container.png differ diff --git a/core/assets-raw/sprites/blocks/storage/vault-team.png b/core/assets-raw/sprites/blocks/storage/vault-team.png new file mode 100644 index 0000000000..0ce6a50222 Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/vault-team.png differ diff --git a/core/assets-raw/sprites/blocks/storage/vault.png b/core/assets-raw/sprites/blocks/storage/vault.png index 38f46d97aa..36a4ee5ea5 100644 Binary files a/core/assets-raw/sprites/blocks/storage/vault.png and b/core/assets-raw/sprites/blocks/storage/vault.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4c98dcac96..2c73511d1e 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -20,7 +20,8 @@ gameover = Game Over gameover.pvp = The[accent] {0}[] team is victorious! highscore = [accent]New highscore! copied = Copied. -indevpopup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. +indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. +indev.notready = This part of the game isn't ready yet load.sound = Sounds load.map = Maps @@ -615,6 +616,8 @@ blocks.inaccuracy = Inaccuracy blocks.shots = Shots blocks.reload = Shots/Second blocks.ammo = Ammo +blocks.shieldhealth = Shield Health +blocks.cooldowntime = Cooldown Time bar.drilltierreq = Better Drill Required bar.noresources = Missing Resources @@ -662,6 +665,7 @@ unit.persecond = /sec unit.perminute = /min unit.timesspeed = x speed unit.percent = % +unit.shieldhealth = shield health unit.items = items unit.thousands = k unit.millions = mil @@ -789,6 +793,9 @@ keybind.diagonal_placement.name = Diagonal Placement keybind.pick.name = Pick Block keybind.break_block.name = Break Block keybind.deselect.name = Deselect +keybind.pickupCargo.name = Pickup Cargo +keybind.dropCargo.name = Drop Cargo +keybind.command.name = Command keybind.shoot.name = Shoot keybind.zoom.name = Zoom keybind.menu.name = Menu @@ -1002,7 +1009,6 @@ block.dark-metal.name = Dark Metal block.basalt.name = Basalt block.hotrock.name = Hot Rock block.magmarock.name = Magma Rock -block.cliffs.name = Cliffs block.copper-wall.name = Copper Wall block.copper-wall-large.name = Large Copper Wall block.titanium-wall.name = Titanium Wall diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index f8b3a20bf8..a248790871 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -868,6 +868,8 @@ unit.mega.name = 메가 unit.risso.name = 리소 unit.minke.name = 민케 unit.bryde.name = 브리드 +unit.sei.name = 세이 +unit.omura.name = 오무라 unit.alpha.name = 알파 unit.beta.name = 베타 unit.gamma.name = 감마 @@ -878,21 +880,21 @@ block.sand-boulder.name = 사암 block.grass.name = 잔디 block.slag.name = 광재 block.salt.name = 소금 -block.saltrocks.name = 소금 바위 +block.salt-wall.name = 소금 벽 block.pebbles.name = 조약돌 block.tendrils.name = 덩굴 -block.sandrocks.name = 모래 바위 +block.sand-wall.name = 모래 벽 block.spore-pine.name = 포자 덮인 소나무 -block.sporerocks.name = 포자 바위 -block.rock.name = 돌 -block.snowrock.name = 눈덩이 +block.spore-wall.name = 포자 벽 +block.boulder.name = 돌 +block.snow-boulder.name = 눈덩이 block.snow-pine.name = 눈 덮인 소나무 block.shale.name = 이판암 block.shale-boulder.name = 둥근 이판암 block.moss.name = 이끼 block.shrubs.name = 관목 block.spore-moss.name = 포자 이끼 -block.shalerocks.name = 이판암 바위 +block.shale-wall.name = 이판암 벽 block.scrap-wall.name = 조각벽 block.scrap-wall-large.name = 대형 조각벽 block.scrap-wall-huge.name = 거대한 조각 벽 @@ -911,6 +913,7 @@ block.water.name = 물 block.tainted-water.name = 오염된 물 block.darksand-tainted-water.name = 오염된 젖은 검은 모래 block.tar.name = 석유 +block.mud.name = 진흙 block.stone.name = 바위 block.sand.name = 모래 block.darksand.name = 검은 모래 @@ -920,13 +923,16 @@ block.craters.name = 구덩이 block.sand-water.name = 젖은 모래 block.darksand-water.name = 젖은 검은 모래 block.char.name = 숯 -block.holostone.name = 홀로스톤 +block.dacite.name = 데이사이트 +block.dacite-wall.name = 데이사이트 벽 block.ice-snow.name = 얼음눈 -block.rocks.name = 돌 -block.icerocks.name = 얼음바위 -block.snowrocks.name = 눈바위 -block.dunerocks.name = 모래돌 +block.stone-wall.name = 돌 벽 +block.ice-wall.name = 얼음 벽 +block.snow-wall.name = 눈 벽 +block.dune-wall.name = 모래 벽 block.pine.name = 소나무 +block.dirt.name = 흙 +block.dirt-wall.name = 흙 벽 block.white-tree-dead.name = 죽은 하얀나무 block.white-tree.name = 하얀 나무 block.spore-cluster.name = 포자낭 @@ -942,7 +948,7 @@ block.dark-panel-4.name = 어두운 패널 4 block.dark-panel-5.name = 어두운 패널 5 block.dark-panel-6.name = 어두운 패널 6 block.dark-metal.name = 어두운 금속제 -block.ignarock.name = 얼은 바위 +block.basalt.name = 현무암 block.hotrock.name = 뜨거운 바위 block.magmarock.name = 용암 바위 block.cliffs.name = 절벽 @@ -1012,7 +1018,7 @@ block.power-void.name = 방전장치 block.power-source.name = 전력 공급기 block.unloader.name = 언로더 block.vault.name = 창고 -block.wave.name = 웨이브 +block.wave.name = 파도 block.swarmer.name = 스워머 block.salvo.name = 살보 block.ripple.name = 립플 @@ -1020,7 +1026,7 @@ block.phase-conveyor.name = 메타 컨베이어 block.bridge-conveyor.name = 다리 컨베이어 block.plastanium-compressor.name = 플라스터늄 압축기 block.pyratite-mixer.name = 파이라타이트 혼합기 -block.blast-mixer.name = 화합물 혼합기 +block.blast-mixer.name = 폭발물 혼합기 block.solar-panel.name = 태양 전지판 block.solar-panel-large.name = 대형 태양 전지판 block.oil-extractor.name = 석유 추출기 @@ -1063,11 +1069,11 @@ block.additive-reconstructor.name = 첨가물 재구성기 block.multiplicative-reconstructor.name = 다중 재구성기 block.exponential-reconstructor.name = 지수 재구성기 block.tetrative-reconstructor.name = 정서 재구성기 -block.payload-conveyor.name = 매스 컨베이어 +block.payload-conveyor.name = 화물 컨베이어 block.payload-router.name = 화물 분배기 -block.disassembler.name = 분해기 +block.disassembler.name = 가속 분해기 block.silicon-crucible.name = 실리콘 도가니 -block.large-overdrive-projector.name = 대형 과부하 프로젝터 +block.overdrive-dome.name = 대형 과부하 프로젝터 team.blue.name = 파랑색 팀 team.crux.name = 빨강색 팀 team.sharded.name = 주황색 팀 @@ -1100,7 +1106,7 @@ tutorial.launch = 특정 웨이브에 도달하면 [accent]코어로 출격[] item.copper.description = 가장 기본적인 건설 재료. 모든 유형의 블록에서 광범위하게 사용됩니다. item.lead.description = 기본 초반 재료. 전자 및 액체 수송 블록에서 광범위하게 사용되는 자원입니다. -item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다. +item.metaglass.description = 초강력 방탄 유리. 액체 분배 및 저장에 광범위하게 사용됩니다. item.graphite.description = 탄약 및 전기 부품에 사용되는 무기질 탄소. item.sand.description = 제련에서 합금 또는 플럭스에서 광범위하게 사용되는 일반적인 재료. item.coal.description = 화석화된 식물 물질. 씨앗이 나오기 훨씬 전에 형성되었습니다. 연료 및 자원 생산에 광범위하게 사용됩니다. @@ -1128,7 +1134,7 @@ block.plastanium-compressor.description = 석유와 티타늄으로 플라스터 block.phase-weaver.description = 방사성 토륨과 모래에서 메타를 합성합니다. 작동하려면 엄청난 양의 전력이 필요합니다. block.alloy-smelter.description = 티타늄, 납, 실리콘, 구리를 결합하여 설금을 생산합니다. block.cryofluidmixer.description = 물과 미세 티타늄 분말을 냉각수로 혼합합니다. 토륨 원자로 사용에 필수적입니다. -block.blast-mixer.description = 포자 클러스터를 파이라타이트와 분쇄하고 혼합하여 화합물을 만듭니다. +block.blast-mixer.description = 포자 클러스터를 파이라타이트와 분쇄하고 혼합하여 폭발물을 만듭니다. block.pyratite-mixer.description = 석탄, 납, 모래를 가연성이 높은 파이라타이트로 만듭니다. block.melter.description = 웨이브 포탑에서 추가 처리 또는 사용을 위해 고철을 광재로 녹입니다. block.separator.description = 광재를 미네랄 성분으로 분리합니다. 그리고 냉각된 결과를 출력합니다. @@ -1195,7 +1201,7 @@ block.combustion-generator.description = 석탄과 같은 가연성 물질을 block.thermal-generator.description = 열이 있는 곳에 설치하면 전력이 생성됩니다. block.steam-generator.description = 고급 연소 발전기. 더 효율적이지만 증기를 생성하기 위해 물이 필요합니다. block.differential-generator.description = 많은 양의 전력을 생성합니다. 냉각수와 불타는 파이라타이트의 온도 차이를 이용합니다. -block.rtg-generator.description = 간단하고 안정적인 발전기. 붕괴하는 방사성 화합물의 열을 이용하여 느린 속도로 전력을 생성합니다. +block.rtg-generator.description = 간단하고 안정적인 발전기. 붕괴하는 방사성 물질의 열을 이용하여 느린 속도로 전력을 생성합니다. block.solar-panel.description = 태양으로부터 소량의 전력을 생성합니다. block.solar-panel-large.description = 표준 태양 전지판보다 훨씬 더 효율적인 버전. block.thorium-reactor.description = 토륨으로부터 상당한 양의 전력을 생산합니다. 지속적인 냉각이 필요하며, 충분한 양의 냉각수가 공급되지 않으면 크게 폭발합니다. 전력 출력은 토륨의 양에 따라 달라집니다. @@ -1229,5 +1235,5 @@ block.ripple.description = 매우 강력한 포병 포탑. 원거리에 있는 block.cyclone.description = 대공 및 대지 포탑. 근처 유닛에게 폭발성 덩어리를 발사합니다. block.spectre.description = 거대한 이중 배럴 대포. 공중 및 지상 목표물에 큰 관통 철갑탄을 발사합니다. block.meltdown.description = 거대한 레이저 대포. 근처의 적에게 지속적인 레이버 빔을 충전하여 발사합니다. 냉각수가 있어야 작동합니다. -block.repair-point.description = 주변에서 가장 가까운 유닛들을 지속적으로 치료합니다. +block.repair-point.description = 주변에서 가장 가까운 유닛을 지속적으로 치료합니다. block.segment.description = 날아오는 발사체를 요격합니다. 레이저는 목표 대상이 아닙니다. diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index cdac6c48da..f532c0caad 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -20,7 +20,7 @@ gameover = Jocul s-a încheiat gameover.pvp = Echipa [accent] {0}[] este câștigătoare! highscore = [accent]Scor maxim nou! copied = Copiat. -indevpopup = [accent]v6[] este momentan în [accent]alpha[].\n[lightgray]Asta înseamnă că:[]\n[scarlet]- Campania este complet neterminată[]\n- Majoritatea [scarlet]AI-ului unităților[] nu funcționează bine\n- Multe unități sunt neterminate\n- Modul campanie nu este terminat \n- Tot ce vedeți se poate schimba sau poate fi eliminat.\n\nPentru a raporta buguri și crashuri intrați pe [accent]Github[]. +indev.popup = [accent]v6[] este momentan în [accent]alpha[].\n[lightgray]Asta înseamnă că:[]\n[scarlet]- Campania este complet neterminată[]\n- Majoritatea [scarlet]AI-ului unităților[] nu funcționează bine\n- Multe unități sunt neterminate\n- Modul campanie nu este terminat \n- Tot ce vedeți se poate schimba sau poate fi eliminat.\n\nPentru a raporta buguri și crashuri intrați pe [accent]Github[]. load.sound = Sunete load.map = Hărți diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index a8b239adc5..3fd62e7072 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -20,7 +20,8 @@ gameover = Игра окончена gameover.pvp = [accent]{0}[] команда победила! highscore = [accent]Новый рекорд! copied = Скопировано. -indevpopup = [accent]v6[] находится на стадии [accent]alpha[].\n[lightgray]Это означает следующее:[]\n[scarlet]- Кампания не завершена[]\n- Отсутствие контента\n- Большинство [scarlet]ИИ единиц[] не работает правильно\n- Множество единиц не готово\n- Всё, что вы видите, может быть изменено или удалено.\n\nСообщайте о багах и вылетах на [accent]GitHub[]. +indev.popup = [accent]v6[] находится на стадии [accent]alpha[].\n[lightgray]Это означает следующее:[]\n[scarlet]- Кампания не завершена[]\n- Отсутствие контента\n- Большинство [scarlet]ИИ единиц[] не работает правильно\n- Множество единиц не готово\n- Всё, что вы видите, может быть изменено или удалено.\n\nСообщайте о багах и вылетах на [accent]GitHub[]. +indev.notready = Эта часть игры ещё не готова load.sound = Звуки load.map = Карты diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 7599189c88..6d73c191a9 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -20,7 +20,8 @@ gameover = Гра завершена gameover.pvp = [accent]{0}[] команда перемогла! highscore = [accent]Новий рекорд! copied = Скопійовано. -indevpopup = Наразі [accent]6.0[] знаходиться у стадії [accent]альфа[].\n[lightgray]Це означає наступне:[]\n- Не вистачає наповнення гри;\n- Більшість [scarlet]ШІ бойових одиниць[] не працює належним чином;\n- Багато одиниць [scarlet]відсутні[] або незавершені;\n- Кампанія повністю не є завершеною;\n- Усе, що ви бачите, може змінитися або видалитися.\n\nПовідомляйте про вади або збої на [accent]Github[], а про помилки в перекладі в Discord. +indev.popup = Наразі [accent]6.0[] знаходиться у стадії [accent]альфа[].\n[lightgray]Це означає наступне:[]\n- Не вистачає наповнення гри;\n- Більшість [scarlet]ШІ бойових одиниць[] не працює належним чином;\n- Багато одиниць [scarlet]відсутні[] або незавершені;\n- Кампанія повністю не є завершеною;\n- Усе, що ви бачите, може змінитися або видалитися.\n\nПовідомляйте про вади або збої на [accent]Github[], а про помилки в перекладі в Discord. +indev.notready = Ця частина гри ще не готова load.sound = Звуки load.map = Мапи diff --git a/core/assets/shaders/mud.frag b/core/assets/shaders/mud.frag index 6b6ba8cac6..3858cdec63 100644 --- a/core/assets/shaders/mud.frag +++ b/core/assets/shaders/mud.frag @@ -15,7 +15,7 @@ void main(){ vec2 c = v_texCoords.xy; vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y); - float btime = u_time / 8000000.0; + float btime = u_time / 70000.0; float noise = sin((texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / NSCALE + vec2(abs(sin(btime)) * 1.1) * vec2(-0.8, -1.0)).r) / 2.0); vec4 color = texture2D(u_texture, c); diff --git a/core/assets/shaders/slag.frag b/core/assets/shaders/slag.frag index 2dae9dc45c..f904d48dbf 100755 --- a/core/assets/shaders/slag.frag +++ b/core/assets/shaders/slag.frag @@ -22,12 +22,10 @@ void main(){ float noise = (texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / NSCALE + vec2(btime * 1.1) * vec2(0.8, -1.0)).r) / 2.0; vec4 color = texture2D(u_texture, c); - if(color.a > 0.1){ - if(noise > 0.6){ - color.rgb = S2; - }else if (noise > 0.54){ - color.rgb = S1; - } + if(noise > 0.6){ + color.rgb = S2; + }else if (noise > 0.54){ + color.rgb = S1; } gl_FragColor = color; diff --git a/core/assets/shaders/tar.frag b/core/assets/shaders/tar.frag index 39b0c27492..ea2a3b3f1d 100644 --- a/core/assets/shaders/tar.frag +++ b/core/assets/shaders/tar.frag @@ -20,7 +20,7 @@ void main(){ vec4 color = texture2D(u_texture, c); if(!(noise > 0.54 && noise < 0.58)){ - color.rgb *= 0.6; + color.rgb *= vec3(0.6, 0.6, 0.7); } gl_FragColor = color; diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 17c56fe410..d1ac03356d 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/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index 2cef0431f4..ccb99e892c 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -1039,6 +1039,13 @@ toxopid-cannon-outline orig: 206, 220 offset: 0, 0 index: -1 +toxopid-leg + rotate: false + xy: 1, 1 + size: 150, 72 + orig: 150, 72 + offset: 0, 0 + index: -1 toxopid-outline rotate: false xy: 648, 895 @@ -1235,13 +1242,6 @@ toxopid-cell orig: 152, 124 offset: 0, 0 index: -1 -toxopid-leg - rotate: false - xy: 1, 1 - size: 150, 72 - orig: 150, 72 - offset: 0, 0 - index: -1 omura-cannon rotate: false xy: 847, 1148 @@ -1264,5894 +1264,5950 @@ filter: nearest,nearest repeat: none launch-pad rotate: false - xy: 865, 1852 + xy: 201, 843 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-light rotate: false - xy: 963, 1852 + xy: 201, 745 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launchpod rotate: false - xy: 421, 238 + xy: 1099, 1547 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 force-projector rotate: false - xy: 409, 1394 + xy: 507, 1751 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 507, 1750 + xy: 507, 1653 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 421, 40 + xy: 1231, 1549 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 487, 10 + xy: 1165, 1417 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1029, 776 + xy: 987, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1033, 742 + xy: 1021, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-dome rotate: false - xy: 703, 1456 + xy: 299, 857 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-top rotate: false - xy: 801, 1754 + xy: 299, 759 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 201, 16 + xy: 1231, 1483 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 774, 1313 + xy: 1231, 1417 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1081, 610 + xy: 1113, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-loader rotate: false - xy: 115, 1624 + xy: 115, 1625 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-unloader rotate: false - xy: 311, 1640 + xy: 311, 1641 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 1112, 1324 + xy: 973, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1010, 1154 + xy: 1917, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1044, 1188 + xy: 1951, 1655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1078, 1222 + xy: 1951, 1621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1112, 1256 + xy: 1985, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 1029, 1426 + xy: 851, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 1029, 1426 + xy: 851, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 1063, 1426 + xy: 839, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1097, 1426 + xy: 841, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1131, 1426 + xy: 841, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 799, 1384 + xy: 841, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1803, 1587 + xy: 841, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 2009, 1922 + xy: 841, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 2009, 1888 + xy: 841, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 2009, 1854 + xy: 841, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 2009, 1820 + xy: 841, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 415, 6 + xy: 841, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 449, 6 + xy: 841, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 833, 1384 + xy: 841, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 867, 1388 + xy: 841, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 901, 1388 + xy: 837, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 935, 1388 + xy: 1038, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 969, 1388 + xy: 1072, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1003, 1392 + xy: 1106, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1037, 1392 + xy: 1000, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1071, 1392 + xy: 1801, 1531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1112, 1120 + xy: 1202, 873 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1112, 1086 + xy: 1202, 839 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1146, 1358 + xy: 1236, 873 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1146, 1324 + xy: 1202, 805 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1146, 1290 + xy: 1236, 839 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1146, 1256 + xy: 1270, 873 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1146, 1222 + xy: 1236, 805 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1146, 1188 + xy: 1270, 839 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1146, 1154 + xy: 1270, 805 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1146, 1120 + xy: 1202, 771 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1146, 1086 + xy: 1236, 771 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 893, 773 + xy: 1270, 771 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 897, 739 + xy: 1304, 873 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 874, 1048 + xy: 1304, 839 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 908, 1048 + xy: 1304, 805 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 942, 1048 + xy: 1304, 771 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 976, 1048 + xy: 875, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1010, 1052 + xy: 875, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1044, 1052 + xy: 875, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 969, 708 + xy: 1045, 517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1003, 708 + xy: 1045, 483 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 969, 674 + xy: 1045, 449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1003, 674 + xy: 1045, 415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1037, 708 + xy: 1045, 381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1037, 674 + xy: 1045, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1149, 474 + xy: 1139, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1183, 508 + xy: 1157, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1183, 474 + xy: 1157, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1217, 644 + xy: 1147, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1217, 610 + xy: 1143, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1217, 576 + xy: 1143, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1217, 542 + xy: 1177, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1217, 508 + xy: 1177, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1217, 474 + xy: 1173, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 979, 436 + xy: 1191, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1013, 436 + xy: 1191, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1047, 436 + xy: 1207, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1081, 440 + xy: 1225, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1115, 440 + xy: 1225, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1149, 440 + xy: 1267, 1318 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1183, 440 + xy: 1267, 1284 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1217, 440 + xy: 1267, 1250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 977, 402 + xy: 1267, 1216 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1011, 402 + xy: 1267, 1182 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 962, 1014 + xy: 909, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 489, 868 + xy: 901, 1415 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 897, 844 + xy: 909, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1067, 916 + xy: 905, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 1551, 1852 + xy: 201, 157 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1131, 780 + xy: 1055, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 payload-conveyor rotate: false - xy: 801, 1656 + xy: 299, 661 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-edge rotate: false - xy: 899, 1754 + xy: 299, 563 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-top rotate: false - xy: 801, 1558 + xy: 299, 465 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-top rotate: false - xy: 801, 1558 + xy: 299, 465 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router rotate: false - xy: 899, 1656 + xy: 299, 367 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-edge rotate: false - xy: 997, 1754 + xy: 299, 269 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-over rotate: false - xy: 801, 1460 + xy: 299, 171 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1169, 746 + xy: 1015, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1199, 780 + xy: 1049, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1203, 746 + xy: 1041, 585 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 935, 708 + xy: 1083, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1013, 538 + xy: 1075, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1081, 576 + xy: 1113, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1045, 402 + xy: 1267, 1080 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 drill-top rotate: false - xy: 489, 670 + xy: 967, 1415 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-liquid rotate: false - xy: 489, 670 + xy: 967, 1415 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 507, 1358 + xy: 605, 1459 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 605, 1362 + xy: 201, 1137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 669, 1848 + xy: 201, 1039 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 767, 1852 + xy: 201, 941 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 421, 106 + xy: 1165, 1549 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 355, 79 + xy: 1231, 1615 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 487, 76 + xy: 1165, 1483 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 1845, 1852 + xy: 299, 1249 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 703, 1750 + xy: 299, 1151 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 703, 1652 + xy: 299, 1053 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 703, 1554 + xy: 299, 955 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 555, 698 + xy: 1363, 1654 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 555, 632 + xy: 1429, 1720 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 555, 566 + xy: 1297, 1522 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 708, 1049 + xy: 1759, 1739 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 774, 1049 + xy: 1561, 1475 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 1943, 1884 + xy: 1627, 1541 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1943, 1818 + xy: 1693, 1607 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 840, 1248 + xy: 1168, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 908, 1184 + xy: 1165, 1347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1010, 1358 + xy: 1233, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1078, 1154 + xy: 1245, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 899, 1558 + xy: 299, 73 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1112, 1290 + xy: 1007, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1010, 1188 + xy: 1817, 1589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1010, 1188 + xy: 1817, 1589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1044, 1222 + xy: 901, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1078, 1256 + xy: 919, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1078, 1188 + xy: 1233, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1112, 1222 + xy: 1197, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1010, 1086 + xy: 1231, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1044, 1120 + xy: 1211, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1044, 1120 + xy: 1211, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1044, 1120 + xy: 1211, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1112, 1188 + xy: 1265, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1044, 1086 + xy: 1279, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1078, 1120 + xy: 1211, 907 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1112, 1154 + xy: 1245, 907 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1112, 1154 + xy: 1245, 907 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1078, 1086 + xy: 1279, 907 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1101, 916 + xy: 939, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1101, 882 + xy: 973, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1067, 814 + xy: 1007, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1101, 848 + xy: 973, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1101, 814 + xy: 1007, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1135, 916 + xy: 1007, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 1061, 1852 + xy: 201, 647 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 1159, 1852 + xy: 201, 549 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 1257, 1852 + xy: 201, 451 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1169, 916 + xy: 1037, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1169, 882 + xy: 953, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1169, 882 + xy: 953, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1169, 882 + xy: 953, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1165, 780 + xy: 1071, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1067, 746 + xy: 1089, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1101, 746 + xy: 1089, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1135, 746 + xy: 1034, 653 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1071, 678 + xy: 1045, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1105, 712 + xy: 1045, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1105, 678 + xy: 1045, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1139, 712 + xy: 1075, 585 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1139, 678 + xy: 1079, 551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1173, 712 + xy: 1079, 517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 979, 640 + xy: 1079, 381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 979, 606 + xy: 1079, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1013, 640 + xy: 1079, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 979, 572 + xy: 1079, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 553, 170 + xy: 1429, 1588 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 1193, 1656 + xy: 397, 513 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hyper-processor rotate: false - xy: 507, 1456 + xy: 605, 1751 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 logic-display rotate: false - xy: 1355, 1852 + xy: 201, 353 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 logic-processor rotate: false - xy: 421, 172 + xy: 1099, 1481 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-cell rotate: false - xy: 1169, 814 + xy: 987, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1063, 780 + xy: 1021, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor rotate: false - xy: 1097, 780 + xy: 1055, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch rotate: false - xy: 1115, 474 + xy: 1105, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch-on rotate: false - xy: 1149, 508 + xy: 1123, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery rotate: false - xy: 1105, 1392 + xy: 1126, 763 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large rotate: false - xy: 1171, 1950 + xy: 1171, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large-top rotate: false - xy: 1269, 1950 + xy: 1269, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-top rotate: false - xy: 1139, 1392 + xy: 1140, 729 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1010, 1120 + xy: 1985, 1595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1044, 1154 + xy: 1199, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 103, 448 + xy: 103, 351 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 103, 350 + xy: 103, 253 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 103, 252 + xy: 103, 155 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 diode rotate: false - xy: 928, 980 + xy: 909, 513 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 894, 946 + xy: 909, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 931, 912 + xy: 909, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 897, 878 + xy: 909, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node rotate: false - xy: 1173, 678 + xy: 1079, 483 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 553, 500 + xy: 1363, 1588 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1207, 712 + xy: 1079, 449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1207, 678 + xy: 1079, 415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 553, 104 + xy: 1495, 1654 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 979, 470 + xy: 1109, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1115, 644 + xy: 1113, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 1095, 1558 + xy: 397, 611 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 steam-generator rotate: false - xy: 1655, 1456 + xy: 667, 93 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-cap rotate: false - xy: 1655, 1390 + xy: 651, 23 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-top rotate: false - xy: 1457, 1331 + xy: 717, 27 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine0 rotate: false - xy: 1523, 1324 + xy: 1561, 1739 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine1 rotate: false - xy: 1589, 1324 + xy: 1561, 1673 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 1655, 1324 + xy: 1627, 1739 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 1909, 1580 + xy: 1693, 1739 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 1291, 1754 + xy: 397, 415 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 1095, 1460 + xy: 397, 317 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-top rotate: false - xy: 1193, 1558 + xy: 397, 219 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 975, 1950 + xy: 975, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 1073, 1950 + xy: 1073, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 357, 1003 + xy: 1683, 1805 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-forge rotate: false - xy: 1857, 1950 + xy: 1857, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 576, 1226 + xy: 835, 1679 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 423, 832 + xy: 967, 1613 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 423, 766 + xy: 1033, 1679 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 423, 700 + xy: 835, 1415 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 498, 1066 + xy: 901, 1481 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 489, 1000 + xy: 967, 1547 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 489, 934 + xy: 1033, 1613 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 disassembler rotate: false - xy: 103, 154 + xy: 103, 57 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-liquid rotate: false - xy: 103, 56 + xy: 409, 1787 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-spinner rotate: false - xy: 409, 1786 + xy: 409, 1689 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 421, 568 + xy: 1033, 1415 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 931, 878 + xy: 909, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1098, 1018 + xy: 1011, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1033, 882 + xy: 905, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 421, 502 + xy: 1099, 1811 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 421, 436 + xy: 1099, 1745 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 421, 436 + xy: 1099, 1745 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1135, 814 + xy: 1041, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1166, 1018 + xy: 1041, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1169, 848 + xy: 953, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press rotate: false - xy: 1649, 1852 + xy: 201, 59 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 570, 1094 + xy: 1297, 1720 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 564, 1028 + xy: 1429, 1786 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 555, 962 + xy: 1297, 1654 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 555, 896 + xy: 1363, 1720 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 555, 830 + xy: 1495, 1786 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1013, 606 + xy: 1079, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 979, 538 + xy: 1079, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 553, 368 + xy: 1495, 1720 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1391, 1447 + xy: 676, 753 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1391, 1381 + xy: 673, 687 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 1457, 1463 + xy: 673, 621 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-crucible rotate: false - xy: 1193, 1754 + xy: 397, 807 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-crucible-top rotate: false - xy: 997, 1460 + xy: 397, 709 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1457, 1397 + xy: 667, 555 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1523, 1456 + xy: 667, 489 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1523, 1390 + xy: 667, 423 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1589, 1456 + xy: 667, 357 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1589, 1390 + xy: 667, 291 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1621, 1522 + xy: 667, 225 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1687, 1551 + xy: 667, 159 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 boulder1 rotate: false - xy: 677, 259 + xy: 865, 1315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 boulder2 rotate: false - xy: 677, 209 + xy: 815, 1215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder1 rotate: false - xy: 1721, 1359 + xy: 965, 1215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder2 rotate: false - xy: 1721, 1309 + xy: 1015, 1265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1013, 504 + xy: 1143, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1013, 470 + xy: 1113, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1047, 470 + xy: 1113, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1081, 644 + xy: 1113, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-boulder1 rotate: false - xy: 877, 313 + xy: 908, 807 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-boulder2 rotate: false - xy: 877, 263 + xy: 958, 807 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1821, 1272 + xy: 1050, 797 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1863, 1272 + xy: 1092, 797 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 801, 1418 + xy: 1008, 755 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 container rotate: false - xy: 642, 1230 + xy: 1033, 1811 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +container-team + rotate: false + xy: 769, 1547 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-shard rotate: false - xy: 311, 1542 + xy: 115, 1429 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team rotate: false - xy: 115, 1428 + xy: 213, 1445 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 unloader rotate: false - xy: 977, 334 + xy: 1267, 1046 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1011, 334 + xy: 1267, 1012 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 1291, 1656 + xy: 397, 121 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +vault-team + rotate: false + xy: 507, 1359 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 995, 1426 + xy: 817, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 840, 1350 + xy: 1134, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 357, 937 + xy: 1749, 1805 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-3 rotate: false - xy: 1367, 1950 + xy: 1367, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 2007, 1692 + xy: 1561, 1810 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 421, 304 + xy: 1099, 1613 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 1095, 1754 + xy: 397, 1199 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 1193, 1415 + xy: 1429, 1522 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1259, 1415 + xy: 1495, 1588 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1291, 1513 + xy: 1429, 1456 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1047, 606 + xy: 1113, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1941, 1686 + xy: 1825, 1739 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 additive-reconstructor rotate: false - xy: 681, 1950 + xy: 681, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 additive-reconstructor-top rotate: false - xy: 779, 1950 + xy: 779, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 air-factory rotate: false - xy: 877, 1950 + xy: 877, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 command-center rotate: false - xy: 642, 1296 + xy: 901, 1745 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 factory-in-3 rotate: false - xy: 409, 1688 + xy: 409, 1591 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-out-3 rotate: false - xy: 409, 1590 + xy: 409, 1493 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-top-3 rotate: false - xy: 409, 1492 + xy: 409, 1395 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ground-factory rotate: false - xy: 507, 1554 + xy: 507, 1457 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 naval-factory rotate: false - xy: 1747, 1852 + xy: 299, 1347 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rally-point rotate: false - xy: 553, 302 + xy: 1297, 1456 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 979, 504 + xy: 1075, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 553, 236 + xy: 1363, 1522 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1078, 1052 + xy: 875, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 708, 1313 + xy: 967, 1745 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 962, 980 + xy: 909, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 489, 802 + xy: 967, 1481 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 489, 736 + xy: 1033, 1547 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 928, 946 + xy: 909, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 935, 674 + xy: 1045, 551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 774, 1181 + xy: 1363, 1786 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1071, 712 + xy: 1045, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 555, 764 + xy: 1297, 1588 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 997, 1558 + xy: 397, 1003 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 1095, 1656 + xy: 397, 905 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 1423, 1529 + xy: 1495, 1456 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1489, 1529 + xy: 1297, 1390 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1555, 1522 + xy: 1363, 1390 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1325, 1447 + xy: 1429, 1390 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1047, 572 + xy: 1113, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1047, 538 + xy: 1113, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1047, 504 + xy: 1113, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1047, 504 + xy: 1113, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1183, 576 + xy: 1109, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 349, 13 + xy: 1561, 1607 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1183, 542 + xy: 1123, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 708, 1115 + xy: 1561, 1541 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 977, 368 + xy: 1267, 1148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 774, 1115 + xy: 1627, 1607 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 797, 763 + xy: 733, 151 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 681, 659 + xy: 733, 97 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 191, 38 + xy: 191, 39 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 circle-end rotate: false - xy: 1, 1261 + xy: 1, 1262 size: 100, 199 orig: 100, 199 offset: 0, 0 index: -1 circle-mid rotate: false - xy: 1180, 1180 + xy: 1301, 1151 size: 1, 199 orig: 1, 199 offset: 0, 0 index: -1 error rotate: false - xy: 1821, 1480 + xy: 765, 1161 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 636, 1110 + xy: 585, 672 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 283, 926 + xy: 817, 1877 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 2043, 1906 + xy: 1687, 1491 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 283, 852 + xy: 891, 1877 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 843, 1422 + xy: 1050, 759 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 881, 1422 + xy: 1088, 759 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 parallax-laser rotate: false - xy: 2043, 1856 + xy: 1753, 1557 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 parallax-laser-end rotate: false - xy: 283, 778 + xy: 965, 1877 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 particle rotate: false - xy: 851, 765 + xy: 1092, 839 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 498, 1156 + xy: 1955, 1951 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 shell rotate: false - xy: 919, 1422 + xy: 1000, 717 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 957, 1422 + xy: 1139, 927 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 343, 3 + xy: 1819, 1623 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1011, 368 + xy: 1267, 1114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 703, 1374 + xy: 676, 1082 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 alpha-outline rotate: false - xy: 785, 663 + xy: 763, 1361 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 679, 609 + xy: 765, 1311 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 679, 559 + xy: 765, 1261 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 91, 6 + xy: 765, 1211 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 arc rotate: false - xy: 1635, 1620 + xy: 783, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arkyid-foot rotate: false - xy: 283, 632 + xy: 299, 1 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-joint-base rotate: false - xy: 283, 560 + xy: 1113, 1879 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 +arkyid-leg + rotate: false + xy: 201, 1 + size: 56, 56 + orig: 56, 56 + offset: 0, 0 + index: -1 arkyid-leg-base rotate: false - xy: 473, 1982 + xy: 473, 1983 size: 104, 64 orig: 104, 64 offset: 0, 0 index: -1 artillery-mount-outline rotate: false - xy: 283, 416 + xy: 1257, 1879 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 artillery-outline rotate: false - xy: 630, 1036 + xy: 1684, 1375 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 atrax-foot rotate: false - xy: 2007, 1776 + xy: 2007, 1705 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 atrax-joint rotate: false - xy: 1725, 1523 + xy: 837, 119 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 +atrax-leg + rotate: false + xy: 259, 31 + size: 36, 26 + orig: 36, 26 + offset: 0, 0 + index: -1 atrax-leg-base rotate: false - xy: 1687, 1523 + xy: 2009, 1777 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 atrax-outline rotate: false - xy: 1581, 1720 + xy: 495, 590 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck0 rotate: false - xy: 1671, 1786 + xy: 495, 524 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck1 rotate: false - xy: 1671, 1720 + xy: 495, 458 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck2 rotate: false - xy: 1761, 1786 + xy: 495, 392 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 beam-weapon-outline rotate: false - xy: 201, 984 + xy: 569, 1 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 beta-outline rotate: false - xy: 835, 663 + xy: 913, 1365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck0 rotate: false - xy: 847, 713 + xy: 963, 1365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 679, 509 + xy: 1013, 1365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 677, 459 + xy: 1063, 1365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-additive-reconstructor-full rotate: false - xy: 1465, 1950 + xy: 1465, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-air-factory-full rotate: false - xy: 1563, 1950 + xy: 1563, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 840, 1316 + xy: 1134, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-full rotate: false - xy: 840, 1282 + xy: 1134, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-boulder-full rotate: false - xy: 677, 409 + xy: 1113, 1365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-char-full rotate: false - xy: 840, 1214 + xy: 1168, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 840, 1180 + xy: 1168, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-container-full + rotate: false + xy: 1815, 1805 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-conveyor-full rotate: false - xy: 840, 1146 + xy: 867, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 840, 1146 + xy: 867, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-shard-full rotate: false - xy: 1661, 1950 + xy: 1661, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 840, 1112 + xy: 885, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 357, 871 + xy: 1881, 1805 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 357, 805 + xy: 703, 1807 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cyclone-full rotate: false - xy: 1759, 1950 + xy: 1759, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-dacite-boulder-full rotate: false - xy: 677, 359 + xy: 815, 1315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-dacite-full rotate: false - xy: 840, 1078 + xy: 1038, 687 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-full rotate: false - xy: 874, 1354 + xy: 1072, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-full rotate: false - xy: 908, 1354 + xy: 1106, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 874, 1320 + xy: 1140, 695 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-full rotate: false - xy: 942, 1354 + xy: 1168, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-full rotate: false - xy: 874, 1286 + xy: 871, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-full rotate: false - xy: 908, 1320 + xy: 871, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 874, 1252 + xy: 871, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-fuse-full rotate: false - xy: 473, 1884 + xy: 473, 1885 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-grass-full rotate: false - xy: 942, 1320 + xy: 1072, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ground-factory-full rotate: false - xy: 571, 1848 + xy: 571, 1849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 908, 1286 + xy: 1106, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 874, 1218 + xy: 1140, 661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 908, 1252 + xy: 1140, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 942, 1286 + xy: 1885, 1663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-wall-full rotate: false - xy: 874, 1184 + xy: 1883, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-lancer-full rotate: false - xy: 357, 739 + xy: 703, 1741 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-laser-drill-full rotate: false - xy: 115, 1820 + xy: 115, 1821 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-liquid-router-full rotate: false - xy: 908, 1218 + xy: 1163, 1381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-full rotate: false - xy: 115, 1722 + xy: 115, 1723 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-magmarock-full rotate: false - xy: 942, 1252 + xy: 1197, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-driver-full rotate: false - xy: 115, 1526 + xy: 115, 1527 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mechanical-drill-full rotate: false - xy: 1569, 1588 + xy: 703, 1675 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-metal-floor-damaged-full rotate: false - xy: 874, 1150 + xy: 1231, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 942, 1218 + xy: 1165, 1313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mud-full rotate: false - xy: 874, 1116 + xy: 1165, 1279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-naval-factory-full rotate: false - xy: 213, 1836 + xy: 213, 1837 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 311, 1836 + xy: 311, 1837 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-ore-coal-full rotate: false - xy: 908, 1150 + xy: 1165, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 942, 1184 + xy: 1165, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 874, 1082 + xy: 1165, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 908, 1116 + xy: 1165, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 942, 1150 + xy: 1165, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 908, 1082 + xy: 1165, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-parallax-full rotate: false - xy: 283, 53 + xy: 703, 1609 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-payload-conveyor-full rotate: false - xy: 213, 1738 + xy: 213, 1739 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-icon rotate: false - xy: 213, 1738 + xy: 213, 1739 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-payload-router-full rotate: false - xy: 213, 1640 + xy: 213, 1641 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-icon rotate: false - xy: 213, 1640 + xy: 213, 1641 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-pebbles-full rotate: false - xy: 942, 1116 + xy: 1199, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 504, 1132 + xy: 703, 1543 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 942, 1082 + xy: 1199, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 357, 673 + xy: 703, 1477 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 976, 1354 + xy: 1199, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 976, 1320 + xy: 1199, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 976, 1286 + xy: 1199, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ripple-full rotate: false - xy: 311, 1738 + xy: 311, 1739 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-salt-wall-full rotate: false - xy: 976, 1252 + xy: 1199, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 355, 607 + xy: 703, 1411 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 976, 1218 + xy: 1199, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 976, 1184 + xy: 1199, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-wall-full rotate: false - xy: 976, 1150 + xy: 1199, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 355, 541 + xy: 769, 1811 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 976, 1116 + xy: 1233, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 976, 1082 + xy: 1233, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 976, 1082 + xy: 1233, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-huge-full rotate: false - xy: 213, 1542 + xy: 213, 1543 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 213, 1542 + xy: 213, 1543 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-scrap-wall-large-full rotate: false - xy: 355, 475 + xy: 835, 1811 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-segment-full rotate: false - xy: 355, 409 + xy: 769, 1745 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 1044, 1358 + xy: 1233, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1010, 1324 + xy: 1233, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-wall-full rotate: false - xy: 1010, 1290 + xy: 1233, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1078, 1358 + xy: 1233, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-boulder-full rotate: false - xy: 677, 309 + xy: 815, 1265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1044, 1324 + xy: 1233, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-wall-full rotate: false - xy: 1044, 1290 + xy: 1233, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-cluster-full rotate: false - xy: 2007, 1734 + xy: 2007, 1663 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1010, 1256 + xy: 1165, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 355, 343 + xy: 901, 1811 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-spore-wall-full rotate: false - xy: 1112, 1358 + xy: 1199, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-steam-generator-full rotate: false - xy: 355, 277 + xy: 769, 1679 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1078, 1324 + xy: 1233, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-wall-full rotate: false - xy: 1078, 1290 + xy: 1163, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 355, 211 + xy: 835, 1745 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 1010, 1222 + xy: 1163, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1044, 1256 + xy: 1177, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1044, 1256 + xy: 1177, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-vault-full + rotate: false + xy: 311, 1543 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 block-water-extractor-full rotate: false - xy: 355, 145 + xy: 967, 1811 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 576, 1292 + xy: 769, 1613 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +container-team-crux + rotate: false + xy: 835, 1613 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +container-team-sharded + rotate: false + xy: 901, 1679 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-shard-team-crux rotate: false - xy: 213, 1444 + xy: 311, 1445 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team-sharded rotate: false - xy: 311, 1444 + xy: 103, 1331 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1112, 1052 + xy: 875, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1146, 1052 + xy: 875, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 860, 1014 + xy: 875, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 860, 980 + xy: 875, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 894, 1014 + xy: 875, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 860, 946 + xy: 875, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 928, 1014 + xy: 875, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 894, 980 + xy: 909, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 708, 1247 + xy: 769, 1481 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 576, 1160 + xy: 835, 1547 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 642, 1164 + xy: 901, 1613 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 708, 1181 + xy: 967, 1679 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 432, 1096 + xy: 1033, 1745 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 423, 1030 + xy: 769, 1415 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 423, 964 + xy: 835, 1481 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 423, 898 + xy: 901, 1547 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 103, 1330 + xy: 103, 1233 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 103, 1232 + xy: 103, 1135 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 103, 1134 + xy: 103, 1037 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 103, 1036 + xy: 103, 939 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 103, 938 + xy: 103, 841 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 103, 840 + xy: 103, 743 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 103, 742 + xy: 103, 645 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 103, 644 + xy: 103, 547 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 677, 9 + xy: 915, 1265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-outline rotate: false - xy: 885, 663 + xy: 965, 1315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck0 rotate: false - xy: 1753, 1509 + xy: 915, 1215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 1721, 1459 + xy: 965, 1265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 1721, 1409 + xy: 1015, 1315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone rotate: false - xy: 103, 546 + xy: 103, 449 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1771, 1359 + xy: 1065, 1265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-outline rotate: false - xy: 1771, 1309 + xy: 1065, 1215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck0 rotate: false - xy: 1803, 1530 + xy: 1115, 1315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 1853, 1530 + xy: 1115, 1265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 1903, 1530 + xy: 1115, 1215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 962, 946 + xy: 909, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 eruption-outline rotate: false - xy: 1871, 1472 + xy: 815, 1157 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flamethrower-outline rotate: false - xy: 1821, 1314 + xy: 965, 1157 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flare-outline rotate: false - xy: 1871, 1314 + xy: 1065, 1165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck0 rotate: false - xy: 1921, 1480 + xy: 1115, 1165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck1 rotate: false - xy: 1921, 1430 + xy: 865, 1115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck2 rotate: false - xy: 1921, 1380 + xy: 915, 1107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 1761, 1621 + xy: 591, 745 size: 80, 60 orig: 80, 60 offset: 0, 0 index: -1 fortress-outline rotate: false - xy: 1, 1015 + xy: 1, 1016 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck0 rotate: false - xy: 1, 933 + xy: 1, 934 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck1 rotate: false - xy: 1, 851 + xy: 1, 852 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck2 rotate: false - xy: 1, 769 + xy: 1, 770 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fuse rotate: false - xy: 507, 1652 + xy: 507, 1555 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 gamma-outline rotate: false - xy: 619, 431 + xy: 1627, 1433 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck0 rotate: false - xy: 619, 373 + xy: 1626, 1375 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck1 rotate: false - xy: 619, 315 + xy: 1693, 1499 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck2 rotate: false - xy: 619, 257 + xy: 1759, 1565 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 hail rotate: false - xy: 897, 912 + xy: 909, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 heal-shotgun-weapon-outline rotate: false - xy: 1953, 1530 + xy: 1015, 1115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount-outline rotate: false - xy: 1971, 1380 + xy: 1735, 1449 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-outline rotate: false - xy: 1971, 1330 + xy: 1735, 1399 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 horizon-outline rotate: false - xy: 286, 1222 + xy: 676, 893 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck0 rotate: false - xy: 286, 1148 + xy: 676, 819 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck1 rotate: false - xy: 283, 1074 + xy: 669, 1873 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck2 rotate: false - xy: 283, 1000 + xy: 743, 1877 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 2007, 1650 + xy: 797, 589 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 897, 810 + xy: 977, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 897, 713 + xy: 371, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 1803, 1512 + xy: 935, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1921, 1280 + xy: 1734, 1349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 927, 221 + xy: 847, 623 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 965, 912 + xy: 977, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 317, 27 + xy: 905, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 1975, 1582 + xy: 669, 1855 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1971, 1280 + xy: 1727, 1299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 927, 179 + xy: 889, 615 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 965, 844 + xy: 977, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 591, 12 + xy: 371, 21 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 2025, 1632 + xy: 1134, 803 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 729, 609 + xy: 1015, 1065 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 927, 137 + xy: 787, 77 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 927, 776 + xy: 977, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1635, 1594 + xy: 717, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 977, 264 + xy: 1817, 1571 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 729, 559 + xy: 1065, 1065 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 927, 95 + xy: 783, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 931, 742 + xy: 977, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1661, 1591 + xy: 743, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 680, 1054 + xy: 1985, 1671 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 729, 509 + xy: 1115, 1065 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 927, 53 + xy: 931, 615 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 996, 1014 + xy: 977, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1165, 1434 + xy: 1297, 1853 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 1993, 1582 + xy: 1117, 639 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 727, 459 + xy: 1777, 1299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 777, 3 + xy: 973, 617 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 996, 946 + xy: 977, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 840, 1052 + xy: 1947, 1845 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 2025, 1614 + xy: 371, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 727, 409 + xy: 1784, 1349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 819, 3 + xy: 1785, 1457 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 999, 878 + xy: 977, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1045, 376 + xy: 259, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 995, 264 + xy: 651, 5 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 727, 359 + xy: 1827, 1299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 861, 3 + xy: 1785, 1415 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 999, 810 + xy: 977, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 977, 308 + xy: 2009, 1751 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 1013, 264 + xy: 1929, 1611 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 727, 309 + xy: 791, 537 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 903, 5 + xy: 829, 77 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1030, 1018 + xy: 977, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1045, 350 + xy: 1801, 1505 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 1031, 264 + xy: 669, 5 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 727, 259 + xy: 791, 487 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 945, 11 + xy: 825, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1064, 1018 + xy: 977, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 977, 282 + xy: 1265, 1391 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 1011, 246 + xy: 687, 5 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 727, 209 + xy: 791, 437 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 969, 221 + xy: 1013, 923 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1064, 984 + xy: 1011, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1003, 308 + xy: 1919, 1671 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 1029, 246 + xy: 1835, 1571 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 727, 159 + xy: 791, 387 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 969, 179 + xy: 1055, 923 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1098, 984 + xy: 1011, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1003, 282 + xy: 2019, 1637 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 1011, 228 + xy: 998, 665 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 727, 109 + xy: 791, 337 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 969, 137 + xy: 1097, 923 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1098, 950 + xy: 1011, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1289, 1487 + xy: 943, 589 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 1029, 228 + xy: 1016, 665 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 727, 59 + xy: 791, 287 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 969, 95 + xy: 1008, 881 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1132, 950 + xy: 1011, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 317, 1 + xy: 875, 183 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 1011, 210 + xy: 2019, 1593 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 727, 9 + xy: 791, 237 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 969, 53 + xy: 1050, 881 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1033, 916 + xy: 1011, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 680, 1072 + xy: 1947, 1819 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1029, 210 + xy: 1835, 1553 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 779, 613 + xy: 791, 187 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 421, 370 + xy: 1099, 1679 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 large-artillery-outline rotate: false - xy: 829, 595 + xy: 813, 1089 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-bullet-mount-outline rotate: false - xy: 283, 218 + xy: 1401, 1852 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount-outline rotate: false - xy: 605, 1460 + xy: 201, 1235 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount-outline rotate: false - xy: 360, 1295 + xy: 1545, 1852 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-weapon-outline rotate: false - xy: 879, 613 + xy: 863, 1065 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 987, 11 + xy: 1008, 839 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1067, 882 + xy: 939, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 1029, 308 + xy: 2019, 1611 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 1011, 192 + xy: 1835, 1535 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 879, 563 + xy: 813, 989 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 855, 891 + xy: 1092, 881 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1067, 848 + xy: 973, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 1029, 282 + xy: 1851, 1605 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1029, 192 + xy: 1160, 773 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 779, 495 + xy: 863, 1015 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 855, 849 + xy: 1050, 839 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1135, 848 + xy: 1041, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 1071, 376 + xy: 1877, 1603 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 1011, 174 + xy: 1178, 773 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 829, 495 + xy: 913, 1057 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 855, 807 + xy: 1008, 797 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1166, 950 + xy: 1003, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1071, 350 + xy: 1903, 1603 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1029, 174 + xy: 1267, 1373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 879, 513 + xy: 963, 1057 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mace-leg rotate: false - xy: 487, 406 + xy: 1165, 1747 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-outline rotate: false - xy: 487, 340 + xy: 1165, 1681 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck0 rotate: false - xy: 487, 274 + xy: 1231, 1747 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck1 rotate: false - xy: 487, 208 + xy: 1165, 1615 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck2 rotate: false - xy: 487, 142 + xy: 1231, 1681 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 1453, 1852 + xy: 201, 255 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mega-outline rotate: false - xy: 1, 463 + xy: 1, 464 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck0 rotate: false - xy: 1, 361 + xy: 1, 362 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck1 rotate: false - xy: 1, 259 + xy: 1, 260 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck2 rotate: false - xy: 1, 157 + xy: 1, 158 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 minke-outline rotate: false - xy: 1851, 1749 + xy: 495, 186 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck0 rotate: false - xy: 1851, 1646 + xy: 495, 83 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck1 rotate: false - xy: 1389, 1595 + xy: 397, 18 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck2 rotate: false - xy: 1479, 1595 + xy: 593, 1256 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 missiles-mount-outline rotate: false - xy: 827, 445 + xy: 808, 839 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-outline rotate: false - xy: 777, 295 + xy: 1013, 1015 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck0 rotate: false - xy: 827, 345 + xy: 1063, 1015 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 777, 245 + xy: 1113, 1015 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 827, 295 + xy: 863, 965 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon-outline rotate: false - xy: 827, 245 + xy: 858, 865 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon-outline rotate: false - xy: 827, 195 + xy: 963, 957 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 827, 145 + xy: 1063, 965 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-outline rotate: false - xy: 619, 83 + xy: 1949, 1689 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 619, 25 + xy: 1619, 1317 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 686, 991 + xy: 755, 1057 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 744, 991 + xy: 755, 999 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 parallax rotate: false - xy: 774, 1247 + xy: 1297, 1786 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 poly-outline rotate: false - xy: 744, 933 + xy: 750, 825 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck0 rotate: false - xy: 802, 933 + xy: 742, 761 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 681, 875 + xy: 742, 703 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 681, 817 + xy: 739, 645 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar-leg rotate: false - xy: 553, 434 + xy: 1429, 1654 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulsar-outline rotate: false - xy: 621, 863 + xy: 1627, 1491 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck0 rotate: false - xy: 621, 813 + xy: 1693, 1557 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck1 rotate: false - xy: 621, 763 + xy: 1759, 1623 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck2 rotate: false - xy: 621, 713 + xy: 1825, 1689 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 quasar-leg rotate: false - xy: 201, 656 + xy: 585, 417 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-outline rotate: false - xy: 201, 574 + xy: 585, 335 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck0 rotate: false - xy: 201, 492 + xy: 585, 253 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck1 rotate: false - xy: 201, 410 + xy: 585, 171 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck2 rotate: false - xy: 201, 328 + xy: 585, 89 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 reign-weapon-outline rotate: false - xy: 201, 1148 + xy: 591, 807 size: 83, 138 orig: 83, 138 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1013, 572 + xy: 1075, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 997, 1656 + xy: 397, 1297 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 risso-outline rotate: false - xy: 360, 1215 + xy: 1689, 1871 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck0 rotate: false - xy: 432, 1234 + xy: 1761, 1871 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck1 rotate: false - xy: 504, 1278 + xy: 1833, 1871 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck2 rotate: false - xy: 360, 1135 + xy: 1905, 1871 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 salvo rotate: false - xy: 553, 38 + xy: 1363, 1456 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1357, 1513 + xy: 1495, 1522 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scepter-weapon-outline rotate: false - xy: 739, 771 + xy: 733, 379 size: 56, 102 orig: 56, 102 offset: 0, 0 index: -1 scorch rotate: false - xy: 1047, 640 + xy: 1113, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 1325, 1381 + xy: 1495, 1390 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sei-launcher-outline rotate: false - xy: 201, 164 + xy: 683, 1197 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 small-basic-weapon-outline rotate: false - xy: 827, 45 + xy: 958, 907 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon-outline rotate: false - xy: 877, 413 + xy: 958, 857 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spiroct-foot rotate: false - xy: 360, 1396 + xy: 950, 659 size: 46, 46 orig: 46, 46 offset: 0, 0 index: -1 spiroct-joint rotate: false - xy: 1115, 610 + xy: 1147, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +spiroct-leg + rotate: false + xy: 507, 1849 + size: 48, 34 + orig: 48, 34 + offset: 0, 0 + index: -1 spiroct-leg-base rotate: false - xy: 1941, 1650 + xy: 763, 1125 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 spiroct-outline rotate: false - xy: 1193, 1481 + xy: 495, 1030 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-weapon-outline rotate: false - xy: 877, 147 + xy: 808, 781 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 spiroct-wreck0 rotate: false - xy: 1291, 1579 + xy: 495, 953 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck1 rotate: false - xy: 1389, 1698 + xy: 495, 876 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck2 rotate: false - xy: 1485, 1775 + xy: 495, 799 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 splash-0 rotate: false - xy: 1149, 644 + xy: 1147, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1081, 542 + xy: 1147, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1115, 508 + xy: 1109, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1149, 542 + xy: 1109, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1115, 576 + xy: 1147, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1149, 610 + xy: 1147, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1183, 644 + xy: 1147, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1081, 508 + xy: 1147, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1115, 542 + xy: 1147, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1149, 576 + xy: 1147, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1183, 610 + xy: 1147, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1081, 474 + xy: 1147, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1843, 1580 + xy: 1627, 1673 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 toxopid-foot rotate: false - xy: 1955, 1956 + xy: 1955, 1957 size: 90, 90 orig: 90, 90 offset: 0, 0 index: -1 toxopid-joint-base rotate: false - xy: 432, 1162 + xy: 1977, 1885 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 877, 97 + xy: 800, 731 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-arkyid-full rotate: false - xy: 1, 1918 + xy: 1, 1919 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unit-atrax-full rotate: false - xy: 1581, 1654 + xy: 591, 1190 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 877, 47 + xy: 858, 765 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-crawler-full rotate: false - xy: 1975, 1600 + xy: 908, 757 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 929, 613 + xy: 958, 757 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-flare-full rotate: false - xy: 929, 563 + xy: 800, 681 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-fortress-full rotate: false - xy: 1, 75 + xy: 1, 76 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 unit-gamma-full rotate: false - xy: 797, 875 + xy: 733, 321 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-horizon-full rotate: false - xy: 283, 704 + xy: 1039, 1877 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 unit-mace-full rotate: false - xy: 642, 1098 + xy: 1693, 1673 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-mega-full rotate: false - xy: 579, 1946 + xy: 579, 1947 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 unit-minke-full rotate: false - xy: 1671, 1617 + xy: 591, 1087 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 unit-mono-full rotate: false - xy: 929, 513 + xy: 797, 631 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 739, 713 + xy: 733, 263 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-poly-full rotate: false - xy: 797, 817 + xy: 733, 205 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-pulsar-full rotate: false - xy: 621, 663 + xy: 1891, 1755 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 unit-quasar-full rotate: false - xy: 201, 82 + xy: 681, 1115 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 unit-risso-full rotate: false - xy: 504, 1198 + xy: 1977, 1805 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 unit-spiroct-full rotate: false - xy: 1485, 1698 + xy: 495, 722 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 unit-zenith-full rotate: false - xy: 1, 1804 + xy: 1, 1805 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 +vault-team-crux + rotate: false + xy: 605, 1361 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +vault-team-sharded + rotate: false + xy: 495, 1261 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 wave rotate: false - xy: 1941, 1752 + xy: 1759, 1673 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 zenith-missiles-outline rotate: false - xy: 927, 263 + xy: 900, 657 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-outline rotate: false - xy: 245, 1934 + xy: 245, 1935 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck0 rotate: false - xy: 1, 1576 + xy: 1, 1577 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck1 rotate: false - xy: 359, 1934 + xy: 359, 1935 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck2 rotate: false - xy: 1, 1462 + xy: 1, 1463 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 931, 844 + xy: 943, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 931, 810 + xy: 943, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 965, 878 + xy: 943, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 965, 810 + xy: 943, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 961, 776 + xy: 943, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 965, 742 + xy: 943, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 996, 980 + xy: 943, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 999, 912 + xy: 943, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 999, 844 + xy: 943, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 995, 776 + xy: 943, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1030, 984 + xy: 943, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1030, 950 + xy: 1011, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1064, 950 + xy: 1011, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1132, 1018 + xy: 1011, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1132, 984 + xy: 1011, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 999, 742 + xy: 1011, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1033, 848 + xy: 905, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1033, 814 + xy: 939, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1135, 882 + xy: 935, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1166, 984 + xy: 969, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 504, 1391 + xy: 673, 804 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 621, 963 + xy: 1561, 1410 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 797, 713 + xy: 91, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 735, 663 + xy: 141, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -arkyid-leg - rotate: false - xy: 621, 605 - size: 56, 56 - orig: 56, 56 - offset: 0, 0 - index: -1 atrax rotate: false - xy: 1, 9 + xy: 1, 10 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-base rotate: false - xy: 357, 1069 + xy: 1617, 1805 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 atrax-cell rotate: false - xy: 1581, 1786 + xy: 495, 656 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 -atrax-leg - rotate: false - xy: 553, 10 - size: 36, 26 - orig: 36, 26 - offset: 0, 0 - index: -1 beta rotate: false - xy: 141, 6 + xy: 813, 1365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 267, 3 + xy: 863, 1365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler rotate: false - xy: 677, 159 + xy: 865, 1265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 677, 109 + xy: 915, 1315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 677, 59 + xy: 865, 1215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 1771, 1459 + xy: 1065, 1315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 1771, 1409 + xy: 1015, 1215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare rotate: false - xy: 1871, 1364 + xy: 1015, 1165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress rotate: false - xy: 1, 1179 + xy: 1, 1180 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 423, 634 + xy: 1033, 1481 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-cell rotate: false - xy: 1, 1097 + xy: 1, 1098 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 gamma rotate: false - xy: 621, 547 + xy: 1951, 1747 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 619, 489 + xy: 1561, 1352 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 horizon rotate: false - xy: 286, 1370 + xy: 681, 1041 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-cell rotate: false - xy: 286, 1296 + xy: 676, 967 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 mace rotate: false - xy: 489, 604 + xy: 1099, 1415 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-base rotate: false - xy: 487, 538 + xy: 1165, 1813 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-cell rotate: false - xy: 487, 472 + xy: 1231, 1813 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mega rotate: false - xy: 1, 667 + xy: 1, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-cell rotate: false - xy: 1, 565 + xy: 1, 566 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 minke rotate: false - xy: 1761, 1683 + xy: 495, 289 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 mono rotate: false - xy: 777, 345 + xy: 913, 1007 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 827, 395 + xy: 963, 1007 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 619, 199 + xy: 1825, 1631 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 777, 95 + xy: 1013, 965 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 619, 141 + xy: 1891, 1697 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly rotate: false - xy: 802, 991 + xy: 750, 941 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 686, 933 + xy: 750, 883 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 739, 875 + xy: 739, 587 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar rotate: false - xy: 409, 1884 + xy: 409, 1885 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-base rotate: false - xy: 777, 45 + xy: 1113, 965 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulsar-cell rotate: false - xy: 621, 913 + xy: 703, 1361 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 quasar rotate: false - xy: 201, 902 + xy: 591, 663 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-base rotate: false - xy: 201, 820 + xy: 585, 581 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-cell rotate: false - xy: 201, 738 + xy: 585, 499 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 risso rotate: false - xy: 432, 1314 + xy: 1617, 1871 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-cell rotate: false - xy: 899, 1460 + xy: 397, 1101 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 spiroct rotate: false - xy: 703, 1379 + xy: 495, 1184 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-cell rotate: false - xy: 1389, 1775 + xy: 495, 1107 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 -spiroct-leg - rotate: false - xy: 507, 1848 - size: 48, 34 - orig: 48, 34 - offset: 0, 0 - index: -1 vanguard rotate: false - xy: 929, 463 + xy: 850, 715 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 927, 413 + xy: 850, 665 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 1753, 1559 + xy: 1677, 1317 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 artillery-mount rotate: false - xy: 283, 488 + xy: 1185, 1879 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 201, 1066 + xy: 487, 1 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 eruption rotate: false - xy: 1821, 1422 + xy: 1685, 1433 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 1821, 1372 + xy: 865, 1165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 1871, 1414 + xy: 915, 1157 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 1921, 1330 + xy: 965, 1107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 1971, 1480 + xy: 1065, 1115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 1971, 1430 + xy: 1115, 1115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-artillery rotate: false - xy: 779, 545 + xy: 787, 119 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-bullet-mount rotate: false - xy: 283, 317 + xy: 1329, 1852 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount rotate: false - xy: 605, 1654 + xy: 605, 1557 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount rotate: false - xy: 283, 119 + xy: 1473, 1852 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 829, 545 + xy: 813, 1039 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 777, 445 + xy: 808, 939 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 777, 395 + xy: 808, 889 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon rotate: false - xy: 777, 195 + xy: 858, 915 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 777, 145 + xy: 913, 957 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reign-weapon rotate: false - xy: 201, 1288 + xy: 591, 947 size: 83, 138 orig: 83, 138 offset: 0, 0 index: -1 scepter-weapon rotate: false - xy: 681, 713 + xy: 733, 483 size: 56, 102 orig: 56, 102 offset: 0, 0 index: -1 sei-launcher rotate: false - xy: 201, 246 + xy: 683, 1279 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 827, 95 + xy: 908, 907 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 879, 463 + xy: 908, 857 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 877, 363 + xy: 858, 815 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spiroct-weapon rotate: false - xy: 877, 205 + xy: 1751, 1499 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 weapon rotate: false - xy: 927, 363 + xy: 900, 707 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-missiles rotate: false - xy: 927, 313 + xy: 950, 707 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith rotate: false - xy: 131, 1934 + xy: 131, 1935 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-cell rotate: false - xy: 1, 1690 + xy: 1, 1691 size: 112, 112 orig: 112, 112 offset: 0, 0 diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 8bf8a9d54e..38e9ca8235 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index 515cd7a25d..cbc9ef549b 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 84c3812f0b..cea5ab31a9 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index 0a93548325..43330a0028 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/fallback/sprites6.png b/core/assets/sprites/fallback/sprites6.png index 982d12207a..3e03d0223a 100644 Binary files a/core/assets/sprites/fallback/sprites6.png and b/core/assets/sprites/fallback/sprites6.png differ diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png index 01e028eb12..f9610bc02f 100644 Binary files a/core/assets/sprites/fallback/sprites7.png and b/core/assets/sprites/fallback/sprites7.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index e5dbe2aaa7..830ecef064 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,7 +13,7 @@ core-silo index: -1 launch-pad rotate: false - xy: 2525, 2955 + xy: 2623, 2955 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -27,91 +27,91 @@ launch-pad-large index: -1 launch-pad-light rotate: false - xy: 2623, 2955 + xy: 2721, 2955 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launchpod rotate: false - xy: 3416, 2548 + xy: 3437, 3103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 force-projector rotate: false - xy: 2139, 2349 + xy: 2041, 2251 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 2041, 2251 + xy: 2139, 2251 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 1513, 2153 + xy: 3635, 3193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1645, 2219 + xy: 3569, 3127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 2265, 2167 + xy: 2937, 2509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 2299, 2171 + xy: 2971, 2509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-dome rotate: false - xy: 3309, 2877 + xy: 3407, 2877 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-top rotate: false - xy: 3407, 2877 + xy: 3113, 2779 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 1579, 2153 + xy: 3503, 3061 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1645, 2153 + xy: 3701, 3193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1473, 986 + xy: 1765, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -132,77 +132,77 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 3165, 2455 + xy: 3231, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 2427, 2487 + xy: 3401, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 2461, 2487 + xy: 3435, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 2427, 2453 + xy: 3469, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 2461, 2453 + xy: 3095, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 1251, 2723 + xy: 461, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 1251, 2723 + xy: 461, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 2361, 3197 + xy: 3903, 2675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 3181, 2591 + xy: 1251, 2723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1761, 1957 + xy: 2361, 3197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1803, 2087 + xy: 2087, 2151 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -230,532 +230,532 @@ armored-conveyor-1-3 index: -1 armored-conveyor-2-0 rotate: false - xy: 3181, 2557 + xy: 2121, 2151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 1803, 2053 + xy: 1319, 2723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 1319, 2723 + xy: 2155, 2151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 3181, 2523 + xy: 2189, 2151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1803, 2019 + xy: 2223, 2151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1841, 2127 + xy: 1605, 2129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 3215, 2539 + xy: 1473, 776 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 3249, 2539 + xy: 1481, 742 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 3283, 2539 + xy: 1481, 708 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1803, 1985 + xy: 1481, 674 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 3953, 3071 + xy: 1481, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 697, 18 + xy: 1481, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 2527, 2419 + xy: 3537, 2697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 2563, 2453 + xy: 3571, 2697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 2493, 2351 + xy: 3605, 2697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 2527, 2385 + xy: 3639, 2697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 2561, 2419 + xy: 2749, 2581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 2493, 2317 + xy: 2699, 2547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 2527, 2351 + xy: 2733, 2547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 2561, 2385 + xy: 2767, 2547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 2527, 2317 + xy: 2841, 2655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 2561, 2351 + xy: 1751, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 2561, 2317 + xy: 1785, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 2595, 2416 + xy: 1819, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 2629, 2416 + xy: 1853, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 2595, 2382 + xy: 1887, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 2595, 2348 + xy: 1921, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 2629, 2382 + xy: 1955, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 2629, 2348 + xy: 1989, 2111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 2595, 2314 + xy: 2023, 2113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 2629, 2314 + xy: 2057, 2113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1813, 1617 + xy: 2552, 2311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1847, 1923 + xy: 2552, 2277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1847, 1889 + xy: 2549, 2243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1847, 1855 + xy: 2549, 2209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1847, 1821 + xy: 2549, 2175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1847, 1787 + xy: 2549, 2141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 3689, 2853 + xy: 2105, 2049 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 3723, 2887 + xy: 2173, 2083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 3757, 2921 + xy: 2139, 2049 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 3689, 2819 + xy: 2207, 2083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 3723, 2853 + xy: 2173, 2049 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 3757, 2887 + xy: 2207, 2049 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 3723, 2819 + xy: 2241, 2083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 3757, 2853 + xy: 2241, 2049 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 3757, 2819 + xy: 1731, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 3689, 2785 + xy: 1765, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 3723, 2785 + xy: 1799, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 3757, 2785 + xy: 1833, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 3691, 2751 + xy: 1867, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 3691, 2717 + xy: 1901, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 3725, 2751 + xy: 1935, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 3725, 2717 + xy: 1969, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 3698, 2683 + xy: 2003, 2009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 3698, 2649 + xy: 2037, 2011 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 3698, 2615 + xy: 2071, 2011 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 2765, 2378 + xy: 3027, 2679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 1407, 1026 + xy: 1255, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 2867, 2337 + xy: 3367, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1385, 108 + xy: 2937, 2543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 2623, 2857 + xy: 2721, 2857 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1837, 1957 + xy: 3073, 2509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 payload-conveyor rotate: false - xy: 3113, 2779 + xy: 3211, 2779 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-edge rotate: false - xy: 3211, 2779 + xy: 3309, 2779 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-top rotate: false - xy: 3309, 2779 + xy: 3407, 2779 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-top rotate: false - xy: 3309, 2779 + xy: 3407, 2779 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router rotate: false - xy: 3407, 2779 + xy: 1187, 694 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-edge rotate: false - xy: 1187, 694 + xy: 1187, 596 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-over rotate: false - xy: 1187, 596 + xy: 1187, 498 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1813, 1787 + xy: 1509, 62 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1813, 1753 + xy: 1505, 28 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1813, 1719 + xy: 2552, 2413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1813, 1685 + xy: 2552, 2379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1615, 1557 + xy: 1663, 2121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1473, 918 + xy: 1799, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 3698, 2513 + xy: 2173, 2015 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -790,21 +790,21 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 1407, 828 + xy: 3591, 3457 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-liquid rotate: false - xy: 1407, 828 + xy: 3591, 3457 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 2329, 3031 + xy: 2237, 2253 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -818,476 +818,476 @@ laser-drill-rim index: -1 laser-drill-rotator rotate: false - xy: 2329, 2933 + xy: 2427, 2933 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 2427, 2933 + xy: 2525, 2955 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 1513, 2219 + xy: 3569, 3193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1447, 2153 + xy: 3503, 3127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1579, 2219 + xy: 3701, 3259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 2917, 2857 + xy: 3015, 2857 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 3015, 2857 + xy: 3113, 2877 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 3113, 2877 + xy: 3211, 2877 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 3211, 2877 + xy: 3309, 2877 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 1629, 2087 + xy: 3701, 2995 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 1563, 1955 + xy: 3505, 2929 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1629, 2021 + xy: 3505, 2863 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 2965, 2487 + xy: 3835, 2909 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 3031, 2561 + xy: 3835, 2843 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 3031, 2495 + xy: 3835, 2777 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 2767, 2412 + xy: 3505, 2731 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 3215, 2505 + xy: 1479, 402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1215, 136 + xy: 1629, 2061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 3655, 2867 + xy: 3027, 2747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 2459, 2351 + xy: 3333, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 1187, 498 + xy: 1187, 400 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1498, 194 + xy: 3265, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1498, 160 + xy: 3299, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1498, 160 + xy: 3299, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 2431, 2521 + xy: 3333, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 2465, 2521 + xy: 3367, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 2459, 2419 + xy: 3197, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 2425, 2351 + xy: 3231, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 2459, 2385 + xy: 3265, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 2425, 2317 + xy: 3299, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 2425, 2317 + xy: 3299, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 2425, 2317 + xy: 3299, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 2459, 2317 + xy: 3367, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 2495, 2453 + xy: 3401, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 2493, 2419 + xy: 3435, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 2529, 2453 + xy: 3469, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 2529, 2453 + xy: 3469, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 2493, 2385 + xy: 3503, 2697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1385, 40 + xy: 3039, 2543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1419, 74 + xy: 679, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1419, 40 + xy: 1475, 164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1453, 144 + xy: 1475, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1453, 110 + xy: 1475, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1453, 76 + xy: 1475, 62 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 2721, 2955 + xy: 2819, 2955 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 2819, 2955 + xy: 2917, 2955 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 2917, 2955 + xy: 3015, 2955 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1521, 126 + xy: 2801, 2519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1521, 92 + xy: 2835, 2519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1521, 92 + xy: 2835, 2519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1521, 92 + xy: 2835, 2519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1813, 1923 + xy: 1508, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1813, 1889 + xy: 1509, 164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1813, 1855 + xy: 1509, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1813, 1821 + xy: 1509, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1847, 1719 + xy: 2549, 2073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1847, 1685 + xy: 3789, 3337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1847, 1651 + xy: 1627, 1566 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1847, 1617 + xy: 1627, 1532 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1483, 1591 + xy: 1625, 1498 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1517, 1591 + xy: 1681, 1148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1653, 1591 + xy: 1681, 1012 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1687, 1591 + xy: 1681, 978 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1721, 1591 + xy: 1681, 944 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1755, 1591 + xy: 1681, 910 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1549, 1823 + xy: 3637, 2863 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 1285, 676 + xy: 1285, 578 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hyper-processor rotate: false - xy: 2237, 2643 + xy: 2237, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1301,56 +1301,56 @@ large-logic-display index: -1 logic-display rotate: false - xy: 3015, 2955 + xy: 2525, 2857 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 logic-processor rotate: false - xy: 3482, 2548 + xy: 3437, 3037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-cell rotate: false - xy: 1521, 24 + xy: 2903, 2519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 2333, 2171 + xy: 3005, 2509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor rotate: false - xy: 2367, 2171 + xy: 3039, 2509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch rotate: false - xy: 3689, 2921 + xy: 2071, 2045 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch-on rotate: false - xy: 3689, 2887 + xy: 2105, 2083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery rotate: false - xy: 731, 18 + xy: 1481, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1371,70 +1371,70 @@ battery-large-top index: -1 battery-top rotate: false - xy: 765, 18 + xy: 1481, 538 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 2425, 2419 + xy: 3129, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 2425, 2385 + xy: 3163, 2711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 2041, 2741 + xy: 2041, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 2041, 2643 + xy: 2139, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 2139, 2741 + xy: 2041, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 diode rotate: false - xy: 2799, 2378 + xy: 3061, 2679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 2765, 2344 + xy: 3095, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 2765, 2310 + xy: 3265, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 2799, 2310 + xy: 3299, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1490,126 +1490,126 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1551, 1591 + xy: 1681, 1114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1629, 1955 + xy: 3571, 2929 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1585, 1591 + xy: 1681, 1080 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1619, 1591 + xy: 1681, 1046 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1615, 1889 + xy: 3637, 2797 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1649, 1557 + xy: 1663, 2087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1473, 952 + xy: 1833, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 1301, 774 + xy: 1285, 676 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 steam-generator rotate: false - xy: 1747, 1691 + xy: 3899, 3041 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-cap rotate: false - xy: 1747, 1625 + xy: 3965, 3297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-top rotate: false - xy: 1068, 156 + xy: 4031, 3297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine0 rotate: false - xy: 1057, 90 + xy: 3965, 3231 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine1 rotate: false - xy: 1057, 24 + xy: 4031, 3231 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 2767, 2544 + xy: 3965, 3165 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 2899, 2553 + xy: 4031, 3099 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 1285, 578 + xy: 1285, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 1285, 480 + xy: 1285, 382 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-top rotate: false - xy: 1285, 382 + xy: 1285, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1630,7 +1630,7 @@ alloy-smelter-top index: -1 blast-mixer rotate: false - xy: 3284, 2639 + xy: 1827, 2187 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1644,378 +1644,378 @@ block-forge index: -1 coal-centrifuge rotate: false - xy: 523, 104 + xy: 1499, 1864 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1411, 1422 + xy: 1123, 90 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1411, 1356 + xy: 1123, 24 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1411, 1290 + xy: 1189, 138 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1411, 1224 + xy: 1189, 72 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1407, 1158 + xy: 1189, 6 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1407, 1092 + xy: 1255, 120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 disassembler rotate: false - xy: 2041, 2545 + xy: 2139, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-liquid rotate: false - xy: 2139, 2643 + xy: 2041, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-spinner rotate: false - xy: 2041, 2447 + xy: 2139, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 3284, 2573 + xy: 3591, 3391 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 2833, 2337 + xy: 3333, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 2197, 2167 + xy: 3037, 2645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1351, 74 + xy: 3039, 2577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 3350, 2614 + xy: 3459, 3367 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 3416, 2614 + xy: 3437, 3301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 3416, 2614 + xy: 3437, 3301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1487, 92 + xy: 747, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1487, 58 + xy: 781, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1521, 58 + xy: 2869, 2519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press rotate: false - xy: 2721, 2857 + xy: 2819, 2857 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 1497, 2087 + xy: 3701, 3127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 1431, 1955 + xy: 3635, 3061 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 1497, 2021 + xy: 3701, 3061 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 1563, 2087 + xy: 3503, 2995 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1497, 1955 + xy: 3569, 2995 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1479, 1557 + xy: 1681, 876 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1513, 1557 + xy: 1681, 842 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1483, 1823 + xy: 3571, 2863 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1695, 2021 + xy: 3769, 2797 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1695, 1955 + xy: 3833, 3305 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 1681, 1889 + xy: 3833, 3239 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-crucible rotate: false - xy: 1309, 970 + xy: 1309, 872 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-crucible-top rotate: false - xy: 1309, 872 + xy: 1301, 774 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1681, 1823 + xy: 3899, 3305 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1681, 1757 + xy: 3833, 3173 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1681, 1691 + xy: 3899, 3239 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1681, 1625 + xy: 3833, 3107 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1747, 1889 + xy: 3899, 3173 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1747, 1823 + xy: 3833, 3041 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1747, 1757 + xy: 3899, 3107 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 boulder1 rotate: false - xy: 1455, 328 + xy: 3987, 2693 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 boulder2 rotate: false - xy: 1455, 278 + xy: 4037, 2693 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder1 rotate: false - xy: 2021, 2201 + xy: 1535, 1318 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder2 rotate: false - xy: 2071, 2201 + xy: 1535, 1268 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1683, 1557 + xy: 1663, 2053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1717, 1557 + xy: 1663, 2019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1473, 1054 + xy: 1731, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1473, 1020 + xy: 1799, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-boulder1 rotate: false - xy: 3811, 3121 + xy: 2715, 2807 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-boulder2 rotate: false - xy: 3861, 3121 + xy: 2565, 2607 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1761, 1991 + xy: 1885, 2145 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1795, 2159 + xy: 1927, 2145 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1837, 2161 + xy: 1969, 2145 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2050,7 +2050,14 @@ white-tree-shadow index: -1 container rotate: false - xy: 523, 38 + xy: 1499, 1732 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +container-team + rotate: false + xy: 1499, 1666 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2085,56 +2092,63 @@ core-nucleus-team index: -1 core-shard rotate: false - xy: 1937, 2849 + xy: 2067, 3133 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team rotate: false - xy: 2067, 3133 + xy: 2165, 3133 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 unloader rotate: false - xy: 3698, 2479 + xy: 2207, 2015 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 3759, 2751 + xy: 2241, 2015 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 1285, 284 + xy: 1280, 186 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +vault-team + rotate: false + xy: 1383, 676 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 3417, 3383 + xy: 427, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 799, 18 + xy: 1481, 504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 259, 265 + xy: 1893, 2187 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2155,14 +2169,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 1134, 180 + xy: 3167, 3365 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 3350, 2548 + xy: 3437, 3169 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2176,42 +2190,42 @@ meltdown-heat index: -1 ripple-heat rotate: false - xy: 1187, 302 + xy: 1182, 204 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 1549, 1757 + xy: 3703, 2863 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1615, 1823 + xy: 3703, 2797 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1483, 1625 + xy: 3767, 3259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1473, 1190 + xy: 1697, 2061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 2899, 2421 + xy: 3637, 2731 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2239,7 +2253,7 @@ air-factory index: -1 command-center rotate: false - xy: 589, 170 + xy: 1499, 1798 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2260,7 +2274,7 @@ exponential-reconstructor-top index: -1 factory-in-3 rotate: false - xy: 2139, 2545 + xy: 2041, 2349 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2288,7 +2302,7 @@ factory-in-9 index: -1 factory-out-3 rotate: false - xy: 2041, 2349 + xy: 2139, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2316,14 +2330,14 @@ factory-out-9 index: -1 factory-top-3 rotate: false - xy: 2139, 2447 + xy: 2139, 2349 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ground-factory rotate: false - xy: 2237, 2741 + xy: 2237, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2344,28 +2358,28 @@ multiplicative-reconstructor-top index: -1 naval-factory rotate: false - xy: 2819, 2857 + xy: 2917, 2857 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rally-point rotate: false - xy: 1549, 1889 + xy: 3637, 2929 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1581, 1557 + xy: 1681, 774 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 1483, 1757 + xy: 3571, 2797 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2386,70 +2400,70 @@ tetrative-reconstructor-top index: -1 copper-wall rotate: false - xy: 2663, 2412 + xy: 2091, 2117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 589, 104 + xy: 1565, 1798 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 2799, 2344 + xy: 3129, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1407, 960 + xy: 3459, 3433 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1407, 894 + xy: 3525, 3457 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 2663, 2310 + xy: 3163, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1813, 1651 + xy: 2552, 2345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 1431, 2021 + xy: 3569, 3061 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1847, 1753 + xy: 2549, 2107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 1563, 2021 + xy: 3635, 2995 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2463,98 +2477,98 @@ scrap-wall-gigantic index: -1 scrap-wall-huge2 rotate: false - xy: 1309, 1166 + xy: 1309, 1068 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 1309, 1068 + xy: 1309, 970 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 1615, 1757 + xy: 3767, 3127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1549, 1625 + xy: 3767, 3061 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1615, 1691 + xy: 3767, 2995 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1615, 1625 + xy: 3769, 2929 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1473, 1156 + xy: 1697, 2027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1473, 1122 + xy: 1731, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1473, 1088 + xy: 1765, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1473, 1088 + xy: 1765, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 3759, 2955 + xy: 2071, 2079 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 2767, 2478 + xy: 4031, 3165 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 3723, 2921 + xy: 2139, 2083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 2833, 2487 + xy: 3965, 3033 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2568,28 +2582,28 @@ thruster index: -1 titanium-wall rotate: false - xy: 3698, 2581 + xy: 2105, 2015 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 2899, 2487 + xy: 4031, 3033 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 3553, 3075 + xy: 1321, 132 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 3553, 3021 + xy: 1321, 78 size: 52, 52 orig: 52, 52 offset: 0, 0 @@ -2624,7 +2638,7 @@ circle-shadow index: -1 error rotate: false - xy: 3505, 2813 + xy: 1481, 1168 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2638,91 +2652,91 @@ laser index: -1 laser-end rotate: false - xy: 3029, 2701 + xy: 1407, 940 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 319, 83 + xy: 1381, 2917 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 3103, 2705 + xy: 1407, 866 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 1879, 2165 + xy: 3075, 2819 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1917, 2165 + xy: 3075, 2781 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 parallax-laser rotate: false - xy: 1381, 2917 + xy: 3497, 2987 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 parallax-laser-end rotate: false - xy: 3177, 2705 + xy: 1399, 792 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 particle rotate: false - xy: 1761, 2033 + xy: 1843, 2145 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 2329, 2850 + xy: 2329, 2852 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 shell rotate: false - xy: 1955, 2165 + xy: 2011, 2147 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1803, 2121 + xy: 2049, 2147 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 3651, 3473 + xy: 1176, 172 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 3698, 2547 + xy: 2139, 2015 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2736,28 +2750,28 @@ white index: -1 alpha-outline rotate: false - xy: 3611, 3299 + xy: 1425, 122 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 3611, 3249 + xy: 1375, 72 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 3611, 3199 + xy: 1425, 72 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 3611, 3149 + xy: 686, 44 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2792,7 +2806,7 @@ antumbra-wreck2 index: -1 arc rotate: false - xy: 3505, 2779 + xy: 393, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2806,11 +2820,18 @@ arkyid-foot index: -1 arkyid-joint-base rotate: false - xy: 181, 1 + xy: 259, 185 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 +arkyid-leg + rotate: false + xy: 3901, 2883 + size: 56, 56 + orig: 56, 56 + offset: 0, 0 + index: -1 arkyid-leg-base rotate: false xy: 3991, 3641 @@ -2848,21 +2869,21 @@ arkyid-wreck2 index: -1 artillery-mount-outline rotate: false - xy: 3325, 2707 + xy: 333, 277 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 artillery-outline rotate: false - xy: 3607, 3033 + xy: 786, 36 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 atrax-foot rotate: false - xy: 3167, 3365 + xy: 1431, 2140 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2874,6 +2895,13 @@ atrax-joint orig: 26, 26 offset: 0, 0 index: -1 +atrax-leg + rotate: false + xy: 356, 3747 + size: 36, 26 + orig: 36, 26 + offset: 0, 0 + index: -1 atrax-leg-base rotate: false xy: 3113, 2975 @@ -2883,63 +2911,63 @@ atrax-leg-base index: -1 atrax-outline rotate: false - xy: 2431, 2790 + xy: 1487, 2285 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck0 rotate: false - xy: 2335, 2390 + xy: 91, 7 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck1 rotate: false - xy: 91, 7 + xy: 1577, 2285 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck2 rotate: false - xy: 2431, 2724 + xy: 1667, 2285 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 beam-weapon-outline rotate: false - xy: 2521, 2569 + xy: 2425, 2465 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 beta-outline rotate: false - xy: 1455, 678 + xy: 1371, 22 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck0 rotate: false - xy: 1455, 628 + xy: 1421, 22 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 1455, 578 + xy: 3703, 2697 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 1455, 528 + xy: 3753, 2689 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2960,14 +2988,14 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 833, 18 + xy: 1481, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-full rotate: false - xy: 3181, 2489 + xy: 1479, 436 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2981,35 +3009,42 @@ block-blast-drill-full index: -1 block-boulder-full rotate: false - xy: 1455, 478 + xy: 511, 2 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-char-full rotate: false - xy: 3249, 2505 + xy: 1479, 368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 3283, 2505 + xy: 1479, 334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-container-full + rotate: false + xy: 1959, 2187 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-conveyor-full rotate: false - xy: 3987, 3071 + xy: 1479, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 3987, 3071 + xy: 1479, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3037,21 +3072,21 @@ block-core-shard-full index: -1 block-craters-full rotate: false - xy: 4021, 3079 + xy: 1479, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 259, 199 + xy: 2025, 2185 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 259, 133 + xy: 2091, 2185 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3065,63 +3100,63 @@ block-cyclone-full index: -1 block-dacite-boulder-full rotate: false - xy: 1455, 428 + xy: 561, 2 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-dacite-full rotate: false - xy: 457, 4 + xy: 3937, 2659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-full rotate: false - xy: 491, 4 + xy: 3971, 2659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-full rotate: false - xy: 525, 4 + xy: 4005, 2659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 559, 4 + xy: 4039, 2659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-full rotate: false - xy: 593, 4 + xy: 3903, 2641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-full rotate: false - xy: 4061, 3329 + xy: 3937, 2625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-full rotate: false - xy: 4061, 3295 + xy: 3971, 2625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 4061, 3261 + xy: 4005, 2625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3142,7 +3177,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 4061, 3227 + xy: 4039, 2625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3156,35 +3191,35 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 4061, 3193 + xy: 611, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 4061, 3159 + xy: 645, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 4061, 3125 + xy: 1479, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1176, 170 + xy: 1474, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-wall-full rotate: false - xy: 1210, 170 + xy: 2715, 2581 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3198,7 +3233,7 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 325, 283 + xy: 2157, 2185 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3212,7 +3247,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1244, 170 + xy: 2815, 2689 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3226,7 +3261,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1181, 136 + xy: 2807, 2655 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3240,7 +3275,7 @@ block-mass-driver-full index: -1 block-mechanical-drill-full rotate: false - xy: 325, 217 + xy: 2223, 2185 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3254,21 +3289,21 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1181, 102 + xy: 1629, 2095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1181, 68 + xy: 1629, 2027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mud-full rotate: false - xy: 1215, 102 + xy: 836, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3296,49 +3331,49 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1215, 68 + xy: 870, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1249, 136 + xy: 904, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1249, 102 + xy: 938, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1249, 68 + xy: 972, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1181, 34 + xy: 1006, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1215, 34 + xy: 1717, 2129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-parallax-full rotate: false - xy: 391, 283 + xy: 1068, 156 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3373,49 +3408,49 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 1249, 34 + xy: 2857, 2773 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 325, 151 + xy: 1057, 90 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 3215, 2471 + xy: 2857, 2739 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 391, 217 + xy: 1057, 24 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 3249, 2471 + xy: 2891, 2781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 3283, 2471 + xy: 2891, 2747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1123, 6 + xy: 2925, 2781 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3429,63 +3464,63 @@ block-ripple-full index: -1 block-salt-wall-full rotate: false - xy: 3661, 3071 + xy: 2925, 2747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 391, 151 + xy: 1473, 2128 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 3657, 3037 + xy: 2959, 2781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 3657, 3003 + xy: 2959, 2747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-wall-full rotate: false - xy: 3657, 2969 + xy: 2993, 2781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 325, 85 + xy: 1431, 2062 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 3655, 2935 + xy: 2993, 2747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 3655, 2901 + xy: 3027, 2781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 3655, 2901 + xy: 3027, 2781 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3506,63 +3541,63 @@ scrap-wall-huge1 index: -1 block-scrap-wall-large-full rotate: false - xy: 391, 85 + xy: 1431, 1996 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-segment-full rotate: false - xy: 325, 19 + xy: 1497, 2062 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 3655, 2833 + xy: 3061, 2747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 3655, 2799 + xy: 2857, 2705 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-wall-full rotate: false - xy: 4061, 3091 + xy: 2891, 2713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 3097, 2469 + xy: 2925, 2713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-boulder-full rotate: false - xy: 1455, 378 + xy: 3937, 2693 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 3131, 2465 + xy: 2959, 2713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-wall-full rotate: false - xy: 4021, 3045 + xy: 2993, 2713 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3576,63 +3611,63 @@ block-spectre-full index: -1 block-spore-cluster-full rotate: false - xy: 655, 194 + xy: 3417, 3375 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 4055, 3057 + xy: 3027, 2713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 391, 19 + xy: 1497, 1996 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-spore-wall-full rotate: false - xy: 4055, 3023 + xy: 3061, 2713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-steam-generator-full rotate: false - xy: 457, 170 + xy: 1539, 2128 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 3031, 2461 + xy: 3095, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-wall-full rotate: false - xy: 3030, 2427 + xy: 3129, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 457, 104 + xy: 1563, 2062 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 3033, 2393 + xy: 3163, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3646,28 +3681,35 @@ block-tetrative-reconstructor-full index: -1 block-titanium-conveyor-full rotate: false - xy: 3033, 2359 + xy: 3197, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 3033, 2359 + xy: 3197, 2745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-vault-full + rotate: false + xy: 1937, 2849 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 block-water-extractor-full rotate: false - xy: 523, 170 + xy: 1563, 1996 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 457, 38 + xy: 1499, 1930 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3700,6 +3742,20 @@ bryde-wreck2 orig: 140, 140 offset: 0, 0 index: -1 +container-team-crux + rotate: false + xy: 1565, 1930 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +container-team-sharded + rotate: false + xy: 1565, 1864 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 core-foundation-team-crux rotate: false xy: 1781, 2643 @@ -3730,182 +3786,182 @@ core-nucleus-team-sharded index: -1 core-shard-team-crux rotate: false - xy: 2165, 3133 + xy: 2263, 3133 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team-sharded rotate: false - xy: 2263, 3133 + xy: 2035, 3035 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 2663, 2378 + xy: 2125, 2117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 2697, 2412 + xy: 2159, 2117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 2663, 2344 + xy: 2193, 2117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 2697, 2378 + xy: 2227, 2117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 2731, 2412 + xy: 2891, 2679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 2697, 2344 + xy: 2925, 2679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 2731, 2378 + xy: 2959, 2679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 2731, 2344 + xy: 2993, 2679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 589, 38 + xy: 1565, 1732 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1417, 1884 + xy: 1565, 1666 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1417, 1818 + xy: 1499, 1600 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1417, 1752 + xy: 1565, 1600 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1417, 1686 + xy: 1495, 1534 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1417, 1620 + xy: 1561, 1534 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 1413, 1554 + xy: 1493, 1468 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 1411, 1488 + xy: 1559, 1468 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 2035, 3035 + xy: 2035, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 2035, 2937 + xy: 2133, 3035 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 2133, 3035 + xy: 2133, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 2133, 2937 + xy: 2231, 3035 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 2231, 3035 + xy: 2231, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 2231, 2937 + xy: 2035, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 2035, 2839 + xy: 2133, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 2133, 2839 + xy: 2231, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -4248,84 +4304,84 @@ cracks-9-7 index: -1 crawler-leg rotate: false - xy: 1771, 2201 + xy: 1543, 1418 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-outline rotate: false - xy: 1821, 2203 + xy: 1485, 1368 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck0 rotate: false - xy: 1871, 2203 + xy: 1485, 1318 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 1921, 2203 + xy: 1535, 1368 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 1971, 2203 + xy: 1485, 1268 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone rotate: false - xy: 2231, 2839 + xy: 2041, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 2221, 2201 + xy: 1585, 1318 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-outline rotate: false - xy: 2271, 2205 + xy: 1585, 1268 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck0 rotate: false - xy: 3505, 2963 + xy: 1485, 1218 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 3505, 2913 + xy: 1535, 1218 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 3505, 2863 + xy: 1585, 1218 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 2697, 2310 + xy: 3197, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4360,49 +4416,49 @@ eclipse-wreck2 index: -1 eruption-outline rotate: false - xy: 3555, 2905 + xy: 1531, 1160 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flamethrower-outline rotate: false - xy: 3605, 2867 + xy: 1581, 1160 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flare-outline rotate: false - xy: 3605, 2817 + xy: 1531, 1052 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck0 rotate: false - xy: 3605, 2767 + xy: 1581, 1110 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck1 rotate: false - xy: 3541, 2755 + xy: 1481, 960 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck2 rotate: false - xy: 3541, 2705 + xy: 1531, 1002 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 2696, 2692 + xy: 181, 11 size: 80, 60 orig: 80, 60 offset: 0, 0 @@ -4437,112 +4493,112 @@ fortress-wreck2 index: -1 fuse rotate: false - xy: 2139, 2251 + xy: 2237, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 gamma-outline rotate: false - xy: 3517, 3465 + xy: 4019, 2975 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck0 rotate: false - xy: 3575, 3465 + xy: 3763, 2739 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck1 rotate: false - xy: 3459, 3383 + xy: 335, 5 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck2 rotate: false - xy: 3517, 3407 + xy: 3901, 2767 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 hail rotate: false - xy: 2731, 2310 + xy: 3231, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 heal-shotgun-weapon-outline rotate: false - xy: 3548, 2655 + xy: 1481, 910 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount-outline rotate: false - xy: 3598, 2667 + xy: 1581, 960 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-outline rotate: false - xy: 3598, 2617 + xy: 1481, 860 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 horizon-outline rotate: false - xy: 2778, 2619 + xy: 1411, 1236 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck0 rotate: false - xy: 2852, 2619 + xy: 1407, 1162 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck1 rotate: false - xy: 2926, 2619 + xy: 1407, 1088 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck2 rotate: false - xy: 3000, 2627 + xy: 1407, 1014 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1711, 2159 + xy: 1871, 3101 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 2935, 2337 + xy: 3435, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 3151, 2977 + xy: 1473, 1970 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4556,56 +4612,56 @@ item-blast-compound-tiny index: -1 item-blast-compound-xlarge rotate: false - xy: 3598, 2567 + xy: 1531, 902 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 3911, 3071 + xy: 1431, 1954 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 2867, 2303 + xy: 3503, 2663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 2495, 2495 + xy: 3151, 2977 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 325, 1 + xy: 1255, 186 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 3641, 2717 + xy: 1581, 910 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 655, 152 + xy: 1134, 180 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 2935, 2303 + xy: 3571, 2663 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4619,28 +4675,28 @@ item-copper-small index: -1 item-copper-tiny rotate: false - xy: 273, 361 + xy: 3803, 2721 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 3648, 2667 + xy: 1473, 810 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1753, 2159 + xy: 1717, 2163 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 2969, 2303 + xy: 3639, 2663 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4654,658 +4710,658 @@ item-graphite-small index: -1 item-graphite-tiny rotate: false - xy: 343, 1 + xy: 1399, 774 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 3648, 2617 + xy: 1531, 852 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 655, 110 + xy: 2615, 2557 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1312, 173 + xy: 2799, 2621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1353, 2731 + xy: 477, 323 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 361, 1 + xy: 2901, 2627 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 3648, 2567 + xy: 1581, 860 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 655, 68 + xy: 2815, 2765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1283, 102 + xy: 2783, 2587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 3317, 2547 + xy: 1353, 2731 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 379, 1 + xy: 2919, 2593 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 3598, 2517 + xy: 1523, 802 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 3097, 2587 + xy: 2865, 2815 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1283, 34 + xy: 2801, 2553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 865, 68 + xy: 3673, 2705 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 397, 1 + xy: 2399, 2161 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 3648, 2517 + xy: 2507, 2497 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 3097, 2545 + xy: 2715, 2615 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1317, 105 + xy: 2835, 2553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 627, 12 + xy: 2257, 2159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 415, 1 + xy: 1731, 2111 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 3548, 2505 + xy: 2507, 2447 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 3097, 2503 + xy: 2765, 2665 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1317, 37 + xy: 2869, 2553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 3065, 2469 + xy: 1625, 1472 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 433, 1 + xy: 273, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 3598, 2467 + xy: 2502, 2397 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1148, 1185 + xy: 2657, 2557 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 2027, 2167 + xy: 2903, 2553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 2425, 2291 + xy: 1629, 2001 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 3417, 3365 + xy: 1417, 774 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 3648, 2467 + xy: 2502, 2347 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 3139, 2583 + xy: 2815, 2723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 2095, 2167 + xy: 2935, 2645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1346, 181 + xy: 422, 3749 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 273, 343 + xy: 1435, 774 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 2833, 2371 + xy: 2502, 2297 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 3139, 2541 + xy: 2907, 2815 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 2163, 2167 + xy: 3003, 2645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 3655, 2773 + xy: 913, 2975 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 4079, 3443 + xy: 1453, 774 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 2883, 2371 + xy: 2499, 2247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 3139, 2499 + xy: 2949, 2815 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1841, 2093 + xy: 2953, 2611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 3732, 2691 + xy: 2083, 3287 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 4079, 3425 + xy: 2399, 2143 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 2933, 2371 + xy: 2499, 2197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 655, 26 + xy: 2991, 2815 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1837, 2025 + xy: 3021, 2611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 3759, 2725 + xy: 477, 297 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 4079, 3407 + xy: 273, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 2983, 2372 + xy: 2499, 2147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 697, 52 + xy: 3033, 2815 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1351, 142 + xy: 2937, 2577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 422, 3749 + xy: 3673, 2679 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 4079, 3389 + xy: 4079, 3443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 2417, 2237 + xy: 2499, 2097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 739, 52 + xy: 2289, 2211 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1351, 108 + xy: 3005, 2577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 913, 2975 + xy: 448, 3749 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 4079, 3371 + xy: 4079, 3425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 2417, 2187 + xy: 1617, 2163 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 3482, 2614 + xy: 3437, 3235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 large-artillery-outline rotate: false - xy: 3661, 3255 + xy: 1635, 1282 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-bullet-mount-outline rotate: false - xy: 3469, 2680 + xy: 263, 14 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount-outline rotate: false - xy: 2237, 2255 + xy: 2329, 2935 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount-outline rotate: false - xy: 1383, 576 + xy: 405, 151 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-weapon-outline rotate: false - xy: 3661, 3205 + xy: 1667, 2155 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 781, 52 + xy: 1148, 1185 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1385, 74 + xy: 3005, 2543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 2083, 3287 + xy: 939, 2975 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 291, 331 + xy: 4079, 3407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 3761, 3341 + xy: 1635, 1182 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 823, 52 + xy: 2289, 2169 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1419, 108 + xy: 3073, 2543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 3317, 2521 + xy: 2083, 3261 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1003, 2116 + xy: 4079, 3389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 3711, 3291 + xy: 1631, 1132 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 1761, 2117 + xy: 1759, 2145 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1487, 126 + xy: 713, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 2451, 2291 + xy: 477, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 3495, 3365 + xy: 4079, 3371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 3661, 3155 + xy: 1631, 1082 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 1761, 2075 + xy: 1801, 2145 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1453, 8 + xy: 2365, 2145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 3732, 2665 + xy: 474, 3749 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 3633, 3505 + xy: 291, 331 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 3711, 3241 + xy: 1631, 1032 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mace-leg rotate: false - xy: 1589, 2285 + xy: 3723, 3325 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-outline rotate: false - xy: 1655, 2285 + xy: 3503, 3259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck0 rotate: false - xy: 1381, 2219 + xy: 3569, 3259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck1 rotate: false - xy: 1381, 2153 + xy: 3503, 3193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck2 rotate: false - xy: 1447, 2219 + xy: 3635, 3259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 2525, 2857 + xy: 2623, 2857 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -5347,112 +5403,112 @@ meltdown index: -1 minke-outline rotate: false - xy: 2431, 2621 + xy: 2335, 2652 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck0 rotate: false - xy: 2521, 2754 + xy: 2425, 2753 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck1 rotate: false - xy: 2611, 2754 + xy: 2335, 2549 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck2 rotate: false - xy: 2521, 2651 + xy: 2425, 2650 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 missiles-mount-outline rotate: false - xy: 3711, 3191 + xy: 1631, 882 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-outline rotate: false - xy: 3761, 3191 + xy: 1631, 782 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck0 rotate: false - xy: 3761, 3141 + xy: 2515, 2806 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 3811, 3321 + xy: 2515, 2756 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 3811, 3271 + xy: 2515, 2706 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon-outline rotate: false - xy: 3811, 3221 + xy: 2515, 2606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon-outline rotate: false - xy: 3911, 3321 + xy: 2565, 2807 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 3861, 3221 + xy: 2615, 2807 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-outline rotate: false - xy: 3575, 3349 + xy: 3959, 2859 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 3437, 3325 + xy: 3959, 2801 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 3437, 3267 + xy: 4017, 2859 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 3437, 3209 + xy: 4017, 2801 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5494,105 +5550,105 @@ omura-wreck2 index: -1 parallax rotate: false - xy: 1431, 2087 + xy: 3635, 3127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 poly-outline rotate: false - xy: 3437, 3035 + xy: 396, 93 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck0 rotate: false - xy: 3437, 2977 + xy: 395, 35 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 3495, 3291 + xy: 3821, 2719 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 3553, 3291 + xy: 3879, 2709 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar-leg rotate: false - xy: 1483, 1889 + xy: 3505, 2797 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulsar-outline rotate: false - xy: 3357, 3367 + xy: 3437, 2987 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck0 rotate: false - xy: 3113, 3003 + xy: 3901, 2991 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck1 rotate: false - xy: 259, 83 + xy: 3703, 2747 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck2 rotate: false - xy: 1399, 778 + xy: 335, 63 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 quasar-leg rotate: false - xy: 2603, 2532 + xy: 2335, 2179 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-outline rotate: false - xy: 2685, 2528 + xy: 2417, 2137 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck0 rotate: false - xy: 2521, 2487 + xy: 1417, 1868 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck1 rotate: false - xy: 2603, 2450 + xy: 1417, 1786 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck2 rotate: false - xy: 2685, 2446 + xy: 1417, 1704 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -5613,7 +5669,7 @@ reign-outline index: -1 reign-weapon-outline rotate: false - xy: 2611, 2614 + xy: 517, 1999 size: 83, 138 orig: 83, 138 offset: 0, 0 @@ -5641,56 +5697,56 @@ reign-wreck2 index: -1 repair-point rotate: false - xy: 1547, 1557 + xy: 1681, 808 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 1187, 400 + xy: 1187, 302 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 risso-outline rotate: false - xy: 1383, 416 + xy: 549, 156 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck0 rotate: false - xy: 1383, 336 + xy: 621, 156 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck1 rotate: false - xy: 1383, 256 + xy: 1473, 2194 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck2 rotate: false - xy: 1376, 176 + xy: 1545, 2205 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 salvo rotate: false - xy: 1483, 1691 + xy: 3703, 2929 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1549, 1691 + xy: 3767, 3193 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5711,7 +5767,7 @@ scepter-outline index: -1 scepter-weapon-outline rotate: false - xy: 3553, 3187 + xy: 570, 52 size: 56, 102 orig: 56, 102 offset: 0, 0 @@ -5739,21 +5795,21 @@ scepter-wreck2 index: -1 scorch rotate: false - xy: 1751, 1557 + xy: 1697, 2095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 1695, 2087 + xy: 3769, 2863 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sei-launcher-outline rotate: false - xy: 2791, 2693 + xy: 1413, 1540 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -5788,14 +5844,14 @@ sei-wreck2 index: -1 small-basic-weapon-outline rotate: false - xy: 3911, 3221 + xy: 2665, 2807 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon-outline rotate: false - xy: 3711, 3091 + xy: 2615, 2707 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5816,140 +5872,147 @@ spiroct-foot index: -1 spiroct-joint rotate: false - xy: 1473, 884 + xy: 1867, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +spiroct-leg + rotate: false + xy: 1381, 2146 + size: 48, 34 + orig: 48, 34 + offset: 0, 0 + index: -1 spiroct-leg-base rotate: false - xy: 1871, 3107 + xy: 1098, 1191 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 spiroct-outline rotate: false - xy: 1280, 207 + xy: 1383, 326 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-weapon-outline rotate: false - xy: 3961, 3305 + xy: 2665, 2699 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 spiroct-wreck0 rotate: false - xy: 2335, 2779 + xy: 2425, 2856 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck1 rotate: false - xy: 2335, 2702 + xy: 1383, 249 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck2 rotate: false - xy: 2335, 2625 + xy: 1378, 172 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 splash-0 rotate: false - xy: 1473, 850 + xy: 1833, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 3695, 3057 + xy: 1901, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 3691, 2955 + xy: 2037, 2079 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 3725, 2955 + xy: 2037, 2045 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 3729, 3057 + xy: 1867, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 3763, 3057 + xy: 1935, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 3691, 3023 + xy: 1901, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 3691, 2989 + xy: 1969, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 3725, 3023 + xy: 1935, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 3725, 2989 + xy: 1969, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 3759, 3023 + xy: 2003, 2077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 3759, 2989 + xy: 2003, 2043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 2833, 2553 + xy: 3965, 3099 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5963,18 +6026,25 @@ toxopid-cannon-outline index: -1 toxopid-foot rotate: false - xy: 2335, 2456 + xy: 1381, 2182 size: 90, 90 orig: 90, 90 offset: 0, 0 index: -1 toxopid-joint-base rotate: false - xy: 3074, 2629 + xy: 1617, 2213 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 +toxopid-leg + rotate: false + xy: 3215, 3507 + size: 150, 72 + orig: 150, 72 + offset: 0, 0 + index: -1 toxopid-leg-base rotate: false xy: 1, 331 @@ -6012,7 +6082,7 @@ toxopid-wreck2 index: -1 unit-alpha-full rotate: false - xy: 3961, 3255 + xy: 2715, 2757 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6033,14 +6103,14 @@ unit-arkyid-full index: -1 unit-atrax-full rotate: false - xy: 2431, 2555 + xy: 2335, 2483 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 4011, 3313 + xy: 2765, 2807 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6054,14 +6124,14 @@ unit-bryde-full index: -1 unit-crawler-full rotate: false - xy: 3961, 3205 + xy: 2565, 2557 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 4011, 3263 + xy: 2615, 2599 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6075,7 +6145,7 @@ unit-eclipse-full index: -1 unit-flare-full rotate: false - xy: 3961, 3155 + xy: 2665, 2649 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6089,21 +6159,21 @@ unit-fortress-full index: -1 unit-gamma-full rotate: false - xy: 3495, 3071 + xy: 453, 35 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-horizon-full rotate: false - xy: 3251, 2705 + xy: 259, 257 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 unit-mace-full rotate: false - xy: 2965, 2553 + xy: 3835, 2975 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6117,21 +6187,21 @@ unit-mega-full index: -1 unit-minke-full rotate: false - xy: 2701, 2754 + xy: 2425, 2547 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 unit-mono-full rotate: false - xy: 4011, 3213 + xy: 2715, 2707 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 3553, 3129 + xy: 628, 98 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -6145,21 +6215,21 @@ unit-omura-full index: -1 unit-poly-full rotate: false - xy: 3495, 3013 + xy: 628, 40 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-pulsar-full rotate: false - xy: 1711, 2201 + xy: 3901, 2941 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 unit-quasar-full rotate: false - xy: 2873, 2693 + xy: 1411, 1458 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -6173,7 +6243,7 @@ unit-reign-full index: -1 unit-risso-full rotate: false - xy: 3146, 2625 + xy: 1689, 2205 size: 70, 78 orig: 70, 78 offset: 0, 0 @@ -6194,7 +6264,7 @@ unit-sei-full index: -1 unit-spiroct-full rotate: false - xy: 2335, 2548 + xy: 1391, 2274 size: 94, 75 orig: 94, 75 offset: 0, 0 @@ -6213,16 +6283,30 @@ unit-zenith-full orig: 112, 112 offset: 0, 0 index: -1 +vault-team-crux + rotate: false + xy: 1383, 578 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +vault-team-sharded + rotate: false + xy: 1383, 480 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 wave rotate: false - xy: 2833, 2421 + xy: 3571, 2731 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 zenith-missiles-outline rotate: false - xy: 3861, 3071 + xy: 2765, 2707 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6257,140 +6341,140 @@ zenith-wreck2 index: -1 item-blast-compound rotate: false - xy: 2901, 2337 + xy: 3401, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 2833, 2303 + xy: 3469, 2677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 2901, 2303 + xy: 3537, 2663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 2969, 2337 + xy: 3605, 2663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1278, 170 + xy: 2765, 2631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1283, 136 + xy: 2833, 2621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1283, 68 + xy: 2817, 2587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1317, 139 + xy: 2851, 2587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1317, 71 + xy: 2867, 2621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1993, 2167 + xy: 2885, 2587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 2061, 2167 + xy: 2901, 2645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 2129, 2167 + xy: 2969, 2645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 2231, 2167 + xy: 2919, 2611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1837, 2059 + xy: 2987, 2611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1837, 1991 + xy: 3055, 2611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1385, 142 + xy: 2971, 2577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1351, 40 + xy: 2971, 2543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1419, 142 + xy: 3073, 2577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1453, 42 + xy: 1471, 28 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1487, 24 + xy: 2331, 2145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6411,21 +6495,21 @@ circle index: -1 shape-3 rotate: false - xy: 2965, 2422 + xy: 331, 113 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 457, 299 + xy: 1255, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 457, 249 + xy: 1375, 122 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6458,13 +6542,6 @@ arkyid-cell orig: 128, 128 offset: 0, 0 index: -1 -arkyid-leg - rotate: false - xy: 1123, 98 - size: 56, 56 - orig: 56, 56 - offset: 0, 0 - index: -1 atrax rotate: false xy: 1, 7 @@ -6474,7 +6551,7 @@ atrax index: -1 atrax-base rotate: false - xy: 3218, 2639 + xy: 1761, 2187 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6486,23 +6563,16 @@ atrax-cell orig: 88, 64 offset: 0, 0 index: -1 -atrax-leg - rotate: false - xy: 356, 3747 - size: 36, 26 - orig: 36, 26 - offset: 0, 0 - index: -1 beta rotate: false - xy: 1459, 778 + xy: 836, 44 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 1455, 728 + xy: 1321, 28 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6523,35 +6593,35 @@ bryde-cell index: -1 crawler rotate: false - xy: 1455, 228 + xy: 3803, 2669 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1448, 178 + xy: 3853, 2659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 3607, 2983 + xy: 1493, 1418 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 2121, 2201 + xy: 1593, 1418 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 2171, 2201 + xy: 1585, 1368 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6572,7 +6642,7 @@ eclipse-cell index: -1 flare rotate: false - xy: 3555, 2805 + xy: 1481, 1010 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6586,7 +6656,7 @@ fortress index: -1 fortress-base rotate: false - xy: 3218, 2573 + xy: 3525, 3391 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6600,49 +6670,49 @@ fortress-cell index: -1 gamma rotate: false - xy: 1123, 40 + xy: 3901, 2825 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 3459, 3441 + xy: 3961, 2975 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 horizon rotate: false - xy: 3037, 2783 + xy: 1411, 1384 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-cell rotate: false - xy: 2955, 2701 + xy: 1411, 1310 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 mace rotate: false - xy: 1391, 2285 + xy: 3525, 3325 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-base rotate: false - xy: 1457, 2285 + xy: 3591, 3325 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-cell rotate: false - xy: 1523, 2285 + xy: 3657, 3325 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6663,7 +6733,7 @@ mega-cell index: -1 minke rotate: false - xy: 2335, 2287 + xy: 2335, 2755 size: 88, 101 orig: 88, 101 offset: 0, 0 @@ -6677,35 +6747,35 @@ minke-cell index: -1 mono rotate: false - xy: 3761, 3241 + xy: 1631, 832 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 3711, 3141 + xy: 1581, 810 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 3575, 3407 + xy: 3961, 2917 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 3811, 3171 + xy: 2565, 2757 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 3517, 3349 + xy: 4019, 2917 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -6733,63 +6803,63 @@ omura-cell index: -1 poly rotate: false - xy: 3437, 3151 + xy: 3959, 2743 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 3437, 3093 + xy: 4017, 2743 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 3495, 3233 + xy: 454, 93 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar rotate: false - xy: 1721, 2301 + xy: 3113, 3003 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-base rotate: false - xy: 3911, 3271 + xy: 2565, 2707 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulsar-cell rotate: false - xy: 1721, 2251 + xy: 3357, 3367 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 quasar rotate: false - xy: 2873, 2775 + xy: 2420, 2383 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-base rotate: false - xy: 2955, 2775 + xy: 2420, 2301 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-cell rotate: false - xy: 2696, 2610 + xy: 2417, 2219 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -6817,14 +6887,14 @@ reign-cell index: -1 risso rotate: false - xy: 1383, 496 + xy: 477, 156 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-cell rotate: false - xy: 1182, 204 + xy: 1309, 1166 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -6866,25 +6936,18 @@ sei-cell index: -1 spiroct rotate: false - xy: 2329, 2856 + xy: 2329, 2858 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-cell rotate: false - xy: 2425, 2856 + xy: 1383, 403 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 -spiroct-leg - rotate: false - xy: 1098, 1191 - size: 48, 34 - orig: 48, 34 - offset: 0, 0 - index: -1 toxopid rotate: false xy: 1229, 2530 @@ -6906,149 +6969,142 @@ toxopid-cell orig: 152, 124 offset: 0, 0 index: -1 -toxopid-leg - rotate: false - xy: 3215, 3507 - size: 150, 72 - orig: 150, 72 - offset: 0, 0 - index: -1 vanguard rotate: false - xy: 4011, 3163 + xy: 2765, 2757 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 3961, 3105 + xy: 2815, 2807 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 3611, 3091 + xy: 736, 36 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 artillery-mount rotate: false - xy: 253, 1 + xy: 259, 113 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 2791, 2775 + xy: 2335, 2261 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 eruption rotate: false - xy: 3555, 2963 + xy: 1481, 1110 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 3555, 2855 + xy: 1481, 1060 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 3605, 2925 + xy: 1531, 1102 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 3591, 2717 + xy: 1581, 1060 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 3548, 2605 + xy: 1531, 952 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 3548, 2555 + xy: 1581, 1010 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-artillery rotate: false - xy: 3661, 3323 + xy: 1635, 1350 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-bullet-mount rotate: false - xy: 3397, 2680 + xy: 405, 250 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount rotate: false - xy: 2237, 2449 + xy: 2237, 2351 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount rotate: false - xy: 1383, 675 + xy: 333, 178 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 3711, 3341 + xy: 1635, 1232 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 3761, 3291 + xy: 1631, 982 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 3661, 3105 + xy: 1631, 932 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon rotate: false - xy: 3861, 3321 + xy: 2515, 2656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 3861, 3271 + xy: 2515, 2556 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7069,63 +7125,63 @@ omura-cannon-heat index: -1 reign-weapon rotate: false - xy: 517, 1999 + xy: 2335, 2343 size: 83, 138 orig: 83, 138 offset: 0, 0 index: -1 scepter-weapon rotate: false - xy: 3495, 3129 + xy: 512, 52 size: 56, 102 orig: 56, 102 offset: 0, 0 index: -1 sei-launcher rotate: false - xy: 2335, 2205 + xy: 1417, 1622 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 3861, 3171 + xy: 2615, 2757 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 3911, 3171 + xy: 2565, 2657 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 3761, 3091 + xy: 2665, 2757 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spiroct-weapon rotate: false - xy: 3911, 3113 + xy: 2615, 2649 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 weapon rotate: false - xy: 4011, 3113 + xy: 2665, 2599 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-missiles rotate: false - xy: 3811, 3071 + xy: 2715, 2657 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index e6514bf997..a369939f63 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 2315c5d8f1..3138a194d8 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 1f1833da5b..6e90118bff 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 3bdd8003e7..6db7b1ace7 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index fdb672e2be..9ab5d1be50 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/ai/formations/patterns/CircleFormation.java b/core/src/mindustry/ai/formations/patterns/CircleFormation.java index c658c48bf0..0988657adf 100644 --- a/core/src/mindustry/ai/formations/patterns/CircleFormation.java +++ b/core/src/mindustry/ai/formations/patterns/CircleFormation.java @@ -5,20 +5,14 @@ import arc.math.geom.*; import mindustry.ai.formations.*; public class CircleFormation extends FormationPattern{ - /** The radius of one member. This is needed to determine how close we can pack a given number of members around circle. */ - public float memberRadius; /** Angle offset. */ public float angleOffset = 0; - public CircleFormation(float memberRadius){ - this.memberRadius = memberRadius; - } - @Override public Vec3 calculateSlotLocation(Vec3 outLocation, int slotNumber){ if(slots > 1){ float angle = (360f * slotNumber) / slots; - float radius = memberRadius / (float)Math.sin(180f / slots * Mathf.degRad); + float radius = spacing / (float)Math.sin(180f / slots * Mathf.degRad); outLocation.set(Angles.trnsx(angle, radius), Angles.trnsy(angle, radius), angle); }else{ outLocation.set(0, 0, 360f * slotNumber); diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java index e101291ccf..4201fb3486 100644 --- a/core/src/mindustry/ai/types/FormationAI.java +++ b/core/src/mindustry/ai/types/FormationAI.java @@ -2,10 +2,10 @@ package mindustry.ai.types; import arc.math.geom.*; import arc.util.ArcAnnotate.*; -import mindustry.*; import mindustry.ai.formations.*; import mindustry.entities.units.*; import mindustry.gen.*; +import mindustry.type.*; public class FormationAI extends AIController implements FormationMember{ public Unit leader; @@ -25,33 +25,33 @@ public class FormationAI extends AIController implements FormationMember{ @Override public void updateUnit(){ + UnitType type = unit.type(); + if(leader.dead){ unit.resetController(); return; } - unit.controlWeapons(leader.isRotate(), leader.isShooting); + unit.controlWeapons(true, leader.isShooting); // unit.moveAt(Tmp.v1.set(deltaX, deltaY).limit(unit.type().speed)); - if(leader.isShooting){ - unit.aimLook(leader.aimX(), leader.aimY()); - }else{ - if(!leader.moving() || !unit.type().rotateShooting){ - if(unit.moving()){ - unit.lookAt(unit.vel.angle()); - } - }else{ - unit.lookAt(leader.rotation); - } + + unit.aim(leader.aimX(), leader.aimY()); + + if(unit.type().rotateShooting){ + unit.lookAt(leader.aimX(), leader.aimY()); + }else if(unit.moving()){ + unit.lookAt(unit.vel.angle()); } Vec2 realtarget = vec.set(target); - if(unit.isGrounded() && Vars.world.raycast(unit.tileX(), unit.tileY(), leader.tileX(), leader.tileY(), Vars.world::solid)){ - //TODO pathfind - //realtarget.set(Vars.pathfinder.getTargetTile(unit.tileOn(), unit.team, leader)); - } + float margin = 3f; - unit.moveAt(realtarget.sub(unit).limit(unit.type().speed)); + if(unit.dst(realtarget) <= margin){ + unit.vel.approachDelta(Vec2.ZERO, type.speed * type.accel / 2f); + }else{ + unit.moveAt(realtarget.sub(unit).limit(type.speed)); + } } @Override @@ -68,7 +68,7 @@ public class FormationAI extends AIController implements FormationMember{ //TODO return formation size //eturn ((Commanderc)unit).formation(). } - return unit.hitSize * 1.7f; + return unit.hitSize * 1f; } @Override diff --git a/core/src/mindustry/async/TeamIndexProcess.java b/core/src/mindustry/async/TeamIndexProcess.java index c4dbede3a7..cb1edfa242 100644 --- a/core/src/mindustry/async/TeamIndexProcess.java +++ b/core/src/mindustry/async/TeamIndexProcess.java @@ -5,6 +5,7 @@ import mindustry.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.type.*; +import mindustry.world.blocks.payloads.*; import java.util.*; @@ -48,6 +49,19 @@ public class TeamIndexProcess implements AsyncProcess{ activeCounts[team.id][type.id] += amount; } + private void count(Unit unit){ + updateCount(unit.team, unit.type(), 1); + if(!unit.deactivated) updateActiveCount(unit.team, unit.type(), 1); + + if(unit instanceof Payloadc){ + ((Payloadc)unit).payloads().each(p -> { + if(p instanceof UnitPayload){ + count(((UnitPayload)p).unit); + } + }); + } + } + @Override public void reset(){ counts = new int[Team.all.length]; @@ -71,8 +85,7 @@ public class TeamIndexProcess implements AsyncProcess{ for(Unit unit : Groups.unit){ tree(unit.team).insert(unit); - updateCount(unit.team, unit.type(), 1); - if(!unit.deactivated) updateActiveCount(unit.team, unit.type(), 1); + count(unit); } } diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index c84bfccfca..350cc8cc15 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -342,6 +342,7 @@ public class Blocks implements ContentList{ sandWall = new StaticWall("sand-wall"){{ variants = 2; + sandWater.asFloor().wall = this; }}; saltWall = new StaticWall("salt-wall"); @@ -801,7 +802,7 @@ public class Blocks implements ContentList{ }}; door = new Door("door"){{ - requirements(Category.defense, with(Items.graphite, 6, Items.silicon, 4)); + requirements(Category.defense, with(Items.titanium, 6, Items.silicon, 4)); health = 100 * wallHealthMultiplier; }}; diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 9900d75b0a..2abe1ce799 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -1,18 +1,15 @@ package mindustry.content; import arc.*; -import arc.math.*; import arc.struct.*; import arc.util.ArcAnnotate.*; -import mindustry.core.*; import mindustry.ctype.*; import mindustry.game.Objectives.*; import mindustry.type.*; -import mindustry.world.*; import static mindustry.content.Blocks.*; -import static mindustry.content.SectorPresets.*; import static mindustry.content.SectorPresets.craters; +import static mindustry.content.SectorPresets.*; import static mindustry.content.UnitTypes.*; import static mindustry.type.ItemStack.*; @@ -422,7 +419,11 @@ public class TechTree implements ContentList{ node(risso, () -> { node(minke, () -> { node(bryde, () -> { + node(sei, () -> { + node(omura, () -> { + }); + }); }); }); }); @@ -522,42 +523,27 @@ public class TechTree implements ContentList{ }); } - private static void setup(){ + public static void setup(){ TechNode.context = null; map = new ObjectMap<>(); all = new Seq<>(); } - private static TechNode node(UnlockableContent content, Runnable children){ - ItemStack[] requirements; - - if(content instanceof Block){ - Block block = (Block)content; - - requirements = new ItemStack[block.requirements.length]; - for(int i = 0; i < requirements.length; i++){ - int quantity = 40 + Mathf.round(Mathf.pow(block.requirements[i].amount, 1.25f) * 20, 10); - - requirements[i] = new ItemStack(block.requirements[i].item, UI.roundAmount(quantity)); - } - }else{ - requirements = ItemStack.empty; - } - - return node(content, requirements, children); + public static TechNode node(UnlockableContent content, Runnable children){ + return node(content, content.researchRequirements(), children); } - private static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){ + public static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){ return new TechNode(content, requirements, children); } - private static TechNode node(UnlockableContent content, Seq objectives, Runnable children){ + public static TechNode node(UnlockableContent content, Seq objectives, Runnable children){ TechNode node = new TechNode(content, empty, children); node.objectives = objectives; return node; } - private static TechNode node(UnlockableContent block){ + public static TechNode node(UnlockableContent block){ return node(block, () -> {}); } diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index fbcbfa4553..4891cb5b37 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -38,6 +38,9 @@ public class UnitTypes implements ContentList{ //air + building + mining + payload public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType mega; + //air + building + payload TODO implement + public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType quad, oct; + //air + building + mining public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma; @@ -744,6 +747,7 @@ public class UnitTypes implements ContentList{ accel = 0.08f; drag = 0.016f; flying = true; + hitsize = 9f; targetAir = false; engineOffset = 7.8f; range = 140f; @@ -1010,6 +1014,7 @@ public class UnitTypes implements ContentList{ abilities.add(new HealFieldAbility(5f, 60f * 5, 50f)); weapons.add(new Weapon("heal-weapon-mount"){{ + top = false; y = -2.5f; x = 3.5f; reload = 30f; diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 6734b3794c..38ddda6a24 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -334,7 +334,7 @@ public class Control implements ApplicationListener, Loadable{ } public void playTutorial(){ - ui.showInfo("There is no tutorial yet."); + ui.showInfo("@indev.notready"); //TODO implement //ui.showInfo("death"); /* @@ -434,7 +434,7 @@ public class Control implements ApplicationListener, Loadable{ //just a regular reminder if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){ app.post(() -> app.post(() -> { - ui.showStartupInfo("@indevpopup"); + ui.showStartupInfo("@indev.popup"); })); } diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index d42c8d7b4f..c4e519a4a5 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -338,8 +338,6 @@ public class NetClient implements ApplicationListener{ @Remote(variants = Variant.both) public static void setRules(Rules rules){ state.rules = rules; - //campaign is not valid in multiplayer - state.rules.sector = null; } @Remote(variants = Variant.both) @@ -442,7 +440,7 @@ public class NetClient implements ApplicationListener{ } @Remote(variants = Variant.one, priority = PacketPriority.low, unreliable = true) - public static void stateSnapshot(float waveTime, int wave, int enemies, boolean paused, boolean gameOver, short coreDataLen, byte[] coreData){ + public static void stateSnapshot(float waveTime, int wave, int enemies, boolean paused, boolean gameOver, int timeData, short coreDataLen, byte[] coreData){ try{ if(wave > state.wave){ state.wave = wave; @@ -455,6 +453,8 @@ public class NetClient implements ApplicationListener{ state.enemies = enemies; state.serverPaused = paused; + universe.updateNetSeconds(timeData); + netClient.byteStream.setBytes(net.decompressSnapshot(coreData, coreDataLen)); DataInputStream input = netClient.dataStream; diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 7ca78f8c89..994b3a273e 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -846,7 +846,7 @@ public class NetServer implements ApplicationListener{ byte[] stateBytes = syncStream.toByteArray(); //write basic state data. - Call.stateSnapshot(player.con, state.wavetime, state.wave, state.enemies, state.serverPaused, state.gameOver, (short)stateBytes.length, net.compressSnapshot(stateBytes)); + Call.stateSnapshot(player.con, state.wavetime, state.wave, state.enemies, state.serverPaused, state.gameOver, universe.seconds(), (short)stateBytes.length, net.compressSnapshot(stateBytes)); viewport.setSize(player.con.viewWidth, player.con.viewHeight).setCenter(player.con.viewX, player.con.viewY); diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index c6a448a642..867ba38f1a 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -519,7 +519,7 @@ public class World{ dark = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), dark); } - if(state.hasSector()){ + if(state.hasSector() && state.getSector().preset == null){ int circleBlend = 14; //quantized angle float offset = state.getSector().rect.rotation + 90; diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java index 65e168c54a..ee1739eb9d 100644 --- a/core/src/mindustry/ctype/UnlockableContent.java +++ b/core/src/mindustry/ctype/UnlockableContent.java @@ -8,6 +8,7 @@ import arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*; import mindustry.game.EventType.*; import mindustry.graphics.*; +import mindustry.type.*; import mindustry.ui.*; import static mindustry.Vars.*; @@ -43,6 +44,11 @@ public abstract class UnlockableContent extends MappableContent{ } + /** @return items needed to research this content */ + public ItemStack[] researchRequirements(){ + return ItemStack.empty; + } + public String emoji(){ return Fonts.getUnicodeStr(name); } diff --git a/core/src/mindustry/editor/DrawOperation.java b/core/src/mindustry/editor/DrawOperation.java index 77162fe2a5..e63c2f3a6b 100755 --- a/core/src/mindustry/editor/DrawOperation.java +++ b/core/src/mindustry/editor/DrawOperation.java @@ -64,8 +64,12 @@ public class DrawOperation{ if(type == OpType.floor.ordinal()){ tile.setFloor((Floor)content.block(to)); }else if(type == OpType.block.ordinal()){ + tile.getLinkedTiles(t -> editor.renderer.updatePoint(t.x, t.y)); + Block block = content.block(to); tile.setBlock(block, tile.team(), tile.build == null ? 0 : tile.build.rotation); + + tile.getLinkedTiles(t -> editor.renderer.updatePoint(t.x, t.y)); }else if(type == OpType.rotation.ordinal()){ if(tile.build != null) tile.build.rotation = to; }else if(type == OpType.team.ordinal()){ @@ -74,7 +78,7 @@ public class DrawOperation{ tile.setOverlayID(to); } }); - editor.renderer().updatePoint(tile.x, tile.y); + editor.renderer.updatePoint(tile.x, tile.y); } @Struct diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java index 63803d5db8..1098e463d3 100644 --- a/core/src/mindustry/editor/EditorTile.java +++ b/core/src/mindustry/editor/EditorTile.java @@ -46,14 +46,14 @@ public class EditorTile extends Tile{ return; } - //if(this.block == type && (build == null || build.rotation == rotation)){ - // ui.editor.editor.renderer().updatePoint(x, y); - // return; - //} + if(this.block == type && (build == null || build.rotation == rotation)){ + update(); + return; + } - if(rotation != 0) op(OpType.rotation, (byte)rotation); - if(team() != Team.derelict) op(OpType.team, (byte)team().id); op(OpType.block, block.id); + if(rotation != 0) op(OpType.rotation, (byte)rotation); + if(team != Team.derelict) op(OpType.team, (byte)team.id); super.setBlock(type, team, rotation); } @@ -87,7 +87,7 @@ public class EditorTile extends Tile{ if(skip()){ super.fireChanged(); }else{ - ui.editor.editor.renderer().updatePoint(x, y); + update(); } } @@ -121,6 +121,10 @@ public class EditorTile extends Tile{ } } + private void update(){ + ui.editor.editor.renderer.updatePoint(x, y); + } + private boolean skip(){ return state.isGame() || ui.editor.editor.isLoading(); } diff --git a/core/src/mindustry/editor/MapEditor.java b/core/src/mindustry/editor/MapEditor.java index 14325e94d8..49d174779b 100644 --- a/core/src/mindustry/editor/MapEditor.java +++ b/core/src/mindustry/editor/MapEditor.java @@ -18,10 +18,10 @@ import static mindustry.Vars.*; public class MapEditor{ public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20}; - private final Context context = new Context(); - private StringMap tags = new StringMap(); - private MapRenderer renderer = new MapRenderer(this); + public StringMap tags = new StringMap(); + public MapRenderer renderer = new MapRenderer(this); + private final Context context = new Context(); private OperationStack stack = new OperationStack(); private DrawOperation currentOp; private boolean loading; @@ -35,10 +35,6 @@ public class MapEditor{ return loading; } - public StringMap getTags(){ - return tags; - } - public void beginEdit(int width, int height){ reset(); @@ -214,10 +210,6 @@ public class MapEditor{ } } - public MapRenderer renderer(){ - return renderer; - } - public void resize(int width, int height){ clearOp(); diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 0cf8477691..353e39fcf8 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -116,9 +116,9 @@ public class MapEditorDialog extends Dialog implements Disposable{ t.button("@editor.export", Icon.upload, () -> createDialog("@editor.export", "@editor.exportfile", "@editor.exportfile.description", Icon.file, - (Runnable)() -> platform.export(editor.getTags().get("name", "unknown"), mapExtension, file -> MapIO.writeMap(file, editor.createMap(file))), + (Runnable)() -> platform.export(editor.tags.get("name", "unknown"), mapExtension, file -> MapIO.writeMap(file, editor.createMap(file))), "@editor.exportimage", "@editor.exportimage.description", Icon.fileImage, - (Runnable)() -> platform.export(editor.getTags().get("name", "unknown"), "png", file -> { + (Runnable)() -> platform.export(editor.tags.get("name", "unknown"), "png", file -> { Pixmap out = MapIO.writeImage(editor.tiles()); file.writePNG(out); out.dispose(); @@ -129,16 +129,16 @@ public class MapEditorDialog extends Dialog implements Disposable{ if(steam){ menu.cont.button("@editor.publish.workshop", Icon.link, () -> { - Map builtin = maps.all().find(m -> m.name().equals(editor.getTags().get("name", "").trim())); + Map builtin = maps.all().find(m -> m.name().equals(editor.tags.get("name", "").trim())); - if(editor.getTags().containsKey("steamid") && builtin != null && !builtin.custom){ - platform.viewListingID(editor.getTags().get("steamid")); + if(editor.tags.containsKey("steamid") && builtin != null && !builtin.custom){ + platform.viewListingID(editor.tags.get("steamid")); return; } Map map = save(); - if(editor.getTags().containsKey("steamid") && map != null){ + if(editor.tags.containsKey("steamid") && map != null){ platform.viewListing(map); return; } @@ -156,7 +156,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ } platform.publish(map); - }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? editor.getTags().get("author").equals(player.name) ? "@workshop.listing" : "@view.workshop" : "@editor.publish.workshop")); + }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.tags.containsKey("steamid") ? editor.tags.get("author").equals(player.name) ? "@workshop.listing" : "@view.workshop" : "@editor.publish.workshop")); menu.cont.row(); } @@ -235,7 +235,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ state.rules = (lastSavedRules == null ? new Rules() : lastSavedRules); lastSavedRules = null; saved = false; - editor.renderer().updateAll(); + editor.renderer.updateAll(); } private void playtest(){ @@ -264,10 +264,10 @@ public class MapEditorDialog extends Dialog implements Disposable{ public @Nullable Map save(){ boolean isEditor = state.rules.editor; state.rules.editor = false; - String name = editor.getTags().get("name", "").trim(); - editor.getTags().put("rules", JsonIO.write(state.rules)); - editor.getTags().remove("width"); - editor.getTags().remove("height"); + String name = editor.tags.get("name", "").trim(); + editor.tags.put("rules", JsonIO.write(state.rules)); + editor.tags.remove("width"); + editor.tags.remove("height"); player.clearUnit(); @@ -281,7 +281,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ if(map != null && !map.custom){ handleSaveBuiltin(map); }else{ - returned = maps.saveMap(editor.getTags()); + returned = maps.saveMap(editor.tags); ui.showInfoFade("@editor.saved"); } } @@ -352,7 +352,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ @Override public void dispose(){ - editor.renderer().dispose(); + editor.renderer.dispose(); } public void beginEditMap(Fi file){ @@ -614,12 +614,12 @@ public class MapEditorDialog extends Dialog implements Disposable{ Tile tile = editor.tile(x, y); if(tile.block().breakable && tile.block() instanceof Boulder){ tile.setBlock(Blocks.air); - editor.renderer().updatePoint(x, y); + editor.renderer.updatePoint(x, y); } if(tile.overlay() != Blocks.air && tile.overlay() != Blocks.spawn){ tile.setOverlay(Blocks.air); - editor.renderer().updatePoint(x, y); + editor.renderer.updatePoint(x, y); } } } diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index a8ceb58d79..472a20dee0 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -144,7 +144,7 @@ public class MapGenerateDialog extends BaseDialog{ } //reset undo stack as generation... messes things up - editor.renderer().updateAll(); + editor.renderer.updateAll(); editor.clearOp(); } diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java index 9e217c335f..c46e06f36d 100644 --- a/core/src/mindustry/editor/MapInfoDialog.java +++ b/core/src/mindustry/editor/MapInfoDialog.java @@ -29,7 +29,7 @@ public class MapInfoDialog extends BaseDialog{ private void setup(){ cont.clear(); - ObjectMap tags = editor.getTags(); + ObjectMap tags = editor.tags; cont.pane(t -> { t.add("@editor.mapname").padRight(8).left(); @@ -73,8 +73,8 @@ public class MapInfoDialog extends BaseDialog{ t.row(); t.add("@editor.generation").padRight(8).left(); t.button("@edit", () -> { - generate.show(Vars.maps.readFilters(editor.getTags().get("genfilters", "")), - filters -> editor.getTags().put("genfilters", JsonIO.write(filters))); + generate.show(Vars.maps.readFilters(editor.tags.get("genfilters", "")), + filters -> editor.tags.put("genfilters", JsonIO.write(filters))); hide(); }).left().width(200f); diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index f3ce2f6630..21e659ae1b 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -248,7 +248,7 @@ public class MapView extends Element implements GestureListener{ Draw.color(Pal.remove); Lines.stroke(2f); Lines.rect(centerx - sclwidth / 2 - 1, centery - sclheight / 2 - 1, sclwidth + 2, sclheight + 2); - editor.renderer().draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight); + editor.renderer.draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight); Draw.reset(); if(grid){ diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 6460e9ce8d..95ca278bbd 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -1,5 +1,6 @@ package mindustry.entities; +import arc.*; import arc.func.*; import arc.math.geom.*; import mindustry.annotations.Annotations.*; @@ -18,6 +19,15 @@ public class Units{ private static float cdist; private static boolean boolResult; + @Remote(called = Loc.server) + public static void unitCapDeath(Unit unit){ + if(unit != null){ + unit.dead = true; + Fx.unitCapKill.at(unit); + Core.app.post(() -> Call.unitDeath(unit.id)); + } + } + @Remote(called = Loc.server) public static void unitDeath(int uid){ Unit unit = Groups.unit.getByID(uid); diff --git a/core/src/mindustry/entities/comp/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java index c9c93bb618..354581654b 100644 --- a/core/src/mindustry/entities/comp/CommanderComp.java +++ b/core/src/mindustry/entities/comp/CommanderComp.java @@ -27,7 +27,7 @@ abstract class CommanderComp implements Unitc{ @Override public void update(){ if(formation != null){ - formation.anchor.set(x, y, rotation); + formation.anchor.set(x, y, /*rotation*/ 0); //TODO rotation set to 0 because rotating is pointless formation.updateSlots(); } } @@ -73,7 +73,7 @@ abstract class CommanderComp implements Unitc{ void command(Formation formation, Seq units){ clearCommand(); - float spacing = hitSize() * 1.7f; + float spacing = hitSize() * 1f; minFormationSpeed = type().speed; controlling.addAll(units); diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index e6e5b07acd..79df336be4 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -37,7 +37,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I private UnitController controller; private UnitType type; - boolean spawnedByCore, deactivated; + boolean spawnedByCore, deactivated; //TODO remove deactivation boolean transient Seq abilities = new Seq<>(0); @@ -204,13 +204,14 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I @Override public void add(){ - teamIndex.updateCount(team, type, 1); //check if over unit cap if(count() > cap() && !spawnedByCore){ deactivated = true; - }else{ - teamIndex.updateActiveCount(team, type, 1); + + if(!dead){ + Call.unitCapDeath(self()); + } } } @@ -245,6 +246,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I a.update(self()); } } + }else if(!dead){ + Call.unitCapDeath(self()); } drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f); diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index 1934697aad..806d079b05 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -87,6 +87,9 @@ public class SectorInfo{ /** Update averages of various stats, updates some special sector logic. * Called every frame. */ public void update(){ + //updating in multiplayer as a client doesn't make sense + if(net.client()) return; + internalTimeSpent += Time.delta; //create last stored core items diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index c1416cc672..cb3cf1de19 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -14,7 +14,8 @@ import static mindustry.Vars.*; /** Updates and handles state of the campaign universe. Has no relevance to other gamemodes. */ public class Universe{ - private long seconds; + private int seconds; + private int netSeconds; private float secondCounter; private int turn; @@ -76,15 +77,19 @@ public class Universe{ /** Update planet rotations, global time and relevant state. */ public void update(){ - secondCounter += Time.delta / 60f; - if(secondCounter >= 1){ - seconds += (int)secondCounter; - secondCounter %= 1f; + //only update time when not in multiplayer + if(!net.client()){ + secondCounter += Time.delta / 60f; - //save every few seconds - if(seconds % 10 == 1){ - save(); + if(secondCounter >= 1){ + seconds += (int)secondCounter; + secondCounter %= 1f; + + //save every few seconds + if(seconds % 10 == 1){ + save(); + } } } @@ -191,25 +196,30 @@ public class Universe{ return count; } - public float secondsMod(float mod, float scale){ - return (seconds / scale) % mod; + public void updateNetSeconds(int value){ + netSeconds = value; } - public long seconds(){ - return seconds; + public float secondsMod(float mod, float scale){ + return (seconds() / scale) % mod; + } + + public int seconds(){ + //use networked seconds when playing as client + return net.client() ? netSeconds : seconds; } public float secondsf(){ - return seconds + secondCounter; + return seconds() + secondCounter; } private void save(){ - Core.settings.put("utime", seconds); + Core.settings.put("utimei", seconds); Core.settings.put("turn", turn); } private void load(){ - seconds = Core.settings.getLong("utime"); + seconds = Core.settings.getInt("utimei"); turn = Core.settings.getInt("turn"); } diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java index 26816b08d0..3598a0ad09 100644 --- a/core/src/mindustry/graphics/FloorRenderer.java +++ b/core/src/mindustry/graphics/FloorRenderer.java @@ -210,8 +210,8 @@ public class FloorRenderer implements Disposable{ tile.block().drawBase(tile); }else if(floor.cacheLayer == layer && (world.isAccessible(tile.x, tile.y) || tile.block().cacheLayer != CacheLayer.walls || !tile.block().fillsTile)){ floor.drawBase(tile); - }else if(floor.cacheLayer.ordinal() < layer.ordinal() && layer != CacheLayer.walls){ - floor.drawNonLayer(tile); + }else if(floor.cacheLayer != layer && layer != CacheLayer.walls){ + floor.drawNonLayer(tile, layer); } } } diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 1cde8aebd6..c678723fec 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -324,7 +324,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ commander.clearCommand(); }else{ - commander.commandNearby(new SquareFormation()); + //TODO try out some other formations + commander.commandNearby(new CircleFormation()); Fx.commandSend.at(player); } diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java index c5237178b3..ebf2896e0e 100644 --- a/core/src/mindustry/maps/Map.java +++ b/core/src/mindustry/maps/Map.java @@ -146,7 +146,7 @@ public class Map implements Comparable, Publishable{ public void addSteamID(String id){ tags.put("steamid", id); - ui.editor.editor.getTags().put("steamid", id); + ui.editor.editor.tags.put("steamid", id); try{ ui.editor.save(); }catch(Exception e){ @@ -159,7 +159,7 @@ public class Map implements Comparable, Publishable{ public void removeSteamID(){ tags.remove("steamid"); - ui.editor.editor.getTags().remove("steamid"); + ui.editor.editor.tags.remove("steamid"); try{ ui.editor.save(); }catch(Exception e){ @@ -203,7 +203,7 @@ public class Map implements Comparable, Publishable{ @Override public boolean prePublish(){ tags.put("author", player.name); - ui.editor.editor.getTags().put("author", tags.get("author")); + ui.editor.editor.tags.put("author", tags.get("author")); ui.editor.save(); return true; diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java index 271ea5f9d1..05bd69fe32 100644 --- a/core/src/mindustry/net/NetworkIO.java +++ b/core/src/mindustry/net/NetworkIO.java @@ -42,8 +42,6 @@ public class NetworkIO{ try(DataInputStream stream = new DataInputStream(is)){ Time.clear(); state.rules = JsonIO.read(Rules.class, stream.readUTF()); - //campaign is not valid in multiplayer - state.rules.sector = null; state.map = new Map(SaveIO.getSaveWriter().readStringMap(stream)); state.wave = stream.readInt(); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 92abb2ee47..c670f3ecd6 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -15,6 +15,7 @@ import arc.util.ArcAnnotate.*; import mindustry.ai.types.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; +import mindustry.core.*; import mindustry.ctype.*; import mindustry.entities.*; import mindustry.entities.abilities.*; @@ -28,6 +29,7 @@ import mindustry.world.*; import mindustry.world.blocks.environment.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.units.*; +import mindustry.world.consumers.*; import static mindustry.Vars.*; @@ -299,6 +301,34 @@ public class UnitType extends UnlockableContent{ } } + @Override + public ItemStack[] researchRequirements(){ + ItemStack[] stacks = null; + + //calculate costs based on reconstructors or factories found + Block rec = content.blocks().find(b -> b instanceof Reconstructor && Structs.contains(((Reconstructor)b).upgrades, u -> u[1] == this)); + + if(rec != null && rec.consumes.has(ConsumeType.item) && rec.consumes.get(ConsumeType.item) instanceof ConsumeItems){ + stacks = ((ConsumeItems)rec.consumes.get(ConsumeType.item)).items; + }else{ + UnitFactory factory = (UnitFactory)content.blocks().find(u -> u instanceof UnitFactory && Structs.contains(((UnitFactory)u).plans, p -> p.unit == this)); + if(factory != null){ + stacks = Structs.find(factory.plans, p -> p.unit == this).requirements; + } + } + + if(stacks != null){ + ItemStack[] out = new ItemStack[stacks.length]; + for(int i = 0; i < out.length; i++){ + out[i] = new ItemStack(stacks[i].item, UI.roundAmount((int)(Math.pow(stacks[i].amount, 1.1) * 50))); + } + + return out; + } + + return super.researchRequirements(); + } + @Override public ContentType getContentType(){ return ContentType.unit; diff --git a/core/src/mindustry/ui/dialogs/MapsDialog.java b/core/src/mindustry/ui/dialogs/MapsDialog.java index 24b1cf3609..c03c01e799 100644 --- a/core/src/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/mindustry/ui/dialogs/MapsDialog.java @@ -54,7 +54,7 @@ public class MapsDialog extends BaseDialog{ Runnable show = () -> ui.loadAnd(() -> { hide(); ui.editor.show(); - ui.editor.editor.getTags().put("name", text); + ui.editor.editor.tags.put("name", text); Events.fire(new MapMakeEvent()); }); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 01b700ddc9..94fc221305 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -15,6 +15,7 @@ import arc.util.*; import arc.util.ArcAnnotate.*; import arc.util.pooling.*; import mindustry.annotations.Annotations.*; +import mindustry.core.*; import mindustry.ctype.*; import mindustry.entities.*; import mindustry.entities.units.*; @@ -615,6 +616,18 @@ public class Block extends UnlockableContent{ } } + @Override + public ItemStack[] researchRequirements(){ + ItemStack[] out = new ItemStack[requirements.length]; + for(int i = 0; i < out.length; i++){ + int quantity = 40 + Mathf.round(Mathf.pow(requirements[i].amount, 1.25f) * 20, 10); + + out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity)); + } + + return out; + } + @Override public void getDependencies(Cons cons){ //just requires items diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java index 7d38a302ba..efbd2485a2 100644 --- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java +++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java @@ -97,7 +97,7 @@ public class LaunchPad extends Block{ //launch when full and base conditions are met if(items.total() >= itemCapacity && efficiency() >= 1f && timer(timerLaunch, launchTime / timeScale)){ LaunchPayload entity = LaunchPayload.create(); - items.each((item, amount) -> entity.stacks().add(new ItemStack(item, amount))); + items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount))); entity.set(this); entity.lifetime(120f); entity.team(team); @@ -174,9 +174,14 @@ public class LaunchPad extends Block{ @Override public void remove(){ + if(!state.isCampaign()) return; + + //on multiplayer the destination is a the first captured sector (basically random) + Sector destsec = !net.client() ? state.secinfo.origin : state.rules.sector.planet.sectors.find(Sector::hasBase); + //actually launch the items upon removal - if(team() == state.rules.defaultTeam && state.secinfo.origin != null){ - ItemSeq dest = state.secinfo.origin.getExtraItems(); + if(team() == state.rules.defaultTeam && destsec != null){ + ItemSeq dest = destsec.getExtraItems(); for(ItemStack stack : stacks){ dest.add(stack); @@ -186,7 +191,7 @@ public class LaunchPad extends Block{ Events.fire(new LaunchItemEvent(stack)); } - state.secinfo.origin.setExtraItems(dest); + destsec.setExtraItems(dest); } } } diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index 8d54dfad9f..5a2fd461af 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -23,6 +23,7 @@ public class ForceProjector extends Block{ public float phaseUseTime = 350f; public float phaseRadiusBoost = 80f; + public float phaseShieldBoost = 400f; public float radius = 101.7f; public float breakage = 550f; public float cooldownNormal = 1.75f; @@ -59,9 +60,11 @@ public class ForceProjector extends Block{ @Override public void setStats(){ super.setStats(); - + stats.add(BlockStat.shieldHealth, breakage, StatUnit.none); + stats.add(BlockStat.cooldownTime, (int) (breakage / cooldownBrokenBase / 60f), StatUnit.seconds); stats.add(BlockStat.powerUse, basePowerDraw * 60f, StatUnit.powerSecond); stats.add(BlockStat.boostEffect, phaseRadiusBoost / tilesize, StatUnit.blocks); + stats.add(BlockStat.boostEffect, phaseShieldBoost, StatUnit.shieldHealth); } @Override @@ -130,7 +133,7 @@ public class ForceProjector extends Block{ broken = false; } - if(buildup >= breakage && !broken){ + if(buildup >= breakage + phaseShieldBoost && !broken){ broken = true; buildup = breakage; Fx.shieldBreak.at(x, y, realRadius(), team.color); diff --git a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java index c65d637859..847f624247 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -22,7 +22,7 @@ public class PowerTurret extends Turret{ @Override public void init(){ - consumes.powerCond(powerUse, entity -> ((TurretBuild)entity).target != null); + consumes.powerCond(powerUse, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting)); super.init(); } diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java index 6640613779..2ac5e933cf 100644 --- a/core/src/mindustry/world/blocks/environment/Floor.java +++ b/core/src/mindustry/world/blocks/environment/Floor.java @@ -67,7 +67,7 @@ public class Floor extends Block{ protected TextureRegion[][] edges; protected Seq blenders = new Seq<>(); - protected IntSet blended = new IntSet(); + protected Bits blended = new Bits(256); protected TextureRegion edgeRegion; public Floor(String name){ @@ -170,30 +170,43 @@ public class Floor extends Block{ return drownTime > 0; } - public void drawNonLayer(Tile tile){ + public void drawNonLayer(Tile tile, CacheLayer layer){ Mathf.rand.setSeed(tile.pos()); - drawEdges(tile, true); - } - - protected void drawEdges(Tile tile){ - drawEdges(tile, false); - } - - protected void drawEdges(Tile tile, boolean sameLayer){ blenders.clear(); blended.clear(); for(int i = 0; i < 8; i++){ Point2 point = Geometry.d8[i]; Tile other = tile.getNearby(point); - if(other != null && doEdge(other.floor(), sameLayer) && other.floor().edges() != null){ - if(blended.add(other.floor().id)){ + if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null){ + if(!blended.getAndSet(other.floor().id)){ blenders.add(other.floor()); } } } + drawBlended(tile); + } + + protected void drawEdges(Tile tile){ + blenders.clear(); + blended.clear(); + + for(int i = 0; i < 8; i++){ + Point2 point = Geometry.d8[i]; + Tile other = tile.getNearby(point); + if(other != null && doEdge(other.floor()) && other.floor().cacheLayer == cacheLayer && other.floor().edges() != null){ + if(!blended.getAndSet(other.floor().id)){ + blenders.add(other.floor()); + } + } + } + + drawBlended(tile); + } + + protected void drawBlended(Tile tile){ blenders.sort(a -> a.id); for(Block block : blenders){ @@ -201,23 +214,18 @@ public class Floor extends Block{ Point2 point = Geometry.d8[i]; Tile other = tile.getNearby(point); if(other != null && other.floor() == block){ - TextureRegion region = edge((Floor)block, 2 - (point.x + 1), 2 - (point.y + 1)); + TextureRegion region = edge((Floor)block, 1 - point.x, 1 - point.y); Draw.rect(region, tile.worldx(), tile.worldy()); - - if(!sameLayer && block.cacheLayer.ordinal() > cacheLayer.ordinal()){ - Draw.rect(block.variantRegions()[0], tile.worldx() + point.x*tilesize, tile.worldy() + point.y*tilesize); - } } } } - } //'new' style of edges with shadows instead of colors, not used currently protected void drawEdgesFlat(Tile tile, boolean sameLayer){ for(int i = 0; i < 4; i++){ Tile other = tile.getNearby(i); - if(other != null && doEdge(other.floor(), sameLayer)){ + if(other != null && doEdge(other.floor())){ Color color = other.floor().mapColor; Draw.color(color.r, color.g, color.b, 1f); Draw.rect(edgeRegion, tile.worldx(), tile.worldy(), i*90); @@ -231,8 +239,8 @@ public class Floor extends Block{ return ((Floor)blendGroup).edges; } - protected boolean doEdge(Floor other, boolean sameLayer){ - return (((other.blendGroup.id > blendGroup.id) || edges() == null) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer)); + protected boolean doEdge(Floor other){ + return other.blendGroup.id > blendGroup.id || edges() == null; } TextureRegion edge(Floor block, int x, int y){ diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java index 6327857637..6b8739b93a 100644 --- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java +++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java @@ -33,8 +33,8 @@ public class ArmoredConduit extends Conduit{ @Override public boolean acceptLiquid(Building source, Liquid liquid, float amount){ - return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit) || - Edges.getFacingEdge(source.tile(), tile).absoluteRelativeTo(tile.x, tile.y) == rotation; + return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit || + source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation); } } } diff --git a/core/src/mindustry/world/meta/BlockStat.java b/core/src/mindustry/world/meta/BlockStat.java index 54aed12de2..66e9e2782c 100644 --- a/core/src/mindustry/world/meta/BlockStat.java +++ b/core/src/mindustry/world/meta/BlockStat.java @@ -48,6 +48,8 @@ public enum BlockStat{ targetsGround(StatCategory.shooting), damage(StatCategory.shooting), ammo(StatCategory.shooting), + shieldHealth(StatCategory.shooting), + cooldownTime(StatCategory.shooting), booster(StatCategory.optional), boostEffect(StatCategory.optional), diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java index 721ac7c582..0466b4f139 100644 --- a/core/src/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -21,6 +21,7 @@ public enum StatUnit{ perMinute, timesSpeed(false), percent(false), + shieldHealth, none, items; diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 926c57663f..3f09c262ee 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -338,6 +338,7 @@ public class Generators{ outliner.get(type.footRegion); outliner.get(type.legBaseRegion); outliner.get(type.baseJointRegion); + if(type.constructor.get() instanceof Legsc) outliner.get(type.legRegion); Image image = ImagePacker.get(type.region);