diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index 7aa92b9a42..d2aaaa70b4 100644 Binary files a/core/assets/planets/TODO.dat and b/core/assets/planets/TODO.dat differ diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index a7c33bfb94..dd25efd89c 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -36,7 +36,7 @@ public class Planets implements ContentList{ }}; starter = new Planet("TODO", sun, 3, 1){{ - generator = new TestPlanetGenerator(); + generator = new TODOPlanetGenerator(); meshLoader = () -> new HexMesh(this, 6); }}; } diff --git a/core/src/mindustry/maps/planet/TestPlanetGenerator.java b/core/src/mindustry/maps/planet/TODOPlanetGenerator.java similarity index 99% rename from core/src/mindustry/maps/planet/TestPlanetGenerator.java rename to core/src/mindustry/maps/planet/TODOPlanetGenerator.java index f8bff4ba0b..7828e51949 100644 --- a/core/src/mindustry/maps/planet/TestPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/TODOPlanetGenerator.java @@ -12,7 +12,7 @@ import mindustry.world.*; import static mindustry.Vars.*; -public class TestPlanetGenerator extends PlanetGenerator{ +public class TODOPlanetGenerator extends PlanetGenerator{ Simplex noise = new Simplex(); RidgedPerlin rid = new RidgedPerlin(1, 2); float scl = 5f; diff --git a/tools/src/mindustry/tools/SectorDataGenerator.java b/tools/src/mindustry/tools/SectorDataGenerator.java index 23e6eb0150..7691e71748 100644 --- a/tools/src/mindustry/tools/SectorDataGenerator.java +++ b/tools/src/mindustry/tools/SectorDataGenerator.java @@ -51,6 +51,7 @@ public class SectorDataGenerator{ ObjectIntMap floors = new ObjectIntMap<>(); ObjectSet content = new ObjectSet<>(); + logic.reset(); world.loadSector(sector); float waterFloors = 0, totalFloors = 0; state.rules.sector = sector; @@ -68,7 +69,7 @@ public class SectorDataGenerator{ if(!tile.block().isStatic()){ totalFloors ++; if(liquid == Liquids.water){ - waterFloors += tile.floor().isDeep() ? 1f : 0.5f; + waterFloors += tile.floor().isDeep() ? 1f : 0.7f; } floors.increment(tile.floor()); if(tile.overlay() != Blocks.air){ @@ -93,8 +94,13 @@ public class SectorDataGenerator{ } } + if(waterFloors / totalFloors >= 0.6f){ + Log.info("Sector {0} has {1}/{2} water -> naval", sector.id, waterFloors, totalFloors); + } + //naval sector guaranteed - if(nearTiles >= 4){ + if(nearTiles > 4){ + Log.info("Sector {0} has {1} water tiles at {2} {3} -> naval", sector.id, nearTiles, cx, cy); waterFloors = totalFloors; }