Only recommend sitting down if actually standing.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 25197980ff860b165349ebd89fe98c2c06f5d45a..da995d311dd84b7a777f9c0cc28aae2f091be0d5 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -28,6 +28,7 @@ class Thing(ThingBase):
     commandable = False
     cookable = False
     carried = False
+    consumable = False
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -208,6 +209,7 @@ class Thing_Psychedelic(Thing):
     symbol_hint = 'P'
     portable = True
     cookable = True
+    consumable = True
 
 
 
@@ -224,6 +226,7 @@ class Thing_Bottle(Thing):
     thing_char = '~'
     spinnable = True
     cookable = True
+    consumable = True
 
     def empty(self):
         self.thing_char = '_'
@@ -435,9 +438,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
@@ -479,7 +497,7 @@ class Thing_CrateSpawner(ThingSpawner):
 
 
 class ThingAnimate(Thing):
-    weariness = 0
+    energy = 50
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -508,7 +526,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):
@@ -618,6 +636,7 @@ class Thing_Player(ThingAnimate):
     tripping = 0
     need_for_toilet = 0
     standing = True
+    dancing = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -659,13 +678,25 @@ class Thing_Player(ThingAnimate):
             self.game.changed = True
         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.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):