diff --git a/core/assets/maps/serpulo/hidden/263.msav b/core/assets/maps/serpulo/hidden/263.msav index 630063707a..9aec284839 100644 Binary files a/core/assets/maps/serpulo/hidden/263.msav and b/core/assets/maps/serpulo/hidden/263.msav differ diff --git a/core/src/mindustry/service/GameService.java b/core/src/mindustry/service/GameService.java index 38cd32ffdf..4460e85fd7 100644 --- a/core/src/mindustry/service/GameService.java +++ b/core/src/mindustry/service/GameService.java @@ -461,7 +461,8 @@ public class GameService{ if(campaign()){ SStat.maxWavesSurvived.max(Vars.state.wave); - if(state.stats.buildingsBuilt == 0 && state.wave >= 10){ + //TODO: remove (263 is uniquely broken) + if(state.stats.buildingsBuilt == 0 && state.wave >= 10 && !(Vars.state.getSector() != null && Vars.state.getPlanet() == Planets.serpulo && Vars.state.getSector().id == 263)){ survive10WavesNoBlocks.complete(); } } diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index a9401442a2..817e99534f 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -13,8 +13,8 @@ import mindustry.core.*; import mindustry.core.GameState.*; import mindustry.ctype.*; import mindustry.entities.units.*; -import mindustry.game.*; import mindustry.game.MapObjectives.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.io.*; import mindustry.maps.*; diff --git a/tools/src/mindustry/tools/MapFixer.java b/tools/src/mindustry/tools/MapFixer.java index 858bb7181e..0f81f34015 100644 --- a/tools/src/mindustry/tools/MapFixer.java +++ b/tools/src/mindustry/tools/MapFixer.java @@ -76,6 +76,9 @@ public class MapFixer{ SectorPreset preset = content.sectors().find(s -> s.generator.map.file.absolutePath().equals(f.absolutePath())); if(preset == null) return; + //uniquely broken (TODO: remove and fix 263) + if(preset.sector.planet == Planets.serpulo && preset.sector.id == 263) return; + String targetName = preset.requireUnlock ? preset.localizedName : f.nameWithoutExtension(); editor.beginEdit(map);