Cleanup

core/src/mindustry/Vars.java

@@ -210,6 +210,16 @@ public class Vars implements Loadable{
 
         Version.init();
 
+        dataDirectory = Core.settings.getDataDirectory();
+        screenshotDirectory = dataDirectory.child("screenshots/");
+        customMapDirectory = dataDirectory.child("maps/");
+        mapPreviewDirectory = dataDirectory.child("previews/");
+        saveDirectory = dataDirectory.child("saves/");
+        tmpDirectory = dataDirectory.child("tmp/");
+        modDirectory = dataDirectory.child("mods/");
+        schematicDirectory = dataDirectory.child("schematics/");
+        bebuildDirectory = dataDirectory.child("be_builds/");
+
         if(tree == null) tree = new FileTree();
         if(mods == null) mods = new Mods();
 
@@ -233,16 +243,6 @@ public class Vars implements Loadable{
         ios = Core.app.getType() == ApplicationType.iOS;
         android = Core.app.getType() == ApplicationType.Android;
 
-        dataDirectory = Core.settings.getDataDirectory();
-        screenshotDirectory = dataDirectory.child("screenshots/");
-        customMapDirectory = dataDirectory.child("maps/");
-        mapPreviewDirectory = dataDirectory.child("previews/");
-        saveDirectory = dataDirectory.child("saves/");
-        tmpDirectory = dataDirectory.child("tmp/");
-        modDirectory = dataDirectory.child("mods/");
-        schematicDirectory = dataDirectory.child("schematics/");
-        bebuildDirectory = dataDirectory.child("be_builds/");
-
         modDirectory.mkdirs();
 
         mods.load();

core/src/mindustry/core/World.java

@@ -26,7 +26,7 @@ import static mindustry.Vars.*;
 public class World{
     public final Context context = new Context();
 
-    private Map currentMap;
+    private Map currentMap = new Map(new StringMap());
     public @NonNull Tiles tiles = new Tiles(0, 0);
 
     private boolean generating, invalidMap;
@@ -214,6 +214,7 @@ public class World{
     }
 
     public void loadSector(Sector sector){
+        currentMap = new Map(StringMap.of("name", sector.planet.localizedName + "; Sector " + sector.id));
         state.rules.sector = sector;
         int size = sector.getSize();
         loadGenerator(size, size, tiles -> sector.planet.generator.generate(tiles, sector));

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

@@ -216,6 +216,8 @@ public class TODOPlanetGenerator extends PlanetGenerator{
         });
 
         schematics.placeLoadout(Loadouts.advancedShard, spawn.x, spawn.y);
+
+        state.rules.waves = true;
     }
 
 }

core/src/mindustry/type/Planet.java

@@ -89,8 +89,10 @@ public class Planet extends UnlockableContent{
                 }
             }
 
-            //for now
+            for(Sector sector : sectors){
-            sectors.each(s -> s.unlocked = true);
+                sector.unlocked = true;
+                sector.generate();
+            }
         }else{
             sectors = new Array<>();
         }

core/src/mindustry/type/Sector.java

@@ -4,6 +4,7 @@ import arc.math.geom.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
+import arc.util.noise.*;
 import mindustry.*;
 import mindustry.ctype.*;
 import mindustry.game.Saves.*;
@@ -38,6 +39,11 @@ public class Sector{
         this.data = data;
     }
 
+    public void generate(){
+        //TODO use simplex and a seed
+        hostility = Noise.snoise3(tile.v.x, tile.v.y, tile.v.z, 4f, 1f);
+    }
+
     public boolean locked(){
         return !unlocked;
     }

tools/src/mindustry/tools/SectorDataGenerator.java

@@ -61,9 +61,9 @@ public class SectorDataGenerator{
                         continue;
                     }
 
-                    Item item = tile.floor().itemDrop;
                     Liquid liquid = tile.floor().liquidDrop;
-                    if(item != null) content.add(item);
+                    if(tile.floor().itemDrop != null) content.add(tile.floor().itemDrop);
+                    if(tile.overlay().itemDrop != null) content.add(tile.overlay().itemDrop);
                     if(liquid != null) content.add(liquid);
 
                     if(!tile.block().isStatic()){