Another fix.

[plomrogue2] / plomrogue / game.py

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 68bcb65ccd98ff456512a97071b541addc637b6f..a6bc2a3fe6f5956769718623f4b651520260eaf7 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -49,6 +49,8 @@ class Game(GameBase):
         self.thing_types = {'player': ThingPlayer}
         self.sessions = {}
         self.map = Map(self.map_geometry.size)
+        self.map_control = Map(self.map_geometry.size)
+        self.map_control_passwords = {}
         self.annotations = {}
         self.portals = {}
         if os.path.exists(self.io.save_file):
@@ -71,6 +73,14 @@ class Game(GameBase):
                 print("FILE INPUT LINE %5s: %s" % (i, line), end='')
                 self.io.handle_input(line, god_mode=True)
 
+    def can_do_tile_with_pw(self, yx, pw):
+        tile_class = self.map_control[yx]
+        if tile_class in self.map_control_passwords:
+            tile_pw = self.map_control_passwords[tile_class]
+            if pw != tile_pw:
+                return False
+        return True
+
     def get_string_options(self, string_option_type):
         import string
         if string_option_type == 'direction':
@@ -98,6 +108,7 @@ class Game(GameBase):
             send_thing(t)
         self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(),
                                        self.map_geometry.size, quote(self.map.terrain)))
+        self.io.send('MAP_CONTROL %s' % quote(self.map_control.terrain))
         for yx in self.portals:
             self.io.send('PORTAL %s %s' % (yx, quote(self.portals[yx])))
         self.io.send('GAME_STATE_COMPLETE')
@@ -196,8 +207,14 @@ class Game(GameBase):
               write(f, 'ANNOTATE %s %s' % (yx, quote(self.annotations[yx])))
           for yx in self.portals:
               write(f, 'PORTAL %s %s' % (yx, quote(self.portals[yx])))
+          for y, line in self.map_control.lines():
+              write(f, 'MAP_CONTROL_LINE %5s %s' % (y, quote(line)))
+          for tile_class in self.map_control_passwords:
+              write(f, 'MAP_CONTROL_PW %s %s' % (tile_class,
+                                                 self.map_control_passwords[tile_class]))
 
     def new_world(self, map_geometry):
         self.map_geometry = map_geometry
         self.map = Map(self.map_geometry.size)
+        self.map_control = Map(self.map_geometry.size)
         self.annotations = {}