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

TODO cleanup / Test fixes

Browse Source
This commit is contained in:
Anuken
2019-02-08 16:29:10 -05:00
parent 66c27fab13
commit adf5189541
18 changed files with 43 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
View File

@@ -21,7 +21,6 @@ public class BasicGenerator extends RandomGenerator{
@Override
public void generate(Tile[][] tiles){
//todo use set seed
int seed = Mathf.random(99999999);
sim.setSeed(seed);
sim2.setSeed(seed + 1);

9
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@@ -36,6 +36,7 @@ public class MapGenerator extends Generator{
public boolean distortFloor = false;
/**Items randomly added to containers and vaults.*/
public ItemStack[] storageDrops = ItemStack.with(Items.copper, 300, Items.lead, 300, Items.silicon, 200, Items.graphite, 200, Items.blastCompound, 200);
public Block coreBlock;
public MapGenerator(String mapName){
this.mapName = mapName;
@@ -46,6 +47,11 @@ public class MapGenerator extends Generator{
this.enemySpawns = enemySpawns;
}
public MapGenerator core(Block block){
this.coreBlock = block;
return this;
}
public MapGenerator drops(ItemStack[] drops){
this.storageDrops = drops;
return this;
@@ -174,8 +180,7 @@ public class MapGenerator extends Generator{
throw new IllegalArgumentException("All zone maps must have a core.");
}
//TODO set specific core block?
tiles[core.x][core.y].setBlock(coreTypes.get(players.indexOf(core)), defaultTeam);
tiles[core.x][core.y].setBlock(coreBlock == null ? coreTypes.get(players.indexOf(core)) : coreBlock, defaultTeam);
world.prepareTiles(tiles);
world.setMap(map);