X-Git-Url: https://plomlompom.com/repos/?p=plomrogue2-experiments;a=blobdiff_plain;f=new2%2Fplomrogue%2Ftasks.py;fp=new2%2Fplomrogue%2Ftasks.py;h=99bb41f516249e81dc3470caa09444e18c21047d;hp=bb78b98699a84ac507699074de4d45dd37237fbd;hb=6a42c14f0f393f8866689e3b19e950cdc299938b;hpb=85fa1896a0c890aa385d26f2186f7da23523cfd8

diff --git a/new2/plomrogue/tasks.py b/new2/plomrogue/tasks.py
index bb78b98..99bb41f 100644
--- a/new2/plomrogue/tasks.py
+++ b/new2/plomrogue/tasks.py
@@ -36,6 +36,8 @@ class Task_MOVE(Task):
         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')