X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-logo.png?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=c538a235d8c4a7d301800563022470b3a41638c7;hb=1ece82099bbf02faed3d1348d7014b8ed38528a9;hp=25197980ff860b165349ebd89fe98c2c06f5d45a;hpb=509d9ca8e54529b5d728b1635df4ba4bbb0bcc23;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index 2519798..c538a23 100644 --- 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): @@ -618,6 +618,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 +660,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.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: + 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):