Don't uncarry things on dooring.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 2c12cf283e41cc5b788d37c35d1fabe23225ba17..18cdf4c78069e9273e411c38223f4baae080a38f 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,5 +1,6 @@
 from plomrogue.errors import GameError, PlayError
 from plomrogue.mapping import YX
+import random
 
 
 
@@ -95,9 +96,7 @@ class ThingSpawner(Thing):
         for t in [t for t in self.game.things
                   if t != self and t.position == self.position]:
             return
-        t = self.game.thing_types[self.child_type](self.game,
-                                                   position=self.position)
-        self.game.things += [t]
+        self.game.add_thing(self.child_type, self.position)
         self.game.changed = True
 
 
@@ -166,13 +165,22 @@ class Thing_BottleSpawner(ThingSpawner):
 class Thing_Hat(Thing):
     symbol_hint = 'H'
     portable = True
-    design = ' X  X ==='
+    design = ' +--+ ' + ' |  | ' + '======'
 
 
 
-class Thing_HatSpawner(ThingSpawner):
-    child_type = 'Hat'
+class Thing_HatRemixer(Thing):
+    symbol_hint = 'H'
 
+    def accept(self, hat):
+        import string
+        new_design = ''
+        legal_chars = string.ascii_letters + string.digits + string.punctuation + ' '
+        for i in range(18):
+            new_design += random.choice(list(legal_chars))
+        hat.design = new_design
+        self.sound('HAT REMIXER', 'remixing a hat …')
+        self.game.changed = True
 
 
 
@@ -245,6 +253,7 @@ class Thing_MusicPlayer(Thing):
             self.playlist_index -= 1
             if self.playlist_index < -1:
                 self.playlist_index = -1
+            self.game.changed = True
             return ['removed song']
         elif command == 'REWIND':
             self.playlist_index = -1
@@ -289,12 +298,14 @@ class Thing_BottleDeposit(Thing):
     def proceed(self):
         if self.bottle_counter >= 3:
             self.bottle_counter = 0
-            t = self.game.thing_types['MusicPlayer'](self.game,
-                                                     position=self.position)
-            self.game.things += [t]
-            self.sound('BOTTLE DEPOSITOR',
-                       'here is a gift as a reward for ecological consciousness –'
-                       'use "command thing" on it to learn more!')
+            choice = random.choice(['MusicPlayer', 'Hat'])
+            self.game.add_thing(choice, self.position)
+            msg = 'here is a gift as a reward for ecological consciousness –'
+            if choice == 'MusicPlayer':
+                msg += 'pick it up and then use "command thing" on it!'
+            elif choice == 'Hat':
+                msg += 'pick it up and then use "(un-)wear" on it!'
+            self.sound('BOTTLE DEPOSITOR', msg)
             self.game.changed = True
 
     def accept(self):
@@ -314,7 +325,12 @@ 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
 
     def set_next_task(self, task_name, args=()):
         task_class = self.game.tasks[task_name]
@@ -332,11 +348,12 @@ class ThingAnimate(Thing):
         if self.drunk == 0:
             for c_id in self.game.sessions:
                 if self.game.sessions[c_id]['thing_id'] == self.id_:
+                    # 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()
                     break
             self.game.changed = True
-        self._fov = None
         if self.task is None:
             self.task = self.get_next_task()
             return
@@ -380,7 +397,7 @@ class ThingAnimate(Thing):
                 return True
         return False
 
-    def fov_stencil_map(self, map_type='normal'):
+    def fov_stencil_map(self, map_type):
         visible_terrain = ''
         for yx in self.fov_stencil:
             if self.fov_stencil[yx] == '.':
@@ -391,6 +408,20 @@ class ThingAnimate(Thing):
                 visible_terrain += ' '
         return visible_terrain
 
+    @property
+    def visible_terrain(self):
+        if self._visible_terrain:
+            return self._visible_terrain
+        self._visible_terrain = self.fov_stencil_map('normal')
+        return self._visible_terrain
+
+    @property
+    def visible_control(self):
+        if self._visible_control:
+            return self._visible_control
+        self._visible_control = self.fov_stencil_map('control')
+        return self._visible_control
+
 
 
 class Thing_Player(ThingAnimate):