X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=rogue_chat_curses.py;h=b09dcc7e6548a3a1cd712684965b50f39dc5a5f2;hb=be6b49b5f152b31230dd222c8306ee0d773e707e;hp=73c1a98d13c2fb5c801a0f9dad0d347f9998cc8c;hpb=68ba631d7af62a416da8ff487534ec27b6a2d5c3;p=plomrogue2

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 73c1a98..b09dcc7 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -211,15 +211,15 @@ class TUI:
         self.host = host
         self.mode_play = self.Mode('play', 'This mode allows you to interact with the map.')
         self.mode_study = self.Mode('study', 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it (unless obscured by this help screen here, which you can disappear with any key).', shows_info=True)
-        self.mode_edit = self.Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your terrain editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.')
-        self.mode_annotate = self.Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on.  Hit Return to leave.', has_input_prompt=True, shows_info=True)
-        self.mode_portal = self.Mode('portal', 'This mode imprints/edits/removes a teleportation target on the ground you are currently standing on.  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.', has_input_prompt=True, shows_info=True)
+        self.mode_edit = self.Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.')
+        self.mode_annotate = self.Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.', has_input_prompt=True, shows_info=True)
+        self.mode_portal = self.Mode('portal', 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.', has_input_prompt=True, shows_info=True)
         self.mode_chat = self.Mode('chat', 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent to all users.  Lines that start with a "/" are used for commands like:', has_input_prompt=True)
         self.mode_waiting_for_server = self.Mode('waiting_for_server', 'Waiting for a server response.', is_intro=True)
         self.mode_login = self.Mode('login', 'Pick your player name.', has_input_prompt=True, is_intro=True)
         self.mode_post_login_wait = self.Mode('post_login_wait', 'Waiting for a server response.', is_intro=True)
         self.mode_teleport = self.Mode('teleport', 'Follow the instructions to re-connect and log-in to another server, or enter anything else to abort.', has_input_prompt=True)
-        self.mode_password = self.Mode('password', 'This mode allows you to change the password that you send to authorize yourself for editing password-protected tiles.  Hit return to confirm and leave.', has_input_prompt=True)
+        self.mode_password = self.Mode('password', 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles.  Hit return to confirm and leave.', has_input_prompt=True)
         self.game = Game()
         self.game.tui = self
         self.parser = Parser(self.game)
@@ -636,13 +636,15 @@ class TUI:
             elif self.mode == self.mode_annotate and key == '\n':
                 if self.input_ == '':
                     self.input_ = ' '
-                self.send('ANNOTATE %s %s' % (self.explorer, quote(self.input_)))
+                self.send('ANNOTATE %s %s %s' % (self.explorer, quote(self.input_),
+                                                 quote(self.password))
                 self.input_ = ""
                 self.switch_mode('study', keep_position=True)
             elif self.mode == self.mode_portal and key == '\n':
                 if self.input_ == '':
                     self.input_ = ' '
-                self.send('PORTAL %s %s' % (self.explorer, quote(self.input_)))
+                self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_),
+                                               quote(self.password)))
                 self.input_ = ""
                 self.switch_mode('study', keep_position=True)
             elif self.mode == self.mode_teleport and key == '\n':