diff --git a/build.gradle b/build.gradle index f93082e0fa..afaa994b8b 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ allprojects{ ext{ versionNumber = '7' - if(!project.hasProperty("versionModifier")) versionModifier = 'dev' + if(!project.hasProperty("versionModifier")) versionModifier = 'pre-alpha' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94' diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2e30852194..7386f73454 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1018,17 +1018,17 @@ public class Blocks implements ContentList{ //special transport blocks duct = new Duct("duct"){{ - requirements(Category.distribution, with(Items.graphite, 5, Items.metaglass, 2)); + requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 5, Items.metaglass, 2)); speed = 4f; }}; ductRouter = new DuctRouter("duct-router"){{ - requirements(Category.distribution, with(Items.graphite, 10, Items.metaglass, 4)); + requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 10, Items.metaglass, 4)); speed = 4f; }}; ductBridge = new DuctBridge("duct-bridge"){{ - requirements(Category.distribution, with(Items.graphite, 20, Items.metaglass, 8)); + requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 20, Items.metaglass, 8)); speed = 4f; }}; diff --git a/core/src/mindustry/world/blocks/campaign/Accelerator.java b/core/src/mindustry/world/blocks/campaign/Accelerator.java index 6ca4ee3f0a..7aeb501bef 100644 --- a/core/src/mindustry/world/blocks/campaign/Accelerator.java +++ b/core/src/mindustry/world/blocks/campaign/Accelerator.java @@ -109,10 +109,15 @@ public class Accelerator extends Block{ if(!state.isCampaign() || !consValid()) return; - ui.planet.showPlanetLaunch(state.rules.sector, sector -> { - //TODO cutscene, etc... - consume(); - }); + //TODO implement + if(true){ + ui.showInfo("@indev.campaign"); + }else{ + ui.planet.showPlanetLaunch(state.rules.sector, sector -> { + //TODO cutscene, etc... + consume(); + }); + } Events.fire(Trigger.acceleratorUse); }