'short': 'name thing',
'long': 'Give name to/change name of thing here.'
},
+ 'command_thing': {
+ 'short': 'command thing',
+ 'long': 'Enter a command to the thing you carry. Enter nothing to return to play mode.'
+ },
'admin_thing_protect': {
'short': 'change thing protection',
'long': 'Change protection character for thing here.'
game.tui.do_refresh = True
cmd_ADMIN_OK.argtypes = ''
+def cmd_REPLY(game, msg):
+ game.tui.log_msg('#MUSICPLAYER: ' + msg)
+ game.tui.do_refresh = True
+cmd_REPLY.argtypes = 'string'
+
def cmd_CHAT(game, msg):
game.tui.log_msg('# ' + msg)
game.tui.do_refresh = True
def cmd_TASKS(game, tasks_comma_separated):
game.tasks = tasks_comma_separated.split(',')
game.tui.mode_write.legal = 'WRITE' in game.tasks
+ game.tui.mode_command_thing.legal = 'COMMAND' in game.tasks
cmd_TASKS.argtypes = 'string'
def cmd_THING_TYPE(game, thing_type, symbol_hint):
self.register_command(cmd_ADMIN_OK)
self.register_command(cmd_PONG)
self.register_command(cmd_CHAT)
+ self.register_command(cmd_REPLY)
self.register_command(cmd_PLAYER_ID)
self.register_command(cmd_TURN)
self.register_command(cmd_THING)
mode_post_login_wait = Mode('post_login_wait', is_intro=True)
mode_password = Mode('password', has_input_prompt=True)
mode_name_thing = Mode('name_thing', has_input_prompt=True, shows_info=True)
+ mode_command_thing = Mode('command_thing', has_input_prompt=True)
is_admin = False
tile_draw = False
def __init__(self, host):
import os
import json
- self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+ self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
+ "command_thing"]
self.mode_play.available_actions = ["move", "take_thing", "drop_thing",
"teleport", "door", "consume"]
self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
'switch_to_edit': 'E',
'switch_to_write': 'm',
'switch_to_name_thing': 'N',
+ 'switch_to_command_thing': 'O',
'switch_to_admin_enter': 'A',
'switch_to_control_pw_type': 'C',
'switch_to_control_tile_type': 'Q',
self.input_lines = []
self.fov = ''
self.flash = False
+ self.map_lines = []
+ self.offset = YX(0,0)
curses.wrapper(self.loop)
def connect(self):
self.send('LOGIN ' + quote(self.login_name))
else:
self.log_msg('@ enter username')
+ elif self.mode.name == 'command_thing':
+ self.send('TASK:COMMAND ' + quote('HELP'))
elif self.mode.name == 'admin_enter':
self.log_msg('@ enter admin password:')
elif self.mode.name == 'control_pw_type':
'MODE: %s – %s' % (self.mode.short_desc, help))
def draw_map():
- if not self.game.turn_complete:
+ if not self.game.turn_complete and len(self.map_lines) == 0:
return
- map_lines_split = []
- 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
- if self.map_mode == 'protections':
- map_lines_split += [[c + ' ' for c
- in self.game.map_control_content[start:end]]]
+ if self.game.turn_complete:
+ map_lines_split = []
+ 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
+ if self.map_mode == 'protections':
+ map_lines_split += [[c + ' ' for c
+ in self.game.map_control_content[start:end]]]
+ else:
+ map_lines_split += [[c + ' ' for c
+ in self.game.map_content[start:end]]]
+ if self.map_mode == 'terrain + annotations':
+ for p in self.game.info_hints:
+ map_lines_split[p.y][p.x] = 'A '
+ elif self.map_mode == 'terrain + things':
+ for p in self.game.portals.keys():
+ original = map_lines_split[p.y][p.x]
+ map_lines_split[p.y][p.x] = original[0] + 'P'
+ used_positions = []
+ for t in self.game.things:
+ symbol = self.game.thing_types[t.type_]
+ meta_char = ' '
+ if hasattr(t, 'thing_char'):
+ meta_char = t.thing_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]
+ player = self.game.get_thing(self.game.player_id)
+ if self.mode.shows_info or self.mode.name == 'control_tile_draw':
+ map_lines_split[self.explorer.y][self.explorer.x] = '??'
+ elif self.map_mode != 'terrain + things':
+ map_lines_split[player.position.y][player.position.x] = '??'
+ self.map_lines = []
+ if type(self.game.map_geometry) == MapGeometryHex:
+ indent = 0
+ for line in map_lines_split:
+ self.map_lines += [indent * ' ' + ''.join(line)]
+ indent = 0 if indent else 1
else:
- map_lines_split += [[c + ' ' for c
- in self.game.map_content[start:end]]]
- if self.map_mode == 'terrain + annotations':
- for p in self.game.info_hints:
- map_lines_split[p.y][p.x] = 'A '
- elif self.map_mode == 'terrain + things':
- for p in self.game.portals.keys():
- original = map_lines_split[p.y][p.x]
- map_lines_split[p.y][p.x] = original[0] + 'P'
- used_positions = []
- for t in self.game.things:
- symbol = self.game.thing_types[t.type_]
- meta_char = ' '
- if hasattr(t, 'thing_char'):
- meta_char = t.thing_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]
- player = self.game.get_thing(self.game.player_id)
- if self.mode.shows_info or self.mode.name == 'control_tile_draw':
- map_lines_split[self.explorer.y][self.explorer.x] = '??'
- elif self.map_mode != 'terrain + things':
- map_lines_split[player.position.y][player.position.x] = '??'
- map_lines = []
- if type(self.game.map_geometry) == MapGeometryHex:
- indent = 0
- for line in map_lines_split:
- map_lines += [indent * ' ' + ''.join(line)]
- indent = 0 if indent else 1
- else:
- for line in map_lines_split:
- map_lines += [''.join(line)]
- window_center = YX(int(self.size.y / 2),
- int(self.window_width / 2))
- center = player.position
- if self.mode.shows_info or self.mode.name == 'control_tile_draw':
- center = self.explorer
- center = YX(center.y, center.x * 2)
- offset = center - window_center
- if type(self.game.map_geometry) == MapGeometryHex and offset.y % 2:
- offset += YX(0, 1)
- term_y = max(0, -offset.y)
- term_x = max(0, -offset.x)
- map_y = max(0, offset.y)
- map_x = max(0, offset.x)
+ for line in map_lines_split:
+ self.map_lines += [''.join(line)]
+ window_center = YX(int(self.size.y / 2),
+ int(self.window_width / 2))
+ center = player.position
+ if self.mode.shows_info or self.mode.name == 'control_tile_draw':
+ center = self.explorer
+ center = YX(center.y, center.x * 2)
+ self.offset = center - window_center
+ if type(self.game.map_geometry) == MapGeometryHex and self.offset.y % 2:
+ self.offset += YX(0, 1)
+ term_y = max(0, -self.offset.y)
+ term_x = max(0, -self.offset.x)
+ map_y = max(0, self.offset.y)
+ map_x = max(0, self.offset.x)
while (term_y < self.size.y and map_y < self.game.map_geometry.size.y):
- to_draw = map_lines[map_y][map_x:self.window_width + offset.x]
+ to_draw = self.map_lines[map_y][map_x:self.window_width + self.offset.x]
safe_addstr(term_y, term_x, to_draw)
term_y += 1
map_y += 1
'drop_thing': 'DROP',
'door': 'DOOR',
'move': 'MOVE',
+ 'command': 'COMMAND',
'consume': 'INTOXICATE',
}
self.login_name = self.input_
self.send('LOGIN ' + quote(self.input_))
self.input_ = ""
+ elif self.mode.name == 'command_thing' and key == '\n':
+ if self.input_ == '':
+ self.log_msg('@ aborted')
+ self.switch_mode('play')
+ elif task_action_on('command'):
+ self.send('TASK:COMMAND ' + quote(self.input_))
+ self.input_ = ""
elif self.mode.name == 'control_pw_pw' and key == '\n':
if self.input_ == '':
self.log_msg('@ aborted')
projects / plomrogue2 / blobdiff