mode_helps = {
'play': {
'short': 'play',
+ 'intro': '',
'long': 'This mode allows you to interact with the map in various ways.'
},
'study': {
'short': 'study',
+ 'intro': '',
'long': 'This mode allows you to study the map and its tiles in detail. Move the question mark over a tile, and the right half of the screen will show detailed information on it. Toggle the map view to show or hide different information layers.'},
'edit': {
'short': 'world edit',
+ 'intro': '',
'long': 'This mode allows you to change the game world in various ways. Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view. You can edit a tile if you set the world edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.'
},
'name_thing': {
'short': 'name thing',
+ 'intro': '',
'long': 'Give name to/change name of thing here.'
},
'command_thing': {
'short': 'command thing',
+ 'intro': '',
'long': 'Enter a command to the thing you carry. Enter nothing to return to play mode.'
},
'take_thing': {
'short': 'take thing',
+ 'intro': 'Pick up a thing in reach by entering its index number. Enter nothing to abort.',
'long': 'You see a list of things which you could pick up. Enter the target thing\'s index, or, to leave, nothing.'
},
'admin_thing_protect': {
'short': 'change thing protection',
+ 'intro': '@ enter thing protection character:',
'long': 'Change protection character for thing here.'
},
'write': {
'short': 'change terrain',
+ 'intro': '',
'long': 'This mode allows you to change the map tile you currently stand on (if your world editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.'
},
'control_pw_type': {
'short': 'change protection character password',
+ 'intro': '@ enter protection character for which you want to change the password:',
'long': 'This mode is the first of two steps to change the password for a protection character. First enter the protection character for which you want to change the password.'
},
'control_pw_pw': {
'short': 'change protection character password',
+ 'intro': '',
'long': 'This mode is the second of two steps to change the password for a protection character. Enter the new password for the protection character you chose.'
},
'control_tile_type': {
'short': 'change tiles protection',
+ 'intro': '@ enter protection character which you want to draw:',
'long': 'This mode is the first of two steps to change tile protection areas on the map. First enter the tile protection character you want to write.'
},
'control_tile_draw': {
'short': 'change tiles protection',
+ 'intro': '',
'long': 'This mode is the second of two steps to change tile protection areas on the map. Toggle tile protection drawing on/off and move the ?? cursor around the map to draw the selected protection character.'
},
'annotate': {
'short': 'annotate tile',
+ 'intro': '',
'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your world editing password authorizes you so). Hit Return to leave.'
},
'portal': {
'short': 'edit portal',
+ 'intro': '',
'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your world editing password authorizes you so). Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target. Hit Return to leave.'
},
'chat': {
'short': 'chat',
- 'long': 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:'
+ 'intro': '',
+ 'long': 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:\n\n/nick NAME – re-name yourself to NAME'
},
'login': {
'short': 'login',
+ 'intro': '',
'long': 'Enter your player name.'
},
'waiting_for_server': {
'short': 'waiting for server response',
+ 'intro': '@ waiting for server …',
'long': 'Waiting for a server response.'
},
'post_login_wait': {
'short': 'waiting for server response',
+ 'intro': '',
'long': 'Waiting for a server response.'
},
'password': {
'short': 'set world edit password',
+ 'intro': '',
'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected elements of the world. Hit return to confirm and leave.'
},
'admin_enter': {
'short': 'become admin',
+ 'intro': '@ enter admin password:',
'long': 'This mode allows you to become admin if you know an admin password.'
},
'admin': {
'short': 'admin',
+ 'intro': '',
'long': 'This mode allows you access to actions limited to administrators.'
}
}
game.player_id = player_id
cmd_PLAYER_ID.argtypes = 'int:nonneg'
-def cmd_THING(game, yx, thing_type, protection, thing_id):
+def cmd_THING(game, yx, thing_type, protection, thing_id, portable):
t = game.get_thing(thing_id)
if not t:
t = ThingBase(game, thing_id)
t.position = yx
t.type_ = thing_type
t.protection = protection
-cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg'
+ t.portable = portable
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg bool'
def cmd_THING_NAME(game, thing_id, name):
t = game.get_thing(thing_id)
game.thing_types[thing_type] = symbol_hint
cmd_THING_TYPE.argtypes = 'string char'
+def cmd_THING_CARRYING(game, thing_id):
+ game.get_thing(thing_id).carrying = True
+cmd_THING_CARRYING.argtypes = 'int:nonneg'
+
def cmd_TERRAIN(game, terrain_char, terrain_desc):
game.terrains[terrain_char] = terrain_desc
cmd_TERRAIN.argtypes = 'char string'
self.register_command(cmd_THING_TYPE)
self.register_command(cmd_THING_NAME)
self.register_command(cmd_THING_CHAR)
+ self.register_command(cmd_THING_CARRYING)
self.register_command(cmd_TERRAIN)
self.register_command(cmd_MAP)
self.register_command(cmd_MAP_CONTROL)
self.shows_info = shows_info
self.is_intro = is_intro
self.help_intro = mode_helps[name]['long']
+ self.intro_msg = mode_helps[name]['intro']
self.is_single_char_entry = is_single_char_entry
self.legal = True
self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
"command_thing", "take_thing"]
self.mode_play.available_actions = ["move", "drop_thing",
- "teleport", "door", "consume"]
+ "teleport", "door", "consume",
+ "install"]
self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"]
self.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
'teleport': 'p',
'consume': 'C',
'door': 'D',
+ 'install': 'I',
'help': 'h',
'toggle_map_mode': 'L',
'toggle_tile_draw': 'm',
self.map_mode = 'terrain only'
def switch_mode(self, mode_name):
+ if self.mode and self.mode.name == 'control_tile_draw':
+ self.log_msg('@ finished tile protection drawing.')
self.tile_draw = False
if mode_name == 'admin_enter' and self.is_admin:
mode_name = 'admin'
else:
self.thing_selected = thing
self.mode = getattr(self, 'mode_' + mode_name)
- if self.mode.name == 'control_tile_draw':
- self.log_msg('@ finished tile protection drawing.')
if self.mode.name in {'control_tile_draw', 'control_tile_type',
'control_pw_type'}:
self.map_mode = 'protections'
self.explorer = YX(player.position.y, player.position.x)
if self.mode.is_single_char_entry:
self.show_help = True
- if self.mode.name == 'waiting_for_server':
- self.log_msg('@ waiting for server …')
- elif self.mode.name == 'login':
+ if len(self.mode.intro_msg) > 0:
+ self.log_msg(self.mode.intro_msg)
+ if self.mode.name == 'login':
if self.login_name:
self.send('LOGIN ' + quote(self.login_name))
else:
self.log_msg('@ enter username')
elif self.mode.name == 'take_thing':
- self.log_msg('selectable things:')
+ self.log_msg('Portable things in reach for pick-up:')
player = self.game.get_thing(self.game.player_id)
- selectables = [t for t in self.game.things
- if t != player and t.type_ != 'Player'
- and t.position == player.position]
- if len(selectables) == 0:
+ select_range = [player.position,
+ player.position + YX(0,-1),
+ player.position + YX(0, 1),
+ player.position + YX(-1, 0),
+ player.position + YX(1, 0)]
+ if type(self.game.map_geometry) == MapGeometryHex:
+ if player.position.y % 2:
+ select_range += [player.position + YX(-1, 1),
+ player.position + YX(1, 1)]
+ else:
+ select_range += [player.position + YX(-1, -1),
+ player.position + YX(1, -1)]
+ self.selectables = [t for t in self.game.things
+ if t.portable and t.position in select_range]
+ if len(self.selectables) == 0:
self.log_msg('none')
else:
- for t in selectables:
- self.log_msg(str(t.id_) + ' ' + self.get_thing_info(t))
+ for i in range(len(self.selectables)):
+ t = self.selectables[i]
+ self.log_msg(str(i) + ': ' + self.get_thing_info(t))
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':
- self.log_msg('@ enter protection character for which you want to change the password:')
- elif self.mode.name == 'control_tile_type':
- self.log_msg('@ enter protection character which you want to draw:')
- elif self.mode.name == 'admin_thing_protect':
- self.log_msg('@ enter thing protection character:')
elif self.mode.name == 'control_pw_pw':
self.log_msg('@ enter protection password for "%s":' % self.tile_control_char)
elif self.mode.name == 'control_tile_draw':
meta_char = t.thing_char
if t.position in used_positions:
meta_char = '+'
+ if hasattr(t, 'carrying') and t.carrying:
+ meta_char = '$'
map_lines_split[t.position.y][t.position.x] = symbol + meta_char
used_positions += [t.position]
key = self.keys[action]
content += '[%s] – %s\n' % (key, action_descriptions[action])
content += '\n'
- if self.mode.name == 'chat':
- content += '/nick NAME – re-name yourself to NAME\n'
- content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play']
- content += '/%s or /study – switch to study mode\n' % self.keys['switch_to_study']
- content += '/%s or /edit – switch to world edit mode\n' % self.keys['switch_to_edit']
- content += '/%s or /admin – switch to admin mode\n' % self.keys['switch_to_admin_enter']
content += self.mode.list_available_modes(self)
for i in range(self.size.y):
safe_addstr(i,
'drop_thing': 'drop thing',
'toggle_map_mode': 'toggle map view',
'toggle_tile_draw': 'toggle protection character drawing',
+ 'install': 'install',
'door': 'open/close',
'consume': 'consume',
}
'take_thing': 'PICK_UP',
'drop_thing': 'DROP',
'door': 'DOOR',
+ 'install': 'INSTALL',
'move': 'MOVE',
'command': 'COMMAND',
'consume': 'INTOXICATE',
reset_screen_size()
elif self.mode.has_input_prompt and key == 'KEY_BACKSPACE':
self.input_ = self.input_[:-1]
+ elif self.mode.has_input_prompt and key == '\n' and self.input_ == ''\
+ and self.mode.name in {'chat', 'command_thing', 'take_thing',
+ 'admin_enter'}:
+ if self.mode.name != 'chat':
+ self.log_msg('@ aborted')
+ self.switch_mode('play')
elif self.mode.has_input_prompt and key == '\n' and self.input_ == '/help':
self.show_help = True
self.input_ = ""
self.send('LOGIN ' + quote(self.input_))
self.input_ = ""
elif self.mode.name == 'take_thing' and key == '\n':
- if self.input_ == '':
- self.log_msg('@ aborted')
- else:
- self.send('TASK:PICK_UP ' + quote(self.input_))
+ try:
+ i = int(self.input_)
+ if i < 0 or i >= len(self.selectables):
+ self.log_msg('? invalid index, aborted')
+ else:
+ self.send('TASK:PICK_UP %s' % self.selectables[i].id_)
+ except ValueError:
+ self.log_msg('? invalid index, aborted')
self.input_ = ''
self.switch_mode('play')
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'):
+ if task_action_on('command'):
self.send('TASK:COMMAND ' + quote(self.input_))
self.input_ = ""
elif self.mode.name == 'control_pw_pw' and key == '\n':
elif self.mode.name == 'chat' and key == '\n':
if self.input_ == '':
continue
- if self.input_[0] == '/': # FIXME fails on empty input
- if self.input_ in {'/' + self.keys['switch_to_play'], '/play'}:
- self.switch_mode('play')
- elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}:
- self.switch_mode('study')
- elif self.input_ in {'/' + self.keys['switch_to_edit'], '/edit'}:
- self.switch_mode('edit')
- elif self.input_ in {'/' + self.keys['switch_to_admin_enter'], '/admin'}:
- self.switch_mode('admin_enter')
- elif self.input_.startswith('/nick'):
+ if self.input_[0] == '/':
+ if self.input_.startswith('/nick'):
tokens = self.input_.split(maxsplit=1)
if len(tokens) == 2:
self.send('NICK ' + quote(tokens[1]))
self.send('TASK:DOOR')
elif key == self.keys['consume'] and task_action_on('consume'):
self.send('TASK:INTOXICATE')
+ elif key == self.keys['install'] and task_action_on('install'):
+ self.send('TASK:INSTALL')
elif key == self.keys['teleport']:
player = self.game.get_thing(self.game.player_id)
if player.position in self.game.portals: