From a39d156d12e486397fc4d749213cbd4589cc2def Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 20 Nov 2021 10:15:55 -0500 Subject: [PATCH] Optional beam drill liquid input / Fixed graphite color --- .../production/cyanogen-synthesizer-heat.png | Bin 5437 -> 6328 bytes core/src/mindustry/content/Blocks.java | 4 +++ core/src/mindustry/content/Items.java | 2 +- .../world/blocks/production/BeamDrill.java | 34 ++++++++++++++++-- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat.png b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat.png index 4a2f00108a6e742925a23248af891da898e3553d..aa49eeb57da1e424d71f5eabb008d2a4d409dc47 100644 GIT binary patch delta 6311 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 delta 5404 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 + new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60, 2)), () -> Pal.ammo, () -> e.warmup)); + } + @Override public boolean outputsItems(){ return true; @@ -80,6 +91,15 @@ public class BeamDrill extends Block{ Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90); } + @Override + public void setStats(){ + super.setStats(); + + if(optionalBoostIntensity != 1){ + stats.add(Stat.boostEffect, optionalBoostIntensity, StatUnit.timesSpeed); + } + } + @Override public void drawPlace(int x, int y, int rotation, boolean valid){ Item item = null, invalidItem = null; @@ -166,6 +186,7 @@ public class BeamDrill extends Block{ public float time; public float warmup; + public float lastDrillSpeed; @Override public void drawSelect(){ @@ -188,7 +209,7 @@ public class BeamDrill extends Block{ warmup = Mathf.approachDelta(warmup, Mathf.num(consValid()), 1f / 60f); lastItem = null; boolean multiple = false; - int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation); + int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation), facingAmount = 0; //update facing tiles for(int p = 0; p < size; p++){ @@ -201,6 +222,7 @@ public class BeamDrill extends Block{ if(other.solid()){ Item drop = other.wallDrop(); if(drop != null && drop.hardness <= tier){ + facingAmount ++; if(lastItem != drop && lastItem != null){ multiple = true; } @@ -220,7 +242,15 @@ public class BeamDrill extends Block{ lastItem = null; } - time += edelta(); + float multiplier = 1f; + + if(cons.optionalValid()){ + multiplier *= optionalBoostIntensity; + } + + lastDrillSpeed = (facingAmount * multiplier * timeScale) / drillTime; + + time += edelta() * multiplier; if(time >= drillTime){ for(Tile tile : facing){