From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 16 Dec 2020 19:13:02 +0000 (+0100)
Subject: Make players non-blocking, but movement through them awkward.
X-Git-Url: https://plomlompom.com/repos/add_task?a=commitdiff_plain;h=a87fff596af07090497fc16c429c4df739f0c3d9;p=plomrogue2

Make players non-blocking, but movement through them awkward.
---

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index de9f1c8..fced650 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -49,6 +49,17 @@ class Task_MOVE(Task):
         if self.thing.blocks_light:
             self.thing.game.record_change(self.thing.position, 'fov')
         self.thing.position = self._get_move_target()
+        for t in [t for t in self.thing.game.things
+                  if t.type_ == 'Player' and not t == self.thing
+                  and t.position == self.thing.position]:
+            self.thing.send_msg('CHAT %s' %
+                                quote('You get awkwardly close to %s.' % t.name))
+            for c_id in self.thing.game.sessions:
+                if self.thing.game.sessions[c_id]['thing_id'] == t.id_:
+                    t.send_msg('CHAT %s' %
+                               quote('%s gets awkwardly close to you.' %
+                                     self.thing.name))
+                    break
         self.thing.game.record_change(self.thing.position, 'other')
         terrain = \
             self.thing.game.maps[self.thing.position[0]][self.thing.position[1]]
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 4cc3512..98d056a 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -433,7 +433,6 @@ class Thing_CookieSpawner(Thing):
 
 
 class ThingAnimate(Thing):
-    blocks_movement = True
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)