from plomrogue.errors import GameError
from plomrogue.misc import quote
+from plomrogue.mapping import YX
for arg in self.args:
if type(arg) == str:
stringed_args += [quote(arg)]
+ elif type(arg) == int:
+ stringed_args += [str(arg)]
else:
raise GameError('stringifying arg type not implemented')
return ' '.join(stringed_args)
argtypes = 'string:direction'
def check(self):
- test_pos = self.thing.world.map_.move(self.thing.position, self.args[0])
- if test_pos is None:
+ test_pos = (YX(0,0),
+ self.thing.world.maps[YX(0,0)].
+ move(self.thing.position[1], self.args[0]))
+ if test_pos == (YX(0,0), None):
raise GameError('would move outside map bounds')
- if self.thing.world.map_[test_pos] != '.':
+ if self.thing.world.maps[test_pos[0]][test_pos[1]] != '.':
raise GameError('%s would move into illegal terrain' % self.thing.id_)
- for t in self.thing.world.things:
- if t.blocking and t.position == test_pos:
+ for t in self.thing.world.things_at_pos(test_pos):
+ if t.blocking:
raise GameError('%s would move into other thing' % self.thing.id_)
def do(self):
- self.thing.position = self.thing.world.map_.move(self.thing.position,
- self.args[0])
- for id_ in self.thing.inventory:
- t = self.thing.world.get_thing(id_)
- t.position = self.thing.position
+ self.thing.position = YX(0,0), self.thing.world.maps[YX(0,0)].\
+ move(self.thing.position[1], self.args[0])