From 53a6297b591cc8c2f5678f79b0f6694043d9b36a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 22 Mar 2020 11:30:15 -0400 Subject: [PATCH] Better naval check --- core/assets/planets/TODO.dat | Bin 18611 -> 18605 bytes core/src/mindustry/content/Planets.java | 2 +- ...enerator.java => TODOPlanetGenerator.java} | 2 +- .../mindustry/tools/SectorDataGenerator.java | 10 ++++++++-- 4 files changed, 10 insertions(+), 4 deletions(-) rename core/src/mindustry/maps/planet/{TestPlanetGenerator.java => TODOPlanetGenerator.java} (99%) diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index 7aa92b9a42db583ded339b365b300cdaca990db2..d2aaaa70b4a2e99693dadcd86881a5a017809fcd 100644 GIT binary patch delta 5796 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 BsO$g$ delta 5909 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 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; }