X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=new%2Fplomrogue%2Ftasks.py;h=11d4ba33ca69b125366f4262f4a65bfc8816617f;hb=b7587718cee2308bd2a27462e0996dc279bd3038;hp=c9ce45ed654f1aff64848c65f6b43167db3037c7;hpb=073618f45f297b21e90390be06cafcd430cd4d62;p=plomrogue2-experiments
diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index c9ce45e..11d4ba3 100644
--- 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.mapping import YX
@@ -19,6 +20,8 @@ class Task:
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)
@@ -35,22 +38,21 @@ class Task_WAIT(Task):
class Task_MOVE(Task):
argtypes = 'string:direction'
+ def get_move_target(self):
+ return self.thing.game.map_geometry.move(self.thing.position,
+ self.args[0],
+ self.thing.game.map_size)
+
def check(self):
- test_pos = self.thing.world.map_.move(self.thing.position, self.args[0])
- if test_pos is None:
- raise GameError('would move outside map bounds')
- if self.thing.world.map_[test_pos] != '.':
+ test_pos = self.get_move_target()
+ if self.thing.game.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.game.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 = self.get_move_target()
@@ -58,15 +60,15 @@ class Task_PICKUP(Task):
argtypes = 'int:nonneg'
def check(self):
- to_pick_up = self.thing.world.get_thing(self.args[0],
- create_unfound=False)
+ to_pick_up = self.thing.game.get_thing(self.args[0],
+ create_unfound=False)
if to_pick_up is None or \
to_pick_up.id_ not in self.thing.get_pickable_items():
raise GameError('thing of ID %s not in reach to pick up'
% self.args[0])
def do(self):
- to_pick_up = self.thing.world.get_thing(self.args[0])
+ to_pick_up = self.thing.game.get_thing(self.args[0])
self.thing.inventory += [self.args[0]]
to_pick_up.in_inventory = True
to_pick_up.position = self.thing.position
@@ -77,7 +79,7 @@ class TaskOnInventoryItem(Task):
argtypes = 'int:nonneg'
def _basic_inventory_item_check(self):
- item = self.thing.world.get_thing(self.args[0], create_unfound=False)
+ item = self.thing.game.get_thing(self.args[0], create_unfound=False)
if item is None:
raise GameError('no thing of ID %s' % self.args[0])
if item.id_ not in self.thing.inventory:
@@ -85,7 +87,7 @@ class TaskOnInventoryItem(Task):
return item
def _eliminate_from_inventory(self):
- item = self.thing.world.get_thing(self.args[0])
+ item = self.thing.game.get_thing(self.args[0])
del self.thing.inventory[self.thing.inventory.index(item.id_)]
item.in_inventory = False
return item
@@ -113,5 +115,5 @@ class Task_EAT(TaskOnInventoryItem):
def do(self):
to_eat = self._eliminate_from_inventory()
- del self.thing.world.things[self.thing.world.things.index(to_eat)]
+ del self.thing.game.things[self.thing.game.things.index(to_eat)]
self.thing.health += 50