X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=de9f1c87d1591820f2a405bf97313866e0c90ab5;hb=78c02188e008392eddc2e806bacacecc7d8fd94b;hp=4a6df1641202d75ca66f7f1a057d779774f155f9;hpb=aab94ffb12aa0dedc240d7b29001699b95c49249;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 4a6df16..de9f1c8 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -36,15 +36,31 @@ 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_fov_change(self.thing.position)
+ if self.thing.type_ == 'Player' and not self.thing.standing:
+ self.thing.standing = True
+ self.thing.send_msg('CHAT "You get up."')
+ self.thing.game.record_change(self.thing.position, 'other')
+ 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_fov_change(self.thing.position)
+ 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."'
+ % terrain_type.description)
+ 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
@@ -62,7 +78,7 @@ class Task_WRITE(Task):
big_yx = self.thing.position[0]
little_yx = self.thing.position[1]
self.thing.game.maps[big_yx][little_yx] = self.args[0]
- self.thing.game.record_fov_change((big_yx, little_yx))
+ self.thing.game.record_change((big_yx, little_yx), 'fov')
@@ -79,7 +95,7 @@ class Task_FLATTEN_SURROUNDINGS(Task):
if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]):
continue
self.thing.game.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland()
- self.thing.game.record_fov_change(yxyx)
+ self.thing.game.record_change(yxyx, 'fov')
@@ -111,8 +127,7 @@ class Task_PICK_UP(Task):
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
to_pick_up.carried = True
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@ -155,8 +170,7 @@ class Task_DROP(Task):
and t.position == dropped.position]:
t.accept(dropped)
break
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@ -167,11 +181,12 @@ 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()
- self.thing.game.record_fov_change(t.position)
+ self.thing.game.record_change(t.position, 'other')
+ self.thing.game.record_change(t.position, 'fov')
@@ -179,8 +194,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:
@@ -190,11 +205,17 @@ 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 += 10000
self.thing.drunk = 10000
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ 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)
@@ -248,8 +269,7 @@ class Task_INSTALL(Task):
else:
self._get_uninstallables()[0].uninstall()
self.thing.send_msg('CHAT "You uninstall the thing here."')
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@ -285,10 +305,9 @@ class Task_WEAR(Task):
self.thing.game.hats[self.thing.name] =\
self.thing.carrying.design
self.thing.send_msg('CHAT "You put on a hat."')
- dropped = self.uncarry()
+ dropped = self.thing.uncarry()
self.thing.game.remove_thing(dropped)
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')