diff --git a/core/assets/maps/serpulo/hidden/176.msav b/core/assets/maps/serpulo/hidden/176.msav index dc7f44d816..5e07ecb30f 100644 Binary files a/core/assets/maps/serpulo/hidden/176.msav and b/core/assets/maps/serpulo/hidden/176.msav differ diff --git a/core/assets/maps/serpulo/hidden/180.msav b/core/assets/maps/serpulo/hidden/180.msav index 43dd5628d0..d299162064 100644 Binary files a/core/assets/maps/serpulo/hidden/180.msav and b/core/assets/maps/serpulo/hidden/180.msav differ diff --git a/core/assets/maps/serpulo/hidden/69.msav b/core/assets/maps/serpulo/hidden/69.msav index 7749129ab9..a37919aaea 100644 Binary files a/core/assets/maps/serpulo/hidden/69.msav and b/core/assets/maps/serpulo/hidden/69.msav differ diff --git a/core/assets/maps/serpulo/hidden/76.msav b/core/assets/maps/serpulo/hidden/76.msav index ecb7c0342e..20ed43d860 100644 Binary files a/core/assets/maps/serpulo/hidden/76.msav and b/core/assets/maps/serpulo/hidden/76.msav differ diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index 6aa19920fb..377827886a 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -458,7 +458,6 @@ public class SerpuloTechTree{ new Research(mender), new Research(combustionGenerator) ), () -> { - node(ruinousShores, Seq.with( new SectorComplete(crateredBattleground), new Research(graphitePress), @@ -472,7 +471,6 @@ public class SerpuloTechTree{ new Research(siliconSmelter), new Research(steamGenerator) ), () -> { - node(saltFlats, Seq.with( new SectorComplete(windsweptIslands), new SectorComplete(fungalPass), diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 355d311a1c..553e4faa02 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -2259,7 +2259,7 @@ public class LStatements{ @RegisterStatement("playsound") public static class PlaySoundStatement extends LStatement{ public boolean positional; - public String id = "@sfx-pew", volume = "1", pitch = "1", pan = "0", x = "@thisx", y = "@thisy", limit = "true"; + public String id = "@sfx-shoot", volume = "1", pitch = "1", pan = "0", x = "@thisx", y = "@thisy", limit = "true"; @Override public void build(Table table){ diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index 312e682802..a9401442a2 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -926,6 +926,9 @@ public class ApplicationTests{ fail("Sector " + sector.name + " has unlocalized objectives: " + timers.toString(", ", t -> "'" + t.text + "'")); } + //TODO: some Erekir sectors (origin, caldera) modify the cap, why? + //assertEquals(0, state.rules.unitCap, "Sector " + sector.name + " must not modify the unit cap."); + for(Tile tile : world.tiles){ if(tile.drop() != null){ resources.add(tile.drop());