'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',
- '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 map edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.'
+ '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',
'long': 'Give name to/change name of thing here.'
},
+ 'admin_thing_protect': {
+ 'short': 'change thing protection',
+ 'long': 'Change protection character for thing here.'
+ },
'write': {
'short': 'change terrain',
- 'long': 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.'
+ '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',
- 'long': 'This mode is the first of two steps to change the password for a tile protection character. First enter the tile 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',
- 'long': 'This mode is the second of two steps to change the password for a tile protection character. Enter the new password for the tile protection character you chose.'
+ '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',
- 'long': 'This mode is the first of two steps to change tile protection areas on the map. First enter the tile tile protection character you want to write.'
+ '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',
- '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 tile protection character.'
+ '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',
- 'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so). Hit Return to leave.'
+ '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',
- 'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map 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.'
+ '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': 'Waiting for a server response.'
},
'password': {
- 'short': 'set map edit password',
- 'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles. Hit return to confirm and leave.'
+ 'short': 'set world edit password',
+ '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',
game.player_id = player_id
cmd_PLAYER_ID.argtypes = 'int:nonneg'
-def cmd_THING(game, yx, thing_type, thing_id):
+def cmd_THING(game, yx, thing_type, protection, thing_id):
t = game.get_thing(thing_id)
if not t:
t = ThingBase(game, thing_id)
game.things += [t]
t.position = yx
t.type_ = thing_type
-cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type int:nonneg'
+ t.protection = protection
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg'
def cmd_THING_NAME(game, thing_id, name):
t = game.get_thing(thing_id)
def cmd_THING_CHAR(game, thing_id, c):
t = game.get_thing(thing_id)
if t:
- t.player_char = c
+ t.thing_char = c
cmd_THING_CHAR.argtypes = 'int:nonneg char'
def cmd_MAP(game, geometry, size, content):
self.name = name
self.short_desc = mode_helps[name]['short']
self.available_modes = []
+ self.available_actions = []
self.has_input_prompt = has_input_prompt
self.shows_info = shows_info
self.is_intro = is_intro
mode_control_pw_pw = Mode('control_pw_pw', has_input_prompt=True)
mode_control_tile_type = Mode('control_tile_type', has_input_prompt=True)
mode_control_tile_draw = Mode('control_tile_draw')
+ mode_admin_thing_protect = Mode('admin_thing_protect', has_input_prompt=True)
mode_annotate = Mode('annotate', has_input_prompt=True, shows_info=True)
mode_portal = Mode('portal', has_input_prompt=True, shows_info=True)
mode_chat = Mode('chat', has_input_prompt=True)
import os
import json
self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+ self.mode_play.available_actions = ["move", "take_thing", "drop_thing",
+ "teleport", "door"]
self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
- self.mode_admin.available_modes = ["control_pw_type",
+ self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"]
+ self.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
"control_tile_type", "chat",
"study", "play", "edit"]
+ self.mode_admin.available_actions = ["move"]
self.mode_control_tile_draw.available_modes = ["admin_enter"]
+ self.mode_control_tile_draw.available_actions = ["move_explorer",
+ "toggle_tile_draw"]
self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
"password", "chat", "study", "play",
"admin_enter"]
+ self.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
self.mode = None
self.host = host
self.game = Game()
'switch_to_admin_enter': 'A',
'switch_to_control_pw_type': 'C',
'switch_to_control_tile_type': 'Q',
+ 'switch_to_admin_thing_protect': 'T',
'flatten': 'F',
'take_thing': 'z',
'drop_thing': 'u',
'teleport': 'p',
+ 'door': 'D',
'help': 'h',
'toggle_map_mode': 'L',
'toggle_tile_draw': 'm',
elif self.mode.name == 'name_thing':
if hasattr(self.thing_selected, 'name'):
self.input_ = self.thing_selected.name
+ elif self.mode.name == 'admin_thing_protect':
+ if hasattr(self.thing_selected, 'protection'):
+ self.input_ = self.thing_selected.protection
def send_tile_control_command(self):
self.send('SET_TILE_CONTROL %s %s' %
self.tile_draw = False
if mode_name == 'admin_enter' and self.is_admin:
mode_name = 'admin'
- elif mode_name == 'name_thing':
+ elif mode_name in {'name_thing', 'admin_thing_protect'}:
player = self.game.get_thing(self.game.player_id)
thing = None
for t in [t for t in self.game.things if t.position == player.position
elif self.mode.name == 'admin_enter':
self.log_msg('@ enter admin password:')
elif self.mode.name == 'control_pw_type':
- self.log_msg('@ enter tile protection character for which you want to change the password:')
+ 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 tile protection character which you want to draw:')
+ 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 tile protection password for "%s":' % self.tile_control_char)
+ self.log_msg('@ enter protection password for "%s":' % self.tile_control_char)
elif self.mode.name == 'control_tile_draw':
- self.log_msg('@ can draw tile protection character "%s", turn drawing on/off with [%s], finish with [%s].' % (self.tile_control_char, self.keys['toggle_tile_draw'], self.keys['switch_to_admin_enter']))
+ self.log_msg('@ can draw protection character "%s", turn drawing on/off with [%s], finish with [%s].' % (self.tile_control_char, self.keys['toggle_tile_draw'], self.keys['switch_to_admin_enter']))
self.input_ = ""
self.restore_input_values()
command, args = self.parser.parse(msg)
command(*args)
+ def task_action_on(action):
+ return action_tasks[action] in self.game.tasks
+
def msg_into_lines_of_width(msg, width):
chunk = ''
lines = []
info += 'PROTECTION: %s\n' % protection
for t in self.game.things:
if t.position == self.explorer:
+ protection = t.protection
+ if protection == '.':
+ protection = 'none'
info += 'THING: %s / %s' % (t.type_,
self.game.thing_types[t.type_])
- if hasattr(t, 'player_char'):
- info += t.player_char
+ if hasattr(t, 'thing_char'):
+ info += t.thing_char
if hasattr(t, 'name'):
info += ' (%s)' % t.name
- info += '\n'
+ info += ' / protection: %s\n' % protection
if self.explorer in self.game.portals:
info += 'PORTAL: ' + self.game.portals[self.explorer] + '\n'
else:
for t in self.game.things:
symbol = self.game.thing_types[t.type_]
meta_char = ' '
- if hasattr(t, 'player_char'):
- meta_char = t.player_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
def draw_help():
content = "%s help\n\n%s\n\n" % (self.mode.short_desc,
self.mode.help_intro)
- if self.mode.name == 'play':
- 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] – pick up thing\n" % self.keys['take_thing']
- if 'DROP' in self.game.tasks:
- content += "[%s] – drop thing\n" % self.keys['drop_thing']
- content += '[%s] – teleport\n' % self.keys['teleport']
- content += '\n'
- elif self.mode.name == 'study':
- content += 'Available actions:\n'
- content += '[%s] – move question mark\n' % ','.join(self.movement_keys)
- content += '[%s] – toggle map view\n' % self.keys['toggle_map_mode']
- content += '\n'
- elif self.mode.name == 'edit':
- content += "Available actions:\n"
- if 'MOVE' in self.game.tasks:
- content += "[%s] – move player\n" % ','.join(self.movement_keys)
- if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
- content += "[%s] – flatten surroundings\n" % self.keys['flatten']
- content += '[%s] – toggle map view\n' % self.keys['toggle_map_mode']
- content += '\n'
- elif self.mode.name == 'control_tile_draw':
+ if len(self.mode.available_actions) > 0:
content += "Available actions:\n"
- content += "[%s] – toggle tile protection drawing\n" % self.keys['toggle_tile_draw']
+ for action in self.mode.available_actions:
+ if action in action_tasks:
+ if action_tasks[action] not in self.game.tasks:
+ continue
+ if action == 'move_explorer':
+ action = 'move'
+ if action == 'move':
+ key = ','.join(self.movement_keys)
+ else:
+ key = self.keys[action]
+ content += '[%s] – %s\n' % (key, action_descriptions[action])
content += '\n'
- elif self.mode.name == 'chat':
+ 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 map edit mode\n' % self.keys['switch_to_edit']
+ 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):
def draw_screen():
stdscr.clear()
+ recalc_input_lines()
if self.mode.has_input_prompt:
- recalc_input_lines()
draw_input()
if self.mode.shows_info:
draw_info()
if self.show_help:
draw_help()
+ action_descriptions = {
+ 'move': 'move',
+ 'flatten': 'flatten surroundings',
+ 'teleport': 'teleport',
+ 'take_thing': 'pick up thing',
+ 'drop_thing': 'drop thing',
+ 'toggle_map_mode': 'toggle map view',
+ 'toggle_tile_draw': 'toggle protection character drawing',
+ 'door': 'open/close',
+ }
+
+ action_tasks = {
+ 'flatten': 'FLATTEN_SURROUNDINGS',
+ 'take_thing': 'PICK_UP',
+ 'drop_thing': 'DROP',
+ 'door': 'DOOR',
+ 'move': 'MOVE',
+ }
+
curses.curs_set(False) # hide cursor
curses.use_default_colors()
stdscr.timeout(10)
else:
self.tile_control_char = self.input_
self.switch_mode('control_pw_pw')
+ elif self.mode.name == 'admin_thing_protect' and key == '\n':
+ if len(self.input_) != 1:
+ self.log_msg('@ entered non-single-char, therefore aborted')
+ else:
+ self.send('THING_PROTECTION %s %s' % (self.thing_selected.id_,
+ quote(self.input_)))
+ self.log_msg('@ sent new protection character for thing')
+ self.switch_mode('admin')
elif self.mode.name == 'control_tile_type' and key == '\n':
if len(self.input_) != 1:
self.log_msg('@ entered non-single-char, therefore aborted')
elif self.mode.name == 'name_thing' and key == '\n':
if self.input_ == '':
self.input_ = ' '
- self.send('THING_NAME %s %s' % (self.thing_selected.id_,
- quote(self.input_)))
+ self.send('THING_NAME %s %s %s' % (self.thing_selected.id_,
+ quote(self.input_),
+ quote(self.password)))
self.switch_mode('edit')
elif self.mode.name == 'annotate' and key == '\n':
if self.input_ == '':
elif self.mode.name == 'play':
if self.mode.mode_switch_on_key(self, key):
continue
- elif key == self.keys['take_thing'] and 'PICK_UP' in self.game.tasks:
+ elif key == self.keys['take_thing'] and task_action_on('take_thing'):
self.send('TASK:PICK_UP')
- elif key == self.keys['drop_thing'] and 'DROP' in self.game.tasks:
+ elif key == self.keys['drop_thing'] and task_action_on('drop_thing'):
self.send('TASK:DROP')
+ elif key == self.keys['door'] and task_action_on('door'):
+ self.send('TASK:DOOR')
elif key == self.keys['teleport']:
player = self.game.get_thing(self.game.player_id)
if player.position in self.game.portals:
else:
self.flash = True
self.log_msg('? not standing on portal')
- elif key in self.movement_keys and 'MOVE' in self.game.tasks:
+ elif key in self.movement_keys and task_action_on('move'):
self.send('TASK:MOVE ' + self.movement_keys[key])
elif self.mode.name == 'write':
self.send('TASK:WRITE %s %s' % (key, quote(self.password)))
elif self.mode.name == 'admin':
if self.mode.mode_switch_on_key(self, key):
continue
+ elif key in self.movement_keys and task_action_on('move'):
+ self.send('TASK:MOVE ' + self.movement_keys[key])
elif self.mode.name == 'edit':
if self.mode.mode_switch_on_key(self, key):
continue
- elif key == self.keys['flatten'] and\
- 'FLATTEN_SURROUNDINGS' in self.game.tasks:
+ elif key == self.keys['flatten'] and task_action_on('flatten'):
self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
elif key == self.keys['toggle_map_mode']:
self.toggle_map_mode()
- elif key in self.movement_keys and 'MOVE' in self.game.tasks:
+ elif key in self.movement_keys and task_action_on('move'):
self.send('TASK:MOVE ' + self.movement_keys[key])
if len(sys.argv) != 2:
projects / plomrogue2 / blobdiff