if little_yx.y >= game.map_geometry.size.y or \
little_yx.x >= game.map_geometry.size.x:
raise GameError('illegal spawn point')
- game.spawn_point = big_yx, little_yx
+ game.spawn_points += [(big_yx, little_yx)]
cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
def cmd_LOGIN(game, nick, connection_id):
self.map_controls = {}
self.map_control_passwords = {}
self.annotations = {}
- self.spawn_point = YX(0, 0), YX(0, 0)
+ self.spawn_points = [(YX(0, 0), YX(0, 0))]
self.portals = {}
self.player_chars = string.digits + string.ascii_letters
self.players_hat_chars = {}
self.changed = True
def login(self, nick, connection_id):
+ import random
for t in [t for t in self.things
if t.type_ == 'Player' and t.name == nick]:
self.io.send('GAME_ERROR ' + quote('name already in use'),
connection_id)
return
- t = self.add_thing('Player', self.spawn_point)
+ t = self.add_thing('Player', random.choice(self.spawn_points))
t.name = nick
t.thing_char = self.get_next_player_char()
self.sessions[connection_id] = {
write(f, 'THING_SPAWNPOINT_CREATED %s %s'
% (next_thing_id, int(datetime.datetime.now().timestamp())))
next_thing_id += 1
- write(f, 'SPAWN_POINT %s %s' % (self.spawn_point[0],
- self.spawn_point[1]))
+ for s in self.spawn_points:
+ write(f, 'SPAWN_POINT %s %s' % (s[0], s[1]))