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

Add plated conduits

Browse Source 
Went with “plated” instead of “armored” since the titanium one wasn’t named like the conveyors as well.
This commit is contained in:
Patrick 'Quezler' Mounier
2019-11-05 14:00:50 +01:00
parent 3e43f5577e
commit 521da56e70
17 changed files with 10623 additions and 10508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -59,7 +59,7 @@ public class Blocks implements ContentList{
conveyor, titaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router, overflowGate, massDriver,
//liquids
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
//power
combustionGenerator, thermalGenerator, turbineGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
@@ -1013,6 +1013,12 @@ public class Blocks implements ContentList{
health = 90;
}};
platedConduit = new PlatedConduit("plated-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.thorium, 2, Items.metaglass, 1));
liquidCapacity = 16f;
health = 220;
}};
liquidRouter = new LiquidRouter("liquid-router"){{
requirements(Category.liquid, ItemStack.with(Items.graphite, 4, Items.metaglass, 2));
liquidCapacity = 20f;

4
core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
View File

@@ -21,6 +21,8 @@ public class Conduit extends LiquidBlock implements Autotiler{
protected TextureRegion[] topRegions = new TextureRegion[7];
protected TextureRegion[] botRegions = new TextureRegion[7];
protected boolean leaks = true;
public Conduit(String name){
super(name);
rotate = true;
@@ -109,7 +111,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
entity.smoothLiquid = Mathf.lerpDelta(entity.smoothLiquid, entity.liquids.total() / liquidCapacity, 0.05f);
if(tile.entity.liquids.total() > 0.001f && tile.entity.timer.get(timerFlow, 1)){
tryMoveLiquid(tile, tile.getNearby(tile.rotation()), true, tile.entity.liquids.current());
tryMoveLiquid(tile, tile.getNearby(tile.rotation()), leaks, tile.entity.liquids.current());
entity.noSleep();
}else{
entity.sleep();

9
core/src/io/anuke/mindustry/world/blocks/distribution/PlatedConduit.java Normal file
View File

@@ -0,0 +1,9 @@
package io.anuke.mindustry.world.blocks.distribution;
public class PlatedConduit extends Conduit{
public PlatedConduit(String name) {
super(name);
leaks = false;
}
}