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
2021-02-08 09:42:57 -05:00
parent 560914bebe 10c1305eae
commit 64acd6c1e4
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/mindustry/input/DesktopInput.java
View File

@@ -42,7 +42,7 @@ public class DesktopInput extends InputHandler{
/** Selected build request for movement. */
public @Nullable BuildPlan sreq;
/** Whether player is currently deleting removal requests. */
public boolean deleting = false, shouldShoot = false, panning = false;
public boolean deleting = false, wasBuilding = true, shouldShoot = false, panning = false;
/** Mouse pan speed. */
public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 11f;
@@ -62,18 +62,19 @@ public class DesktopInput extends InputHandler{
group.fill(t -> {
t.bottom();
t.visible(() -> {
t.color.a = Mathf.lerpDelta(t.color.a, player.unit().isBuilding() ? 1f : 0f, 0.15f);
t.color.a = Mathf.lerpDelta(t.color.a, !isBuilding && !Core.settings.getBool("buildautopause") || player.unit().isBuilding() ? 1f : 0f, 0.15f);
return ui.hudfrag.shown && Core.settings.getBool("hints") && selectRequests.isEmpty() && t.color.a > 0.01f;
});
t.touchable(() -> t.color.a < 0.1f ? Touchable.disabled : Touchable.childrenOnly);
t.table(Styles.black6, b -> {
b.defaults().left();
b.label(() -> Core.bundle.format(!isBuilding ? "resumebuilding" : "pausebuilding", Core.keybinds.get(Binding.pause_building).key.toString())).style(Styles.outlineLabel);
b.row();
b.label(() -> Core.bundle.format("cancelbuilding", Core.keybinds.get(Binding.clear_building).key.toString())).style(Styles.outlineLabel);
b.row();
b.label(() -> Core.bundle.format("selectschematic", Core.keybinds.get(Binding.schematic_select).key.toString())).style(Styles.outlineLabel);
b.label(() -> ((!isBuilding || !wasBuilding) && !Core.settings.getBool("buildautopause") && !player.unit().isBuilding() ?
Core.bundle.format("enablebuilding", Core.keybinds.get(Binding.pause_building).key.toString()) :
Core.bundle.format(isBuilding ? "pausebuilding" : "resumebuilding", Core.keybinds.get(Binding.pause_building).key.toString()) +
"\n" + Core.bundle.format("cancelbuilding", Core.keybinds.get(Binding.clear_building).key.toString()) +
"\n" + Core.bundle.format("selectschematic", Core.keybinds.get(Binding.schematic_select).key.toString())
)).style(Styles.outlineLabel);
}).margin(10f);
});
@@ -454,6 +455,7 @@ public class DesktopInput extends InputHandler{
buildWasAutoPaused = false;
if(isBuilding){
wasBuilding = player.unit().isBuilding();
player.shooting = false;
}
}
@@ -561,6 +563,7 @@ public class DesktopInput extends InputHandler{
}
mode = none;
wasBuilding = true;
}
if(Core.input.keyTap(Binding.toggle_block_status)){