Enable Hat editing with characters earned by eating cookies from a CookieSpawner.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index a13f771dd2f7821d9d895f837c8348375b30bf0b..5948cb6b6ebbc1b92f6ec8d8adc76f919351d578 100644 (file)
--- 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):
@@ -116,7 +117,7 @@ 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
+        # self.game.changed = True  handled by add_thing
 
 
 
@@ -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,6 +246,8 @@ 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)
 
 
 
@@ -369,7 +373,7 @@ 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
+            # self.game.changed = True  done by game.add_thing
 
     def accept(self):
         self.bottle_counter += 1
@@ -379,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
@@ -394,6 +418,7 @@ class ThingAnimate(Thing):
         self._fov = None
         self._visible_terrain = None
         self._visible_control = None
+        self._seen_things = None
 
     def set_next_task(self, task_name, args=()):
         task_class = self.game.tasks[task_name]
@@ -414,7 +439,9 @@ 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()
+                    #self.invalidate_map_view()
+                    # FIXME: pseudo-FOV-change actually
+                    self.game.record_fov_change(self.position)
                     break
             self.game.changed = True
         if self.task is None:
@@ -434,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):
@@ -485,6 +513,13 @@ class ThingAnimate(Thing):
         self._visible_control = self.fov_stencil_map('control')
         return self._visible_control
 
+    @property
+    def seen_things(self):
+        if self._seen_things is not None:
+            return self._seen_things
+        self._seen_things = [t for t in self.game.things
+                             if self.fov_test(*t.position)]
+        return self._seen_things
 
 
 class Thing_Player(ThingAnimate):
@@ -505,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