X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Frogue_chat_curses.py;h=0ffceeb2d4c5d64c5d60df1fb1e4e38881ffa403;hb=d2490690904d56c3d1fe9e92413dc7d74ad8ac70;hp=689ecc1b1686f023799ae7f94b739e8f33359c6b;hpb=81d69377ef8309ffdfda6a744a7375006521f29e;p=plomrogue2-experiments
diff --git a/new2/rogue_chat_curses.py b/new2/rogue_chat_curses.py
index 689ecc1..0ffceeb 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',
@@ -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)
@@ -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')