X-Git-Url: https://plomlompom.com/repos/day?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fthings.py;h=3a72ca31728dfd72ebeb8e6cd8b23510db34615c;hb=8dfe78d39a92e2967459bf7e4da5e3ed93741ae7;hp=1d9a4d021cc50425ae680584db3a570557fb1aa4;hpb=1a8eb9fa4e8dfaae9a0508882f49575ab68fc45c;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 1d9a4d0..3a72ca3 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -148,6 +148,17 @@ class Thing_SpawnPoint(Thing):
     symbol_hint = 's'
     portable = True
     name = 'username'
+    temporary = False
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.created_at = datetime.datetime.now()
+
+    def proceed(self):
+        super().proceed()
+        if self.temporary and datetime.datetime.now() >\
+           self.created_at + datetime.timedelta(minutes=10):
+            self.game.remove_thing(self)
 
 
 
@@ -163,6 +174,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'
 
@@ -265,6 +291,7 @@ class Thing_Hat(Thing):
     design = ' +--+ ' + ' |  | ' + '======'
     spinnable = True
     cookable = True
+    design_size = YX(3, 6)
 
     def spin(self):
         new_design = ''
@@ -345,10 +372,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:']
@@ -421,13 +449,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):
@@ -681,7 +711,7 @@ class Thing_Player(ThingAnimate):
                 self.energy -= 1
             else:
                 self.energy += 1
-            if self.energy < 0 and self.energy % 5 == 0:
+            if self.energy < 0 and self.standing and self.energy % 5 == 0:
                     self.send_msg('CHAT "All that walking or standing uses up '
                                   'your energy, which makes you slower.  Find a'
                                   ' place to sit or lie down to regain it."')