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
Use smarter YX class for y,x coordinates/sizes.
[plomrogue2-experiments]
/
new
/
plomrogue
/
tasks.py
diff --git
a/new/plomrogue/tasks.py
b/new/plomrogue/tasks.py
index dfd22f7d50094d3732a327e370080e1085ef81ca..3bc0f56ebf50245ee974ba68bbb8644949245118 100644
(file)
--- a/
new/plomrogue/tasks.py
+++ b/
new/plomrogue/tasks.py
@@
-1,5
+1,6
@@
from plomrogue.errors import GameError
from plomrogue.misc import quote
from plomrogue.errors import GameError
from plomrogue.misc import quote
+from plomrogue.mapping import YX
@@
-19,6
+20,8
@@
class Task:
for arg in self.args:
if type(arg) == str:
stringed_args += [quote(arg)]
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)
else:
raise GameError('stringifying arg type not implemented')
return ' '.join(stringed_args)
@@
-36,21
+39,20
@@
class Task_MOVE(Task):
argtypes = 'string:direction'
def check(self):
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')
raise GameError('would move outside map bounds')
- if self.thing.world.map
_[test_pos
] != '.':
+ if self.thing.world.map
s[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 t.blocking:
raise GameError('%s would move into other thing' % self.thing.id_)
def do(self):
raise GameError('%s would move into illegal terrain' % self.thing.id_)
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])