X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-logo.png?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=793c322deb6c4f296348d7c19ac4b562b7ef794f;hb=d77d65edc40bb0ac17e46eb166413edb5f8e0106;hp=95ea71dd71d4e5848924c33cd75f4d419f2eaa64;hpb=7ca861abd3acab67ddf18c39dbaadd9b401f7892;p=plomrogue2

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 95ea71d..793c322 100755
--- 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 = []
         self.portals = {}
         self.player_chars = string.digits + string.ascii_letters
         self.players_hat_chars = {}
@@ -195,6 +195,12 @@ class Game(GameBase):
             return self.thing_types.keys()
         return None
 
+    def get_default_spawn_point(self):
+        import random
+        if len(self.spawn_points) == 0:
+            return (YX(0, 0), YX(0, 0))
+        return random.choice(self.spawn_points)
+
     def get_map_geometry_shape(self):
         return self.map_geometry.__class__.__name__[len('MapGeometry'):]
 
@@ -339,7 +345,7 @@ class Game(GameBase):
             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', self.get_default_spawn_point())
         t.name = nick
         t.thing_char = self.get_next_player_char()
         self.sessions[connection_id] = {
@@ -593,8 +599,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]))
 
 
 
@@ -615,7 +621,6 @@ class Game(GameBase):
         self.annotations = {}
         self.portals = {}
         self.admin_passwords = []
-        self.spawn_point = YX(0, 0), YX(0, 0)
         self.map_geometry = map_geometry
         self.map_control_passwords = {'X': 'secret'}
         self.get_map(YX(0, 0))