diff --git a/core/assets/maps/hidden/serpulo-12.msav b/core/assets/maps/hidden/serpulo-12.msav index 608b683a87..4e54123591 100644 Binary files a/core/assets/maps/hidden/serpulo-12.msav and b/core/assets/maps/hidden/serpulo-12.msav differ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index efd3161f7e..70baee4ca0 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -1,5 +1,6 @@ package mindustry.content; +import mindustry.*; import mindustry.type.*; import static mindustry.content.Planets.*; @@ -175,6 +176,9 @@ public class SectorPresets{ 240 //Cold Grove by wpx: https://discord.com/channels/391020510269669376/1165421701362897000/1230550892718194742 ); + Vars.content.sector("sector-serpulo-173").captureWave = 17; + Vars.content.sector("sector-serpulo-240").captureWave = 40; + //endregion //region erekir diff --git a/core/src/mindustry/net/CrashHandler.java b/core/src/mindustry/net/CrashHandler.java index f3d96061ad..7ed5ade848 100644 --- a/core/src/mindustry/net/CrashHandler.java +++ b/core/src/mindustry/net/CrashHandler.java @@ -65,7 +65,7 @@ public class CrashHandler{ //don't create crash logs for custom builds, as it's expected if(OS.username.equals("anuke") && !"steam".equals(Version.modifier)){ - // System.exit(1); + System.exit(1); } //attempt to load version regardless diff --git a/tests/src/test/java/power/DirectConsumerTests.java b/tests/src/test/java/power/DirectConsumerTests.java index 6919dd20b1..522cdc677b 100644 --- a/tests/src/test/java/power/DirectConsumerTests.java +++ b/tests/src/test/java/power/DirectConsumerTests.java @@ -29,8 +29,9 @@ public class DirectConsumerTests extends PowerTestFixture{ testUnitFactory(30, 30, 0.08f, 0.08f, 1.0f); } + static int fakes = 0; void testUnitFactory(int siliconAmount, int leadAmount, float producedPower, float requestedPower, float expectedSatisfaction){ - Tile ct = createFakeTile(0, 0, new GenericCrafter("fakefactory"){{ + Tile ct = createFakeTile(0, 0, new GenericCrafter("fakefactory" + (fakes ++)){{ hasPower = true; hasItems = true; consumePower(requestedPower); diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java index ac0b9d72c5..ec2f0e60fa 100644 --- a/tests/src/test/java/power/PowerTestFixture.java +++ b/tests/src/test/java/power/PowerTestFixture.java @@ -6,7 +6,6 @@ import arc.util.*; import mindustry.*; import mindustry.content.*; import mindustry.core.*; -import mindustry.ctype.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.world.*; @@ -32,12 +31,7 @@ public class PowerTestFixture{ boolean make = content == null; if(make){ - Vars.content = new ContentLoader(){ - @Override - public void handleMappableContent(MappableContent content){ - - } - }; + Vars.content = new ContentLoader(); } Vars.state = new GameState(); Vars.tree = new FileTree();