From c7bc05f560975cd1d0b520d56b3a6f82968388cd Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 19 Mar 2020 12:45:21 -0400 Subject: [PATCH] Unlock tweaks --- core/assets/planets/TODO.dat | Bin 18317 -> 18323 bytes core/src/mindustry/type/Planet.java | 2 ++ core/src/mindustry/type/Sector.java | 3 ++- .../mindustry/ui/dialogs/PlanetDialog.java | 2 +- .../mindustry/tools/SectorDataGenerator.java | 3 +-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index db308eedc8517d78a3f4123deb96300315a8850b..481f8038b48b01615e372b8ae172358ffcdfb979 100644 GIT binary patch delta 5138 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 } 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()); }