From 56afe6a10bd38921e3e987f96e8ee372cdfb2fc2 Mon Sep 17 00:00:00 2001 From: asl97 Date: Tue, 26 May 2020 01:03:43 +0800 Subject: [PATCH 1/2] Hide "Boost Effect" when liquidBoostIntensity == 1 (#2108) --- core/src/mindustry/world/blocks/production/Drill.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index 0c01dea4ae..ec5b825d7d 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -158,7 +158,7 @@ public class Drill extends Block{ }); stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond); - if(liquidBoostIntensity > 0){ + if(liquidBoostIntensity != 1){ stats.add(BlockStat.boostEffect, liquidBoostIntensity * liquidBoostIntensity, StatUnit.timesSpeed); } } From 803b5328f547223d9359e36559b1700730d6ac5e Mon Sep 17 00:00:00 2001 From: Summet <55251897+Summet-V@users.noreply.github.com> Date: Mon, 25 May 2020 20:25:31 +0300 Subject: [PATCH 2/2] show restricted build area when using schematic (#2109) --- core/src/mindustry/graphics/OverlayRenderer.java | 2 +- core/src/mindustry/input/InputHandler.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index 9f27bf6b5c..23f5eeaa0f 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -97,7 +97,7 @@ public class OverlayRenderer{ input.drawTop(); - buildFade = Mathf.lerpDelta(buildFade, input.isPlacing() ? 1f : 0f, 0.06f); + buildFade = Mathf.lerpDelta(buildFade, input.isPlacing() || input.isUsingSchematic() ? 1f : 0f, 0.06f); Draw.reset(); Lines.stroke(buildFade * 2f); diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 99e6df7904..02cab77f8d 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -202,6 +202,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ }; } + public boolean isUsingSchematic(){ + return !selectRequests.isEmpty(); + } + public OverlayFragment getFrag(){ return frag; }