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 0000000000..c9bcae8de5 Binary files /dev/null and b/core/assets/maps/facility32m.msav differ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index eb537f1164..a6e4dca023 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -7,7 +7,7 @@ import static mindustry.content.Planets.*; public class SectorPresets{ public static SectorPreset groundZero, - craters, biomassFacility, frozenForest, ruinousShores, windsweptIslands, stainedMountains, tarFields, + craters, biomassFacility, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields, fungalPass, extractionOutpost, saltFlats, overgrowth, impact0078, desolateRift, nuclearComplex, planetaryTerminal, coastline, navalFortress, @@ -52,6 +52,11 @@ public class SectorPresets{ difficulty = 3; }}; + facility32m = new SectorPreset("facility32m", serpulo, 170){{ + captureWave = 25; + difficulty = 4; + }}; + windsweptIslands = new SectorPreset("windsweptIslands", serpulo, 246){{ captureWave = 30; difficulty = 4; diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index b452004f7d..e8b212791a 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -502,15 +502,19 @@ public class SerpuloTechTree{ }); }); - node(extractionOutpost, Seq.with( - new SectorComplete(stainedMountains), - new SectorComplete(windsweptIslands), - new Research(groundFactory), - new Research(nova), - new Research(airFactory), - new Research(mono) + node(facility32m, Seq.with( + new Research(pneumaticDrill) ), () -> { + 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();