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

Grid mode tweak

Browse Source
This commit is contained in:
Anuken
2018-12-11 17:48:55 -05:00
parent 65e65ba308
commit 97d54868e9
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/bundles/bundle.properties
View File

@@ -384,6 +384,8 @@ category.multiplayer.name = Multiplayer
command.attack = Attack command.attack = Attack
command.retreat = Retreat command.retreat = Retreat
command.patrol = Patrol command.patrol = Patrol
keybind.gridMode.name = Block Select
keybind.gridModeShift.name = Category Select
keybind.press = Press a key... keybind.press = Press a key...
keybind.press.axis = Press an axis or key... keybind.press.axis = Press an axis or key...
keybind.screenshot.name = Map Screenshot keybind.screenshot.name = Map Screenshot
@@ -406,7 +408,7 @@ keybind.toggle_menus.name = Toggle menus
keybind.chat_history_prev.name = Chat history prev keybind.chat_history_prev.name = Chat history prev
keybind.chat_history_next.name = Chat history next keybind.chat_history_next.name = Chat history next
keybind.chat_scroll.name = Chat scroll keybind.chat_scroll.name = Chat scroll
keybind.drop_unit.name = drop unit keybind.drop_unit.name = Drop Unit
keybind.zoom_minimap.name = Zoom minimap keybind.zoom_minimap.name = Zoom minimap
mode.text.help.title = Description of modes mode.text.help.title = Description of modes
mode.waves.name = Waves mode.waves.name = Waves

2
core/src/io/anuke/mindustry/input/DefaultKeybinds.java
View File

@@ -25,7 +25,7 @@ public class DefaultKeybinds{
"rotate", new Axis(Input.SCROLL), "rotate", new Axis(Input.SCROLL),
"dash", Input.SHIFT_LEFT, "dash", Input.SHIFT_LEFT,
"drop_unit", Input.SHIFT_LEFT, "drop_unit", Input.SHIFT_LEFT,
"gridMode", Input.ALT_LEFT, "gridMode", Input.CONTROL_LEFT,
"gridModeShift", Input.SHIFT_LEFT, "gridModeShift", Input.SHIFT_LEFT,
new Category("view"), new Category("view"),
"zoom_hold", Input.CONTROL_LEFT, "zoom_hold", Input.CONTROL_LEFT,

7
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -41,6 +41,7 @@ public class PlacementFragment extends Fragment{
boolean shown = true; boolean shown = true;
boolean lastGround; boolean lastGround;
//TODO make this configurable
final Input[] inputGrid = { final Input[] inputGrid = {
Input.NUM_1, Input.NUM_2, Input.NUM_3, Input.NUM_4, Input.NUM_1, Input.NUM_2, Input.NUM_3, Input.NUM_4,
Input.Q, Input.W, Input.E, Input.R, Input.Q, Input.W, Input.E, Input.R,
@@ -64,7 +65,7 @@ public class PlacementFragment extends Fragment{
boolean gridUpdate(InputHandler input){ boolean gridUpdate(InputHandler input){
if(!Inputs.keyDown("gridMode")) return false; if(!Inputs.keyDown("gridMode")) return false;
if(Inputs.keyDown("gridModeShift")){ // Select Category if(Inputs.keyDown("gridModeShift")){ //select category
int i = 0; int i = 0;
for(Input key : inputCatGrid){ for(Input key : inputCatGrid){
if(Inputs.keyDown(key)){ if(Inputs.keyDown(key)){
@@ -74,7 +75,7 @@ public class PlacementFragment extends Fragment{
i++; i++;
} }
return true; return true;
}else if(Inputs.keyDown("select")){ // Mouse eyedropper select }else if(Inputs.keyDown("select")){ //mouse eyedropper select
Tile tile = world.tileWorld(Graphics.mouseWorld().x, Graphics.mouseWorld().y); Tile tile = world.tileWorld(Graphics.mouseWorld().x, Graphics.mouseWorld().y);
if(tile != null){ if(tile != null){
@@ -86,7 +87,7 @@ public class PlacementFragment extends Fragment{
return true; return true;
} }
} }
}else{ // Select block }else{ //select block
int i = 0; int i = 0;
Array<Recipe> recipes = Recipe.getByCategory(currentCategory); Array<Recipe> recipes = Recipe.getByCategory(currentCategory);
for(Input key : inputGrid){ for(Input key : inputGrid){