Fix same keybinding bug in curses client.

[plomrogue2-experiments] / new2 / rogue_chat_curses.py

diff --git a/new2/rogue_chat_curses.py b/new2/rogue_chat_curses.py
index 689ecc1b1686f023799ae7f94b739e8f33359c6b..7030c296353332d30cc4cb4e032a6d38d9026687 100755 (executable)
--- 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',
@@ -281,8 +281,8 @@ class TUI:
         self.log_msg("  /nick NAME - re-name yourself to NAME");
         self.log_msg("  /msg USER TEXT - send TEXT to USER");
         self.log_msg("  /help - show this help");
-        self.log_msg("  /P or /play - switch to play mode");
-        self.log_msg("  /? or /study - switch to study mode");
+        self.log_msg("  /%s or /play - switch to play mode" % self.keys['switch_to_play']);
+        self.log_msg("  /%s or /study - switch to study mode" % self.keys['switch_to_study']);
         self.log_msg("commands common to study and play mode:");
         self.log_msg("  %s - move" % ','.join(self.movement_keys));
         self.log_msg("  %s - switch to chat mode" % self.keys['switch_to_chat']);
@@ -480,6 +480,7 @@ class TUI:
                 draw_map()
 
         curses.curs_set(False)  # hide cursor
+        curses.use_default_colors();
         stdscr.timeout(10)
         reset_screen_size()
         self.explorer = YX(0, 0)
@@ -516,9 +517,9 @@ class TUI:
                 self.input_ = ""
             elif self.mode == self.mode_chat and key == '\n':
                 if self.input_[0] == '/':
-                    if self.input_ in {'/P', '/play'}:
+                    if self.input_ in {'/' + self.keys['switch_to_play'], '/play'}:
                         self.switch_mode('play')
-                    elif self.input_ in {'/?', '/study'}:
+                    elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}:
                         self.switch_mode('study')
                     elif self.input_ == '/help':
                         self.help()
@@ -584,9 +585,6 @@ class TUI:
                     self.send('TASK:FLATTEN_SURROUNDINGS')
                 elif key in self.movement_keys:
                     self.send('TASK:MOVE ' + self.movement_keys[key])
-                elif key == 'q':
-                    self.log_msg('quitting')
-                    self.send('QUIT')
             elif self.mode == self.mode_edit:
                 self.send('TASK:WRITE ' + key)
                 self.switch_mode('play')