mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-15 19:30:51 -07:00
Code Issues Projects Releases Wiki Activity

Wave editor bugfixes

Browse source
This commit is contained in:
Anuken 2019-03-21 00:19:06 -04:00
parent 2c8620a75c
commit fd5fcc9928
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets/maps/map_9.mmap Normal file
View file

Binary file not shown.

BIN
core/assets/maps/stainedMountains.mmap
View file

Binary file not shown.

2
core/src/io/anuke/mindustry/content/Zones.java
View file

@ -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();

6
core/src/io/anuke/mindustry/game/SpawnGroup.java
View file

@ -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));