diff --git a/core/assets/maps/map_9.mmap b/core/assets/maps/map_9.mmap new file mode 100644 index 0000000000..4209ca6b7a Binary files /dev/null and b/core/assets/maps/map_9.mmap differ diff --git a/core/assets/maps/stainedMountains.mmap b/core/assets/maps/stainedMountains.mmap index 288ff1978a..f1119c0e80 100644 Binary files a/core/assets/maps/stainedMountains.mmap and b/core/assets/maps/stainedMountains.mmap differ diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 1c12202b73..be77a09aa4 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -92,7 +92,7 @@ public class Zones implements ContentList{ }};*/ stainedMountains = new Zone("stainedMountains", new MapGenerator("stainedMountains", 2) - .dist(2.5f, true) + .dist(0f, false) .decor(new Decoration(Blocks.moss, Blocks.shaleBoulder, 0.02))){{ loadout = Loadouts.basicFoundation; baseLaunchCost = ItemStack.with(); diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/io/anuke/mindustry/game/SpawnGroup.java index 6847b9a116..2305cd6346 100644 --- a/core/src/io/anuke/mindustry/game/SpawnGroup.java +++ b/core/src/io/anuke/mindustry/game/SpawnGroup.java @@ -28,7 +28,7 @@ public class SpawnGroup implements Serializable{ /**The spacing, in waves, of spawns. For example, 2 = spawns every other wave*/ public int spacing = 1; /**Maximum amount of units that spawn*/ - public int max = 40; + public int max = 100; /**How many waves need to pass before the amount of units spawned increases by 1*/ public float unitScaling = never; /**Amount of enemies spawned initially, with no scaling*/ @@ -80,7 +80,7 @@ public class SpawnGroup implements Serializable{ if(begin != 0) json.writeValue("begin", begin); if(end != never) json.writeValue("end", end); if(spacing != 1) json.writeValue("spacing", spacing); - if(max != 40) json.writeValue("max", max); + //if(max != 40) json.writeValue("max", max); if(unitScaling != never) json.writeValue("scaling", unitScaling); if(unitAmount != 1) json.writeValue("amount", unitAmount); if(effect != null) json.writeValue("effect", effect.id); @@ -92,7 +92,7 @@ public class SpawnGroup implements Serializable{ begin = data.getInt("begin", 0); end = data.getInt("end", never); spacing = data.getInt("spacing", 1); - max = data.getInt("spacing", 40); + //max = data.getInt("max", 40); unitScaling = data.getFloat("scaling", never); unitAmount = data.getInt("amount", 1); effect = content.getByID(ContentType.status, data.getInt("effect", -1));