Functional presets

core/src/mindustry/maps/generators/FileMapGenerator.java

@@ -22,9 +22,10 @@ public class FileMapGenerator implements WorldGenerator{
 
     @Override
     public void generate(Tiles tiles){
-        tiles.fill();
-
         SaveIO.load(map.file);
+        world.beginMapLoad();
+
+        tiles = world.tiles;
 
         for(Tile tile : tiles){
             if(tile.block() instanceof StorageBlock && !(tile.block() instanceof CoreBlock) && state.hasSector()){
@@ -39,6 +40,7 @@ public class FileMapGenerator implements WorldGenerator{
         boolean anyCores = false;
 
         for(Tile tile : tiles){
+
             if(tile.overlay() == Blocks.spawn){
                 int rad = 10;
                 Geometry.circle(tile.x, tile.y, tiles.width, tiles.height, rad, (wx, wy) -> {
@@ -48,15 +50,15 @@ public class FileMapGenerator implements WorldGenerator{
                 });
             }
 
-            if(tile.block() instanceof CoreBlock && tile.team() == state.rules.defaultTeam){
+            if(tile.block() instanceof CoreBlock && tile.team() == state.rules.defaultTeam && !anyCores){
                 //TODO PLACE THE (CORRECT) LOADOUT
-                Schematics.placeLoadout(Loadouts.basicFoundation, tile.x, tile.y);
+                Schematics.placeLoadout(Loadouts.basicShard, tile.x, tile.y);
                 anyCores = true;
             }
         }
 
         if(!anyCores){
-            throw new IllegalArgumentException("All zone maps must have a core.");
+            throw new IllegalArgumentException("All maps must have a core.");
         }
 
         state.map = map;

core/src/mindustry/maps/generators/PlanetGenerator.java

@@ -1,7 +1,7 @@
 package mindustry.maps.generators;
 
 import arc.math.geom.*;
-import mindustry.graphics.g3d.HexMesher;
+import mindustry.graphics.g3d.*;
 import mindustry.type.*;
 import mindustry.world.*;
 

core/src/mindustry/maps/planet/TODOPlanetGenerator.java

@@ -24,10 +24,10 @@ public class TODOPlanetGenerator extends PlanetGenerator{
     {Blocks.water, Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.darksandTaintedWater, Blocks.snow, Blocks.snow, Blocks.ice},
     {Blocks.water, Blocks.darksandWater, Blocks.darksand, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.darksandTaintedWater, Blocks.snow, Blocks.ice, Blocks.ice},
     {Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.salt, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.iceSnow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice},
-    {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice},
+    {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.ignarock, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice},
     {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.iceSnow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice},
     {Blocks.deepwater, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.moss, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.ice},
-    {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.darksandTaintedWater, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice},
+    {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.ignarock, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice},
     {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.moss, Blocks.sporeMoss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice},
     {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice},
     {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice},