From 6c7dbdc91e2a7d2edae0a292d20ecb8fcfd0a529 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 25 Nov 2021 13:08:10 -0500 Subject: [PATCH] Generative outlines for mod parts --- core/src/mindustry/world/Block.java | 14 ++++++++++++++ .../mindustry/world/consumers/ConsumeLiquids.java | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 7547a17abf..2a6ca43c0f 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -1049,6 +1049,20 @@ public class Block extends UnlockableContent{ packer.add(PageType.main, name, out); } + var toOutline = new Seq(); + getRegionsToOutline(toOutline); + + for(var region : toOutline){ + if(region instanceof AtlasRegion atlas){ + String regionName = atlas.name; + Pixmap outlined = Pixmaps.outline(Core.atlas.getPixmap(region), outlineColor, outlineRadius); + + if(Core.settings.getBool("linear", true)) Pixmaps.bleed(outlined); + + packer.add(PageType.main, regionName + "-outline", outlined); + } + } + var editorBase = Core.atlas.getPixmap(fullIcon); if(gen.length > 1){ diff --git a/core/src/mindustry/world/consumers/ConsumeLiquids.java b/core/src/mindustry/world/consumers/ConsumeLiquids.java index 74448ef64e..d3b24d3997 100644 --- a/core/src/mindustry/world/consumers/ConsumeLiquids.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquids.java @@ -64,7 +64,6 @@ public class ConsumeLiquids extends Consume{ @Override public void display(Stats stats){ - //TODO display is wrong stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(1f, true, liquids)); }