Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-05-25 14:36:45 -04:00
parent 1ae9d04f47 803b5328f5
commit 9292f62a20
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/graphics/OverlayRenderer.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class OverlayRenderer{
input.drawTop(); 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(); Draw.reset();
Lines.stroke(buildFade * 2f); Lines.stroke(buildFade * 2f);
core/src/mindustry/input/InputHandler.java
+4
View File
@@ -202,6 +202,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}; };
} }
public boolean isUsingSchematic(){
return !selectRequests.isEmpty();
}
public OverlayFragment getFrag(){ public OverlayFragment getFrag(){
return frag; return frag;
} }
core/src/mindustry/world/blocks/production/Drill.java
+1 -1
View File
@@ -158,7 +158,7 @@ public class Drill extends Block{
}); });
stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond); stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond);
if(liquidBoostIntensity > 0){ if(liquidBoostIntensity != 1){
stats.add(BlockStat.boostEffect, liquidBoostIntensity * liquidBoostIntensity, StatUnit.timesSpeed); stats.add(BlockStat.boostEffect, liquidBoostIntensity * liquidBoostIntensity, StatUnit.timesSpeed);
} }
} }