X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Ftasks.py;h=b408ea49636b582a3dcbe8fd505faa196270fe99;hb=2a7e3040d58b1d7dcddf64378bfd1abd8d7ded7c;hp=cc375272c1edd941aeafbbb4117a3d30db142d8c;hpb=1ece82099bbf02faed3d1348d7014b8ed38528a9;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index cc37527..b408ea4 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -61,15 +61,7 @@ class Task_MOVE(Task):
self.thing.name))
break
self.thing.game.record_change(self.thing.position, 'other')
- terrain = \
- self.thing.game.maps[self.thing.position[0]][self.thing.position[1]]
- if terrain in self.thing.game.terrains:
- terrain_type = self.thing.game.terrains[terrain]
- if 'sittable' in terrain_type.tags:
- self.thing.standing = False
- self.thing.send_msg('CHAT "You sink into the %s. '
- 'Staying here will replenish your energy."'
- % terrain_type.description)
+ self.thing.try_to_sit()
self.thing.invalidate('fov')
if self.thing.blocks_light:
self.thing.game.record_change(self.thing.position, 'fov')
@@ -213,6 +205,8 @@ class Task_DOOR(Task):
t.type_ == 'Door' and t.position in action_radius]
if len(reachable_doors) == 0:
raise PlayError('not standing next to a door to open/close')
+ if len([d for d in reachable_doors if not d.portable]) == 0:
+ raise PlayError('can only open/close doors that are installed')
for door in reachable_doors:
if not door.blocks_movement:
return
@@ -247,7 +241,7 @@ class Task_INTOXICATE(Task):
def check(self):
if self.thing.carrying is None:
raise PlayError('carrying nothing to consume')
- if self.thing.carrying.type_ not in {'Bottle', 'Cookie', 'Psychedelic'}:
+ if not self.thing.carrying.consumable:
raise PlayError('cannot consume this kind of thing')
if self.thing.carrying.type_ == 'Bottle' and\
not self.thing.carrying.full:
@@ -259,20 +253,25 @@ class Task_INTOXICATE(Task):
self.thing.carrying.empty()
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.need_for_toilet += 1
- self.thing.drunk = 10000
+ self.thing.drunk += 100000
self.thing.invalidate('fov')
self.thing.game.record_change(self.thing.position, 'other')
elif self.thing.carrying.type_ == 'Psychedelic':
- self.thing.tripping = 10000
+ self.thing.tripping += 100000
self.thing.send_msg('CHAT "You start tripping."')
self.thing.send_msg('RANDOM_COLORS')
eaten = self.thing.uncarry()
self.thing.game.remove_thing(eaten)
elif self.thing.carrying.type_ == 'Cookie':
- self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
+ self.thing.send_msg('CHAT ' + quote('You eat a cookie that grants the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
self.thing.add_cookie_char(self.thing.carrying.thing_char)
eaten = self.thing.uncarry()
self.thing.game.remove_thing(eaten)
+ elif self.thing.carrying.type_ == 'Stimulant':
+ self.thing.send_msg('CHAT "You feel a flash of energy."')
+ self.thing.energy += 50
+ eaten = self.thing.uncarry()
+ self.thing.game.remove_thing(eaten)