X-Git-Url: https://plomlompom.com/repos//%22https:/validator.w3.org/check?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=0d17d3c029469713ed25305d20433467a847b6d2;hb=9c9475a01bbbd18b69056a9564768df6bff36539;hp=5948cb6b6ebbc1b92f6ec8d8adc76f919351d578;hpb=aab94ffb12aa0dedc240d7b29001699b95c49249;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 5948cb6..0d17d3c 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -68,11 +68,13 @@ 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']
+        # player's don't block sound
+        obstacles = [t.position for t in self.game.things
+                     if t.blocking and t.type_ != 'Player']
         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
 
 
 
@@ -184,7 +185,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.blocking]
+        fov = fov_map_class(light_blockers, obstacles, self.game.maps,
                             self.position, fov_radius, self.game.get_map)
         fov.init_terrain()
         visible_players = []
@@ -246,8 +248,7 @@ class Thing_HatRemixer(Thing):
         hat.design = new_design
         self.sound('HAT REMIXER', 'remixing a hat …')
         self.game.changed = True
-        # FIXME: pseudo-FOV-change actually
-        self.game.record_fov_change(self.position)
+        self.game.record_change(self.position, 'other')
 
 
 
@@ -373,7 +374,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
@@ -412,13 +412,19 @@ class ThingAnimate(Thing):
         super().__init__(*args, **kwargs)
         self.next_task = [None]
         self.task = None
-        self.invalidate_map_view()
-
-    def invalidate_map_view(self):
-        self._fov = None
-        self._visible_terrain = None
-        self._visible_control = None
-        self._seen_things = None
+        self.invalidate('fov')
+        self.invalidate('other')  # currently redundant though
+
+    def invalidate(self, type_):
+        if type_ == 'fov':
+            self._fov = None
+            self._visible_terrain = None
+            self._visible_control = None
+            self.invalidate('other')
+        elif type_ == 'other':
+            self._seen_things = None
+            self._seen_annotation_positions = None
+            self._seen_portal_positions = None
 
     def set_next_task(self, task_name, args=()):
         task_class = self.game.tasks[task_name]
@@ -439,9 +445,7 @@ class ThingAnimate(Thing):
                     # TODO: refactor with self.send_msg
                     self.game.io.send('DEFAULT_COLORS', c_id)
                     self.game.io.send('CHAT "You sober up."', c_id)
-                    #self.invalidate_map_view()
-                    # FIXME: pseudo-FOV-change actually
-                    self.game.record_fov_change(self.position)
+                    self.invalidate('fov')
                     break
             self.game.changed = True
         if self.task is None:
@@ -462,7 +466,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.blocking]
+        self._fov = fov_map_class(light_blockers, obstacles, self.game.maps,
                                   self.position, fov_radius, self.game.get_map)
 
     def multiprocessible_fov_stencil(self):
@@ -521,6 +526,31 @@ class ThingAnimate(Thing):
                              if self.fov_test(*t.position)]
         return self._seen_things
 
+    @property
+    def seen_annotation_positions(self):
+        if self._seen_annotation_positions is not None:
+            return self._seen_annotation_positions
+        self._seen_annotation_positions = []
+        for big_yx in self.game.annotations:
+            for little_yx in [little_yx for little_yx
+                              in self.game.annotations[big_yx]
+                              if self.fov_test(big_yx, little_yx)]:
+                self._seen_annotation_positions += [(big_yx, little_yx)]
+        return self._seen_annotation_positions
+
+    @property
+    def seen_portal_positions(self):
+        if self._seen_portal_positions is not None:
+            return self._seen_portal_positions
+        self._seen_portal_positions = []
+        for big_yx in self.game.portals:
+            for little_yx in [little_yx for little_yx
+                              in self.game.portals[big_yx]
+                              if self.fov_test(big_yx, little_yx)]:
+                self._seen_portal_positions += [(big_yx, little_yx)]
+        return self._seen_portal_positions
+
+
 
 class Thing_Player(ThingAnimate):
     symbol_hint = '@'