'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. 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. 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.'
+ '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': 'change terrain',
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
'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',
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.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 and self.mode.name == 'control_tile_draw':
+ 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':
+ 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)
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:
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)
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()
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)
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['flatten'] and\
- 'FLATTEN_SURROUNDINGS' in self.game.tasks:
+ '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()
projects / plomrogue2 / blobdiff