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 + ' ']
return None
def remove_thing(self, t):
+ if t.carrying:
+ t.uncarry()
self.things.remove(t)
self.record_fov_change(t.position)
self.io.send('MAP_CONTROL %s' % quote(player.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 %s' % (target_yx, t.type_,
- quote(t.protection),
- t.id_, int(t.portable)),
+ self.io.send('THING %s %s %s %s %s %s'
+ % (target_yx, t.type_, quote(t.protection), t.id_,
+ int(t.portable), int(t.commandable)),
c_id)
if hasattr(t, 'name'):
self.io.send('THING_NAME %s %s' % (t.id_, quote(t.name)), c_id)
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_), c_id)
+ self.io.send('THING_CARRYING %s %s' % (t.id_, t.carrying.id_),
+ c_id)
if hasattr(t, 'installable') and not t.portable:
self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
for big_yx in self.portals:
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: