From 738d909ab62b9248adb1cf5244b37daa412b39c7 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 16 Dec 2020 22:22:42 +0100 Subject: [PATCH] Re-calibrate bladder pressure following weariness mechanic. --- plomrogue/tasks.py | 2 +- plomrogue/things.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 5449c0c..94f79a3 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -240,7 +240,7 @@ class Task_INTOXICATE(Task): self.thing.carrying.full = False self.thing.carrying.empty() self.thing.send_msg('CHAT "You are drunk now."') - self.thing.need_for_toilet += 10000 + self.thing.need_for_toilet += 1 self.thing.drunk = 10000 self.thing.invalidate('fov') self.thing.game.record_change(self.thing.position, 'other') diff --git a/plomrogue/things.py b/plomrogue/things.py index c8ef346..f8f1373 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -603,18 +603,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') @@ -631,6 +635,7 @@ class Thing_Player(ThingAnimate): self.weariness += 1 elif self.weariness > 0: self.weariness -= 1 + self.game.changed = True def send_msg(self, msg): for c_id in self.game.sessions: -- 2.30.2