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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 JJ|A^@{|_EY-z)$C 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()); }