Add TASK:DOOR error message on absence of adjacent door.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index d42aa4deb232de0a17dcaebaa838dc20e10a01c9..4cf8700b1f5b93473fabb70c3acedf471167667d 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -42,11 +42,33 @@ class Task_MOVE(Task):
             raise PlayError('blocked by impassable tile')
 
     def do(self):
+        if self.thing.type_ == 'Player' and not self.thing.standing:
+            self.thing.standing = True
+            self.thing.send_msg('CHAT "You get up."')
         self.thing.game.record_change(self.thing.position, 'other')
         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]]
+        if terrain in self.thing.game.terrains:
+            terrain_type = self.thing.game.terrains[terrain]
+            if 'sittable' in terrain_type.tags:
+                self.thing.standing = False
+                self.thing.send_msg('CHAT "You sink into the %s."'
+                                    % terrain_type.description)
         self.thing.invalidate('fov')
         if self.thing.blocks_light:
             self.thing.game.record_change(self.thing.position, 'fov')
@@ -165,6 +187,13 @@ class Task_DROP(Task):
 
 class Task_DOOR(Task):
 
+    def check(self):
+        action_radius = list(self.thing.game.map_geometry.
+                             get_neighbors_yxyx(self.thing.position).values())
+        if len([t for t in self.thing.game.things if
+                  t.type_ == 'Door' and t.position in action_radius]) == 0:
+            raise PlayError('not standing next to a door to open/close')
+
     def do(self):
         action_radius = list(self.thing.game.map_geometry.
                              get_neighbors_yxyx(self.thing.position).values())
@@ -195,6 +224,7 @@ class Task_INTOXICATE(Task):
             self.thing.carrying.full = False
             self.thing.carrying.empty()
             self.thing.send_msg('CHAT "You are drunk now."')
+            self.thing.need_for_toilet += 10000
             self.thing.drunk = 10000
             self.thing.invalidate('fov')
             self.thing.game.record_change(self.thing.position, 'other')