Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
This commit is contained in:
Anuken
2021-10-14 21:00:14 -04:00
parent ef399d349c b855849e4a
commit 56d291c963
7 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2302,14 +2302,15 @@ public class Blocks implements ContentList{
}};
constructor = new Constructor("constructor"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.silicon, 50, Items.thorium, 70, Items.graphite, 50));
hasPower = true;
consumes.power(2f);
size = 3;
}};
//yes this block is pretty much useless
largeConstructor = new Constructor("large-constructor"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.silicon, 100, Items.thorium, 150, Items.graphite, 50, Items.phaseFabric, 40));
hasPower = true;
consumes.power(2f);
maxBlockSize = 4;
@@ -2318,20 +2319,20 @@ public class Blocks implements ContentList{
}};
payloadLoader = new PayloadLoader("payload-loader"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.copper, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
payloadUnloader = new PayloadUnloader("payload-unloader"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.copper, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
//TODO deprecated
//deprecated, will be removed.
blockForge = constructor;
blockLoader = payloadLoader;
blockUnloader = payloadUnloader;