X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=sidebyside;f=new2%2Fplomrogue%2Ftasks.py;h=99bb41f516249e81dc3470caa09444e18c21047d;hb=6a42c14f0f393f8866689e3b19e950cdc299938b;hp=0fe68791d9ee779df2f6160a8f85bc0f2ade9dcf;hpb=a213ed788c8f305ea9c2192eabfb0d3562c8b2fa;p=plomrogue2-experiments

diff --git a/new2/plomrogue/tasks.py b/new2/plomrogue/tasks.py
index 0fe6879..99bb41f 100644
--- a/new2/plomrogue/tasks.py
+++ b/new2/plomrogue/tasks.py
@@ -1,4 +1,4 @@
-from plomrogue.errors import GameError
+from plomrogue.errors import PlayError
 from plomrogue.mapping import YX
 
 
@@ -35,9 +35,11 @@ class Task_MOVE(Task):
     def check(self):
         test_pos = self.get_move_target()
         if test_pos is None:
-            raise GameError('would move out of map')
+            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 GameError('would move into illegal territory')
+            raise PlayError('would move into illegal territory')
 
     def do(self):
         self.thing.position = self.get_move_target()