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

Better wave timer / Sprite tweaks / Core wave spawns

Browse Source
This commit is contained in:
Anuken
2019-06-09 21:09:29 -04:00
parent 4199702b9b
commit ea0788f56c
18 changed files with 103 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -18,7 +18,7 @@ import static io.anuke.mindustry.Vars.*;
public class Maps implements Disposable{
/** List of all built-in maps. Filenames only. */
private static final String[] defaultMapNames = {"fortress", "labyrinth", "islands"};
private static String[] defaultMapNames = {"fortress", "labyrinth", "islands"};
/** All maps stored in an ordered array. */
private Array<Map> maps = new Array<>();
/** Serializer for meta. */

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

@@ -16,6 +16,7 @@ import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.blocks.storage.CoreBlock;
import io.anuke.mindustry.world.blocks.storage.StorageBlock;
import static io.anuke.mindustry.Vars.defaultTeam;
import static io.anuke.mindustry.Vars.world;
public class MapGenerator extends Generator{
@@ -79,7 +80,7 @@ public class MapGenerator extends Generator{
for(int x = 0; x < width; x++){
for(int y = 0; y < height; y++){
if(tiles[x][y].block() instanceof CoreBlock){
if(tiles[x][y].block() instanceof CoreBlock && tiles[x][y].getTeam() == defaultTeam){
players.add(new Point2(x, y));
tiles[x][y].setBlock(Blocks.air);
}