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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 B?|lFO literal 0 HcmV?d00001 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();