Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

many things

Browse Source
This commit is contained in:
Anuken
2019-05-06 14:34:21 -04:00
parent 20fbe2fbbe
commit 51f9ad5a2c
50 changed files with 424 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/maps/Map.java
View File

@@ -9,7 +9,6 @@ import io.anuke.arc.util.Log;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.DefaultWaves;
import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.io.MapIO;
import static io.anuke.mindustry.Vars.world;
@@ -44,7 +43,11 @@ public class Map implements Comparable<Map>{
}
public Map(FileHandle file, int width, int height, ObjectMap<String, String> tags, boolean custom){
this(file, width, height, tags, custom, MapIO.version);
this(file, width, height, tags, custom, -1);
}
public Map(ObjectMap<String, String> tags){
this(Vars.customMapDirectory.child(tags.get("name", "unknown")), 0, 0, tags, true);
}
public Array<SpawnGroup> getWaves(){

3
core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java
View File

@@ -6,7 +6,6 @@ import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Vars.customMapDirectory;
import static io.anuke.mindustry.Vars.world;
public abstract class RandomGenerator extends Generator{
@@ -32,7 +31,7 @@ public abstract class RandomGenerator extends Generator{
decorate(tiles);
world.setMap(new Map(customMapDirectory.child("generated"), 0, 0, new ObjectMap<>(), true));
world.setMap(new Map(new ObjectMap<>()));
}
public abstract void decorate(Tile[][] tiles);