X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=0c17977f2d6e2014570332db5e7ffd202e361edc;hb=3ab9a2ef6f42f109e9b8460be2ea3ebfcc0af19b;hp=68bcb65ccd98ff456512a97071b541addc637b6f;hpb=540aec0e9bf55d0452cffda4b34e1995d3724abf;p=plomrogue2

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 68bcb65..0c17977 100755
--- 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':
@@ -88,18 +98,25 @@ class Game(GameBase):
     def send_gamestate(self, connection_id=None):
         """Send out game state data relevant to clients."""
 
-        def send_thing(thing):
-            self.io.send('THING_POS %s %s' % (thing.id_, t.position))
-            if hasattr(thing, 'nickname'):
-                self.io.send('THING_NAME %s %s' % (thing.id_, quote(t.nickname)))
-
         self.io.send('TURN ' + str(self.turn))
-        for t in self.things:
-            send_thing(t)
-        self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(),
-                                       self.map_geometry.size, quote(self.map.terrain)))
-        for yx in self.portals:
-            self.io.send('PORTAL %s %s' % (yx, quote(self.portals[yx])))
+        for c_id in self.sessions:
+            player = self.get_thing(self.sessions[c_id], create_unfound = False)
+            visible_terrain = player.fov_stencil_map(self.map)
+            self.io.send('FOV %s' % quote(player.fov_stencil.terrain), c_id)
+            self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(),
+                                           self.map_geometry.size,
+                                           quote(visible_terrain)), c_id)
+            visible_control = player.fov_stencil_map(self.map_control)
+            self.io.send('MAP_CONTROL %s' % quote(visible_control), c_id)
+            for t in [t for t in self.things
+                      if player.fov_stencil[t.position] == '.']:
+                self.io.send('THING_POS %s %s' % (t.id_, t.position), c_id)
+                if hasattr(t, 'nickname'):
+                    self.io.send('THING_NAME %s %s' % (t.id_,
+                                                       quote(t.nickname)), c_id)
+            for yx in [yx for yx in self.portals
+                       if player.fov_stencil[yx] == '.']:
+                self.io.send('PORTAL %s %s' % (yx, quote(self.portals[yx])), c_id)
         self.io.send('GAME_STATE_COMPLETE')
 
     def run_tick(self):
@@ -193,11 +210,17 @@ class Game(GameBase):
           for y, line in self.map.lines():
               write(f, 'MAP_LINE %5s %s' % (y, quote(line)))
           for yx in self.annotations:
-              write(f, 'ANNOTATE %s %s' % (yx, quote(self.annotations[yx])))
+              write(f, 'GOD_ANNOTATE %s %s' % (yx, quote(self.annotations[yx])))
           for yx in self.portals:
-              write(f, 'PORTAL %s %s' % (yx, quote(self.portals[yx])))
+              write(f, 'GOD_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 = {}