Only re-process FOVs for players whose FOV radius is affected by change.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 720adc0ec64f0c432ec0f8e9ecbb3d5ecb29a413..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
 
 
@@ -163,6 +162,28 @@ class Thing_BottleSpawner(ThingSpawner):
 
 
 
+class Thing_Hat(Thing):
+    symbol_hint = 'H'
+    portable = True
+    design = ' +--+ ' + ' |  | ' + '======'
+
+
+
+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
+
+
+
 import datetime
 class Thing_MusicPlayer(Thing):
     symbol_hint = 'R'
@@ -170,7 +191,7 @@ class Thing_MusicPlayer(Thing):
     portable = True
     repeat = True
     next_song_start = datetime.datetime.now()
-    playlist_index = 0
+    playlist_index = -1
     playing = True
 
     def __init__(self, *args, **kwargs):
@@ -182,12 +203,13 @@ class Thing_MusicPlayer(Thing):
         if (not self.playing) or len(self.playlist) == 0:
             return
         if datetime.datetime.now() > self.next_song_start:
-            song_data = self.playlist[self.playlist_index]
             self.playlist_index += 1
             if self.playlist_index == len(self.playlist):
                 self.playlist_index = 0
                 if not self.repeat:
                     self.playing = False
+                    return
+            song_data = self.playlist[self.playlist_index]
             self.next_song_start = datetime.datetime.now() +\
                 datetime.timedelta(seconds=song_data[1])
             self.sound('MUSICPLAYER', song_data[0])
@@ -198,7 +220,7 @@ class Thing_MusicPlayer(Thing):
         if command == 'HELP':
             msg_lines += ['available commands:']
             msg_lines += ['HELP – show this help']
-            msg_lines += ['PLAY – toggle playback on/off']
+            msg_lines += ['ON/OFF – toggle playback on/off']
             msg_lines += ['REWIND – return to start of playlist']
             msg_lines += ['LIST – list programmed songs, durations']
             msg_lines += ['SKIP – to skip to next song']
@@ -217,15 +239,24 @@ class Thing_MusicPlayer(Thing):
                 msg_lines += ['%s %s:%s – %s' % (selector, minutes, seconds, entry[0])]
                 i += 1
             return msg_lines
-        elif command == 'PLAY':
+        elif command == 'ON/OFF':
             self.playing = False if self.playing else True
             self.game.changed = True
             if self.playing:
                 return ['playing']
             else:
                 return ['paused']
+        elif command == 'REMOVE':
+            if len(self.playlist) == 0:
+                return ['playlist already empty']
+            del self.playlist[max(0, self.playlist_index)]
+            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 = 0
+            self.playlist_index = -1
             self.next_song_start = datetime.datetime.now()
             self.game.changed = True
             return ['back at start of playlist']
@@ -267,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):
@@ -292,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]
@@ -310,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
@@ -358,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] == '.':
@@ -369,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):