'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.'
+ },
+ 'admin_thing_protect': {
+ 'short': 'change thing protection',
+ 'long': 'Change protection character for thing here.'
},
'write': {
'short': 'change terrain',
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_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_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)
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
import json
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",
+ self.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
"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',
+ 'switch_to_admin_thing_protect': 'T',
'flatten': 'F',
'take_thing': 'z',
'drop_thing': 'u',
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
+ 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 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
+ 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)
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 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)
elif self.mode.name == 'control_tile_draw':
info += 'PROTECTION: %s\n' % protection
for t in self.game.things:
if t.position == self.explorer:
- info += 'THING: %s / %s' % (t.type_,
- self.game.thing_types[t.type_])
+ protection = t.protection
+ if protection == '.':
+ protection = 'unprotected'
+ info += 'THING: %s / protection: %s / %s' %\
+ (t.type_, protection, self.game.thing_types[t.type_])
if hasattr(t, 'player_char'):
info += t.player_char
if hasattr(t, 'name'):
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:
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']
+ elif self.mode.name == 'admin':
+ content += "Available actions:\n"
+ if 'MOVE' in self.game.tasks:
+ content += "[%s] – move player\n" % ','.join(self.movement_keys)
+ content += '\n'
content += self.mode.list_available_modes(self)
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.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')
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 %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_ == '':
self.input_ = ' '
elif self.mode.name == 'admin':
if self.mode.mode_switch_on_key(self, key):
continue
+ 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':
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()