X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=ad87ebd90c52bd65c3b44615b89a971e1144d00c;hb=2df42b53c56bd32dc445df532b4c42c53d97b767;hp=2c3f540443b46fbca6b4aee5170619d53d287d59;hpb=7c03e8e8e4ed15f01e29dd331596719058af9f07;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 2c3f540..ad87ebd 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -29,6 +29,7 @@ class Thing(ThingBase):
cookable = False
carried = False
consumable = False
+ sittable = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -174,6 +175,21 @@ class ThingInstallable(Thing):
+class Thing_SignSpawner(ThingSpawner):
+ child_type = 'Sign'
+
+
+
+class Thing_Sign(ThingInstallable):
+ symbol_hint = '?'
+ design_size = YX(16, 36)
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.design = 'x' * self.design_size.y * self.design_size.x
+
+
+
class Thing_DoorSpawner(ThingSpawner):
child_type = 'Door'
@@ -276,6 +292,7 @@ class Thing_Hat(Thing):
design = ' +--+ ' + ' | | ' + '======'
spinnable = True
cookable = True
+ design_size = YX(3, 6)
def spin(self):
new_design = ''
@@ -356,10 +373,11 @@ class Thing_MusicPlayer(Thing):
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 += ['LIST â list programmed item, durations']
+ msg_lines += ['REMOVE â remove current item']
+ msg_lines += ['SKIP â to skip to next item']
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"']
+ msg_lines += ['ADD LENGTH ITEM â add ITEM to playlist, with LENGTH in format "minutes:seconds" (something like "0:47" or "11:02")']
return msg_lines
elif command == 'LIST':
msg_lines += ['playlist:']
@@ -432,13 +450,15 @@ class Thing_BottleDeposit(Thing):
def proceed(self):
if self.bottle_counter >= 3:
self.bottle_counter = 0
- choice = random.choice(['MusicPlayer', 'Hat'])
+ choice = random.choice(['MusicPlayer', 'Hat', 'Stimulant', 'Psychedelic'])
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!'
+ elif choice in {'Psychedelic', 'Stimulant'}:
+ msg += 'pick it up and then use "consume" on it!'
self.sound('BOTTLE DEPOSITOR', msg)
def accept(self):
@@ -463,6 +483,19 @@ class Thing_StimulantSpawner(ThingSpawner):
+class Thing_Chair(Thing):
+ symbol_hint = 'h'
+ portable = True
+ sittable = True
+
+
+
+class Thing_ChairSpawner(ThingSpawner):
+ symbol_hint = 'e'
+ child_type = 'Chair'
+
+
+
class Thing_Cookie(Thing):
symbol_hint = 'c'
portable = True