raise PlayError('blocked by impassable tile')
def do(self):
+ self.thing.game.record_fov_change(self.thing.position)
self.thing.position = self.get_move_target()
+ self.thing.game.record_fov_change(self.thing.position)
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
- self.thing.game.changed_fovs = True
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.changed_fovs = True
+ self.thing.game.record_fov_change((big_yx, little_yx))
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.changed_fovs = True
+ self.thing.game.record_fov_change(yxyx)
raise PlayError('cannot pick up oneself')
elif to_pick_up.type_ == 'Player':
raise PlayError('cannot pick up player')
+ elif to_pick_up.carried:
+ raise PlayError('thing already carried by a player')
elif to_pick_up.position not in reach:
raise PlayError('thing not in reach')
elif not to_pick_up.portable:
to_pick_up = self.thing.game.get_thing(self.args[0])
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
+ to_pick_up.carried = True
raise PlayError('cannot drop full bottle into bottle deposit')
def do(self):
- if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full:
+ dropped = self.thing.uncarry()
+ if dropped.type_ == 'Bottle' and not dropped.full:
for t in [t for t in self.thing.game.things
if t.type_ == 'BottleDeposit'
and t.position == self.thing.position]:
t.accept()
- self.thing.game.remove_thing(self.thing.carrying)
+ self.thing.game.remove_thing(dropped)
break
- elif self.thing.carrying.type_ == 'Hat':
+ elif dropped.type_ == 'Hat':
for t in [t for t in self.thing.game.things
if t.type_ == 'HatRemixer'
and t.position == self.thing.position]:
- t.accept(self.thing.carrying)
+ t.accept(dropped)
break
- self.thing.carrying = None
class Task_DOOR(Task):
def do(self):
- self.thing.carrying = None
action_radius = list(self.thing.game.map_geometry.
get_neighbors_yxyx(self.thing.position).values())
for t in [t for t in self.thing.game.things if
t.open()
else:
t.close()
- self.thing.game.changed_fovs = True
+ self.thing.game.record_fov_change(t.position)
self.thing.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
- self.thing.game.changed_fovs = True
+ self.thing.invalidate_map_view()
def do(self):
if self.thing.carrying:
- self.thing.carrying.install()
- self.thing.carrying = None
+ t = self.thing.uncarry()
+ t.install()
self.thing.send_msg('CHAT "You install the thing you carry."')
else:
self._get_uninstallables()[0].uninstall()
else:
from plomrogue.misc import quote
self.thing.game.hats[self.thing.name] = self.thing.carrying.design
- self.thing.game.things.remove(self.thing.carrying)
+ self.thing.game.remove_thing(self.thing.carrying)
self.thing.carrying = None
self.thing.send_msg('CHAT "You put on a hat."')