Simplify toilet need calcuation, add pee-into-pants emergency exit.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 09dc4b678a066ba83f475250a8f205ac7ab4ec90..249a138eef3c7570b03e9d43d25cfd8e0cc790c7 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -584,13 +584,14 @@ class Thing_Player(ThingAnimate):
                     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:
-                self.send_msg('CHAT "You need to use a toilet."')
+                self.send_msg('CHAT "You need to go to a toilet. %s"' % self.need_for_toilet)
+            if self.need_for_toilet > 1000000:
+                self.send_msg('CHAT "You pee into your pants. Eww!"')
+                self.need_for_toilet = 0
         if self.drunk == 0:
             self.send_msg('CHAT "You sober up."')
             self.invalidate('fov')
             self.game.changed = True
-            self.need_for_toilet *= 2
-            self.need_for_toilet += 1
         if self.tripping == 0:
             self.send_msg('DEFAULT_COLORS')
             self.send_msg('CHAT "You sober up."')