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

Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater

Browse Source
This commit is contained in:
Anuken
2020-04-24 15:46:32 -04:00
parent 32a182cd01 cf186e0219
commit 21946cafd1
25 changed files with 8194 additions and 7785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,8 +57,8 @@ public class Blocks implements ContentList{
scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
//transport
conveyor, titaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router, overflowGate,
underflowGate, massDriver, massConveyor,
conveyor, titaniumConveyor, plastaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router,
overflowGate, underflowGate, massDriver, massConveyor,
//liquid
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
@@ -910,6 +910,13 @@ public class Blocks implements ContentList{
displayedSpeed = 10f;
}};
plastaniumConveyor = new CraterConveyor("plastanium-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.silicon, 1, Items.graphite, 1));
health = 75;
speed = 0.04f;
recharge = 4f;
}};
armoredConveyor = new ArmoredConveyor("armored-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1));
health = 180;

4
core/src/mindustry/content/TechTree.java
View File

@@ -52,6 +52,10 @@ public class TechTree implements ContentList{
});
});
node(plastaniumConveyor, () -> {
});
node(armoredConveyor, () -> {
});