This commit is contained in:
Anuken
2021-11-20 17:59:24 -05:00
parent f4c54b20f7
commit 4fcd873f65
10 changed files with 15 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 527 B

After

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 508 B

After

Width:  |  Height:  |  Size: 508 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 484 B

After

Width:  |  Height:  |  Size: 484 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 519 B

After

Width:  |  Height:  |  Size: 518 B

View File

@@ -452,3 +452,4 @@
63254=fracture|block-fracture-ui 63254=fracture|block-fracture-ui
63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui 63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui
63252=cyanogen|liquid-cyanogen-ui 63252=cyanogen|liquid-cyanogen-ui
63251=gallium|liquid-gallium-ui

Binary file not shown.

View File

@@ -1043,7 +1043,13 @@ public class Blocks implements ContentList{
slagCentrifuge = new GenericCrafter("slag-centrifuge"){{ slagCentrifuge = new GenericCrafter("slag-centrifuge"){{
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 60, Items.oxide, 40)); requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 60, Items.oxide, 40));
outputLiquids = new LiquidStack[]{}; size = 3;
consumes.item(Items.sand, 1);
liquidCapacity = 80f;
consumes.liquid(Liquids.slag, 40f / 60f);
outputLiquid = new LiquidStack(Liquids.gallium, 1f);
outputItem = new ItemStack(Items.scrap, 1);
}}; }};
//TODO "crucible" is getting old //TODO "crucible" is getting old

View File

@@ -6,6 +6,7 @@ import mindustry.type.*;
public class Liquids implements ContentList{ public class Liquids implements ContentList{
public static Liquid water, slag, oil, cryofluid, neoplasm, public static Liquid water, slag, oil, cryofluid, neoplasm,
gallium,
ozone, hydrogen, cyanogen; ozone, hydrogen, cyanogen;
@Override @Override
@@ -57,6 +58,11 @@ public class Liquids implements ContentList{
colorTo = Color.valueOf("9e172c"); colorTo = Color.valueOf("9e172c");
}}; }};
//TODO I have doubts about this liquid's usefulness
gallium = new Liquid("gallium", Color.valueOf("9a9dbf")){{
}};
//TODO reactivity, etc //TODO reactivity, etc
ozone = new Liquid("ozone", Color.valueOf("f099da")){{ ozone = new Liquid("ozone", Color.valueOf("f099da")){{
gas = true; gas = true;

View File

@@ -71,7 +71,7 @@ public class Liquid extends UnlockableContent{
//ensure no accidental global mutation //ensure no accidental global mutation
color = color.cpy(); color = color.cpy();
//all gases are transparent //all gases are transparent
color.a = 0.5f; color.a = 0.6f;
//for gases, gas color is implicitly their color //for gases, gas color is implicitly their color
gasColor = color; gasColor = color;
} }