From ea3e16ee165283b5eeed7ef90e130c5af40213ed Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 22 Mar 2020 09:44:38 -0400 Subject: [PATCH] Added water check --- core/assets/planets/TODO.dat | Bin 18323 -> 18611 bytes .../mindustry/ui/dialogs/PlanetDialog.java | 4 +++ .../mindustry/tools/SectorDataGenerator.java | 30 +++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index 481f8038b48b01615e372b8ae172358ffcdfb979..7aa92b9a42db583ded339b365b300cdaca990db2 100644 GIT binary patch literal 18611 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 literal 18323 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 diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index c1d648b534..46c818fc07 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -302,6 +302,10 @@ public class PlanetDialog extends FloatingDialog{ stable.addButton("Launch", () -> { if(selected != null){ + if(selected.hasAttribute(SectorAttribute.naval)){ + ui.showInfo("You need a naval loadout to launch here."); + return; + } control.playSector(selected); hide(); } diff --git a/tools/src/mindustry/tools/SectorDataGenerator.java b/tools/src/mindustry/tools/SectorDataGenerator.java index efaa6254c2..23e6eb0150 100644 --- a/tools/src/mindustry/tools/SectorDataGenerator.java +++ b/tools/src/mindustry/tools/SectorDataGenerator.java @@ -10,10 +10,12 @@ import mindustry.*; import mindustry.content.*; import mindustry.core.*; import mindustry.ctype.*; +import mindustry.game.*; import mindustry.net.Net; import mindustry.type.*; import mindustry.type.Sector.*; import mindustry.world.*; +import mindustry.world.blocks.storage.CoreBlock.*; import static mindustry.Vars.*; @@ -50,7 +52,7 @@ public class SectorDataGenerator{ ObjectSet content = new ObjectSet<>(); world.loadSector(sector); - int waterFloors = 0, totalFloors = 0; + float waterFloors = 0, totalFloors = 0; state.rules.sector = sector; for(Tile tile : world.tiles){ @@ -66,7 +68,7 @@ public class SectorDataGenerator{ if(!tile.block().isStatic()){ totalFloors ++; if(liquid == Liquids.water){ - waterFloors ++; + waterFloors += tile.floor().isDeep() ? 1f : 0.5f; } floors.increment(tile.floor()); if(tile.overlay() != Blocks.air){ @@ -75,6 +77,27 @@ public class SectorDataGenerator{ } } + CoreEntity entity = Team.sharded.core(); + int cx = entity.tileX(), cy = entity.tileY(); + + int nearTiles = 0; + int waterCheckRad = 5; + + //check for water presence + for(int rx = -waterCheckRad; rx <= waterCheckRad; rx++){ + for(int ry = -waterCheckRad; ry <= waterCheckRad; ry++){ + Tile tile = world.tile(cx + rx, cy + ry); + if(tile == null || tile.floor().liquidDrop != null){ + nearTiles ++; + } + } + } + + //naval sector guaranteed + if(nearTiles >= 4){ + waterFloors = totalFloors; + } + //sort counts in descending order Array> entries = floors.entries().toArray(); entries.sort(e -> -e.value); @@ -91,8 +114,7 @@ public class SectorDataGenerator{ data.resources = content.asArray().sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id))).toArray(UnlockableContent.class); //50% water -> naval attribute - //TODO also select sectors with water spawns - if((float)waterFloors / totalFloors >= 0.6f){ + if(waterFloors / totalFloors >= 0.6f){ data.attributes |= (1 << SectorAttribute.naval.ordinal()); }