From 97d54868e9e8fb077a77caab40b93f66d7bef9dc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 11 Dec 2018 17:48:55 -0500
Subject: [PATCH] Grid mode tweak

---
 core/assets/bundles/bundle.properties                      | 4 +++-
 core/src/io/anuke/mindustry/input/DefaultKeybinds.java     | 2 +-
 .../io/anuke/mindustry/ui/fragments/PlacementFragment.java | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ab0e7e3510..cc0c45f925 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -384,6 +384,8 @@ category.multiplayer.name = Multiplayer
 command.attack = Attack
 command.retreat = Retreat
 command.patrol = Patrol
+keybind.gridMode.name = Block Select
+keybind.gridModeShift.name = Category Select
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
 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_next.name = Chat history next
 keybind.chat_scroll.name = Chat scroll
-keybind.drop_unit.name = drop unit
+keybind.drop_unit.name = Drop Unit
 keybind.zoom_minimap.name = Zoom minimap
 mode.text.help.title = Description of modes
 mode.waves.name = Waves
diff --git a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java
index 69d993676e..19639b7466 100644
--- a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java
+++ b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java
@@ -25,7 +25,7 @@ public class DefaultKeybinds{
                 "rotate", new Axis(Input.SCROLL),
                 "dash", Input.SHIFT_LEFT,
                 "drop_unit", Input.SHIFT_LEFT,
-                "gridMode", Input.ALT_LEFT,
+                "gridMode", Input.CONTROL_LEFT,
                 "gridModeShift", Input.SHIFT_LEFT,
                 new Category("view"),
                 "zoom_hold", Input.CONTROL_LEFT,
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
index ad37a2df83..7cf712c8f1 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
@@ -41,6 +41,7 @@ public class PlacementFragment extends Fragment{
     boolean shown = true;
     boolean lastGround;
 
+    //TODO make this configurable
     final Input[] inputGrid = {
         Input.NUM_1, Input.NUM_2, Input.NUM_3, Input.NUM_4,
         Input.Q, Input.W, Input.E, Input.R,
@@ -64,7 +65,7 @@ public class PlacementFragment extends Fragment{
 
     boolean gridUpdate(InputHandler input){
         if(!Inputs.keyDown("gridMode")) return false;
-        if(Inputs.keyDown("gridModeShift")){ // Select Category
+        if(Inputs.keyDown("gridModeShift")){ //select category
             int i = 0;
             for(Input key : inputCatGrid){
                 if(Inputs.keyDown(key)){
@@ -74,7 +75,7 @@ public class PlacementFragment extends Fragment{
                 i++;
             }
             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);
 
             if(tile != null){
@@ -86,7 +87,7 @@ public class PlacementFragment extends Fragment{
                     return true;
                 }
             }
-        }else{    // Select block
+        }else{ //select block
             int i = 0;
             Array<Recipe> recipes = Recipe.getByCategory(currentCategory);
             for(Input key : inputGrid){