home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow player movement beyond central map. Lots of mapping rewrite.
[plomrogue2-experiments]
/
new
/
plomrogue
/
tasks.py
diff --git
a/new/plomrogue/tasks.py
b/new/plomrogue/tasks.py
index 3bc0f56ebf50245ee974ba68bbb8644949245118..6d67c35b1b088b0bf5b617525530668d8c1acbac 100644
(file)
--- a/
new/plomrogue/tasks.py
+++ b/
new/plomrogue/tasks.py
@@
-38,12
+38,13
@@
class Task_WAIT(Task):
class Task_MOVE(Task):
argtypes = 'string:direction'
class Task_MOVE(Task):
argtypes = 'string:direction'
+ def get_move_target(self):
+ return self.thing.world.game.map_geometry.move(self.thing.position,
+ self.args[0],
+ self.thing.world.game.map_size)
+
def check(self):
def check(self):
- 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')
+ test_pos = self.get_move_target()
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_at_pos(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_at_pos(test_pos):
@@
-51,8
+52,7
@@
class Task_MOVE(Task):
raise GameError('%s would move into other thing' % self.thing.id_)
def do(self):
raise GameError('%s would move into other thing' % self.thing.id_)
def do(self):
- self.thing.position = YX(0,0), self.thing.world.maps[YX(0,0)].\
- move(self.thing.position[1], self.args[0])
+ self.thing.position = self.get_move_target()