home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken get_flatland().
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index 841a0e663d0f343542dd7e0dd96476f37a5151e3..68f3269c04738ee8f44e785453f5c50fb8e2f713 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-34,10
+34,11
@@
class Task_MOVE(Task):
def check(self):
test_yxyx = self._get_move_target()
def check(self):
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]:
raise PlayError('blocked by other thing')
if test_yxyx in [t.position for t in self.thing.game.things
if t.blocking]:
raise PlayError('blocked by other thing')
- elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]]
!= '.'
:
+ elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]]
in move_blockers
:
raise PlayError('blocked by impassable tile')
def do(self):
raise PlayError('blocked by impassable tile')
def do(self):
@@
-77,7
+78,7
@@
class Task_FLATTEN_SURROUNDINGS(Task):
self.thing.position).values()):
if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]):
continue
self.thing.position).values()):
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.maps[yxyx[0]][yxyx[1]] =
self.thing.game.get_flatland()
self.thing.game.record_fov_change(yxyx)
self.thing.game.record_fov_change(yxyx)
@@
-110,6
+111,8
@@
class Task_PICK_UP(Task):
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
to_pick_up.carried = True
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)
@@
-143,6
+146,8
@@
class Task_DROP(Task):
and t.position == dropped.position]:
t.accept(dropped)
break
and t.position == dropped.position]:
t.accept(dropped)
break
+ # FIXME: pseudo-FOV-change actually
+ self.thing.game.record_fov_change(self.thing.position)
@@
-177,7
+182,8
@@
class Task_INTOXICATE(Task):
self.thing.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
self.thing.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
- self.thing.invalidate_map_view()
+ # FIXME: pseudo-FOV-change actually
+ self.thing.game.record_fov_change(self.thing.position)
@@
-198,6
+204,7
@@
class Task_COMMAND(Task):
class Task_INSTALL(Task):
class Task_INSTALL(Task):
+ argtypes = 'string'
def _get_uninstallables(self):
return [t for t in self.thing.game.things
def _get_uninstallables(self):
return [t for t in self.thing.game.things
@@
-207,6
+214,9
@@
class Task_INSTALL(Task):
and t.position == self.thing.position]
def check(self):
and t.position == self.thing.position]
def check(self):
+ if not self.thing.game.can_do_tile_with_pw(*self.thing.position,
+ self.args[0]):
+ raise GameError('wrong password for tile')
if self.thing.carrying:
if not hasattr(self.thing.carrying, 'installable')\
or not self.thing.carrying.installable:
if self.thing.carrying:
if not hasattr(self.thing.carrying, 'installable')\
or not self.thing.carrying.installable:
@@
-222,6
+232,8
@@
class Task_INSTALL(Task):
else:
self._get_uninstallables()[0].uninstall()
self.thing.send_msg('CHAT "You uninstall the thing here."')
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)
@@
-259,6
+271,8
@@
class Task_WEAR(Task):
self.thing.send_msg('CHAT "You put on a hat."')
self.thing.game.remove_thing(self.thing.carrying)
self.thing.carrying = None
self.thing.send_msg('CHAT "You put on a hat."')
self.thing.game.remove_thing(self.thing.carrying)
self.thing.carrying = None
+ # FIXME: pseudo-FOV-change actually
+ self.thing.game.record_fov_change(self.thing.position)