X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Ftasks.py;h=262576273f4726301777fe0297f7e0b441d4c0a8;hb=d33b918833cc762029abf5ca0b6930e16f91e8da;hp=a2c041b06aeb0807ab095f3f07f914ea705e26f2;hpb=e530d9faf68b4057322f5cc61aa0e3b76f8db3f6;p=plomrogue2-experiments diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py index a2c041b..2625762 100644 --- a/new/plomrogue/tasks.py +++ b/new/plomrogue/tasks.py @@ -11,12 +11,6 @@ class Task: self.args = args self.todo = 3 - @property - def name(self): - prefix = 'Task_' - class_name = self.__class__.__name__ - return class_name[len(prefix):] - def check(self): pass @@ -46,7 +40,7 @@ class Task_MOVE(Task): if self.thing.world.map_[test_pos] != '.': raise GameError('%s would move into illegal terrain' % self.thing.id_) for t in self.thing.world.things: - if t.position == test_pos: + if t.blocking and t.position == test_pos: raise GameError('%s would move into other thing' % self.thing.id_) def do(self):