from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
from plomrogue.things import ThingBase
from plomrogue.misc import quote
-from plomrogue.errors import BrokenSocketConnection
+from plomrogue.errors import BrokenSocketConnection, ArgError
mode_helps = {
'play': {
'short': 'play',
- 'long': 'This mode allows you to interact with the map.'
+ 'long': 'This mode allows you to interact with the map in various ways.'
},
'study': {
'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.'},
+ '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': 'map edit',
- 'long': 'This mode allows you to change the map in various ways.'
+ '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.'
+ },
+ 'name_thing': {
+ 'short': 'name thing',
+ 'long': 'Give name to/change name of thing here.'
},
'write': {
- 'short': 'terrain 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.'
},
'control_pw_type': {
- 'short': 'change tiles control password',
- 'long': 'This mode is the first of two steps to change the password for a tile control character. First enter the tile control character for which you want to change the password.'
+ '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.'
},
'control_pw_pw': {
- 'short': 'change tiles control password',
- 'long': 'This mode is the second of two steps to change the password for a tile control character. Enter the new password for the tile control character you chose.'
+ '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.'
},
'control_tile_type': {
- 'short': 'change tiles control',
- 'long': 'This mode is the first of two steps to change tile control areas on the map. First enter the tile control character you want to write.'
+ '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.'
},
'control_tile_draw': {
- 'short': 'change tiles control',
- 'long': 'This mode is the second of two steps to change tile control areas on the map. Toggle tile control drawing on, then move cursor around the map to draw selected tile control character.'
+ '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.'
},
'annotate': {
'short': 'annotate tile',
},
'login': {
'short': 'login',
- 'long': 'Pick your player name.'
+ 'long': 'Enter your player name.'
},
'waiting_for_server': {
'short': 'waiting for server response',
'long': 'Waiting for a server response.'
},
'password': {
- 'short': 'map edit 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.'
},
'admin_enter': {
def cmd_ANNOTATION(game, position, msg):
game.info_db[position] = msg
- game.tui.restore_input_values()
if game.tui.mode.shows_info:
game.tui.do_refresh = True
cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'
mode_login = Mode('login', has_input_prompt=True, is_intro=True)
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)
is_admin = False
tile_draw = False
"control_tile_type", "chat",
"study", "play", "edit"]
self.mode_control_tile_draw.available_modes = ["admin_enter"]
- self.mode_edit.available_modes = ["write", "annotate", "portal",
+ self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
"password", "chat", "study", "play",
"admin_enter"]
+ self.mode = None
self.host = host
self.game = Game()
self.game.tui = self
'switch_to_study': '?',
'switch_to_edit': 'E',
'switch_to_write': 'm',
+ 'switch_to_name_thing': 'N',
'switch_to_admin_enter': 'A',
'switch_to_control_pw_type': 'C',
'switch_to_control_tile_type': 'Q',
'drop_thing': 'u',
'teleport': 'p',
'help': 'h',
- 'toggle_map_mode': 'M',
+ 'toggle_map_mode': 'L',
'toggle_tile_draw': 'm',
'hex_move_upleft': 'w',
'hex_move_upright': 'e',
self.disconnected = False
self.game.thing_types = {}
self.game.terrains = {}
+ time.sleep(0.1) # give potential SSL negotation some time …
self.socket.send('TASKS')
self.socket.send('TERRAINS')
self.socket.send('THING_TYPES')
def reconnect(self):
self.log_msg('@ attempting reconnect')
self.send('QUIT')
- time.sleep(0.1) # FIXME necessitated by some some strange SSL race
- # conditions with ws4py, find out what exactly
+ # necessitated by some strange SSL race conditions with ws4py
+ time.sleep(0.1) # FIXME find out why exactly necessary
self.switch_mode('waiting_for_server')
self.connect()
self.input_ = self.game.portals[self.explorer]
elif self.mode.name == 'password':
self.input_ = self.password
+ elif self.mode.name == 'name_thing':
+ if hasattr(self.thing_selected, 'name'):
+ self.input_ = self.thing_selected.name
def send_tile_control_command(self):
self.send('SET_TILE_CONTROL %s %s' %
(self.explorer, quote(self.tile_control_char)))
+ def toggle_map_mode(self):
+ if self.map_mode == 'terrain only':
+ self.map_mode = 'terrain + annotations'
+ elif self.map_mode == 'terrain + annotations':
+ self.map_mode = 'terrain + things'
+ elif self.map_mode == 'terrain + things':
+ self.map_mode = 'protections'
+ elif self.map_mode == 'protections':
+ self.map_mode = 'terrain only'
+
def switch_mode(self, mode_name):
- self.map_mode = 'terrain + things'
self.tile_draw = False
if mode_name == 'admin_enter' and self.is_admin:
mode_name = 'admin'
+ elif mode_name == 'name_thing':
+ 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
+ and t.id_ != player.id_]:
+ thing = t
+ break
+ if not thing:
+ self.flash = True
+ self.log_msg('? not standing over thing')
+ return
+ 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'
+ elif self.mode.name != 'edit':
+ self.map_mode = 'terrain + things'
if self.mode.shows_info or self.mode.name == 'control_tile_draw':
player = self.game.get_thing(self.game.player_id)
self.explorer = YX(player.position.y, player.position.x)
elif self.mode.name == 'admin_enter':
self.log_msg('@ enter admin password:')
elif self.mode.name == 'control_pw_type':
- self.log_msg('@ enter tile control character for which you want to change the password:')
+ self.log_msg('@ enter tile protection character for which you want to change the password:')
elif self.mode.name == 'control_tile_type':
- self.log_msg('@ enter tile control character which you want to draw:')
+ self.log_msg('@ enter tile protection character which you want to draw:')
elif self.mode.name == 'control_pw_pw':
- self.log_msg('@ enter tile control password for "%s":' % self.tile_control_char)
+ self.log_msg('@ enter tile protection password for "%s":' % self.tile_control_char)
elif self.mode.name == 'control_tile_draw':
- self.log_msg('@ can draw tile control 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 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.input_ = ""
self.restore_input_values()
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.mode.name in {'edit', 'write', 'control_tile_draw',
- 'control_tile_type'}:
- line = []
- for i in range(start, end):
- line += [self.game.map_content[i]
- + self.game.map_control_content[i]]
- map_lines_split += [line]
+ 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]]]
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)]
+ 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))
- player = self.game.get_thing(self.game.player_id)
center = player.position
- if self.mode.shows_info:
+ 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 '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 picked up thing\n" % self.keys['drop_thing']
- content += '[%s] – teleport to other space\n' % self.keys['teleport']
+ 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 view between anything, terrain, and annotations\n' % self.keys['toggle_map_mode']
+ 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 player's surroundings\n" % self.keys['flatten']
+ 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':
content += "Available actions:\n"
- content += "[%s] – toggle tile control drawing\n" % self.keys['toggle_tile_draw']
+ content += "[%s] – toggle tile protection drawing\n" % self.keys['toggle_tile_draw']
content += '\n'
elif self.mode.name == 'chat':
content += '/nick NAME – re-name yourself to NAME\n'
for i in range(self.size.y):
safe_addstr(i,
self.window_width * (not self.mode.has_input_prompt),
- ' '*self.window_width)
+ ' ' * self.window_width)
lines = []
for line in content.split('\n'):
lines += msg_into_lines_of_width(line, self.window_width)
draw_help()
curses.curs_set(False) # hide cursor
- curses.use_default_colors();
+ curses.use_default_colors()
stdscr.timeout(10)
reset_screen_size()
self.explorer = YX(0, 0)
self.log_msg('@ aborted')
else:
self.send('SET_MAP_CONTROL_PASSWORD ' + quote(self.tile_control_char) + ' ' + quote(self.input_))
+ self.log_msg('@ sent new password for protection character "%s"' % self.tile_control_char)
self.switch_mode('admin')
elif self.mode.name == 'password' and key == '\n':
if self.input_ == '':
else:
self.send('ALL ' + quote(self.input_))
self.input_ = ""
+ 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.switch_mode('edit')
elif self.mode.name == 'annotate' and key == '\n':
if self.input_ == '':
self.input_ = ' '
if self.mode.mode_switch_on_key(self, key):
continue
elif key == self.keys['toggle_map_mode']:
- if self.map_mode == 'terrain only':
- self.map_mode = 'terrain + annotations'
- elif self.map_mode == 'terrain + annotations':
- self.map_mode = 'terrain + things'
- else:
- self.map_mode = 'terrain only'
+ self.toggle_map_mode()
elif key in self.movement_keys:
move_explorer(self.movement_keys[key])
elif self.mode.name == 'play':
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:
+ elif key == self.keys['flatten'] and\
+ 'FLATTEN_SURROUNDINGS' in self.game.tasks:
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:
self.send('TASK:MOVE ' + self.movement_keys[key])
projects / plomrogue2 / blobdiff