Enable sinking into and getting up from terrain tagged as sittable.

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 4f390d47c92a88fbb1782944f623b3c44012d846..de9f1c87d1591820f2a405bf97313866e0c90ab5 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -42,11 +42,22 @@ class Task_MOVE(Task):
             raise PlayError('blocked by impassable tile')
 
     def do(self):
             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()
         self.thing.game.record_change(self.thing.position, 'other')
         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()
         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')
         self.thing.invalidate('fov')
         if self.thing.blocks_light:
             self.thing.game.record_change(self.thing.position, 'fov')

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 249a138eef3c7570b03e9d43d25cfd8e0cc790c7..6ad8534317476c3c92a2591141253d452ce96ae1 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -564,6 +564,7 @@ class Thing_Player(ThingAnimate):
     drunk = 0
     tripping = 0
     need_for_toilet = 0
     drunk = 0
     tripping = 0
     need_for_toilet = 0

+    standing = True

 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)