X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=3c8f09da72ff02bd96584ae4297cfc053c6499e7;hb=ac4f9e2337229827418b191743c1182cc5eae4d1;hp=f8f13733ec2aef82ceab45c5dd27768c7b64eb46;hpb=738d909ab62b9248adb1cf5244b37daa412b39c7;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index f8f1373..3c8f09d 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -26,7 +26,9 @@ class Thing(ThingBase):
     portable = False
     protection = '.'
     commandable = False
+    cookable = False
     carried = False
+    consumable = False
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -146,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)
 
 
 
@@ -161,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'
 
@@ -206,6 +234,8 @@ class Thing_Door(ThingInstallable):
 class Thing_Psychedelic(Thing):
     symbol_hint = 'P'
     portable = True
+    cookable = True
+    consumable = True
 
 
 
@@ -221,6 +251,8 @@ class Thing_Bottle(Thing):
     full = True
     thing_char = '~'
     spinnable = True
+    cookable = True
+    consumable = True
 
     def empty(self):
         self.thing_char = '_'
@@ -258,6 +290,8 @@ class Thing_Hat(Thing):
     portable = True
     design = ' +--+ ' + ' |  | ' + '======'
     spinnable = True
+    cookable = True
+    design_size = YX(3, 6)
 
     def spin(self):
         new_design = ''
@@ -308,6 +342,7 @@ class Thing_MusicPlayer(Thing):
     next_song_start = datetime.datetime.now()
     playlist_index = -1
     playing = True
+    cookable = True
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -337,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:']
@@ -430,9 +466,24 @@ class Thing_BottleDeposit(Thing):
 
 
 
+class Thing_Stimulant(Thing):
+    symbol_hint = 'e'
+    cookable = True
+    portable = True
+    consumable = True
+
+
+
+class Thing_StimulantSpawner(ThingSpawner):
+    symbol_hint = 'e'
+    child_type = 'Stimulant'
+
+
+
 class Thing_Cookie(Thing):
     symbol_hint = 'c'
     portable = True
+    consumable = True
 
     def __init__(self, *args, **kwargs):
         import string
@@ -451,8 +502,30 @@ class Thing_CookieSpawner(Thing):
 
 
 
+class Thing_Crate(Thing):
+    portable = True
+    symbol_hint = 'C'
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.content = []
+
+    def accept(self, thing):
+        self.content += [thing]
+
+    def remove_from_crate(self, thing):
+        self.content.remove(thing)
+
+
+
+class Thing_CrateSpawner(ThingSpawner):
+    child_type = 'Crate'
+    symbol_hint = 'C'
+
+
+
 class ThingAnimate(Thing):
-    weariness = 0
+    energy = 50
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -481,7 +554,7 @@ class ThingAnimate(Thing):
             task = self.next_task[0]
             self.next_task = [None]
             task.check()
-            task.todo += self.weariness * 10
+            task.todo += max(0, -self.energy * 10)
             return task
 
     def proceed(self):
@@ -591,6 +664,7 @@ class Thing_Player(ThingAnimate):
     tripping = 0
     need_for_toilet = 0
     standing = True
+    dancing = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -632,9 +706,25 @@ class Thing_Player(ThingAnimate):
             self.game.changed = True
         if random.random() > 0.9999:
             if self.standing:
-                self.weariness += 1
-            elif self.weariness > 0:
-                self.weariness -= 1
+                self.energy -= 1
+            else:
+                self.energy += 1
+            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."')
+            self.game.changed = True
+        if self.dancing and random.random() > 0.99 and not self.next_task[0]:
+            self.dancing -= 1
+            direction = random.choice(self.game.map_geometry.directions)
+            self.set_next_task('MOVE', [direction])
+            if random.random() > 0.9:
+                self.energy -= 1
+                self.game.changed = True
+        if 1000000 * random.random() < self.energy - 50:
+            self.send_msg('CHAT "Your body tries to '
+                          'dance off its energy surplus."')
+            self.dancing += 50
             self.game.changed = True
 
     def send_msg(self, msg):