diff --git a/core/assets/maps/craters.mmap b/core/assets/maps/craters.mmap index b3a6e5432d..6b614e442a 100644 Binary files a/core/assets/maps/craters.mmap and b/core/assets/maps/craters.mmap differ diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap index ad90b921fd..6128b705b8 100644 Binary files a/core/assets/maps/nuclearProductionComplex.mmap and b/core/assets/maps/nuclearProductionComplex.mmap differ diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index 36178915dd..1686a3cc92 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -51,8 +51,8 @@ public class UnitTypes implements ContentList{ }}; crawler = new UnitType("crawler", Crawler.class, Crawler::new){{ - maxVelocity = 1.1f; - speed = 0.22f; + maxVelocity = 1.2f; + speed = 0.26f; drag = 0.4f; hitsize = 8f; mass = 1.75f; diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 059f2261e9..6a1d3ec0da 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -75,9 +75,9 @@ public class Zones implements ContentList{ rules = () -> new Rules(){{ waves = true; waveTimer = true; - waveSpacing = 60 * 60 * 1.5f; + waveSpacing = 60 * 60 * 1f; spawns = Array.with( - new SpawnGroup(UnitTypes.dagger){{ + new SpawnGroup(UnitTypes.crawler){{ unitScaling = 1.5f; }}, @@ -89,7 +89,7 @@ public class Zones implements ContentList{ }}, new SpawnGroup(UnitTypes.dagger){{ - begin = 10; + begin = 3; unitScaling = 1.5f; }}, @@ -446,7 +446,7 @@ public class Zones implements ContentList{ launchPeriod = 20; zoneRequirements = new Zone[]{ruinousShores}; blockRequirements = new Block[]{Blocks.thermalGenerator}; - resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium}; + resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand}; rules = () -> new Rules(){{ waves = true; waveTimer = true; @@ -549,7 +549,7 @@ public class Zones implements ContentList{ launchPeriod = 15; zoneRequirements = new Zone[]{impact}; blockRequirements = new Block[]{Blocks.blastDrill, Blocks.thermalGenerator}; - resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium}; + resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium, Items.sand}; rules = () -> new Rules(){{ waves = true; waveTimer = true; diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index e7d72001a8..0877deb4fd 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/io/anuke/mindustry/type/Zone.java @@ -17,6 +17,8 @@ import io.anuke.mindustry.maps.generators.Generator; import io.anuke.mindustry.maps.generators.MapGenerator; import io.anuke.mindustry.world.Block; +import java.util.Arrays; + import static io.anuke.mindustry.Vars.data; import static io.anuke.mindustry.Vars.state; @@ -133,6 +135,7 @@ public class Zone extends UnlockableContent{ @Override public void init(){ generator.init(loadout); + Arrays.sort(resources); Array arr = Core.settings.getObject(name + "-starting-items", Array.class, () -> null); if(arr != null){