Password-protect tiles from portal and annotation editing, too.

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index f8c8e3aa5aa139d3ece7746abe37162ed7ad58f9..f6744aca92e037d132effc9ebd0b8dcae9e05d13 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -72,23 +72,27 @@ def cmd_TURN(game, n):
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
 
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
 

-def cmd_ANNOTATE(game, yx, msg, connection_id):
+def cmd_ANNOTATE(game, pw, yx, msg, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
+        raise GameError('wrong password for tile')

     if msg == ' ':
         if yx in game.annotations:
             del game.annotations[yx]
     else:
         game.annotations[yx] = msg
     game.changed = True
     if msg == ' ':
         if yx in game.annotations:
             del game.annotations[yx]
     else:
         game.annotations[yx] = msg
     game.changed = True

-cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+cmd_ANNOTATE.argtypes = 'string yx_tuple:nonneg string'

 
 

-def cmd_PORTAL(game, yx, msg, connection_id):
+def cmd_PORTAL(game, pw, yx, msg, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
+        raise GameError('wrong password for tile')

     if msg == ' ':
         if yx in game.portals:
             del game.portals[yx]
     else:
         game.portals[yx] = msg
     game.changed = True
     if msg == ' ':
         if yx in game.portals:
             del game.portals[yx]
     else:
         game.portals[yx] = msg
     game.changed = True

-cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
+cmd_PORTAL.argtypes = 'string yx_tuple:nonneg string'

 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 73c1a98d13c2fb5c801a0f9dad0d347f9998cc8c..7ff74464f0a73a1e58396353b6a9883dae590de7 100755 (executable)
--- 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.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_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)
         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_ = ' '
             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' % (quote(self.password),
+                                                 self.explorer, quote(self.input_)))

                 self.input_ = ""
                 self.switch_mode('study', keep_position=True)
             elif self.mode == self.mode_portal and key == '\n':
                 if self.input_ == '':
                     self.input_ = ' '
                 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' % (quote(self.password),
+                                               self.explorer, quote(self.input_)))

                 self.input_ = ""
                 self.switch_mode('study', keep_position=True)
             elif self.mode == self.mode_teleport and key == '\n':
                 self.input_ = ""
                 self.switch_mode('study', keep_position=True)
             elif self.mode == self.mode_teleport and key == '\n':

diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index 8ceb72870f5c1c6efd9230d9338f7ac4789b133b..28d3773b0898b2866cb9c9a7a5a34f1d7e5f730c 100644 (file)
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -298,13 +298,13 @@ let mode_waiting_for_server = new Mode('waiting_for_server', 'Waiting for a serv
 let mode_login = new Mode('login', 'Pick your player name.', true, false, true);
 let mode_post_login_wait = new Mode('waiting for game world', 'Waiting for a server response.', false, false, true);
 let mode_chat = new 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:', true, false);
 let mode_login = new Mode('login', 'Pick your player name.', true, false, true);
 let mode_post_login_wait = new Mode('waiting for game world', 'Waiting for a server response.', false, false, true);
 let mode_chat = new 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:', true, false);

-let mode_annotate = new Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on.  Hit Return to leave.', true, true);
+  let mode_annotate = new 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.', true, true);

 let mode_play = new Mode('play', 'This mode allows you to interact with the map.', false, false);
 let mode_study = new 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.', false, true);
 let mode_play = new Mode('play', 'This mode allows you to interact with the map.', false, false);
 let mode_study = new 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.', false, true);

-let mode_edit = new 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.', false, false);
+let mode_edit = new 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.', false, false);

 let mode_teleport = new Mode('teleport', 'Follow the instructions to re-connect and log-in to another server, or enter anything else to abort.', true);
 let mode_teleport = new Mode('teleport', 'Follow the instructions to re-connect and log-in to another server, or enter anything else to abort.', true);

-let mode_portal = new 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.', true, true);
-let mode_password = new 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.', true, false, false);
+let mode_portal = new 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.', true, true);
+let mode_password = new 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.', true, false, false);

 
 let tui = {
   mode: mode_waiting_for_server,
 
 let tui = {
   mode: mode_waiting_for_server,


@@ -709,13 +709,13 @@ let explorer = {
         if (msg.length == 0) {
             msg = " ";  // triggers annotation deletion
         }
         if (msg.length == 0) {
             msg = " ";  // triggers annotation deletion
         }

-        server.send(["ANNOTATE", unparser.to_yx(explorer.position), msg]);
+        server.send(["ANNOTATE", tui.password, unparser.to_yx(explorer.position), msg]);

     },
     set_portal: function(msg) {
         if (msg.length == 0) {
             msg = " ";  // triggers portal deletion
         }
     },
     set_portal: function(msg) {
         if (msg.length == 0) {
             msg = " ";  // triggers portal deletion
         }

-        server.send(["PORTAL", unparser.to_yx(explorer.position), msg]);
+        server.send(["PORTAL", tui.password, unparser.to_yx(explorer.position), msg]);

     }
 }
 
     }
 }