mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 17:28:14 +07:00
Code Issues Packages Projects Releases Wiki Activity

Preparations for 127 pre-alpha release

Browse Source
This commit is contained in:
Anuken 2021-06-24 17:25:08 -04:00
parent 2d4677aa27
commit 5af6e8c5de
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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'

6
core/src/mindustry/content/Blocks.java
View File

@ -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;
}};

13
core/src/mindustry/world/blocks/campaign/Accelerator.java
View File

@ -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);
}