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-09-12 12:47:29 -04:00
parent fa9611e28c b5b75656d1
commit 5ce8e6339d
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/contributors
+1
View File
@@ -89,3 +89,4 @@ Daniel Dusek
DeltaNedas DeltaNedas
GioIacca9 GioIacca9
SnakkiZXZ SnakkiZXZ
sk7725
core/src/mindustry/graphics/OverlayRenderer.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class OverlayRenderer{
build.drawDisabled(); build.drawDisabled();
} }
if(Core.input.keyDown(Binding.rotateplaced) && build.block.rotate && build.interactable(player.team())){ if(Core.input.keyDown(Binding.rotateplaced) && build.block.rotate && build.block.quickRotate && build.interactable(player.team())){
control.input.drawArrow(build.block, build.tileX(), build.tileY(), build.rotation, true); control.input.drawArrow(build.block, build.tileX(), build.tileY(), build.rotation, true);
Draw.color(Pal.accent, 0.3f + Mathf.absin(4f, 0.2f)); Draw.color(Pal.accent, 0.3f + Mathf.absin(4f, 0.2f));
Fill.square(build.x, build.y, build.block.size * tilesize/2f); Fill.square(build.x, build.y, build.block.size * tilesize/2f);
core/src/mindustry/input/DesktopInput.java
+1 -1
View File
@@ -306,7 +306,7 @@ public class DesktopInput extends InputHandler{
cursorType = ui.unloadCursor; cursorType = ui.unloadCursor;
} }
if(cursor.build != null && cursor.interactable(player.team()) && !isPlacing() && Math.abs(Core.input.axisTap(Binding.rotate)) > 0 && Core.input.keyDown(Binding.rotateplaced) && cursor.block().rotate){ if(cursor.build != null && cursor.interactable(player.team()) && !isPlacing() && Math.abs(Core.input.axisTap(Binding.rotate)) > 0 && Core.input.keyDown(Binding.rotateplaced) && cursor.block().rotate && cursor.block().quickRotate){
Call.rotateBlock(player, cursor.build, Core.input.axisTap(Binding.rotate) > 0); Call.rotateBlock(player, cursor.build, Core.input.axisTap(Binding.rotate) > 0);
} }
} }
core/src/mindustry/world/Block.java
+2
View File
@@ -195,6 +195,8 @@ public class Block extends UnlockableContent{
public float buildCostMultiplier = 1f; public float buildCostMultiplier = 1f;
/** Whether this block has instant transfer.*/ /** Whether this block has instant transfer.*/
public boolean instantTransfer = false; public boolean instantTransfer = false;
/** Whether you can rotate this block with Keybind rotateplaced + Scroll Wheel. */
public boolean quickRotate = true;
public Prov<Building> buildType = null; //initialized later public Prov<Building> buildType = null; //initialized later
public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>(); public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();