X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=plomrogue%2Ftasks.py;h=09e9c56702083cefbff105268a5c7a241f20d8fb;hb=d16c11ef2034c2903418b44ee8b8f5f06714347a;hp=8af4bb957f683227decdcd2f2066a79a766004e5;hpb=4a49836086c55c2736bcc7def243f6c4a72ae690;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 8af4bb9..09e9c56 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -36,18 +36,19 @@ class Task_MOVE(Task):
test_yxyx = self._get_move_target()
move_blockers = self.thing.game.get_movement_blockers()
if test_yxyx in [t.position for t in self.thing.game.things
- if t.blocking]:
+ if t.blocks_movement]:
raise PlayError('blocked by other thing')
elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] in move_blockers:
raise PlayError('blocked by impassable tile')
def do(self):
self.thing.game.record_change(self.thing.position, 'other')
- if self.thing.blocking:
+ if self.thing.blocks_light:
self.thing.game.record_change(self.thing.position, 'fov')
self.thing.position = self._get_move_target()
self.thing.game.record_change(self.thing.position, 'other')
- if self.thing.blocking:
+ self.thing.invalidate('fov')
+ if self.thing.blocks_light:
self.thing.game.record_change(self.thing.position, 'fov')
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
@@ -169,7 +170,7 @@ class Task_DOOR(Task):
get_neighbors_yxyx(self.thing.position).values())
for t in [t for t in self.thing.game.things if
t.type_ == 'Door' and t.position in action_radius]:
- if t.blocking:
+ if t.blocks_movement:
t.open()
else:
t.close()
@@ -182,8 +183,8 @@ class Task_INTOXICATE(Task):
def check(self):
if self.thing.carrying is None:
- raise PlayError('carrying nothing to drink from')
- if self.thing.carrying.type_ not in {'Bottle', 'Cookie'}:
+ raise PlayError('carrying nothing to consume')
+ if self.thing.carrying.type_ not in {'Bottle', 'Cookie', 'Psychedelic'}:
raise PlayError('cannot consume this kind of thing')
if self.thing.carrying.type_ == 'Bottle' and\
not self.thing.carrying.full:
@@ -193,11 +194,18 @@ class Task_INTOXICATE(Task):
if self.thing.carrying.type_ == 'Bottle':
self.thing.carrying.full = False
self.thing.carrying.empty()
- self.thing.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
+ self.thing.need_for_toilet *= 2
+ self.thing.need_for_toilet += 1
self.thing.drunk = 10000
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.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.add_cookie_char(self.thing.carrying.thing_char)