From f9024e55009e9d798e82a0cbdb0f4f59f4c33885 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 5 Dec 2020 21:14:10 -0500 Subject: [PATCH] Consider sectors with bases unlocked --- core/src/mindustry/ui/dialogs/PlanetDialog.java | 5 +++-- fastlane/metadata/android/en-US/changelogs/29766.txt | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29766.txt diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 6df80b6311..3d323a9bc0 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -254,6 +254,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ boolean canSelect(Sector sector){ if(mode == select) return sector.hasBase(); + if(sector.hasBase()) return true; //preset sectors can only be selected once unlocked if(sector.preset != null){ TechNode node = sector.preset.node(); @@ -702,7 +703,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ stable.image().color(Pal.accent).fillX().height(3f).pad(3f).row(); - boolean locked = sector.preset != null && sector.preset.locked() && sector.preset.node() != null; + boolean locked = sector.preset != null && sector.preset.locked() && !sector.hasBase() && sector.preset.node() != null; if(locked){ stable.table(r -> { @@ -769,7 +770,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ return; } - if(sector.preset != null && sector.preset.locked()){ + if(sector.preset != null && sector.preset.locked() && !sector.hasBase()){ return; } diff --git a/fastlane/metadata/android/en-US/changelogs/29766.txt b/fastlane/metadata/android/en-US/changelogs/29766.txt new file mode 100644 index 0000000000..bccc1e789c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29766.txt @@ -0,0 +1,9 @@ +[This is a truncated changelog, see Github for full notes] +- Fixed certain sectors having infinite waves in very specific situations +- Fixed various crashes +- Fixed community servers not displaying on Linux +- Fixed some logic UI bugs +- Fixed Distort filter not working in map post-generation +- Fixed clients in multiplayer not getting item unlocks +- Fixed enemy AI blocking ground unit paths in some circumstances +- Made night in campaign slightly less dark