X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=18cdf4c78069e9273e411c38223f4baae080a38f;hb=3484a01e592bafc9d573b878ff94ef5e64755476;hp=895f5ce98938515e84670aa89b05694b01c6fbac;hpb=ba9a4a402779b49f3b960f937ca73565a4854e8d;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 895f5ce..18cdf4c 100644
--- 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
@@ -128,17 +127,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):
@@ -158,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'
@@ -165,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):
@@ -177,81 +203,91 @@ 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])
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 += ['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']
+ 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
- elif command == 'PLAY':
+ return msg_lines
+ elif command == 'ON/OFF':
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 == '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'
+ 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']
@@ -262,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):
@@ -287,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]
@@ -305,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
@@ -353,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] == '.':
@@ -364,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):
@@ -372,3 +430,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