X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=3c8f09da72ff02bd96584ae4297cfc053c6499e7;hb=64cf00e418112f70163a5b24ccad8247a88abfd9;hp=6dbe8ef7eee4ccd2d4bb17354895edc0cc584044;hpb=cf2a7a164c24e82a5efc4cfe9c56c4b4f2c442df;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 6dbe8ef..3c8f09d 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:']
@@ -497,7 +525,7 @@ class Thing_CrateSpawner(ThingSpawner):
 
 
 class ThingAnimate(Thing):
-    energy = 0
+    energy = 50
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -681,7 +709,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."')
@@ -693,7 +721,7 @@ class Thing_Player(ThingAnimate):
             if random.random() > 0.9:
                 self.energy -= 1
                 self.game.changed = True
-        if 1000000 * random.random() < self.energy:
+        if 1000000 * random.random() < self.energy - 50:
             self.send_msg('CHAT "Your body tries to '
                           'dance off its energy surplus."')
             self.dancing += 50