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

New power system implemented

Browse Source
This commit is contained in:
Anuken
2018-03-23 22:39:42 -04:00
parent 7d2fd514be
commit 7b3d60215b
18 changed files with 128 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -96,7 +96,7 @@ public class DesktopInput extends InputHandler{
}
Tile cursor = world.tile(tilex(), tiley());
Tile target = cursor == null ? null : cursor.isLinked() ? cursor.getLinked() : cursor;
Tile target = cursor == null ? null : cursor.target();
boolean showCursor = false;
if(recipe == null && target != null && !ui.hasMouse() && Inputs.keyDown("block_info")
@@ -111,10 +111,11 @@ public class DesktopInput extends InputHandler{
if(target != null && Inputs.keyTap("select") && !ui.hasMouse()){
if(target.block().isConfigurable(target)){
if((!ui.configfrag.isShown()
|| ui.configfrag.getSelectedTile().block().onConfigureTileTapped(ui.configfrag.getSelectedTile(), target)))
|| ui.configfrag.getSelectedTile().block().onConfigureTileTapped(ui.configfrag.getSelectedTile(), cursor)))
ui.configfrag.showConfig(target);
}else if(!ui.configfrag.hasConfigMouse()){
ui.configfrag.hideConfig();
if(ui.configfrag.isShown() && ui.configfrag.getSelectedTile().block().onConfigureTileTapped(ui.configfrag.getSelectedTile(), cursor))
ui.configfrag.hideConfig();
}
target.block().tapped(target);