X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fthings.py;h=db4a4322d442c086a7109660f8704e1ef4a73419;hb=ca61b0ee39690ef3b4fc33c14655b73d4b31f5f9;hp=8a6be226532084e0e1d142a760e1cfb4c2aaca59;hpb=e1c11c0c04770c3e91f36e953074822d3f9d75dd;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 8a6be22..db4a432 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -445,7 +445,7 @@ class Thing_MusicPlayer(Thing):
class Thing_BottleDeposit(Thing):
bottle_counter = 0
- symbol_hint = 'O'
+ symbol_hint = 'b'
def proceed(self):
if self.bottle_counter >= 3:
@@ -510,7 +510,7 @@ class Thing_Cookie(Thing):
class Thing_CookieSpawner(Thing):
- symbol_hint = 'O'
+ symbol_hint = 'o'
def accept(self, thing):
self.sound('OVEN', '*heat* *brrzt* here\'s a cookie!')
@@ -570,6 +570,9 @@ class ThingAnimate(Thing):
task = self.next_task[0]
self.next_task = [None]
task.check()
+ if 1000 * random.random() < -self.energy:
+ self.send_msg('CHAT "You movements are slowed down '
+ 'due to your low energy."')
task.todo += max(0, -self.energy * 10)
return task
@@ -725,10 +728,16 @@ class Thing_Player(ThingAnimate):
self.energy -= 1
else:
self.energy += 1
- if self.energy < 0 and self.standing and self.energy % 5 == 0:
+ if self.energy <= 0 and self.standing and self.energy % 10 == 0:
self.send_msg('CHAT "All that walking or standing uses up '
- 'your energy, which makes you slower. Find a'
+ 'your energy, which slows you down. Find a'
' place to sit or lie down to regain it."')
+ if self.energy < -100:
+ self.send_msg('CHAT "Due to low energy, you collapse on the '
+ 'floor. Somebody calls an ambulance. You remember '
+ 'little of what happens afterwards. You end up '
+ 'back here, pumped full with stimulants."')
+ self.energy = 100
self.game.changed = True
if self.dancing and random.random() > 0.99 and not self.next_task[0]:
self.dancing -= 1
@@ -768,3 +777,18 @@ class Thing_Player(ThingAnimate):
chars_split = list(chars)
chars_split.sort()
return ''.join(chars_split)
+
+ def try_to_sit(self):
+ terrain = self.game.maps[self.position[0]][self.position[1]]
+ if terrain in self.game.terrains:
+ terrain_type = self.game.terrains[terrain]
+ if 'sittable' in terrain_type.tags:
+ self.standing = False
+ self.send_msg('CHAT "You sink into the %s. '
+ 'Staying here will replenish your energy."'
+ % terrain_type.description)
+ for t in [t for t in self.game.things
+ if t.type_ == 'Chair' and t.position == self.position]:
+ self.standing = False
+ self.send_msg('CHAT "You sink into the Chair. '
+ 'Staying here will replenish your energy."')