Add plated conduits
Went with “plated” instead of “armored” since the titanium one wasn’t named like the conveyors as well.
BIN
core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png
Normal file
After Width: | Height: | Size: 4.0 KiB |
BIN
core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png
Normal file
After Width: | Height: | Size: 4.1 KiB |
BIN
core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
BIN
core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png
Normal file
After Width: | Height: | Size: 4.0 KiB |
BIN
core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
BIN
core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png
Normal file
After Width: | Height: | Size: 4.0 KiB |
BIN
core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png
Normal file
After Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 736 B After Width: | Height: | Size: 740 B |
Before Width: | Height: | Size: 718 KiB After Width: | Height: | Size: 935 KiB |
Before Width: | Height: | Size: 278 KiB After Width: | Height: | Size: 304 KiB |
Before Width: | Height: | Size: 260 KiB After Width: | Height: | Size: 1.0 MiB |
Before Width: | Height: | Size: 134 KiB After Width: | Height: | Size: 187 KiB |
Before Width: | Height: | Size: 891 KiB After Width: | Height: | Size: 331 KiB |
@ -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;
|
||||
|
@ -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();
|
||||
|
@ -0,0 +1,9 @@
|
||||
package io.anuke.mindustry.world.blocks.distribution;
|
||||
|
||||
public class PlatedConduit extends Conduit{
|
||||
|
||||
public PlatedConduit(String name) {
|
||||
super(name);
|
||||
leaks = false;
|
||||
}
|
||||
}
|