from plomrogue.errors import PlayError, GameError
-from plomrogue.mapping import YX
argtypes = 'string:direction'
def get_move_target(self):
- return self.thing.game.map_geometry.move(self.thing.position,
- self.args[0])
+ return self.thing.game.map_geometry.move_yxyx(self.thing.position,
+ self.args[0])
def check(self):
- test_pos = self.get_move_target()
- if test_pos is None:
- raise PlayError('would move out of map')
- elif test_pos in [t.position for t in self.thing.game.things
- if t.blocking]:
+ test_yxyx = self.get_move_target()
+ 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.map[test_pos] != '.':
- raise PlayError('would move into illegal territory')
+ elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] != '.':
+ raise PlayError('blocked by impassable tile')
def do(self):
self.thing.position = self.get_move_target()
argtypes = 'string:char string'
def check(self):
- if not self.thing.game.can_do_tile_with_pw(self.thing.position,
+ if not self.thing.game.can_do_tile_with_pw(*self.thing.position,
self.args[1]):
raise GameError('wrong password for tile')
def do(self):
- self.thing.game.map[self.thing.position] = self.args[0]
+ big_yx = self.thing.position[0]
+ little_yx = self.thing.position[1]
+ self.thing.game.maps[big_yx][little_yx] = self.args[0]
pass
def do(self):
- for yx in[self.thing.position] + \
- list(self.thing.game.map_geometry.get_neighbors(self.thing.position).values()):
- if yx is not None:
- if not self.thing.game.can_do_tile_with_pw(yx, self.args[0]):
- continue
- self.thing.game.map[yx] = '.'
+ for yxyx in [self.thing.position] + \
+ list(self.thing.game.map_geometry.get_neighbors_yxyx(
+ 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]] = '.'
def check(self):
if self.thing.carrying:
- raise PlayError('already carrying')
+ raise PlayError('already carrying something')
nothing_to_pick_up = True
for t in [t for t in self.thing.game.things
- if t != self.thing and t.position == self.thing.position
- and t.type_ != 'Player']:
+ if t.portable
+ and t != self.thing and t.position == self.thing.position and
+ t.type_ != 'Player']:
nothing_to_pick_up = False
break
if nothing_to_pick_up:
def do(self):
to_pick_up = [t for t in self.thing.game.things
- if t != self.thing and t.position == self.thing.position][0]
+ if t.portable
+ and t != self.thing and t.position == self.thing.position][0]
self.thing.carrying = to_pick_up