X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Ftasks.py;h=a7bcf3772a4ab8f5e0351d63bb1da6f0e86c2f52;hb=9316d59ddce7a7b8ee70d2b4e111330f1a691e37;hp=2c0c3fce395c05011a114b3227e01843f58640f2;hpb=34856a61dd6b52c506aafa2dfd7de9d1ab07ced7;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 2c0c3fc..a7bcf37 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,5 +1,4 @@
from plomrogue.errors import PlayError, GameError
-from plomrogue.mapping import YX
@@ -20,7 +19,7 @@ class Task_WAIT(Task):
todo = 1
def do(self):
- return 'success'
+ pass
@@ -29,20 +28,21 @@ 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])
+ 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]:
- raise PlayError('would collide with other things')
- elif self.thing.game.map[test_pos] != '.':
- raise PlayError('would move into illegal territory')
+ 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.maps[test_yxyx[0]][test_yxyx[1]] != '.':
+ raise PlayError('blocked by impassable tile')
def do(self):
self.thing.position = self.get_move_target()
+ if self.thing.carrying:
+ self.thing.carrying.position = self.thing.position
@@ -51,12 +51,14 @@ class Task_WRITE(Task):
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]
@@ -68,9 +70,45 @@ class Task_FLATTEN_SURROUNDINGS(Task):
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]] = '.'
+
+
+
+class Task_PICK_UP(Task):
+ todo = 1
+
+ def check(self):
+ if self.thing.carrying:
+ raise PlayError('already carrying something')
+ nothing_to_pick_up = True
+ for t in [t for t in self.thing.game.things
+ 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:
+ raise PlayError('nothing to pick up')
+
+ def do(self):
+ to_pick_up = [t for t in self.thing.game.things
+ if t.portable
+ and t != self.thing and t.position == self.thing.position][0]
+ self.thing.carrying = to_pick_up
+
+
+
+class Task_DROP(Task):
+ todo = 1
+
+ def check(self):
+ if not self.thing.carrying:
+ raise PlayError('nothing to drop')
+
+ def do(self):
+ self.thing.carrying = None