Widen Square view, too.

[plomrogue2-experiments] / new2 / rogue_chat_curses.py

diff --git a/new2/rogue_chat_curses.py b/new2/rogue_chat_curses.py
index 6fda713d2206ac3ed7d186586f0c0aaac542801f..9eb99c89354b9402aeddc28f857c0f1b01cd91d5 100755 (executable)
--- a/new2/rogue_chat_curses.py
+++ b/new2/rogue_chat_curses.py
@@ -222,18 +222,21 @@ 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("  :P or :play - switch to play mode");
         self.log_msg("  :? or :study - switch to study mode");
         self.log_msg("commands common to study and play mode:");
-        self.log_msg("  w,a,s,d - move");
-        self.log_msg("  c - switch to chat mode");
+        if type(self.game.map_geometry) == MapGeometrySquare:
+            self.log_msg("  w,a,s,d - move");
+        elif type(self.game.map_geometry) == MapGeometryHex:
+            self.log_msg("  e,d,c,x,s,w - move");
+        self.log_msg("  C - switch to chat mode");
         self.log_msg("commands specific to play mode:");
-        self.log_msg("  e - write following ASCII character");
+        self.log_msg("  E - write following ASCII character");
         self.log_msg("  f - flatten surroundings");
         self.log_msg("  ? - switch to study mode");
         self.log_msg("commands specific to study mode:");
-        self.log_msg("  e - annotate terrain");
-        self.log_msg("  p - switch to play mode");
+        self.log_msg("  E - annotate terrain");
+        self.log_msg("  P - switch to play mode");
 
     def loop(self, stdscr):
 
@@ -297,7 +300,7 @@ class TUI:
 
         def reset_screen_size():
             self.size = YX(*stdscr.getmaxyx())
-            self.size = self.size - YX(self.size.y % 2, 0)
+            self.size = self.size - YX(self.size.y % 4, 0)
             self.size = self.size - YX(0, self.size.x % 4)
             self.window_width = int(self.size.x / 2)
 
@@ -381,15 +384,14 @@ class TUI:
                     indent = 0 if indent else 1
             else:
                 for line in map_lines_split:
-                    map_lines += [''.join(line)]
+                    map_lines += [' '.join(line)]
             window_center = YX(int(self.size.y / 2),
                                int(self.window_width / 2))
             player = self.game.get_thing(self.game.player_id, False)
             center = player.position
             if self.mode.shows_info:
                 center = self.explorer
-            if type(self.game.map_geometry) == MapGeometryHex:
-                center = YX(center.y, center.x * 2)
+            center = YX(center.y, center.x * 2)
             offset = center - window_center
             if type(self.game.map_geometry) == MapGeometryHex and offset.y % 2:
                 offset += YX(0, 1)
@@ -454,7 +456,7 @@ 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 {':P', ':play'}:
                         self.switch_mode('play')
                     elif self.input_ in {':?', ':study'}:
                         self.switch_mode('study')