X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=720adc0ec64f0c432ec0f8e9ecbb3d5ecb29a413;hb=ea5ddf2c37571f3fb0ed486cd4a4294b82c54b54;hp=1c99737c039390938804d467d8e9a490e2dc2a67;hpb=d56384f9b6c88bab666162a0f97d7e64f2b3951c;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 1c99737..720adc0 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,4 +1,4 @@
-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, PlayError
from plomrogue.mapping import YX
@@ -128,17 +128,22 @@ class Thing_Door(Thing):
symbol_hint = 'D'
blocking = False
portable = True
+ installable = True
def open(self):
self.blocking = False
- self.portable = True
del self.thing_char
def close(self):
self.blocking = True
- self.portable = False
self.thing_char = '#'
+ def install(self):
+ self.portable = False
+
+ def uninstall(self):
+ self.portable = True
+
class Thing_Bottle(Thing):
@@ -189,69 +194,69 @@ class Thing_MusicPlayer(Thing):
self.game.changed = True
def interpret(self, command):
+ msg_lines = []
if command == 'HELP':
- msg = 'available commands:\n'
- msg += 'HELP â show this help\n'
- msg += 'PLAY â toggle playback on/off\n'
- msg += 'REWIND â return to start of playlist\n'
- msg += 'LIST â list programmed songs, durations\n'
- msg += 'SKIP â to skip to next song\n'
- msg += 'REPEAT â toggle playlist repeat on/off\n'
- msg += 'ADD LENGTH SONG â add SONG to playlist, with LENGTH in format "minutes:seconds", i.e. something like "0:47" or "11:02"'
- return msg
+ msg_lines += ['available commands:']
+ msg_lines += ['HELP â show this help']
+ msg_lines += ['PLAY â 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']
+ msg_lines += ['REPEAT â toggle playlist repeat on/off']
+ msg_lines += ['ADD LENGTH SONG â add SONG to playlist, with LENGTH in format "minutes:seconds", i.e. something like "0:47" or "11:02"']
+ return msg_lines
elif command == 'LIST':
- msg = 'playlist:'
+ msg_lines += ['playlist:']
i = 0
for entry in self.playlist:
- msg += '\n'
minutes = entry[1] // 60
seconds = entry[1] % 60
if seconds < 10:
seconds = '0%s' % seconds
selector = 'next:' if i == self.playlist_index else ' '
- msg += '%s %s:%s â %s' % (selector, minutes, seconds, entry[0])
+ msg_lines += ['%s %s:%s â %s' % (selector, minutes, seconds, entry[0])]
i += 1
- return msg
+ return msg_lines
elif command == 'PLAY':
self.playing = False if self.playing else True
self.game.changed = True
if self.playing:
- return 'playing'
+ return ['playing']
else:
- return 'paused'
+ return ['paused']
elif command == 'REWIND':
self.playlist_index = 0
self.next_song_start = datetime.datetime.now()
self.game.changed = True
- return 'back at start of playlist'
+ return ['back at start of playlist']
elif command == 'SKIP':
self.next_song_start = datetime.datetime.now()
self.game.changed = True
- return 'skipped'
+ return ['skipped']
elif command == 'REPEAT':
self.repeat = False if self.repeat else True
self.game.changed = True
if self.repeat:
- return 'playlist repeat turned on'
+ return ['playlist repeat turned on']
else:
- return 'playlist repeat turned off'
+ return ['playlist repeat turned off']
elif command.startswith('ADD '):
tokens = command.split(' ', 2)
if len(tokens) != 3:
- return 'wrong syntax, see HELP'
+ return ['wrong syntax, see HELP']
length = tokens[1].split(':')
if len(length) != 2:
- return 'wrong syntax, see HELP'
+ return ['wrong syntax, see HELP']
try:
minutes = int(length[0])
seconds = int(length[1])
except ValueError:
- return 'wrong syntax, see HELP'
+ return ['wrong syntax, see HELP']
self.playlist += [(tokens[2], minutes * 60 + seconds)]
self.game.changed = True
- return 'added'
+ return ['added']
else:
- return 'cannot understand command'
+ return ['cannot understand command']
@@ -285,26 +290,20 @@ class ThingAnimate(Thing):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.next_tasks = []
- self.set_task('WAIT')
+ self.next_task = [None]
+ self.task = None
self._fov = None
- def set_task(self, task_name, args=()):
- task_class = self.game.tasks[task_name]
- self.task = task_class(self, args)
- self.task.check() # will throw GameError if necessary
-
def set_next_task(self, task_name, args=()):
task_class = self.game.tasks[task_name]
- self.next_tasks += [task_class(self, args)]
+ self.next_task = [task_class(self, args)]
def get_next_task(self):
- if len(self.next_tasks) > 0:
- task = self.next_tasks.pop(0)
+ if self.next_task[0]:
+ task = self.next_task[0]
+ self.next_task = [None]
task.check()
return task
- else:
- return None
def proceed(self):
self.drunk -= 1
@@ -313,6 +312,7 @@ class ThingAnimate(Thing):
if self.game.sessions[c_id]['thing_id'] == self.id_:
self.game.io.send('DEFAULT_COLORS', c_id)
self.game.io.send('CHAT "You sober up."', c_id)
+ break
self.game.changed = True
self._fov = None
if self.task is None:
@@ -320,24 +320,37 @@ class ThingAnimate(Thing):
return
try:
self.task.check()
- except GameError as e:
+ except (PlayError, GameError) as e:
self.task = None
raise e
self.task.todo -= 1
if self.task.todo <= 0:
- self._last_task_result = self.task.do()
+ self.task.do()
self.game.changed = True
self.task = self.get_next_task()
+ 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,
+ self.position, fov_radius, self.game.get_map)
+
+ def multiprocessible_fov_stencil(self):
+ self._fov.init_terrain()
+
@property
def fov_stencil(self):
if self._fov:
return self._fov
- fov_map_class = self.game.map_geometry.fov_map_class
- self._fov = fov_map_class(self.game.things, self.game.maps, self.position,
- 12, self.game.get_map)
+ # due to the pre-multiprocessing in game.send_gamestate,
+ # the following should actually never be called
+ self.prepare_multiprocessible_fov_stencil()
+ self.multiprocessible_fov_stencil()
return self._fov
+ def fov_stencil_make(self):
+ self._fov.make()
+
def fov_test(self, big_yx, little_yx):
test_position = self.fov_stencil.target_yx(big_yx, little_yx)
if self.fov_stencil.inside(test_position):
@@ -364,3 +377,9 @@ class Thing_Player(ThingAnimate):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.carrying = None
+
+ def send_msg(self, msg):
+ for c_id in self.game.sessions:
+ if self.game.sessions[c_id]['thing_id'] == self.id_:
+ self.game.io.send(msg, c_id)
+ break