X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=5948cb6b6ebbc1b92f6ec8d8adc76f919351d578;hb=aab94ffb12aa0dedc240d7b29001699b95c49249;hp=8885aa0820fc2de63ab17e2ff0ae8cfa1ea42e7c;hpb=74c0ec0247f058b977996f9e1e2d696f3d2d162b;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 8885aa0..5948cb6 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 = []
@@ -245,7 +247,7 @@ class Thing_HatRemixer(Thing):
         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_fov_change(self.position)
 
 
 
@@ -381,6 +383,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
@@ -419,7 +441,7 @@ class ThingAnimate(Thing):
                     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.game.record_fov_change(self.position)
                     break
             self.game.changed = True
         if self.task is None:
@@ -439,7 +461,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):
@@ -517,3 +540,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