From 0d8d73f9e6a7df52413d14f7922d94ddb5a5c1b6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 3 Sep 2024 13:36:46 -0400 Subject: [PATCH] WIP map submission --- core/assets/bundles/bundle.properties | 3 +++ core/assets/maps/facility32m.msav | Bin 0 -> 19018 bytes core/src/mindustry/content/SectorPresets.java | 7 ++++++- .../mindustry/content/SerpuloTechTree.java | 18 +++++++++++------- core/src/mindustry/editor/WaveInfoDialog.java | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 core/assets/maps/facility32m.msav diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 85b9e6d471..19703a139c 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -821,6 +821,7 @@ sector.fungalPass.name = Fungal Pass sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost +sector.facility32m.name = Facility 32 M sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -843,6 +844,8 @@ sector.impact0078.description = Here lie remnants of the interstellar transport sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure. sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. +#do not translate +sector.facility32m.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis diff --git a/core/assets/maps/facility32m.msav b/core/assets/maps/facility32m.msav new file mode 100644 index 0000000000000000000000000000000000000000..c9bcae8de5bde3dbfca3c20a68ba36b88857cf93 GIT binary patch literal 19018 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 a8Wugd$?ePkpE!MM{&%1M`u}AmUjYD { + node(extractionOutpost, Seq.with( + new SectorComplete(stainedMountains), + new SectorComplete(windsweptIslands), + new Research(groundFactory), + new Research(nova), + new Research(airFactory), + new Research(mono) + ), () -> { + }); }); node(saltFlats, Seq.with( diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java index ca4a24404d..e99008e54e 100644 --- a/core/src/mindustry/editor/WaveInfoDialog.java +++ b/core/src/mindustry/editor/WaveInfoDialog.java @@ -72,7 +72,7 @@ public class WaveInfoDialog extends BaseDialog{ groups = maps.readWaves(Core.app.getClipboardText()); buildGroups(); }catch(Exception e){ - e.printStackTrace(); + Log.err(e); ui.showErrorMessage("@waves.invalid"); } dialog.hide();