X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=36a76561e21870d66d0e250e2d5a6d1b4de02d20;hb=1750783da9cd6fd4f80d6484a3b714c352eef126;hp=143248f4e7afaf0546beca3431fe1df485ca2887;hpb=ba09978e0179406218f052ed29690f1f7c508920;p=plomrogue2

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 143248f..36a7656 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -184,6 +184,8 @@ class Game(GameBase):
     def get_string_options(self, string_option_type):
         if string_option_type == 'direction':
             return self.map_geometry.directions
+        elif string_option_type == 'direction+here':
+            return ['HERE'] + self.map_geometry.directions
         elif string_option_type == 'char':
             return [c for c in
                     string.digits + string.ascii_letters + string.punctuation + ' ']
@@ -211,6 +213,8 @@ class Game(GameBase):
         return None
 
     def remove_thing(self, t):
+        if t.carrying:
+            t.uncarry()
         self.things.remove(t)
         self.record_fov_change(t.position)
 
@@ -352,6 +356,7 @@ class Game(GameBase):
                         y_range_end = absolute_position.y + fov_radius
                         x_range_start = absolute_position.x - fov_radius
                         x_range_end = absolute_position.x + fov_radius
+                        # TODO: refactor with SourcedMap.inside?
                         for position in self.changed_tiles:
                             if position.y < y_range_start\
                                or position.y > y_range_end: