X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=b76860aa5ff7954c802c63334d22367a9acb7ffa;hb=5862e6964f0ce6e7139862e8b1de3b1cca0a306f;hp=793c322deb6c4f296348d7c19ac4b562b7ef794f;hpb=d77d65edc40bb0ac17e46eb166413edb5f8e0106;p=plomrogue2
diff --git a/plomrogue/game.py b/plomrogue/game.py
index 793c322..b76860a 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -50,7 +50,14 @@ class SaveableMap(Map):
return False
return True
- def draw_presets(self, alternate_hex=0):
+ def draw_presets(self, big_yx, type_):
+ if type_ == 1:
+ if big_yx.y < 0:
+ self.terrain = 'X' * self.size_i
+ elif type_ == 2:
+ self.draw_presets_grid(big_yx)
+
+ def draw_presets_grid(self, big_yx):
old_modified = self.modified
if type(self.geometry) == MapGeometrySquare:
self.set_line(0, 'X' * self.geometry.size.x)
@@ -88,6 +95,7 @@ class SaveableMap(Map):
if self.inside(yx):
self[yx] = 'X'
+ alternate_hex = big_yx.y % 2
if alternate_hex:
draw_snake(offset + YX(0, 0))
draw_snake(offset + YX((0 + alternate_hex) * distance,
@@ -132,6 +140,7 @@ class Game(GameBase):
self.annotations = {}
self.spawn_points = []
self.portals = {}
+ self.intro_messages = []
self.player_chars = string.digits + string.ascii_letters
self.players_hat_chars = {}
self.player_char_i = -1
@@ -146,7 +155,7 @@ class Game(GameBase):
'=': Terrain('=', 'glass', blocks_sound=True, blocks_movement=True),
'T': Terrain('T', 'table', blocks_movement=True),
}
- self.draw_control_presets = True
+ self.draw_control_presets = 1
if os.path.exists(self.io.save_file):
if not os.path.isfile(self.io.save_file):
raise GameError('save file path refers to non-file')
@@ -340,6 +349,17 @@ class Game(GameBase):
self.changed = True
def login(self, nick, connection_id):
+ login_limit_filename = 'login_limit'
+ if os.path.exists(login_limit_filename):
+ with open(login_limit_filename, 'r') as f:
+ lines = f.readlines()
+ login_limit = int(lines[0])
+ if len(self.sessions) > login_limit - 1:
+ print('DEBUG LOGIN TOO MANY FOR', nick, connection_id)
+ self.io.send('CHAT "sorry, too many users currently '
+ 'logged in, try again later '
+ 'by re-entering your name"', connection_id)
+ return
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'),
@@ -355,6 +375,8 @@ class Game(GameBase):
print('DEBUG LOGIN', t.name, len(self.sessions))
self.io.send('PLAYER_ID %s' % t.id_, connection_id)
self.io.send('LOGIN_OK', connection_id)
+ for msg in self.intro_messages:
+ self.io.send('CHAT ' + quote(msg), connection_id)
self.io.send('CHAT ' + quote(t.name + ' entered the map.'))
for s in [s for s in self.things
if s.type_ == 'SpawnPoint' and s.name == t.name]:
@@ -516,7 +538,7 @@ class Game(GameBase):
map_geometry_shape = self.get_map_geometry_shape()
# must come before MAP, otherwise first get_map uses the default
# TODO: refactor into MAP
- write(f, 'MAP_CONTROL_PRESETS %s' % int(self.draw_control_presets))
+ write(f, 'MAP_CONTROL_PRESETS %s' % self.draw_control_presets)
write(f, 'MAP %s %s' % (map_geometry_shape, self.map_geometry.size,))
for terrain in self.terrains.values():
write(f, 'TERRAIN %s %s %s %s %s' % (quote(terrain.character),
@@ -601,6 +623,8 @@ class Game(GameBase):
next_thing_id += 1
for s in self.spawn_points:
write(f, 'SPAWN_POINT %s %s' % (s[0], s[1]))
+ for msg in self.intro_messages:
+ write(f, 'INTRO_MSG %s' % quote(msg))
@@ -611,8 +635,8 @@ class Game(GameBase):
maps = self.map_controls
if big_yx not in maps:
maps[big_yx] = SaveableMap(self.map_geometry)
- if self.draw_control_presets and type_ == 'control':
- maps[big_yx].draw_presets(big_yx.y % 2)
+ if type_ == 'control':
+ maps[big_yx].draw_presets(big_yx, self.draw_control_presets)
return maps[big_yx]
def new_world(self, map_geometry):