X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fgame.py;h=7d4103da3d793078d65554607a259b15ba31b7f1;hb=2bc91772ca3d5056eb5a252869d8dff33c586da5;hp=c4951799002c3a2ec086bde6342cb07231c1c6f5;hpb=a81ea397900267331c15c1cda5d349b22a49ea16;p=plomrogue2
diff --git a/plomrogue/game.py b/plomrogue/game.py
index c495179..7d4103d 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -180,7 +180,7 @@ class Game(GameBase):
def get_string_options(self, string_option_type):
if string_option_type == 'direction':
- return self.map_geometry.get_directions()
+ return self.map_geometry.directions
elif string_option_type == 'char':
return [c for c in
string.digits + string.ascii_letters + string.punctuation + ' ']
@@ -231,13 +231,17 @@ class Game(GameBase):
self.io.send('MAP_CONTROL %s' % quote(visible_control), c_id)
for t in [t for t in self.things if player.fov_test(*t.position)]:
target_yx = player.fov_stencil.target_yx(*t.position)
- self.io.send('THING %s %s %s %s' % (target_yx, t.type_,
- quote(t.protection), t.id_), c_id)
+ self.io.send('THING %s %s %s %s %s' % (target_yx, t.type_,
+ quote(t.protection),
+ t.id_, int(t.portable)),
+ c_id)
if hasattr(t, 'name'):
self.io.send('THING_NAME %s %s' % (t.id_, quote(t.name)), c_id)
if hasattr(t, 'thing_char'):
self.io.send('THING_CHAR %s %s' % (t.id_,
quote(t.thing_char)), c_id)
+ if hasattr(t, 'carrying') and t.carrying:
+ self.io.send('THING_CARRYING %s' % (t.id_))
for big_yx in self.portals:
for little_yx in [little_yx for little_yx in self.portals[big_yx]
if player.fov_test(big_yx, little_yx)]: