diff --git a/core/assets-raw/sprites/items/liquid-cryofluid.png b/core/assets-raw/sprites/items/liquid-cryofluid.png index b438a5ed37..dca841ea69 100644 Binary files a/core/assets-raw/sprites/items/liquid-cryofluid.png and b/core/assets-raw/sprites/items/liquid-cryofluid.png differ diff --git a/core/assets-raw/sprites/items/liquid-gallium.png b/core/assets-raw/sprites/items/liquid-gallium.png new file mode 100644 index 0000000000..ad5cf133fd Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-gallium.png differ diff --git a/core/assets-raw/sprites/items/liquid-oil.png b/core/assets-raw/sprites/items/liquid-oil.png index 51c7a8db47..402be18572 100644 Binary files a/core/assets-raw/sprites/items/liquid-oil.png and b/core/assets-raw/sprites/items/liquid-oil.png differ diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png index 2d51d55a8c..21b9d3ea7e 100644 Binary files a/core/assets-raw/sprites/items/liquid-slag.png and b/core/assets-raw/sprites/items/liquid-slag.png differ diff --git a/core/assets-raw/sprites/items/liquid-water.png b/core/assets-raw/sprites/items/liquid-water.png index 602eee79a9..b675b3cfb8 100644 Binary files a/core/assets-raw/sprites/items/liquid-water.png and b/core/assets-raw/sprites/items/liquid-water.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 25cd1d360b..f61cb723ac 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -452,3 +452,4 @@ 63254=fracture|block-fracture-ui 63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui 63252=cyanogen|liquid-cyanogen-ui +63251=gallium|liquid-gallium-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index d287989c25..4c325f53df 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e376e03976..0433c675b6 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1043,7 +1043,13 @@ public class Blocks implements ContentList{ slagCentrifuge = new GenericCrafter("slag-centrifuge"){{ 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 diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index 91c869483e..d95e4aceb5 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -6,6 +6,7 @@ import mindustry.type.*; public class Liquids implements ContentList{ public static Liquid water, slag, oil, cryofluid, neoplasm, + gallium, ozone, hydrogen, cyanogen; @Override @@ -57,6 +58,11 @@ public class Liquids implements ContentList{ colorTo = Color.valueOf("9e172c"); }}; + //TODO I have doubts about this liquid's usefulness + gallium = new Liquid("gallium", Color.valueOf("9a9dbf")){{ + + }}; + //TODO reactivity, etc ozone = new Liquid("ozone", Color.valueOf("f099da")){{ gas = true; diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index ce5972c36e..2bc0ed2455 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -71,7 +71,7 @@ public class Liquid extends UnlockableContent{ //ensure no accidental global mutation color = color.cpy(); //all gases are transparent - color.a = 0.5f; + color.a = 0.6f; //for gases, gas color is implicitly their color gasColor = color; }