From: Christian Heller Date: Sat, 26 Dec 2020 22:01:07 +0000 (+0100) Subject: Fix bug adding new spawn points on each server relaunch. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bprefix%7D%7D/static/bar%20baz.html?a=commitdiff_plain;h=d77d65edc40bb0ac17e46eb166413edb5f8e0106;p=plomrogue2 Fix bug adding new spawn points on each server relaunch. --- diff --git a/plomrogue/game.py b/plomrogue/game.py index dc5924d..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_points = [(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'):] @@ -334,13 +340,12 @@ 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', random.choice(self.spawn_points)) + 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] = { @@ -595,7 +600,7 @@ class Game(GameBase): % (next_thing_id, int(datetime.datetime.now().timestamp()))) next_thing_id += 1 for s in self.spawn_points: - write(f, 'SPAWN_POINT %s %s' % (s[0], s[1])) + write(f, 'SPAWN_POINT %s %s' % (s[0], s[1])) @@ -616,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))