X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=25197980ff860b165349ebd89fe98c2c06f5d45a;hb=509d9ca8e54529b5d728b1635df4ba4bbb0bcc23;hp=c8ef346b13a05e831d092f9430d9a93c49a8473e;hpb=dfb05774efac717d1adc699e97b6140599e5df1e;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index c8ef346..2519798 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -26,6 +26,7 @@ class Thing(ThingBase):
     portable = False
     protection = '.'
     commandable = False
+    cookable = False
     carried = False
 
     def __init__(self, *args, **kwargs):
@@ -206,6 +207,7 @@ class Thing_Door(ThingInstallable):
 class Thing_Psychedelic(Thing):
     symbol_hint = 'P'
     portable = True
+    cookable = True
 
 
 
@@ -221,6 +223,7 @@ class Thing_Bottle(Thing):
     full = True
     thing_char = '~'
     spinnable = True
+    cookable = True
 
     def empty(self):
         self.thing_char = '_'
@@ -258,6 +261,7 @@ class Thing_Hat(Thing):
     portable = True
     design = ' +--+ ' + ' |  | ' + '======'
     spinnable = True
+    cookable = True
 
     def spin(self):
         new_design = ''
@@ -308,6 +312,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)
@@ -451,6 +456,28 @@ 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
 
@@ -603,18 +630,22 @@ class Thing_Player(ThingAnimate):
         if self.tripping >= 0:
             self.tripping -= 1
         if self.need_for_toilet > 0:
-            self.need_for_toilet += 1
             terrain = self.game.maps[self.position[0]][self.position[1]]
             if terrain in self.game.terrains:
                 terrain_type = self.game.terrains[terrain]
                 if 'toilet' in terrain_type.tags:
                     self.send_msg('CHAT "You use the toilet. What a relief!"')
                     self.need_for_toilet = 0
-            if 10000 * random.random() < self.need_for_toilet / 100000:
+        if self.need_for_toilet > 0:
+            if random.random() > 0.9999:
+                self.need_for_toilet += 1
+                self.game.changed = True
+            if 100000 * random.random() < self.need_for_toilet:
                 self.send_msg('CHAT "You need to go to a toilet."')
-            if self.need_for_toilet > 1000000:
+            if self.need_for_toilet > 100:
                 self.send_msg('CHAT "You pee into your pants. Eww!"')
                 self.need_for_toilet = 0
+                self.game.changed = True
         if self.drunk == 0:
             self.send_msg('CHAT "You sober up."')
             self.invalidate('fov')
@@ -629,8 +660,13 @@ class Thing_Player(ThingAnimate):
         if random.random() > 0.9999:
             if self.standing:
                 self.weariness += 1
+                if self.weariness % 5 == 0:
+                    self.send_msg('CHAT "All that walking or standing makes '
+                                  'you weary, and thereby slower. Find a place '
+                                  'to sit or lie down to regain energy."')
             elif self.weariness > 0:
                 self.weariness -= 1
+            self.game.changed = True
 
     def send_msg(self, msg):
         for c_id in self.game.sessions: