diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index d04f03af96..ce188c9d11 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -451,6 +451,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ boolean selectable(Planet planet){ //TODO what if any sector is selectable? + //TODO launch criteria - which planets can be launched to? Where should this be defined? Should planets even be selectable? if(mode == planetLaunch) return launchSector != null && planet != launchSector.planet; return planet == state.planet || (planet.alwaysUnlocked && planet.isLandable()) || planet.sectors.contains(Sector::hasBase); } diff --git a/core/src/mindustry/world/blocks/campaign/Accelerator.java b/core/src/mindustry/world/blocks/campaign/Accelerator.java index 7aeb501bef..9d44bf4991 100644 --- a/core/src/mindustry/world/blocks/campaign/Accelerator.java +++ b/core/src/mindustry/world/blocks/campaign/Accelerator.java @@ -109,15 +109,11 @@ public class Accelerator extends Block{ if(!state.isCampaign() || !consValid()) return; - //TODO implement - if(true){ - ui.showInfo("@indev.campaign"); - }else{ - ui.planet.showPlanetLaunch(state.rules.sector, sector -> { - //TODO cutscene, etc... - consume(); - }); - } + ui.planet.showPlanetLaunch(state.rules.sector, sector -> { + //TODO cutscene, etc... + consume(); + }); + Events.fire(Trigger.acceleratorUse); } diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java index afb6a105db..11156138c3 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java @@ -18,7 +18,7 @@ public class PayloadLoader extends PayloadBlock{ public float loadTime = 2f; public int itemsLoaded = 8; public float liquidsLoaded = 40f; - public int maxBlockSize = 2; + public int maxBlockSize = 3; public PayloadLoader(String name){ super(name); @@ -102,11 +102,11 @@ public class PayloadLoader extends PayloadBlock{ Draw.rect(outRegion, x, y, rotdeg()); + //drawn below payload so 3x3 blocks don't look even even weirder + Draw.rect(topRegion, x, y); + Draw.z(Layer.blockOver); drawPayload(); - - Draw.z(Layer.blockOver + 0.1f); - Draw.rect(topRegion, x, y); } @Override