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

Sector preset support / Per-player votekick cooldown

Browse Source
This commit is contained in:
Anuken
2020-05-17 11:12:22 -04:00
parent 9a32b1a35a
commit d9751dbc6d
10 changed files with 52 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/maps/generators/FileMapGenerator.java
View File

@@ -4,6 +4,7 @@ import arc.math.*;
import arc.math.geom.*;
import mindustry.content.*;
import mindustry.ctype.*;
import mindustry.game.*;
import mindustry.io.*;
import mindustry.maps.*;
import mindustry.type.*;
@@ -13,16 +14,14 @@ import mindustry.world.blocks.storage.*;
import static mindustry.Vars.*;
public class FileMapGenerator implements WorldGenerator{
public final Map map = null;
public final Map map;
public FileMapGenerator(String mapName){
//TODO doesn't work
//this.map = maps.loadInternalMap(mapName);
this.map = maps.loadInternalMap(mapName);
}
@Override
public void generate(Tiles tiles){
if(true) throw new IllegalArgumentException("no!");
tiles.fill();
SaveIO.load(map.file);
@@ -50,8 +49,8 @@ public class FileMapGenerator implements WorldGenerator{
}
if(tile.block() instanceof CoreBlock && tile.team() == state.rules.defaultTeam){
//TODO PLACE THE LOADOUT
//schematics.placeLoadout(loadout, tile.x, tile.y);
//TODO PLACE THE (CORRECT) LOADOUT
Schematics.placeLoadout(Loadouts.basicFoundation, tile.x, tile.y);
anyCores = true;
}
}