Move instantly on move button press, don't wait for interval to end.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 9519a95609a82ba0f9a0fd4f7d7bca95999f756e..8f4f7da96e41f5221880fd6d24036430bdfdf832 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -32,17 +32,17 @@ mode_helps = {
         'long': 'Give name to/change name of thing here.'
     },
     'command_thing': {
-        'short': 'command thing',
+        'short': 'command',
         'intro': '',
         'long': 'Enter a command to the thing you carry.  Enter nothing to return to play mode.'
     },
     'take_thing': {
-        'short': 'take thing',
+        'short': 'take',
         'intro': 'Pick up a thing in reach by entering its index number.  Enter nothing to abort.',
         'long': 'You see a list of things which you could pick up.  Enter the target thing\'s index, or, to leave, nothing.'
     },
     'drop_thing': {
-        'short': 'drop thing',
+        'short': 'drop',
         'intro': 'Enter number of direction to which you want to drop thing.',
         'long': 'Drop currently carried thing by entering the target direction index.  Enter nothing to return to play mode..'
     },
@@ -52,17 +52,17 @@ mode_helps = {
         'long': 'Change protection character for thing here.'
     },
     'enter_face': {
-        'short': 'enter your face',
+        'short': 'edit face',
         'intro': '@ enter face line (enter nothing to abort):',
         'long': 'Draw your face as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
     },
     'enter_hat': {
-        'short': 'enter your hat',
+        'short': 'edit hat',
         'intro': '@ enter hat line (enter nothing to abort):',
-        'long': 'Draw your hat as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
+        'long': 'Draw your face as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom.  Eat cookies to extend the ASCII characters available for drawing.'
     },
     'write': {
-        'short': 'change terrain',
+        'short': 'edit tile',
         'intro': '',
         'long': 'This mode allows you to change the map tile you currently stand on (if your world editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.'
     },
@@ -178,11 +178,11 @@ def cmd_TURN(game, n):
     game.turn_complete = False
 cmd_TURN.argtypes = 'int:nonneg'
 
-def cmd_PSEUDO_FOV_WIPE(game):
+def cmd_OTHER_WIPE(game):
     game.portals_new = {}
     game.annotations_new = {}
     game.things_new = []
-cmd_PSEUDO_FOV_WIPE.argtypes = ''
+cmd_OTHER_WIPE.argtypes = ''
 
 def cmd_LOGIN_OK(game):
     game.tui.switch_mode('post_login_wait')
@@ -377,7 +377,7 @@ class Game(GameBase):
         self.register_command(cmd_REPLY)
         self.register_command(cmd_PLAYER_ID)
         self.register_command(cmd_TURN)
-        self.register_command(cmd_PSEUDO_FOV_WIPE)
+        self.register_command(cmd_OTHER_WIPE)
         self.register_command(cmd_THING)
         self.register_command(cmd_THING_TYPE)
         self.register_command(cmd_THING_NAME)
@@ -582,6 +582,8 @@ class TUI:
         self.fov = ''
         self.flash = False
         self.map_lines = []
+        self.ascii_draw_stage = 0
+        self.full_ascii_draw = ''
         self.offset = YX(0,0)
         curses.wrapper(self.loop)
 
@@ -652,6 +654,13 @@ class TUI:
         elif self.mode.name == 'admin_thing_protect':
             if hasattr(self.thing_selected, 'protection'):
                 self.input_ = self.thing_selected.protection
+        elif self.mode.name in {'enter_face', 'enter_hat'}:
+            start = self.ascii_draw_stage * 6
+            end = (self.ascii_draw_stage + 1) * 6
+            if self.mode.name == 'enter_face':
+                self.input_ = self.game.player.face[start:end]
+            elif self.mode.name == 'enter_hat':
+                self.input_ = self.game.player.hat[start:end]
 
     def send_tile_control_command(self):
         self.send('SET_TILE_CONTROL %s %s' %
@@ -1087,6 +1096,22 @@ class TUI:
             self.input_ = ''
             self.switch_mode('play')
 
+        def enter_ascii_art(command):
+            if len(self.input_) != 6:
+                self.log_msg('? wrong input length, try again')
+                return
+            self.log_msg('  ' + self.input_)
+            self.full_ascii_draw += self.input_
+            self.ascii_draw_stage += 1
+            if self.ascii_draw_stage < 3:
+                self.restore_input_values()
+            else:
+                self.send('%s %s' % (command, quote(self.full_ascii_draw)))
+                self.full_ascii_draw = ""
+                self.ascii_draw_stage = 0
+                self.input_ = ""
+                self.switch_mode('edit')
+
         action_descriptions = {
             'move': 'move',
             'flatten': 'flatten surroundings',
@@ -1188,19 +1213,9 @@ class TUI:
                 self.send('LOGIN ' + quote(self.input_))
                 self.input_ = ""
             elif self.mode.name == 'enter_face' and key == '\n':
-                if len(self.input_) != 18:
-                    self.log_msg('? wrong input length, aborting')
-                else:
-                    self.send('PLAYER_FACE %s' % quote(self.input_))
-                self.input_ = ""
-                self.switch_mode('edit')
+                enter_ascii_art('PLAYER_FACE')
             elif self.mode.name == 'enter_hat' and key == '\n':
-                if len(self.input_) != 18:
-                    self.log_msg('? wrong input length, aborting')
-                else:
-                    self.send('PLAYER_HAT %s' % quote(self.input_))
-                self.input_ = ""
-                self.switch_mode('edit')
+                enter_ascii_art('PLAYER_HAT')
             elif self.mode.name == 'take_thing' and key == '\n':
                 pick_selectable('PICK_UP')
             elif self.mode.name == 'drop_thing' and key == '\n':