Allow multiple default start points, pick them randomly on login.

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 9f7bfff6604bb7c3223d5798a526d7e4947f8553..8376355fdfacdc4d46c5ad546b868c02feb0f6cc 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -53,7 +53,7 @@ def cmd_SPAWN_POINT(game, big_yx, little_yx):
     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):

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 95ea71dd71d4e5848924c33cd75f4d419f2eaa64..dc5924d4d1d43292db9f11c7bbf572a6d2f97350 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -130,7 +130,7 @@ class Game(GameBase):
         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 = {}
@@ -334,12 +334,13 @@ class Game(GameBase):
         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] = {
@@ -593,8 +594,8 @@ class Game(GameBase):
                 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]))