WIP reinforced conduits

This commit is contained in:
Anuken
2021-11-07 12:56:58 -05:00
parent 09a934385e
commit 07d9feeb09
34 changed files with 18 additions and 2 deletions

View File

@@ -80,6 +80,8 @@ public class Blocks implements ContentList{
//liquid
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
reinforcedConduit,
//power
combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
turbineCondenser,
@@ -1426,6 +1428,16 @@ public class Blocks implements ContentList{
consumes.power(0.30f);
}};
reinforcedConduit = new ArmoredConduit("reinforced-conduit"){{
requirements(Category.liquid, with(Items.beryllium, 2, Items.graphite, 1));
botColor = Pal.darkestMetal;
leaks = true;
liquidCapacity = 20f;
liquidPressure = 1.1f;
health = 250;
}};
//endregion
//region power

View File

@@ -28,6 +28,7 @@ public class Pal{
darkMetal = Color.valueOf("6e7080"),
darkerMetal = Color.valueOf("565666"),
darkestMetal = Color.valueOf("38393f"),
missileYellow = Color.valueOf("ffd2ae"),
missileYellowBack = Color.valueOf("e58956"),

View File

@@ -98,7 +98,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
public class ConduitBuild extends LiquidBuild implements ChainedBuilding{
public float smoothLiquid;
public int blendbits, xscl = 1, yscl = 1, blending;
public boolean capped;
public boolean capped, backCapped = false;
@Override
public void draw(){
@@ -122,6 +122,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
Draw.reset();
if(capped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg());
if(backCapped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg() + 180);
}
protected void drawAt(float x, float y, int bits, float rotation, SliceMode slice){
@@ -143,8 +144,9 @@ public class Conduit extends LiquidBlock implements Autotiler{
yscl = bits[2];
blending = bits[4];
Building next = front();
Building next = front(), prev = back();
capped = next == null || next.team != team || !next.block.hasLiquids;
backCapped = blendbits == 0 && (prev == null || prev.team != team || !prev.block.hasLiquids);
}
@Override