+# TODO: instead of sending tasks and thing types on request, send them on connection
+
def cmd_TASKS(game, connection_id):
tasks = []
game.io.send('TASKS ' + ','.join(game.tasks.keys()), connection_id)
cmd_TASKS.argtypes = ''
+def cmd_THING_TYPES(game, connection_id):
+ for t_t in game.thing_types.values():
+ game.io.send('THING_TYPE %s %s' % (t_t.get_type(), t_t.symbol_hint),
+ connection_id)
+cmd_THING_TYPES.argtypes = ''
+
def cmd_ALL(game, msg, connection_id):
def lower_msg_by_volume(msg, volume):
import random
if not connection_id in game.sessions:
raise GameError('need to be logged in for this')
- speaker = game.get_thing(game.sessions[connection_id], False)
+ speaker = game.get_thing(game.sessions[connection_id])
n_max = 255
map_size = game.map.size_i
dijkstra_map = [n_max for i in range(game.map.size_i)]
# x = 0
# print(' '.join(line_to_print))
for c_id in game.sessions:
- listener = game.get_thing(game.sessions[c_id], create_unfound=False)
+ listener = game.get_thing(game.sessions[c_id])
listener_vol = dijkstra_map[game.map.get_position_index(listener.position)]
volume = 1 / max(1, listener_vol)
lowered_msg = lower_msg_by_volume(msg, volume)
- lowered_nick = lower_msg_by_volume(speaker.nickname, volume)
+ lowered_nick = lower_msg_by_volume(speaker.name, volume)
game.io.send('CHAT ' +
quote('(volume: %.2f) %s: %s' % (volume, lowered_nick,
lowered_msg)),
cmd_ALL.argtypes = 'string'
def cmd_LOGIN(game, nick, connection_id):
- for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
+ for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
raise GameError('name already in use')
if connection_id in game.sessions:
raise GameError('cannot log in twice')
- t = game.thing_types['player'](game)
+ t = game.thing_types['Player'](game)
t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
game.things += [t] # TODO refactor into Thing.__init__?
+ t.player_char = game.get_next_player_char()
game.sessions[connection_id] = t.id_
game.io.send('LOGIN_OK', connection_id)
- t.nickname = nick
- game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
+ t.name = nick
+ game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
game.io.send('PLAYER_ID %s' % t.id_, connection_id)
game.changed = True
cmd_LOGIN.argtypes = 'string'
def cmd_NICK(game, nick, connection_id):
- for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
+ for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
raise GameError('name already in use')
if not connection_id in game.sessions:
raise GameError('can only rename when already logged in')
t_id = game.sessions[connection_id]
- t = game.get_thing(t_id, False)
- old_nick = t.nickname
- t.nickname = nick
+ t = game.get_thing(t_id)
+ old_nick = t.name
+ t.name = nick
game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
game.changed = True
cmd_NICK.argtypes = 'string'
game.send_gamestate(connection_id)
cmd_GET_GAMESTATE.argtypes = ''
-def cmd_QUERY(game, target_nick, msg, connection_id):
- if not connection_id in game.sessions:
- raise GameError('can only query when logged in')
- t = game.get_thing(game.sessions[connection_id], False)
- source_nick = t.nickname
- for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
- for c_id in game.sessions:
- if game.sessions[c_id] == t.id_:
- game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
- game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
- return
- raise GameError('target user offline')
- raise GameError('can only query with registered nicknames')
-cmd_QUERY.argtypes = 'string string'
+#def cmd_QUERY(game, target_nick, msg, connection_id):
+# if not connection_id in game.sessions:
+# raise GameError('can only query when logged in')
+# t = game.get_thing(game.sessions[connection_id], False)
+# source_nick = t.name
+# for t in [t for t in game.things if t.type_ == 'Player' and t.name == target_nick]:
+# for c_id in game.sessions:
+# if game.sessions[c_id] == t.id_:
+# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
+# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
+# return
+# raise GameError('target user offline')
+# raise GameError('can only query with registered nicknames')
+#cmd_QUERY.argtypes = 'string string'
def cmd_PING(game, connection_id):
game.io.send('PONG', connection_id)
cmd_TURN.argtypes = 'int:nonneg'
def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
- player = game.get_thing(game.sessions[connection_id], False)
+ player = game.get_thing(game.sessions[connection_id])
if player.fov_stencil[yx] != '.':
raise GameError('cannot annotate tile outside field of view')
if not game.can_do_tile_with_pw(yx, pw):
cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
def cmd_PORTAL(game, yx, msg, pw, connection_id):
- player = game.get_thing(game.sessions[connection_id], False)
+ player = game.get_thing(game.sessions[connection_id])
if player.fov_stencil[yx] != '.':
raise GameError('cannot edit portal on tile outside field of view')
if not game.can_do_tile_with_pw(yx, pw):
cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
def cmd_GET_ANNOTATION(game, yx, connection_id):
- player = game.get_thing(game.sessions[connection_id], False)
+ player = game.get_thing(game.sessions[connection_id])
annotation = '(unknown)';
if player.fov_stencil[yx] == '.':
annotation = '(none)';
def cmd_MAP_CONTROL_PW(game, tile_class, password):
game.map_control_passwords[tile_class] = password
cmd_MAP_CONTROL_PW.argtypes = 'char string'
+
+def cmd_THING(game, yx, thing_type, thing_id):
+ if not thing_type in game.thing_types:
+ raise GameError('illegal thing type %s' % thing_type)
+ if yx.y < 0 or yx.x < 0 or yx.y >= game.map.size.y or yx.x >= game.map.size.x:
+ raise GameError('illegal position %s' % yx)
+ t_old = None
+ if thing_id > 0:
+ t_old = game.get_thing(thing_id)
+ t_new = game.thing_types[thing_type](game, id_=thing_id, position=yx)
+ if t_old:
+ game.things[game.things.index(t_old)] = t_new
+ else:
+ game.things += [t_new]
+ game.changed = True
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type int:nonneg'
+
+def cmd_THING_NAME(game, thing_id, name):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ t.name = name
+cmd_THING_NAME.argtypes = 'int:pos string'
projects / plomrogue2 / blobdiff