Added Fallen Vessel sector submission

core/assets/bundles/bundle.properties

@@ -890,6 +890,7 @@ sector.atolls.name = Atolls
 sector.testingGrounds.name = Testing Grounds
 sector.seaPort.name = Sea Port
 sector.weatheredChannels.name = Weathered Channels
+sector.fallenVessel.name = Fallen Vessel
 sector.mycelialBastion.name = Mycelial Bastion
 sector.frontier.name = Frontier
 sector.sunkenPier.name = Sunken Pier
@@ -926,6 +927,7 @@ sector.polarAerodrome.description = WIP, map submission by hhh i 17
 sector.testingGrounds.description = WIP, map submission by dnx2019
 sector.seaPort.description = WIP, map submission by inkognito626
 sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.fallenVessel.description = WIP, map submission
 sector.mycelialBastion.description = WIP, map submission by Skeledragon
 sector.cruxscape.description = WIP, map submission by Stormride_R
 sector.geothermalStronghold.description = WIP, map submission by Skeledragon

core/assets/icons/icons.properties

@@ -622,3 +622,4 @@
 63060=metal-wall-2|block-metal-wall-2-ui
 63059=metal-tiles-13|block-metal-tiles-13-ui
 63058=metal-wall-3|block-metal-wall-3-ui
+63057=ore-wall-graphite|block-ore-wall-graphite-ui

core/assets/planets/serpulo.json

@@ -1 +1 @@
-{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:166,craters:219,extractionOutpost:213,coastline:164,navalFortress:165,frontier:86,sunkenPier:173,groundZero:170,mycelialBastion:143,facility32m:65,atolls:75,overgrowth:142,testingGrounds:169,frozenForest:64,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:271,nuclearComplex:228,ruinousShores:41,planetaryTerminal:217,impact0078:266,seaPort:214,geothermalStronghold:264,cruxscape:54,fungalPass:221,tarFields:99,biomassFacility:23},attackSectors:[0,6,13,16,19,20,24,27,30,47,55,66,67,69,76,92,94,103,111,116,127,133,138,150,157,161,162,176,180,185,191,192,197,200,204,207,225,230,237,242,243,244,245,246,247,248,251,254,259,263,265]}
+{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:166,craters:219,extractionOutpost:213,coastline:164,navalFortress:165,frontier:86,sunkenPier:173,groundZero:170,mycelialBastion:143,facility32m:65,atolls:75,overgrowth:142,testingGrounds:169,frozenForest:64,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:271,nuclearComplex:228,ruinousShores:41,planetaryTerminal:217,impact0078:266,seaPort:214,fallenVessel:95,fungalPass:221,tarFields:99,biomassFacility:23},attackSectors:[0,6,13,16,19,20,24,27,30,47,55,66,67,69,76,92,94,103,111,116,127,133,138,150,157,161,162,176,180,185,191,192,197,200,204,207,225,230,237,242,243,244,245,246,247,248,251,254,259,263,265]}

core/src/mindustry/content/SectorPresets.java

@@ -10,7 +10,7 @@ public class SectorPresets{
     groundZero,
     craters, biomassFacility, taintedWoods, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields,
     frontier, fungalPass, infestedCanyons, atolls, sunkenPier, mycelialBastion, extractionOutpost, saltFlats, testingGrounds, overgrowth, //polarAerodrome,
-    impact0078, desolateRift, nuclearComplex, planetaryTerminal,
+    impact0078, desolateRift, fallenVessel, nuclearComplex, planetaryTerminal,
     coastline, navalFortress, weatheredChannels, seaPort,
 
     onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera,
@@ -149,6 +149,11 @@ public class SectorPresets{
             difficulty = 8;
         }};
 
+        fallenVessel = new SectorPreset("fallenVessel", serpulo, -1){{
+            captureWave = 121;
+            difficulty = 9;
+        }};
+
         nuclearComplex = new SectorPreset("nuclearComplex", serpulo, 130){{
             captureWave = 50;
             difficulty = 7;

core/src/mindustry/content/SerpuloTechTree.java

@@ -571,7 +571,15 @@ public class SerpuloTechTree{
                                             new Research(surgeSmelter),
                                             new Research(overdriveProjector)
                                             ), () -> {
+                                                node(fallenVessel, Seq.with(
+                                                new SectorComplete(desolateRift),
+                                                new SectorComplete(mycelialBastion),
+                                                new Research(sei),
+                                                new Research(meltdown),
+                                                new Research(spectre)
+                                                ), () -> {
 
+                                                });
                                             });
                                         });
                                     });

core/src/mindustry/io/SaveMeta.java

@@ -22,7 +22,7 @@ public class SaveMeta{
         this.build = build;
         this.timestamp = timestamp;
         this.timePlayed = timePlayed;
-        this.map = maps.all().find(m -> m.name().equals(map));
+        this.map = maps == null ? null : maps.all().find(m -> m.name().equals(map));
         this.wave = wave;
         this.rules = rules;
         this.tags = tags;

gradle.properties

@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=2d81a887eb
+archash=3d19c223ed