From beb5e984048d116d23a3a7f02259a9bc9bc70b9a Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 8 Nov 2020 01:28:44 +0100
Subject: [PATCH] Add default new keybindings in-code and in-file to curses
 client.

---
 new2/config.json          | 19 +++++++++++++++++++
 new2/rogue_chat_curses.py | 18 +++++++++---------
 2 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 new2/config.json

diff --git a/new2/config.json b/new2/config.json
new file mode 100644
index 0000000..c594191
--- /dev/null
+++ b/new2/config.json
@@ -0,0 +1,19 @@
+{
+    "switch_to_chat": "t",
+    "switch_to_play": "p",
+    "switch_to_annotate": "m",
+    "switch_to_portal": "P",
+    "switch_to_study": "?",
+    "switch_to_edit": "m",
+    "flatten": "F",
+    "hex_move_upleft": "w",
+    "hex_move_upright": "e",
+    "hex_move_right": "d",
+    "hex_move_downright": "x",
+    "hex_move_downleft": "y",
+    "hex_move_left": "a",
+    "square_move_up": "w",
+    "square_move_left": "a",
+    "square_move_down": "s",
+    "square_move_right": "d"
+}
diff --git a/new2/rogue_chat_curses.py b/new2/rogue_chat_curses.py
index ad9dba1..94c808b 100755
--- a/new2/rogue_chat_curses.py
+++ b/new2/rogue_chat_curses.py
@@ -208,19 +208,19 @@ class TUI:
         self.login_name = None
         self.switch_mode('waiting_for_server')
         self.keys = {
-            'switch_to_chat': 'C',
-            'switch_to_play': 'P',
-            'switch_to_annotate': 'E',
-            'switch_to_portal': 'p',
+            'switch_to_chat': 't',
+            'switch_to_play': 'p',
+            'switch_to_annotate': 'm',
+            'switch_to_portal': 'P',
             'switch_to_study': '?',
-            'switch_to_edit': 'E',
-            'flatten': 'f',
+            'switch_to_edit': 'm',
+            'flatten': 'F',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',
             'hex_move_right': 'd',
-            'hex_move_downright': 'c',
-            'hex_move_downleft': 'x',
-            'hex_move_left': 's',
+            'hex_move_downright': 'x',
+            'hex_move_downleft': 'y',
+            'hex_move_left': 'a',
             'square_move_up': 'w',
             'square_move_left': 'a',
             'square_move_down': 's',
-- 
2.30.2