Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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) stainedMountains = new Zone("stainedMountains", new MapGenerator("stainedMountains", 2)
.dist(2.5f, true) .dist(0f, false)
.decor(new Decoration(Blocks.moss, Blocks.shaleBoulder, 0.02))){{ .decor(new Decoration(Blocks.moss, Blocks.shaleBoulder, 0.02))){{
loadout = Loadouts.basicFoundation; loadout = Loadouts.basicFoundation;
baseLaunchCost = ItemStack.with(); 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*/ /**The spacing, in waves, of spawns. For example, 2 = spawns every other wave*/
public int spacing = 1; public int spacing = 1;
/**Maximum amount of units that spawn*/ /**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*/ /**How many waves need to pass before the amount of units spawned increases by 1*/
public float unitScaling = never; public float unitScaling = never;
/**Amount of enemies spawned initially, with no scaling*/ /**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(begin != 0) json.writeValue("begin", begin);
if(end != never) json.writeValue("end", end); if(end != never) json.writeValue("end", end);
if(spacing != 1) json.writeValue("spacing", spacing); 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(unitScaling != never) json.writeValue("scaling", unitScaling);
if(unitAmount != 1) json.writeValue("amount", unitAmount); if(unitAmount != 1) json.writeValue("amount", unitAmount);
if(effect != null) json.writeValue("effect", effect.id); if(effect != null) json.writeValue("effect", effect.id);
@@ -92,7 +92,7 @@ public class SpawnGroup implements Serializable{
begin = data.getInt("begin", 0); begin = data.getInt("begin", 0);
end = data.getInt("end", never); end = data.getInt("end", never);
spacing = data.getInt("spacing", 1); spacing = data.getInt("spacing", 1);
max = data.getInt("spacing", 40); //max = data.getInt("max", 40);
unitScaling = data.getFloat("scaling", never); unitScaling = data.getFloat("scaling", never);
unitAmount = data.getInt("amount", 1); unitAmount = data.getInt("amount", 1);
effect = content.getByID(ContentType.status, data.getInt("effect", -1)); effect = content.getByID(ContentType.status, data.getInt("effect", -1));