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

Before

Width:  |  Height:  |  Size: 134 B

After

Width:  |  Height:  |  Size: 134 B

View File

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 177 B

View File

Before

Width:  |  Height:  |  Size: 98 B

After

Width:  |  Height:  |  Size: 98 B

View File

Before

Width:  |  Height:  |  Size: 98 B

After

Width:  |  Height:  |  Size: 98 B

View File

Before

Width:  |  Height:  |  Size: 98 B

After

Width:  |  Height:  |  Size: 98 B

View File

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 156 B

View File

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 284 B

View File

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 328 B

View File

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 323 B

View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View File

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 302 B

View File

Before

Width:  |  Height:  |  Size: 105 B

After

Width:  |  Height:  |  Size: 105 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

View File

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 279 B

View File

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 560 B

After

Width:  |  Height:  |  Size: 560 B

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 368 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

View File

@@ -426,3 +426,4 @@
63282=surge-conveyor|block-surge-conveyor-ui 63282=surge-conveyor|block-surge-conveyor-ui
63281=duct-unloader|block-duct-unloader-ui 63281=duct-unloader|block-duct-unloader-ui
63280=surge-router|block-surge-router-ui 63280=surge-router|block-surge-router-ui
63279=reinforced-conduit|block-reinforced-conduit-ui

Binary file not shown.

View File

@@ -80,6 +80,8 @@ public class Blocks implements ContentList{
//liquid //liquid
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit, mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
reinforcedConduit,
//power //power
combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor, combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
turbineCondenser, turbineCondenser,
@@ -1426,6 +1428,16 @@ public class Blocks implements ContentList{
consumes.power(0.30f); 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 //endregion
//region power //region power

View File

@@ -28,6 +28,7 @@ public class Pal{
darkMetal = Color.valueOf("6e7080"), darkMetal = Color.valueOf("6e7080"),
darkerMetal = Color.valueOf("565666"), darkerMetal = Color.valueOf("565666"),
darkestMetal = Color.valueOf("38393f"),
missileYellow = Color.valueOf("ffd2ae"), missileYellow = Color.valueOf("ffd2ae"),
missileYellowBack = Color.valueOf("e58956"), 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 class ConduitBuild extends LiquidBuild implements ChainedBuilding{
public float smoothLiquid; public float smoothLiquid;
public int blendbits, xscl = 1, yscl = 1, blending; public int blendbits, xscl = 1, yscl = 1, blending;
public boolean capped; public boolean capped, backCapped = false;
@Override @Override
public void draw(){ public void draw(){
@@ -122,6 +122,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
Draw.reset(); Draw.reset();
if(capped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg()); 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){ 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]; yscl = bits[2];
blending = bits[4]; blending = bits[4];
Building next = front(); Building next = front(), prev = back();
capped = next == null || next.team != team || !next.block.hasLiquids; capped = next == null || next.team != team || !next.block.hasLiquids;
backCapped = blendbits == 0 && (prev == null || prev.team != team || !prev.block.hasLiquids);
} }
@Override @Override