X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-favicon.png?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=df5ea58c4c89291b846d0d0c649896dfa50e1289;hb=4a49836086c55c2736bcc7def243f6c4a72ae690;hp=8885aa0820fc2de63ab17e2ff0ae8cfa1ea42e7c;hpb=74c0ec0247f058b977996f9e1e2d696f3d2d162b;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 8885aa0..df5ea58 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -70,7 +70,8 @@ class Thing(ThingBase):
         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']
-        dijkstra_map = DijkstraMap(things, self.game.maps, self.position,
+        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)
         url_limits = []
         for m in re.finditer('https?://[^\s]+', msg):
@@ -182,7 +183,8 @@ class Thing_Bottle(Thing):
         # and ThingPlayer.fov_test
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 12
-        fov = fov_map_class(self.game.things, self.game.maps,
+        light_blockers = self.game.get_light_blockers()
+        fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
                             self.position, fov_radius, self.game.get_map)
         fov.init_terrain()
         visible_players = []
@@ -244,8 +246,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.thing.position)
+        self.game.record_change(self.position, 'other')
 
 
 
@@ -381,6 +382,26 @@ class Thing_BottleDeposit(Thing):
 
 
 
+class Thing_Cookie(Thing):
+    symbol_hint = 'c'
+    portable = True
+
+    def __init__(self, *args, **kwargs):
+        import string
+        super().__init__(*args, **kwargs)
+        legal_chars = string.ascii_letters + string.digits + string.punctuation + ' '
+        self.thing_char = random.choice(list(legal_chars))
+
+
+
+class Thing_CookieSpawner(Thing):
+    symbol_hint = 'O'
+
+    def accept(self, thing):
+        self.sound('OVEN', '*heat* *brrzt* here\'s a cookie!')
+        self.game.add_thing('Cookie', self.position)
+
+
 
 class ThingAnimate(Thing):
     blocking = True
@@ -390,13 +411,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]
@@ -417,9 +444,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.thing.position)
+                    self.invalidate('fov')
                     break
             self.game.changed = True
         if self.task is None:
@@ -439,7 +464,8 @@ class ThingAnimate(Thing):
     def prepare_multiprocessible_fov_stencil(self):
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 3 if self.drunk > 0 else 12
-        self._fov = fov_map_class(self.game.things, self.game.maps,
+        light_blockers = self.game.get_light_blockers()
+        self._fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
                                   self.position, fov_radius, self.game.get_map)
 
     def multiprocessible_fov_stencil(self):
@@ -498,6 +524,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 = '@'
@@ -517,3 +568,14 @@ class Thing_Player(ThingAnimate):
         t.carried = False
         self.carrying = None
         return t
+
+    def add_cookie_char(self, c):
+        if not self.name in self.game.players_hat_chars:
+            self.game.players_hat_chars[self.name] = ' #'  # default
+        if not c in self.game.players_hat_chars[self.name]:
+            self.game.players_hat_chars[self.name] += c
+
+    def get_cookie_chars(self):
+        if self.name in self.game.players_hat_chars:
+            return self.game.players_hat_chars[self.name]
+        return ' #'  # default