From 5d3f48d0ebbbe2ce4457dda9ac0e2940f0a718ab Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 31 Jul 2020 21:07:28 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/type/Sector.java | 2 +- core/src/mindustry/ui/dialogs/PlanetDialog.java | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 1a457f8512..bf20d55b3f 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -89,7 +89,7 @@ public class Sector{ * Only sectors adjacent to non-wave sectors can be landed on. * TODO also preset sectors*/ public boolean unlocked(){ - return hasBase(); + return hasBase() || (preset != null && preset.alwaysUnlocked); } /** @return whether the player has a base here. */ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index a7b9028455..b86a8ddd41 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -365,15 +365,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ }).row(); } - //display how many turns this sector has been attacked - //TODO implement properly - /* - if(sector.getTurnsPassed() > 0 && sector.hasBase()){ - stable.row(); - - stable.add("[scarlet]" + Iconc.warning + " " + sector.getTurnsPassed() + "x attacks"); - }*/ - stable.row(); if((sector.hasBase() && mode == look) || canLaunch(sector) || (sector.preset != null && sector.preset.alwaysUnlocked)){