'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.'
},
+ 'command_thing': {
+ 'short': 'command thing',
+ 'long': 'Enter a command to the thing you carry. Enter nothing to return to play mode.'
+ },
+ 'take_thing': {
+ 'short': 'take thing',
+ 'long': 'You see a list of things which you could pick up. Enter the target thing\'s index, or, to leave, nothing.'
+ },
'admin_thing_protect': {
'short': 'change thing protection',
'long': 'Change protection character for thing here.'
pass # we assume socket will be known as dead by now
def cmd_TURN(game, n):
- game.info_db = {}
- game.info_hints = []
+ game.annotations = {}
game.turn = n
game.things = []
game.portals = {}
game.turn_complete = False
+ game.fov = ''
cmd_TURN.argtypes = 'int:nonneg'
def cmd_LOGIN_OK(game):
game.tui.do_refresh = True
cmd_ADMIN_OK.argtypes = ''
+def cmd_REPLY(game, msg):
+ game.tui.log_msg('#MUSICPLAYER: ' + msg)
+ game.tui.do_refresh = True
+cmd_REPLY.argtypes = 'string'
+
def cmd_CHAT(game, msg):
game.tui.log_msg('# ' + msg)
game.tui.do_refresh = True
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):
def cmd_GAME_STATE_COMPLETE(game):
if game.tui.mode.name == 'post_login_wait':
game.tui.switch_mode('play')
- if game.tui.mode.shows_info:
- game.tui.query_info()
game.turn_complete = True
game.tui.do_refresh = True
+ game.tui.info_cached = None
cmd_GAME_STATE_COMPLETE.argtypes = ''
def cmd_PORTAL(game, position, msg):
game.tui.do_refresh = True
cmd_ARGUMENT_ERROR.argtypes = 'string'
-def cmd_ANNOTATION_HINT(game, position):
- game.info_hints += [position]
-cmd_ANNOTATION_HINT.argtypes = 'yx_tuple:nonneg'
-
def cmd_ANNOTATION(game, position, msg):
- game.info_db[position] = msg
+ game.annotations[position] = msg
if game.tui.mode.shows_info:
game.tui.do_refresh = True
cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'
def cmd_TASKS(game, tasks_comma_separated):
game.tasks = tasks_comma_separated.split(',')
game.tui.mode_write.legal = 'WRITE' in game.tasks
+ game.tui.mode_command_thing.legal = 'COMMAND' in game.tasks
+ game.tui.mode_take_thing.legal = 'PICK_UP' in game.tasks
cmd_TASKS.argtypes = 'string'
def cmd_THING_TYPE(game, thing_type, symbol_hint):
pass
cmd_PONG.argtypes = ''
+def cmd_DEFAULT_COLORS(game):
+ game.tui.set_default_colors()
+cmd_DEFAULT_COLORS.argtypes = ''
+
+def cmd_RANDOM_COLORS(game):
+ game.tui.set_random_colors()
+cmd_RANDOM_COLORS.argtypes = ''
+
class Game(GameBase):
turn_complete = False
tasks = {}
self.register_command(cmd_ADMIN_OK)
self.register_command(cmd_PONG)
self.register_command(cmd_CHAT)
+ self.register_command(cmd_REPLY)
self.register_command(cmd_PLAYER_ID)
self.register_command(cmd_TURN)
self.register_command(cmd_THING)
self.register_command(cmd_MAP_CONTROL)
self.register_command(cmd_PORTAL)
self.register_command(cmd_ANNOTATION)
- self.register_command(cmd_ANNOTATION_HINT)
self.register_command(cmd_GAME_STATE_COMPLETE)
self.register_command(cmd_ARGUMENT_ERROR)
self.register_command(cmd_GAME_ERROR)
self.register_command(cmd_PLAY_ERROR)
self.register_command(cmd_TASKS)
self.register_command(cmd_FOV)
+ self.register_command(cmd_DEFAULT_COLORS)
+ self.register_command(cmd_RANDOM_COLORS)
self.map_content = ''
self.player_id = -1
- self.info_db = {}
- self.info_hints = []
+ self.annotations = {}
self.portals = {}
self.terrains = {}
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_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)
+ mode_command_thing = Mode('command_thing', has_input_prompt=True)
+ mode_take_thing = Mode('take_thing', has_input_prompt=True)
is_admin = False
tile_draw = False
def __init__(self, host):
import os
import json
- self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+ self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
+ "command_thing", "take_thing"]
+ self.mode_play.available_actions = ["move", "drop_thing",
+ "teleport", "door", "consume"]
self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
+ 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_edit': 'E',
'switch_to_write': 'm',
'switch_to_name_thing': 'N',
+ 'switch_to_command_thing': 'O',
'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',
+ 'switch_to_take_thing': 'z',
'drop_thing': 'u',
'teleport': 'p',
+ 'consume': 'C',
+ 'door': 'D',
'help': 'h',
'toggle_map_mode': 'L',
'toggle_tile_draw': 'm',
self.input_lines = []
self.fov = ''
self.flash = False
+ self.map_lines = []
+ self.offset = YX(0,0)
curses.wrapper(self.loop)
def connect(self):
if len(self.log) > 100:
self.log = self.log[-100:]
- def query_info(self):
- self.send('GET_ANNOTATION ' + str(self.explorer))
-
def restore_input_values(self):
- if self.mode.name == 'annotate' and self.explorer in self.game.info_db:
- info = self.game.info_db[self.explorer]
- if info != '(none)':
- self.input_ = info
+ if self.mode.name == 'annotate' and self.explorer in self.game.annotations:
+ self.input_ = self.game.annotations[self.explorer]
elif self.mode.name == 'portal' and self.explorer in self.game.portals:
self.input_ = self.game.portals[self.explorer]
elif self.mode.name == 'password':
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)
- if self.mode.shows_info:
- self.query_info()
if self.mode.is_single_char_entry:
self.show_help = True
if self.mode.name == 'waiting_for_server':
self.send('LOGIN ' + quote(self.login_name))
else:
self.log_msg('@ enter username')
+ elif self.mode.name == 'take_thing':
+ self.log_msg('selectable things:')
+ player = self.game.get_thing(self.game.player_id)
+ selectables = [t for t in self.game.things
+ if t != player and t.type_ != 'Player'
+ and t.position == player.position]
+ if len(selectables) == 0:
+ self.log_msg('none')
+ else:
+ for t in selectables:
+ self.log_msg(str(t.id_) + ' ' + self.get_thing_info(t))
+ elif self.mode.name == 'command_thing':
+ self.send('TASK:COMMAND ' + quote('HELP'))
elif self.mode.name == 'admin_enter':
self.log_msg('@ enter admin password:')
elif self.mode.name == 'control_pw_type':
self.input_ = ""
self.restore_input_values()
+ def set_default_colors(self):
+ curses.init_color(1, 1000, 1000, 1000)
+ curses.init_color(2, 0, 0, 0)
+ self.do_refresh = True
+
+ def set_random_colors(self):
+
+ def rand(offset):
+ import random
+ return int(offset + random.random()*375)
+
+ curses.init_color(1, rand(625), rand(625), rand(625))
+ curses.init_color(2, rand(0), rand(0), rand(0))
+ self.do_refresh = True
+
+ def get_info(self):
+ if self.info_cached:
+ return self.info_cached
+ pos_i = self.explorer.y * self.game.map_geometry.size.x + self.explorer.x
+ info_to_cache = ''
+ if len(self.game.fov) > pos_i and self.game.fov[pos_i] != '.':
+ info_to_cache += 'outside field of view'
+ else:
+ terrain_char = self.game.map_content[pos_i]
+ terrain_desc = '?'
+ if terrain_char in self.game.terrains:
+ terrain_desc = self.game.terrains[terrain_char]
+ info_to_cache += 'TERRAIN: "%s" / %s\n' % (terrain_char,
+ terrain_desc)
+ protection = self.game.map_control_content[pos_i]
+ if protection == '.':
+ protection = 'unprotected'
+ info_to_cache += 'PROTECTION: %s\n' % protection
+ for t in self.game.things:
+ if t.position == self.explorer:
+ info_to_cache += 'THING: %s' % self.get_thing_info(t)
+ protection = t.protection
+ if protection == '.':
+ protection = 'none'
+ info_to_cache += ' / protection: %s\n' % protection
+ if self.explorer in self.game.portals:
+ info_to_cache += 'PORTAL: ' +\
+ self.game.portals[self.explorer] + '\n'
+ else:
+ info_to_cache += 'PORTAL: (none)\n'
+ if self.explorer in self.game.annotations:
+ info_to_cache += 'ANNOTATION: ' +\
+ self.game.annotations[self.explorer]
+ self.info_cached = info_to_cache
+ return self.info_cached
+
+ def get_thing_info(self, t):
+ info = '%s / %s' %\
+ (t.type_, self.game.thing_types[t.type_])
+ if hasattr(t, 'thing_char'):
+ info += t.thing_char
+ if hasattr(t, 'name'):
+ info += ' (%s)' % t.name
+ return info
+
def loop(self, stdscr):
import datetime
def safe_addstr(y, x, line):
if y < self.size.y - 1 or x + len(line) < self.size.x:
- stdscr.addstr(y, x, line)
+ stdscr.addstr(y, x, line, curses.color_pair(1))
else: # workaround to <https://stackoverflow.com/q/7063128>
cut_i = self.size.x - x - 1
cut = line[:cut_i]
last_char = line[cut_i]
- stdscr.addstr(y, self.size.x - 2, last_char)
+ stdscr.addstr(y, self.size.x - 2, last_char, curses.color_pair(1))
stdscr.insstr(y, self.size.x - 2, ' ')
- stdscr.addstr(y, x, cut)
+ stdscr.addstr(y, x, cut, curses.color_pair(1))
def handle_input(msg):
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 = []
def move_explorer(direction):
target = self.game.map_geometry.move_yx(self.explorer, direction)
if target:
+ self.info_cached = None
self.explorer = target
- if self.mode.shows_info:
- self.query_info()
if self.tile_draw:
self.send_tile_control_command()
else:
safe_addstr(max_y - i - 1, self.window_width, lines[i])
def draw_info():
- if not self.game.turn_complete:
- return
- pos_i = self.explorer.y * self.game.map_geometry.size.x + self.explorer.x
- info = 'MAP VIEW: %s\n' % self.map_mode
- if self.game.fov[pos_i] != '.':
- info += 'outside field of view'
- else:
- terrain_char = self.game.map_content[pos_i]
- terrain_desc = '?'
- if terrain_char in self.game.terrains:
- terrain_desc = self.game.terrains[terrain_char]
- info += 'TERRAIN: "%s" / %s\n' % (terrain_char, terrain_desc)
- protection = self.game.map_control_content[pos_i]
- if protection == '.':
- protection = 'unprotected'
- info += 'PROTECTION: %s\n' % protection
- for t in self.game.things:
- if t.position == self.explorer:
- 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'):
- info += ' (%s)' % t.name
- info += '\n'
- if self.explorer in self.game.portals:
- info += 'PORTAL: ' + self.game.portals[self.explorer] + '\n'
- else:
- info += 'PORTAL: (none)\n'
- if self.explorer in self.game.info_db:
- info += 'ANNOTATION: ' + self.game.info_db[self.explorer]
- else:
- info += 'ANNOTATION: waiting …'
+ info = 'MAP VIEW: %s\n%s' % (self.map_mode, self.get_info())
lines = msg_into_lines_of_width(info, self.window_width)
height_header = 2
for i in range(len(lines)):
'MODE: %s – %s' % (self.mode.short_desc, help))
def draw_map():
- if not self.game.turn_complete:
+ if not self.game.turn_complete and len(self.map_lines) == 0:
return
- map_lines_split = []
- 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.map_mode == 'protections':
- map_lines_split += [[c + ' ' for c
- in self.game.map_control_content[start:end]]]
+ if self.game.turn_complete:
+ map_lines_split = []
+ 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.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]]]
+ if self.map_mode == 'terrain + annotations':
+ for p in self.game.annotations:
+ map_lines_split[p.y][p.x] = 'A '
+ elif self.map_mode == 'terrain + things':
+ for p in self.game.portals.keys():
+ original = map_lines_split[p.y][p.x]
+ map_lines_split[p.y][p.x] = original[0] + 'P'
+ used_positions = []
+
+ def draw_thing(t, used_positions):
+ symbol = self.game.thing_types[t.type_]
+ meta_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
+ used_positions += [t.position]
+
+ for t in [t for t in self.game.things if t.type_ != 'Player']:
+ draw_thing(t, used_positions)
+ for t in [t for t in self.game.things if t.type_ == 'Player']:
+ draw_thing(t, used_positions)
+ 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] = '??'
+ self.map_lines = []
+ if type(self.game.map_geometry) == MapGeometryHex:
+ indent = 0
+ for line in map_lines_split:
+ self.map_lines += [indent * ' ' + ''.join(line)]
+ indent = 0 if indent else 1
else:
- map_lines_split += [[c + ' ' for c
- in self.game.map_content[start:end]]]
- if self.map_mode == 'terrain + annotations':
- for p in self.game.info_hints:
- map_lines_split[p.y][p.x] = 'A '
- elif self.map_mode == 'terrain + things':
- for p in self.game.portals.keys():
- original = map_lines_split[p.y][p.x]
- map_lines_split[p.y][p.x] = original[0] + 'P'
- used_positions = []
- 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 t.position in used_positions:
- 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)]
- 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))
- center = player.position
- 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 type(self.game.map_geometry) == MapGeometryHex and offset.y % 2:
- offset += YX(0, 1)
- term_y = max(0, -offset.y)
- term_x = max(0, -offset.x)
- map_y = max(0, offset.y)
- map_x = max(0, offset.x)
+ for line in map_lines_split:
+ self.map_lines += [''.join(line)]
+ window_center = YX(int(self.size.y / 2),
+ int(self.window_width / 2))
+ center = player.position
+ if self.mode.shows_info or self.mode.name == 'control_tile_draw':
+ center = self.explorer
+ center = YX(center.y, center.x * 2)
+ self.offset = center - window_center
+ if type(self.game.map_geometry) == MapGeometryHex and self.offset.y % 2:
+ self.offset += YX(0, 1)
+ term_y = max(0, -self.offset.y)
+ term_x = max(0, -self.offset.x)
+ map_y = max(0, self.offset.y)
+ map_x = max(0, self.offset.x)
while (term_y < self.size.y and map_y < self.game.map_geometry.size.y):
- to_draw = map_lines[map_y][map_x:self.window_width + offset.x]
+ to_draw = self.map_lines[map_y][map_x:self.window_width + self.offset.x]
safe_addstr(term_y, term_x, to_draw)
term_y += 1
map_y += 1
def draw_help():
content = "%s help\n\n%s\n\n" % (self.mode.short_desc,
self.mode.help_intro)
- if self.mode.name == 'play':
+ if len(self.mode.available_actions) > 0:
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':
- 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']
- 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,
def draw_screen():
stdscr.clear()
+ stdscr.bkgd(' ', curses.color_pair(1))
recalc_input_lines()
if self.mode.has_input_prompt:
draw_input()
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',
+ 'consume': 'consume',
+ }
+
+ action_tasks = {
+ 'flatten': 'FLATTEN_SURROUNDINGS',
+ 'take_thing': 'PICK_UP',
+ 'drop_thing': 'DROP',
+ 'door': 'DOOR',
+ 'move': 'MOVE',
+ 'command': 'COMMAND',
+ 'consume': 'INTOXICATE',
+ }
+
curses.curs_set(False) # hide cursor
- curses.use_default_colors()
+ curses.start_color()
+ self.set_default_colors()
+ curses.init_pair(1, 1, 2)
stdscr.timeout(10)
reset_screen_size()
self.explorer = YX(0, 0)
self.login_name = self.input_
self.send('LOGIN ' + quote(self.input_))
self.input_ = ""
+ elif self.mode.name == 'take_thing' and key == '\n':
+ if self.input_ == '':
+ self.log_msg('@ aborted')
+ else:
+ self.send('TASK:PICK_UP ' + quote(self.input_))
+ self.input_ = ''
+ self.switch_mode('play')
+ elif self.mode.name == 'command_thing' and key == '\n':
+ if self.input_ == '':
+ self.log_msg('@ aborted')
+ self.switch_mode('play')
+ elif task_action_on('command'):
+ self.send('TASK:COMMAND ' + quote(self.input_))
+ self.input_ = ""
elif self.mode.name == 'control_pw_pw' and key == '\n':
if self.input_ == '':
self.log_msg('@ aborted')
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:
- 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['consume'] and task_action_on('consume'):
+ self.send('TASK:INTOXICATE')
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 '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 == '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: