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 maps_phase_2

Browse Source
This commit is contained in:
Epowerj
2022-08-08 17:45:06 -04:00
parent f4798f5adc bae64cb98a
commit 901d0106c0
22 changed files with 158 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2123,17 +2123,20 @@ public class Blocks{
requirements(Category.liquid, with(Items.titanium, 10, Items.metaglass, 15));
liquidCapacity = 700f;
size = 2;
solid = true;
}};
liquidTank = new LiquidRouter("liquid-tank"){{
requirements(Category.liquid, with(Items.titanium, 30, Items.metaglass, 40));
size = 3;
solid = true;
liquidCapacity = 1800f;
health = 500;
}};
liquidJunction = new LiquidJunction("liquid-junction"){{
requirements(Category.liquid, with(Items.graphite, 4, Items.metaglass, 8));
solid = false;
}};
bridgeConduit = new LiquidBridge("bridge-conduit"){{
@@ -2157,10 +2160,8 @@ public class Blocks{
//reinforced stuff
//TODO different name
reinforcedPump = new Pump("reinforced-pump"){{
requirements(Category.liquid, with(Items.beryllium, 40, Items.tungsten, 30, Items.silicon, 20));
//TODO CUSTOM DRAW ANIMATION - pistons - repurpose DrawBlock?
consumeLiquid(Liquids.hydrogen, 1.5f / 60f);
pumpAmount = 80f / 60f / 4f;
@@ -5652,7 +5653,7 @@ public class Blocks{
}};
interplanetaryAccelerator = new Accelerator("interplanetary-accelerator"){{
requirements(Category.effect, BuildVisibility.hidden, with(Items.copper, 16000, Items.silicon, 11000, Items.thorium, 13000, Items.titanium, 12000, Items.surgeAlloy, 6000, Items.phaseFabric, 5000));
requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 16000, Items.silicon, 11000, Items.thorium, 13000, Items.titanium, 12000, Items.surgeAlloy, 6000, Items.phaseFabric, 5000));
researchCostMultiplier = 0.1f;
size = 7;
hasPower = true;