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

Various tweaks

Browse Source
This commit is contained in:
Anuken
2020-04-12 10:26:18 -04:00
parent f163601262
commit 603d8b16d0
23 changed files with 816 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/input/Binding.java
View File

@@ -11,7 +11,7 @@ public enum Binding implements KeyBind{
move_y(new Axis(KeyCode.S, KeyCode.W)),
mouse_move(KeyCode.MOUSE_BACK),
dash(KeyCode.SHIFT_LEFT),
control(KeyCode.ALT_LEFT),
control(KeyCode.SHIFT_LEFT),
select(KeyCode.MOUSE_LEFT),
deselect(KeyCode.MOUSE_RIGHT),
break_block(KeyCode.MOUSE_RIGHT),

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

@@ -181,6 +181,7 @@ public class DesktopInput extends InputHandler{
}
}
//TODO this is for debugging, remove later
if(Core.input.keyTap(KeyCode.Q) && !player.dead()){
Fx.commandSend.at(player);
Units.nearby(player.team(), player.x(), player.y(), 200f, u -> {

4
core/src/mindustry/input/InputHandler.java
View File

@@ -174,7 +174,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
player.clearUnit();
//make sure it's AI controlled, so players can't overwrite each other
}else if(unit.isAI() && unit.team() == player.team()){
player.unit(unit);
Time.runTask(Fx.unitSpirit.lifetime * 0.87f, () -> {
player.unit(unit);
});
Time.run(Fx.unitSpirit.lifetime, () -> Fx.unitControl.at(unit.x(), unit.y(), 0f, unit));
if(!player.dead()){
Fx.unitSpirit.at(player.x(), player.y(), 0f, unit);