From 001ee6841405cac91f02510bb36870c48f88394b Mon Sep 17 00:00:00 2001
From: olanti-p <olanti-p@yandex.ru>
Date: Thu, 7 May 2020 17:40:29 +0300
Subject: [PATCH 1/3] Add missing category to target UI keybindings

---
 data/raw/keybindings.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
index 1bee620be70d1..cdd61be40f429 100644
--- a/data/raw/keybindings.json
+++ b/data/raw/keybindings.json
@@ -870,6 +870,7 @@
   {
     "type": "keybinding",
     "id": "FIRE",
+    "category": "TARGET",
     "name": "Fire Weapon",
     "bindings": [
       { "input_method": "keyboard", "key": "f" },
@@ -881,6 +882,7 @@
   {
     "type": "keybinding",
     "id": "PREV_TARGET",
+    "category": "TARGET",
     "name": "Prev Target",
     "bindings": [
       { "input_method": "keyboard", "key": "BACKTAB" },
@@ -891,6 +893,7 @@
   {
     "type": "keybinding",
     "id": "NEXT_TARGET",
+    "category": "TARGET",
     "name": "Next Target",
     "bindings": [
       { "input_method": "keyboard", "key": "TAB" },
@@ -901,48 +904,56 @@
   {
     "type": "keybinding",
     "id": "AIM",
+    "category": "TARGET",
     "name": "Aim",
     "bindings": [ { "input_method": "keyboard", "key": "." }, { "input_method": "keyboard", "key": "5" } ]
   },
   {
     "type": "keybinding",
     "id": "AIMED_SHOT",
+    "category": "TARGET",
     "name": "Aimed Shot",
     "bindings": [ { "input_method": "keyboard", "key": "a" } ]
   },
   {
     "type": "keybinding",
     "id": "CAREFUL_SHOT",
+    "category": "TARGET",
     "name": "Careful Shot",
     "bindings": [ { "input_method": "keyboard", "key": "c" } ]
   },
   {
     "type": "keybinding",
     "id": "PRECISE_SHOT",
+    "category": "TARGET",
     "name": "Precise Shot",
     "bindings": [ { "input_method": "keyboard", "key": "p" } ]
   },
   {
     "type": "keybinding",
     "id": "SWITCH_AIM",
+    "category": "TARGET",
     "name": "Switch Aiming Mode",
     "bindings": [ { "input_method": "keyboard", "key": "m" } ]
   },
   {
     "type": "keybinding",
     "id": "SWITCH_AMMO",
+    "category": "TARGET",
     "name": "Switch ammo",
     "bindings": [ { "input_method": "keyboard", "key": "o" } ]
   },
   {
     "type": "keybinding",
     "id": "SWITCH_MODE",
+    "category": "TARGET",
     "name": "Switch Firing Mode",
     "bindings": [ { "input_method": "keyboard", "key": "s" } ]
   },
   {
     "type": "keybinding",
     "id": "TOGGLE_TURRET_LINES",
+    "category": "TARGET",
     "name": "Toggle turret lines",
     "bindings": [ { "input_method": "keyboard", "key": "t" } ]
   },
@@ -997,6 +1008,7 @@
   {
     "type": "keybinding",
     "id": "TOGGLE_SNAP_TO_TARGET",
+    "category": "TARGET",
     "name": "Toggle Snap to Target",
     "bindings": [ { "input_method": "keyboard", "key": "*" } ]
   },

From bb0e9a059fed4b4f4b6deff9da6f323e7b8c3729 Mon Sep 17 00:00:00 2001
From: olanti-p <olanti-p@yandex.ru>
Date: Thu, 7 May 2020 17:41:22 +0300
Subject: [PATCH 2/3] Move them to single spot

---
 data/raw/keybindings.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
index cdd61be40f429..7e558d422477b 100644
--- a/data/raw/keybindings.json
+++ b/data/raw/keybindings.json
@@ -957,6 +957,13 @@
     "name": "Toggle turret lines",
     "bindings": [ { "input_method": "keyboard", "key": "t" } ]
   },
+  {
+    "type": "keybinding",
+    "id": "TOGGLE_SNAP_TO_TARGET",
+    "category": "TARGET",
+    "name": "Toggle Snap to Target",
+    "bindings": [ { "input_method": "keyboard", "key": "*" } ]
+  },
   {
     "type": "keybinding",
     "id": "SELECT",
@@ -1005,13 +1012,6 @@
     "name": "Travel to destination",
     "bindings": [ { "input_method": "keyboard", "key": "T" } ]
   },
-  {
-    "type": "keybinding",
-    "id": "TOGGLE_SNAP_TO_TARGET",
-    "category": "TARGET",
-    "name": "Toggle Snap to Target",
-    "bindings": [ { "input_method": "keyboard", "key": "*" } ]
-  },
   {
     "type": "keybinding",
     "id": "CENTER",

From 02205a97752754e3a3695eb346588dff27d46f68 Mon Sep 17 00:00:00 2001
From: olanti-p <olanti-p@yandex.ru>
Date: Thu, 7 May 2020 17:41:56 +0300
Subject: [PATCH 3/3] Change 'F' from FIRE to SWITCH_MODE To be consistent with
 how it works outside target selection UI

---
 data/raw/keybindings.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
index 7e558d422477b..434408094ded9 100644
--- a/data/raw/keybindings.json
+++ b/data/raw/keybindings.json
@@ -874,7 +874,6 @@
     "name": "Fire Weapon",
     "bindings": [
       { "input_method": "keyboard", "key": "f" },
-      { "input_method": "keyboard", "key": "F" },
       { "input_method": "keyboard", "key": "RETURN" },
       { "input_method": "mouse", "key": "MOUSE_RIGHT" }
     ]
@@ -948,7 +947,7 @@
     "id": "SWITCH_MODE",
     "category": "TARGET",
     "name": "Switch Firing Mode",
-    "bindings": [ { "input_method": "keyboard", "key": "s" } ]
+    "bindings": [ { "input_method": "keyboard", "key": "s" }, { "input_method": "keyboard", "key": "F" } ]
   },
   {
     "type": "keybinding",