X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=2c0c3fce395c05011a114b3227e01843f58640f2;hb=cf8ab4843ff083bd174a30a5bb148ed3a9c531e2;hp=99bb41f516249e81dc3470caa09444e18c21047d;hpb=540aec0e9bf55d0452cffda4b34e1995d3724abf;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 99bb41f..2c0c3fc 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -1,4 +1,4 @@ -from plomrogue.errors import PlayError +from plomrogue.errors import PlayError, GameError from plomrogue.mapping import YX @@ -48,10 +48,12 @@ class Task_MOVE(Task): class Task_WRITE(Task): todo = 1 - argtypes = 'string:char' + argtypes = 'string:char string' def check(self): - pass + 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] @@ -60,12 +62,15 @@ class Task_WRITE(Task): class Task_FLATTEN_SURROUNDINGS(Task): todo = 10 + argtypes = 'string' def check(self): pass def do(self): - self.thing.game.map[self.thing.position] = '.' - for yx in self.thing.game.map_geometry.get_neighbors(self.thing.position).values(): + 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] = '.'