X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fgame.py;h=64ae6898a9f9c11d56506d37f114d3e997585af0;hb=dbd7f497e0726b80f7df42c53ea7b4ee6a74a280;hp=84bebb98c2d4a45f0a1f68619681790f07ce5d99;hpb=687f032b63ef13e98a8e71ef59c6ef0cd032149f;p=plomrogue2 diff --git a/plomrogue/game.py b/plomrogue/game.py index 84bebb9..64ae689 100755 --- a/plomrogue/game.py +++ b/plomrogue/game.py @@ -3,7 +3,7 @@ from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, from plomrogue.errors import GameError, PlayError from plomrogue.io import GameIO from plomrogue.misc import quote -from plomrogue.mapping import YX, MapGeometrySquare, Map +from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, Map import string @@ -45,6 +45,68 @@ class SaveableMap(Map): super().set_line(*args, **kwargs) self.modified = True + def inside(self, yx): + if yx.y < 0 or yx.x < 0 or \ + yx.y >= self.geometry.size.y or yx.x >= self.geometry.size.x: + return False + return True + + def draw_presets(self, alternate_hex=0): + old_modified = self.modified + if type(self.geometry) == MapGeometrySquare: + self.set_line(0, 'X' * self.geometry.size.x) + self.set_line(1, 'X' * self.geometry.size.x) + self.set_line(2, 'X' * self.geometry.size.x) + self.set_line(3, 'X' * self.geometry.size.x) + self.set_line(4, 'X' * self.geometry.size.x) + for y in range(self.geometry.size.y): + self[YX(y,0)] = 'X' + self[YX(y,1)] = 'X' + self[YX(y,2)] = 'X' + self[YX(y,3)] = 'X' + self[YX(y,4)] = 'X' + elif type(self.geometry) == MapGeometryHex: + # TODO: for this to work we need a map side length divisible by 6. + + def draw_grid(offset=YX(0,0)): + dirs = ('DOWNRIGHT', 'RIGHT', 'UPRIGHT', 'RIGHT') + + def draw_snake(start): + keep_running = True + yx = start + if self.inside(yx): + self[yx] = 'X' + while keep_running: + for direction in dirs: + if not keep_running: + break + for dir_progress in range(distance): + mover = getattr(self.geometry, 'move__' + direction) + yx = mover(yx) + if yx.x >= self.geometry.size.x: + keep_running = False + break + if self.inside(yx): + self[yx] = 'X' + + if alternate_hex: + draw_snake(offset + YX(0, 0)) + draw_snake(offset + YX((0 + alternate_hex) * distance, -int(1.5*distance))) + draw_snake(offset + YX((1 + alternate_hex) * distance, 0)) + draw_snake(offset + YX((2 + alternate_hex) * distance, -int(1.5*distance))) + + distance = self.geometry.size.y // 3 + draw_grid() + draw_grid(YX(2,0)) + draw_grid(YX(0,2)) + draw_grid(YX(1,0)) + draw_grid(YX(0,1)) + draw_grid(YX(-1,0)) + draw_grid(YX(0,-1)) + draw_grid(YX(-2,0)) + draw_grid(YX(0,-2)) + self.modified = old_modified + import os @@ -61,9 +123,11 @@ class Game(GameBase): self.map_controls = {} self.map_control_passwords = {} self.annotations = {} + self.spawn_point = YX(0,0), YX(0,0) self.portals = {} self.player_chars = string.digits + string.ascii_letters self.player_char_i = -1 + self.admin_passwords = [] self.terrains = { '.': 'floor', 'X': 'wall', @@ -75,7 +139,6 @@ class Game(GameBase): 'o': 'sink', 'O': 'toilet' } - self.new_world(self.map_geometry) 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') @@ -96,9 +159,9 @@ class Game(GameBase): self.io.handle_input(line, god_mode=True) def can_do_tile_with_pw(self, big_yx, little_yx, pw): - map_control = self.get_map(big_yx) + map_control = self.get_map(big_yx, 'control') tile_class = map_control[little_yx] - if tile_class in self.map_control_passwords: + if tile_class in self.map_control_passwords.keys(): tile_pw = self.map_control_passwords[tile_class] if pw != tile_pw: return False @@ -119,12 +182,18 @@ class Game(GameBase): def get_map_geometry_shape(self): return self.map_geometry.__class__.__name__[len('MapGeometry'):] + def get_player(self, connection_id): + if not connection_id in self.sessions: + return None + player = self.get_thing(self.sessions[connection_id]['thing_id']) + return player + def send_gamestate(self, connection_id=None): """Send out game state data relevant to clients.""" self.io.send('TURN ' + str(self.turn)) for c_id in self.sessions: - player = self.get_thing(self.sessions[c_id]) + player = self.get_player(c_id) visible_terrain = player.fov_stencil_map() self.io.send('FOV %s' % quote(player.fov_stencil.terrain), c_id) self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(), @@ -163,7 +232,7 @@ class Game(GameBase): connection_id_found = True break if not connection_id_found: - t = self.get_thing(self.sessions[connection_id]) + t = self.get_player(connection_id) if hasattr(t, 'name'): self.io.send('CHAT ' + quote(t.name + ' left the map.')) self.things.remove(t) @@ -177,11 +246,11 @@ class Game(GameBase): t.proceed() except GameError as e: for connection_id in [c_id for c_id in self.sessions - if self.sessions[c_id] == t.id_]: + if self.sessions[c_id]['thing_id'] == t.id_]: self.io.send('GAME_ERROR ' + quote(str(e)), connection_id) except PlayError as e: for connection_id in [c_id for c_id in self.sessions - if self.sessions[c_id] == t.id_]: + if self.sessions[c_id]['thing_id'] == t.id_]: self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id) if self.changed: self.turn += 1 @@ -198,9 +267,9 @@ class Game(GameBase): return p def cmd_TASK_colon(task_name, game, *args, connection_id): - if connection_id not in game.sessions: + t = self.get_player(connection_id) + if not t: raise GameError('Not registered as player.') - t = game.get_thing(game.sessions[connection_id]) t.set_next_task(task_name, args) def task_prefixed(command_name, task_prefix, task_command): @@ -259,11 +328,15 @@ class Game(GameBase): for tile_class in self.map_control_passwords: write(f, 'MAP_CONTROL_PW %s %s' % (tile_class, self.map_control_passwords[tile_class])) + for pw in self.admin_passwords: + write(f, 'ADMIN_PASSWORD %s' % pw) for t in [t for t in self.things if not t.type_ == 'Player']: write(f, 'THING %s %s %s %s' % (t.position[0], t.position[1], t.type_, t.id_)) if hasattr(t, 'name'): write(f, 'THING_NAME %s %s' % (t.id_, quote(t.name))) + write(f, 'SPAWN_POINT %s %s' % (self.spawn_point[0], + self.spawn_point[1])) def get_map(self, big_yx, type_='normal'): if type_ == 'normal': @@ -272,10 +345,19 @@ class Game(GameBase): maps = self.map_controls if not big_yx in maps: maps[big_yx] = SaveableMap(self.map_geometry) + if type_ == 'control': + maps[big_yx].draw_presets(big_yx.y % 2) return maps[big_yx] def new_world(self, map_geometry): + self.maps = {} + self.map_controls = {} + self.annotations = {} + self.portals = {} + self.admin_passwords = [] + self.spawn_point = YX(0,0), YX(0,0) self.map_geometry = map_geometry - self.maps[YX(0,0)] = SaveableMap(self.map_geometry) - self.map_controls[YX(0,0)] = SaveableMap(self.map_geometry) + self.map_control_passwords = {'X': 'secret'} + self.get_map(YX(0,0)) + self.get_map(YX(0,0), 'control') self.annotations = {}