Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-05-25 14:36:45 -04:00
3 changed files with 6 additions and 2 deletions

View File

@@ -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);

View File

@@ -202,6 +202,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
};
}
public boolean isUsingSchematic(){
return !selectRequests.isEmpty();
}
public OverlayFragment getFrag(){
return frag;
}

View File

@@ -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);
}
}