Electrolyzer finalization
This commit is contained in:
@@ -955,9 +955,9 @@ public class Blocks implements ContentList{
|
||||
craftTime = 10f;
|
||||
rotate = true;
|
||||
|
||||
liquidCapacity = 100f;
|
||||
liquidCapacity = 50f;
|
||||
|
||||
consumes.liquid(Liquids.water, 1f);
|
||||
consumes.liquid(Liquids.water, 5f / 60f);
|
||||
consumes.power(2f);
|
||||
|
||||
drawer = new DrawMulti(
|
||||
@@ -974,13 +974,15 @@ public class Blocks implements ContentList{
|
||||
new DrawLiquidOutputs(),
|
||||
new DrawRegion("-top"),
|
||||
new DrawGlowRegion(){{
|
||||
alpha = 0.5f;
|
||||
color = new Color(1f, 0.22f, 0.22f);
|
||||
alpha = 0.7f;
|
||||
color = Color.valueOf("c4bdf3");
|
||||
glowIntensity = 0.3f;
|
||||
glowScale = 6f;
|
||||
}}
|
||||
);
|
||||
iconOverride = new String[]{"-bottom", "", "-top"};
|
||||
|
||||
outputLiquids = LiquidStack.with(Liquids.ozone, 0.5f, Liquids.hydrogen, 0.5f);
|
||||
outputLiquids = LiquidStack.with(Liquids.ozone, 2f * craftTime / 60, Liquids.hydrogen, 3f * craftTime / 60);
|
||||
liquidOutputDirections = new int[]{1, 3};
|
||||
}};
|
||||
|
||||
@@ -988,7 +990,6 @@ public class Blocks implements ContentList{
|
||||
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
|
||||
size = 3;
|
||||
|
||||
//TODO multi liquid output
|
||||
//converts oxygen (?) + beryllium into heat + oxide
|
||||
}};
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ public class MultiPacker implements Disposable{
|
||||
//ui page (sprites5.png) - content icons, white icons, fonts and UI elements
|
||||
public enum PageType{
|
||||
main(4096),
|
||||
environment,
|
||||
environment(4096, 2048),
|
||||
editor(4096, 2048),
|
||||
rubble,
|
||||
ui(4096);
|
||||
|
||||
@@ -15,7 +15,7 @@ import mindustry.world.blocks.production.GenericCrafter.*;
|
||||
public class DrawGlowRegion extends DrawBlock{
|
||||
public Blending blending = Blending.additive;
|
||||
public String suffix = "-glow";
|
||||
public float alpha = 0.9f, glowScale = 3f;
|
||||
public float alpha = 0.9f, glowScale = 10f, glowIntensity = 0.5f;
|
||||
public float layer = Layer.blockAdditive;
|
||||
public Color color = Color.red.cpy();
|
||||
public TextureRegion top;
|
||||
@@ -28,7 +28,7 @@ public class DrawGlowRegion extends DrawBlock{
|
||||
Draw.z(layer);
|
||||
Draw.blend(blending);
|
||||
Draw.color(color);
|
||||
Draw.alpha(Mathf.absin(build.totalProgress, glowScale, alpha) * build.warmup);
|
||||
Draw.alpha((Mathf.absin(build.totalProgress, glowScale, alpha) * glowIntensity + 1f - glowIntensity) * build.warmup * alpha);
|
||||
Draw.rect(top, build.x, build.y);
|
||||
Draw.reset();
|
||||
Draw.blend();
|
||||
|
||||
Reference in New Issue
Block a user