Turn players into non-light-blockers.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index df5ea58c4c89291b846d0d0c649896dfa50e1289..0dced0da0a612b1c10248c3ba8f9eef52e057a72 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -20,7 +20,9 @@ class ThingBase:
 
 
 class Thing(ThingBase):
-    blocking = False
+    blocks_movement = False
+    blocks_sound = False
+    blocks_light = False
     portable = False
     protection = '.'
     commandable = False
@@ -68,11 +70,11 @@ class Thing(ThingBase):
             return lowered_msg
 
         largest_audible_distance = 20
-        # player's don't block sound (or should they?)
-        things = [t for t in self.game.things if t.type_ != 'Player']
+        obstacles = [t.position for t in self.game.things if t.blocks_sound]
         sound_blockers = self.game.get_sound_blockers()
-        dijkstra_map = DijkstraMap(sound_blockers, things, self.game.maps, self.position,
-                                   largest_audible_distance, self.game.get_map)
+        dijkstra_map = DijkstraMap(sound_blockers, obstacles, self.game.maps,
+                                   self.position, largest_audible_distance,
+                                   self.game.get_map)
         url_limits = []
         for m in re.finditer('https?://[^\s]+', msg):
             url_limits += [m.start(), m.end()]
@@ -117,7 +119,6 @@ class ThingSpawner(Thing):
                   if t != self and t.position == self.position]:
             return
         self.game.add_thing(self.child_type, self.position)
-        # self.game.changed = True  handled by add_thing
 
 
 
@@ -145,16 +146,20 @@ class Thing_DoorSpawner(ThingSpawner):
 
 class Thing_Door(Thing):
     symbol_hint = 'D'
-    blocking = False
+    blocks_movement = False
     portable = True
     installable = True
 
     def open(self):
-        self.blocking = False
+        self.blocks_movement = False
+        self.blocks_light = False
+        self.blocks_sound = False
         del self.thing_char
 
     def close(self):
-        self.blocking = True
+        self.blocks_movement = True
+        self.blocks_light = True
+        self.blocks_sound = True
         self.thing_char = '#'
 
     def install(self):
@@ -184,7 +189,8 @@ class Thing_Bottle(Thing):
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 12
         light_blockers = self.game.get_light_blockers()
-        fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
+        obstacles = [t.position for t in self.game.things if t.blocks_light]
+        fov = fov_map_class(light_blockers, obstacles, self.game.maps,
                             self.position, fov_radius, self.game.get_map)
         fov.init_terrain()
         visible_players = []
@@ -372,7 +378,6 @@ class Thing_BottleDeposit(Thing):
             elif choice == 'Hat':
                 msg += 'pick it up and then use "(un-)wear" on it!'
             self.sound('BOTTLE DEPOSITOR', msg)
-            # self.game.changed = True  done by game.add_thing
 
     def accept(self):
         self.bottle_counter += 1
@@ -404,7 +409,7 @@ class Thing_CookieSpawner(Thing):
 
 
 class ThingAnimate(Thing):
-    blocking = True
+    blocks_movement = True
     drunk = 0
 
     def __init__(self, *args, **kwargs):
@@ -465,7 +470,8 @@ class ThingAnimate(Thing):
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 3 if self.drunk > 0 else 12
         light_blockers = self.game.get_light_blockers()
-        self._fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
+        obstacles = [t.position for t in self.game.things if t.blocks_light]
+        self._fov = fov_map_class(light_blockers, obstacles, self.game.maps,
                                   self.position, fov_radius, self.game.get_map)
 
     def multiprocessible_fov_stencil(self):