'short': 'study',
'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.'},
'edit': {
- 'short': 'terrain edit',
+ 'short': 'map edit',
+ 'long': 'This mode allows you to change the map in various ways.'
+ },
+ 'write': {
+ 'short': 'terrain write',
'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.'
},
'control_pw_type': {
def cmd_TASKS(game, tasks_comma_separated):
game.tasks = tasks_comma_separated.split(',')
- game.tui.mode_edit.legal = 'WRITE' in game.tasks
+ game.tui.mode_write.legal = 'WRITE' in game.tasks
cmd_TASKS.argtypes = 'string'
def cmd_THING_TYPE(game, thing_type, symbol_hint):
mode_admin = Mode('admin')
mode_play = Mode('play')
mode_study = Mode('study', shows_info=True)
- mode_edit = Mode('edit', is_single_char_entry=True)
+ mode_write = Mode('write', is_single_char_entry=True)
+ mode_edit = Mode('edit')
mode_control_pw_type = Mode('control_pw_type', is_single_char_entry=True)
mode_control_pw_pw = Mode('control_pw_pw', has_input_prompt=True)
mode_control_tile_type = Mode('control_tile_type', is_single_char_entry=True)
def __init__(self, host):
import os
import json
- self.mode_play.available_modes = ["chat", "study", "edit",
- "annotate", "portal",
- "password", "admin_enter"]
- self.mode_study.available_modes = ["chat", "play", "admin_enter"]
- self.mode_admin.available_modes = ["chat", "play", "study",
- "control_pw_type",
- "control_tile_type"]
+ self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+ self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
+ self.mode_admin.available_modes = ["control_pw_type",
+ "control_tile_type", "chat",
+ "study", "play", "edit"]
self.mode_control_tile_draw.available_modes = ["admin"]
+ self.mode_edit.available_modes = ["write", "annotate", "portal",
+ "password", "chat", "study", "play",
+ "admin_enter"]
self.host = host
self.game = Game()
self.game.tui = self
'switch_to_annotate': 'M',
'switch_to_portal': 'T',
'switch_to_study': '?',
- 'switch_to_edit': 'm',
+ 'switch_to_edit': 'E',
+ 'switch_to_write': 'm',
'switch_to_admin_enter': 'A',
'switch_to_control_pw_type': 'C',
'switch_to_control_tile_type': 'Q',
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 += '[%s] – teleport to other space\n' % self.keys['teleport']
content += '\n'
elif self.mode.name == 'study':
content += '[%s] – move question mark\n' % ','.join(self.movement_keys)
content += '[%s] – toggle view between terrain, annotations, and password protection areas\n' % self.keys['toggle_map_mode']
content += '\n'
+ elif self.mode.name == 'edit':
+ content += "Available actions:\n"
+ if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
+ content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']
+ content += '\n'
elif 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 /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):
self.input_ = ' '
self.password = self.input_
self.input_ = ""
- self.switch_mode('play')
+ self.switch_mode('edit')
elif self.mode.name == 'admin_enter' and key == '\n':
self.send('BECOME_ADMIN ' + quote(self.input_))
self.input_ = ""
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'):
self.send('ANNOTATE %s %s %s' % (self.explorer, quote(self.input_),
quote(self.password)))
self.input_ = ""
- self.switch_mode('play')
+ self.switch_mode('edit')
elif self.mode.name == 'portal' and key == '\n':
if self.input_ == '':
self.input_ = ' '
self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_),
quote(self.password)))
self.input_ = ""
- self.switch_mode('play')
+ self.switch_mode('edit')
elif self.mode.name == 'study':
if self.mode.mode_switch_on_key(self, key):
continue
elif self.mode.name == 'play':
if self.mode.mode_switch_on_key(self, key):
continue
- if 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.log_msg('? not standing on portal')
elif key in self.movement_keys and 'MOVE' in self.game.tasks:
self.send('TASK:MOVE ' + self.movement_keys[key])
- elif self.mode.name == 'edit':
+ elif self.mode.name == 'write':
self.send('TASK:WRITE %s %s' % (key, quote(self.password)))
- self.switch_mode('play')
+ self.switch_mode('edit')
elif self.mode.name == 'control_pw_type':
self.tile_control_char = key
self.switch_mode('control_pw_pw')
elif self.mode.name == 'admin':
if self.mode.mode_switch_on_key(self, key):
continue
+ elif self.mode.name == 'edit':
+ if self.mode.mode_switch_on_key(self, key):
+ continue
+ if key == self.keys['flatten'] and\
+ 'FLATTEN_SURROUNDINGS' in self.game.tasks:
+ self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
+ elif key in self.movement_keys and 'MOVE' in self.game.tasks:
+ self.send('TASK:MOVE ' + self.movement_keys[key])
if len(sys.argv) != 2:
raise ArgError('wrong number of arguments, need game host')
projects / plomrogue2 / blobdiff