WIP electrolyzer + liquid fixes

This commit is contained in:
Anuken
2021-11-15 14:31:20 -05:00
parent 7103de8454
commit 9663d1153f
30 changed files with 364 additions and 23 deletions

View File

@@ -60,7 +60,7 @@ public class Blocks implements ContentList{
//crafting
siliconSmelter, siliconCrucible, siliconArcFurnace, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
oxidizer, heatReactor, carbideCrucible,
electrolyzer, oxidizer, heatReactor, carbideCrucible,
cellSynthesisChamber,
//sandbox
@@ -935,6 +935,7 @@ public class Blocks implements ContentList{
craftTime = 30f;
size = 2;
hasPower = hasItems = hasLiquids = true;
rotatePlan = false;
consumes.liquid(Liquids.oil, 0.1f);
consumes.power(0.7f);
@@ -946,10 +947,46 @@ public class Blocks implements ContentList{
consumes.power(0.50f);
}};
//TODO better name
electrolyzer = new GenericCrafter("electrolyzer"){{
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
size = 3;
craftTime = 10f;
rotate = true;
liquidCapacity = 100f;
consumes.liquid(Liquids.water, 1f);
consumes.power(2f);
drawer = new DrawMulti(
new DrawRegion("-bottom"),
new DrawLiquidRegion(Liquids.water),
new DrawBubbles(Color.valueOf("7693e3")){{
sides = 10;
recurrence = 3f;
spread = 6;
radius = 1.5f;
amount = 20;
}},
new DrawRegion(),
new DrawLiquidOutputs(),
new DrawRegion("-top"),
new DrawGlowRegion(){{
alpha = 0.5f;
color = new Color(1f, 0.22f, 0.22f);
}}
);
iconOverride = new String[]{"-bottom", "", "-top"};
outputLiquids = LiquidStack.with(Liquids.ozone, 0.5f, Liquids.hydrogen, 0.5f);
liquidOutputDirections = new int[]{1, 3};
}};
oxidizer = new HeatProducer("oxidizer"){{
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
//TODO bigger?
size = 2;
size = 3;
//TODO multi liquid output
//converts oxygen (?) + beryllium into heat + oxide

View File

@@ -58,17 +58,18 @@ public class Liquids implements ContentList{
}};
//TODO reactivity, etc
ozone = new Liquid("ozone", Color.valueOf("bdd7ff")){{
ozone = new Liquid("ozone", Color.valueOf("f099da")){{
gas = true;
barColor = Color.valueOf("97bdf7");
barColor = Color.valueOf("d699f0");
explosiveness = 1f;
flammability = 1f;
}};
//TODO combustion
hydrogen = new Liquid("hydrogen", Color.valueOf("e8d1ff")){{
hydrogen = new Liquid("hydrogen", Color.valueOf("97a5f7")){{
gas = true;
barColor = Color.valueOf("c599f0");
barColor = Color.valueOf("7d8be0");
flammability = 1f;
}};
//TODO dicyanoacetylene