diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index aca79aead7..5978f70ed8 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -925,7 +925,7 @@ sector.frontier.description = WIP, map submission by Stormride_R sector.infestedCanyons.description = WIP, map submission by Skeledragon 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.perilousHarbor.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 @@ -2167,8 +2167,6 @@ frontier.tutorial2 = Enemy waves send [accent]infinitely[] until all enemy cores frontier.tutorial3 = [accent]Attack the enemy base fast to prevent waves from getting too high[]. atolls.destroy1 = Destroy the 2 enemy [accent]foundation cores[] first.\n[accent]Gain access to thorium[]. -atolls.destroy2 = The enemy base to the south is fragile to naval units. \nConstruct [accent]naval units[]   to proceed. -atolls.destroy3 = The enemy base to the east is fragile to air units. \nConstruct [accent]air units[]   to proceed. atolls.mega1 = Enter [accent]command mode[] and select the :mega:[accent]Mega[] units. atolls.mega2 = Select the  [accent]Load Units[] command to have Mega units to pick up ground units. atolls.mega3 = Move the Mega units [accent]above[] ground units to load them in. diff --git a/core/assets/maps/atolls.msav b/core/assets/maps/atolls.msav index 8081a6ed44..3057bcfe1d 100644 Binary files a/core/assets/maps/atolls.msav and b/core/assets/maps/atolls.msav differ diff --git a/core/assets/maps/extractionOutpost.msav b/core/assets/maps/extractionOutpost.msav index 34be21a803..3a26bbadc6 100644 Binary files a/core/assets/maps/extractionOutpost.msav and b/core/assets/maps/extractionOutpost.msav differ diff --git a/core/assets/sounds/ui/waveSpawn.ogg b/core/assets/sounds/ui/waveSpawn.ogg index 5b69169a8c..5b507ab40a 100644 Binary files a/core/assets/sounds/ui/waveSpawn.ogg and b/core/assets/sounds/ui/waveSpawn.ogg differ diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index 9933c12658..649aabf1e4 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -668,14 +668,15 @@ public class SerpuloTechTree{ new SectorComplete(windsweptIslands), new SectorComplete(perilousHarbor), new SectorComplete(facility32m), - new Research(groundFactory), - new Research(nova), - new Research(airFactory), - new Research(mono) + + new Research(multiplicativeReconstructor), + new Research(risso), + new Research(minke), + new Research(fortress) ), () -> { node(atolls, Seq.with( new SectorComplete(extractionOutpost), - new Research(multiplicativeReconstructor), + new Research(poly), new Research(mega) ), () -> { diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java index 630c58780a..62110d9a09 100644 --- a/core/src/mindustry/ui/fragments/HintsFragment.java +++ b/core/src/mindustry/ui/fragments/HintsFragment.java @@ -281,12 +281,14 @@ public class HintsFragment{ && state.rules.defaultTeam.core() != null && state.rules.defaultTeam.core().block == Blocks.coreShard && state.rules.defaultTeam.core().items.has(Blocks.coreFoundation.requirements), - () -> ui.hints.placedBlocks.contains(Blocks.coreFoundation)), + () -> ui.hints.placedBlocks.contains(Blocks.coreFoundation) + ), serpuloCoreZone( () -> state.isCampaign() && state.getPlanet() == Planets.serpulo && Vars.indexer.isBlockPresent(Blocks.coreZone) && (!state.rules.attackMode || state.stats.getDestroyed(Blocks.coreShard) + state.stats.getDestroyed(Blocks.coreFoundation) + state.stats.getDestroyed(Blocks.coreNucleus) > 0), - () -> state.rules.defaultTeam.cores().size > 1), + () -> state.rules.defaultTeam.cores().size > 1 + ), presetLaunch( () -> state.isCampaign() && state.getSector().preset == null,