Invert weariness metric into energy metric.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 6637b3744199d94a989fc23000b4b40963d2e3c7..dbec52f57a329b826d1300642b08c378e3973165 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -479,7 +479,7 @@ class Thing_CrateSpawner(ThingSpawner):
 
 
 class ThingAnimate(Thing):
-    weariness = 0
+    energy = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -508,7 +508,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):
@@ -660,22 +660,22 @@ class Thing_Player(ThingAnimate):
             self.game.changed = True
         if random.random() > 0.9999:
             if self.standing:
-                self.weariness += 1
+                self.energy -= 1
             else:
-                self.weariness -= 1
-            if self.weariness > 0 and 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."')
+                self.energy += 1
+            if self.energy < 0 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.weariness += 1
+                self.energy -= 1
                 self.game.changed = True
-        if 1000000 * random.random() < -self.weariness:
+        if 1000000 * random.random() < self.energy:
             self.send_msg('CHAT "Your body tries to '
                           'dance off its energy surplus."')
             self.dancing = 50