t.name = name
cmd_THING_NAME.argtypes = 'int:nonneg string'
+def cmd_THING_CHAR(game, thing_id, c):
+ t = game.get_thing(thing_id)
+ if t:
+ t.player_char = c
+cmd_THING_CHAR.argtypes = 'int:nonneg char'
+
def cmd_MAP(game, geometry, size, content):
map_geometry_class = globals()['MapGeometry' + geometry]
game.map_geometry = map_geometry_class(size)
self.register_command(cmd_THING)
self.register_command(cmd_THING_TYPE)
self.register_command(cmd_THING_NAME)
+ self.register_command(cmd_THING_CHAR)
self.register_command(cmd_MAP)
self.register_command(cmd_MAP_CONTROL)
self.register_command(cmd_PORTAL)
'switch_to_study': '?',
'switch_to_edit': 'm',
'flatten': 'F',
+ 'take_thing': 'z',
+ 'drop_thing': 'u',
'toggle_map_mode': 'M',
'hex_move_upleft': 'w',
'hex_move_upright': 'e',
info = 'TERRAIN: %s\n' % self.game.map_content[pos_i]
for t in self.game.things:
if t.position == self.explorer:
- info += 'THING: %s' % t.type_
+ info += 'THING: %s / %s' % (t.type_,
+ self.game.thing_types[t.type_])
+ if hasattr(t, 'player_char'):
+ info += t.player_char
if hasattr(t, 'name'):
info += ' (name: %s)' % t.name
info += '\n'
for y in range(self.game.map_geometry.size.y):
start = self.game.map_geometry.size.x * y
end = start + self.game.map_geometry.size.x
- map_lines_split += [list(map_content[start:end])]
+ map_lines_split += [[c + ' ' for c in map_content[start:end]]]
if self.map_mode == 'terrain':
+ used_positions = []
for t in self.game.things:
symbol = self.game.thing_types[t.type_]
- map_lines_split[t.position.y][t.position.x] = symbol
+ meta_char = ' '
+ if hasattr(t, 'player_char'):
+ meta_char = t.player_char
+ if t.position in used_positions:
+ meta_char = '+'
+ map_lines_split[t.position.y][t.position.x] = symbol + meta_char
+ used_positions += [t.position]
if self.mode.shows_info:
- map_lines_split[self.explorer.y][self.explorer.x] = '?'
+ map_lines_split[self.explorer.y][self.explorer.x] = '??'
map_lines = []
if type(self.game.map_geometry) == MapGeometryHex:
indent = 0
for line in map_lines_split:
- map_lines += [indent*' ' + ' '.join(line)]
+ map_lines += [indent*' ' + ''.join(line)]
indent = 0 if indent else 1
else:
for line in map_lines_split:
- map_lines += [' '.join(line)]
+ map_lines += [''.join(line)]
window_center = YX(int(self.size.y / 2),
int(self.window_width / 2))
player = self.game.get_thing(self.game.player_id)
content += "Available actions:\n"
if 'MOVE' in self.game.tasks:
content += "[%s] – move player\n" % ','.join(self.movement_keys)
+ if 'PICK_UP' in self.game.tasks:
+ content += "[%s] – take thing under player\n" % self.keys['take_thing']
+ if 'DROP' in self.game.tasks:
+ content += "[%s] – drop carried thing\n" % self.keys['drop_thing']
if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']
content += 'Other modes available from here:\n'
elif key == self.keys['flatten'] and\
'FLATTEN_SURROUNDINGS' in self.game.tasks:
self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
+ elif key == self.keys['take_thing'] and 'PICK_UP' in self.game.tasks:
+ self.send('TASK:PICK_UP')
+ elif key == self.keys['drop_thing'] and 'DROP' in self.game.tasks:
+ self.send('TASK:DROP')
elif key in self.movement_keys and 'MOVE' in self.game.tasks:
self.send('TASK:MOVE ' + self.movement_keys[key])
elif self.mode == self.mode_edit: