More responsive mode leaving.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 49eb01a9d6217e04808366c90a4e624433979072..61513011809bf7de5a9a2aa9ca77f1070142de8d 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -32,15 +32,15 @@ mode_helps = {
         'long': 'This mode is the first of two steps to change the password for a tile protection character.  First enter the tile protection character for which you want to change the password.'
     },
     'control_pw_pw': {
-        'short': 'change tiles control password',
+        'short': 'change protection character password',
         'long': 'This mode is the second of two steps to change the password for a tile protection character.  Enter the new password for the tile protection character you chose.'
     },
     'control_tile_type': {
-        'short': 'change tiles control',
+        'short': 'change tiles protection',
         'long': 'This mode is the first of two steps to change tile protection areas on the map.  First enter the tile tile protection character you want to write.'
     },
     'control_tile_draw': {
-        'short': 'change tiles control',
+        'short': 'change tiles protection',
         'long': 'This mode is the second of two steps to change tile protection areas on the map.  Toggle tile protection drawing on/off and move the ?? cursor around the map to draw the selected tile protection character.'
     },
     'annotate': {
@@ -379,6 +379,7 @@ class TUI:
         self.mode_edit.available_modes = ["write", "annotate", "portal",
                                           "password", "chat", "study", "play",
                                           "admin_enter"]
+        self.mode = None
         self.host = host
         self.game = Game()
         self.game.tui = self
@@ -504,6 +505,8 @@ class TUI:
                   (self.explorer, quote(self.tile_control_char)))
 
     def switch_mode(self, mode_name):
+        if self.mode and self.mode.name == 'control_tile_draw':
+            self.log_msg('@ finished tile protection drawing.')
         self.map_mode = 'terrain + things'
         self.tile_draw = False
         if mode_name == 'admin_enter' and self.is_admin:
@@ -526,13 +529,13 @@ class TUI:
         elif self.mode.name == 'admin_enter':
             self.log_msg('@ enter admin password:')
         elif self.mode.name == 'control_pw_type':
-            self.log_msg('@ enter tile control character for which you want to change the password:')
+            self.log_msg('@ enter tile protection character for which you want to change the password:')
         elif self.mode.name == 'control_tile_type':
-            self.log_msg('@ enter tile control character which you want to draw:')
+            self.log_msg('@ enter tile protection character which you want to draw:')
         elif self.mode.name == 'control_pw_pw':
-            self.log_msg('@ enter tile control password for "%s":' % self.tile_control_char)
+            self.log_msg('@ enter tile protection password for "%s":' % self.tile_control_char)
         elif self.mode.name == 'control_tile_draw':
-            self.log_msg('@ can draw tile control character "%s", turn drawing on/off with [%s], finish with [%s].' % (self.tile_control_char, self.keys['toggle_tile_draw'], self.keys['switch_to_admin_enter']))
+            self.log_msg('@ can draw tile protection character "%s", turn drawing on/off with [%s], finish with [%s].' % (self.tile_control_char, self.keys['toggle_tile_draw'], self.keys['switch_to_admin_enter']))
         self.input_ = ""
         self.restore_input_values()
 
@@ -757,7 +760,7 @@ class TUI:
                 content += '\n'
             elif self.mode.name == 'control_tile_draw':
                 content += "Available actions:\n"
-                content += "[%s] – toggle tile control drawing\n" % self.keys['toggle_tile_draw']
+                content += "[%s] – toggle tile protection drawing\n" % self.keys['toggle_tile_draw']
                 content += '\n'
             elif self.mode.name == 'chat':
                 content += '/nick NAME – re-name yourself to NAME\n'
@@ -858,6 +861,7 @@ class TUI:
                     self.log_msg('@ aborted')
                 else:
                     self.send('SET_MAP_CONTROL_PASSWORD ' + quote(self.tile_control_char) + ' ' + quote(self.input_))
+                    self.log_msg('@ sent new password for protection character "%s"' % self.tile_control_char)
                 self.switch_mode('admin')
             elif self.mode.name == 'password' and key == '\n':
                 if self.input_ == '':