diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index db308eedc8..481f8038b4 100644 Binary files a/core/assets/planets/TODO.dat and b/core/assets/planets/TODO.dat differ diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 87732d411b..06ac6bca46 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -88,6 +88,8 @@ public class Planet extends UnlockableContent{ t.printStackTrace(); } } + + sectors.random().unlocked = true; }else{ sectors = new Array<>(); } diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 6affe16f97..988e579f51 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -21,6 +21,7 @@ public class Sector{ public final SectorData data; public @Nullable SaveSlot save; + public boolean unlocked; //TODO implement a dynamic (?) launch period public int launchPeriod = 10; @@ -35,7 +36,7 @@ public class Sector{ } public boolean locked(){ - return true; + return !unlocked; } /** @return light dot product in the range [0, 1]. */ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index ed1fe67710..df25ea98f9 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -213,7 +213,7 @@ public class PlanetDialog extends FloatingDialog{ batch.proj().mul(planet.getTransform(mat)); for(Sector sec : planet.sectors){ - if(sec.save == null){ + if(sec.locked()){ draw(sec, shadowColor, -0.001f); } } diff --git a/tools/src/mindustry/tools/SectorDataGenerator.java b/tools/src/mindustry/tools/SectorDataGenerator.java index 337cf05027..efaa6254c2 100644 --- a/tools/src/mindustry/tools/SectorDataGenerator.java +++ b/tools/src/mindustry/tools/SectorDataGenerator.java @@ -92,8 +92,7 @@ public class SectorDataGenerator{ //50% water -> naval attribute //TODO also select sectors with water spawns - if((float)waterFloors / totalFloors >= 0.5f){ - Log.info("Floor percentage for sector {0} : {1}", sector.id, (int)((float)waterFloors / totalFloors * 100)); + if((float)waterFloors / totalFloors >= 0.6f){ data.attributes |= (1 << SectorAttribute.naval.ordinal()); }