From b7d8d49aaca0cdfd7be583c5da44aa37e9ad693c Mon Sep 17 00:00:00 2001 From: Christian Heller <c.heller@plomlompom.de> Date: Fri, 18 Jan 2019 00:00:08 +0100 Subject: [PATCH] Use hex map. --- client.py | 37 ++++++++++++++++++++++++----------- game_common.py | 3 +++ server_/game.py | 52 +++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 71 insertions(+), 21 deletions(-) diff --git a/client.py b/client.py index 07d59c2..6594fb5 100755 --- a/client.py +++ b/client.py @@ -60,18 +60,33 @@ class WidgetManager: def draw_map(self): """Draw map view from .game.map_.terrain, .game.things.""" - map_lines = [] - map_size = len(self.game.world.map_.terrain) - start_cut = 0 - while start_cut < map_size: - limit = start_cut + self.game.world.map_.size[1] - map_lines += [self.game.world.map_.terrain[start_cut:limit]] - start_cut = limit + terrain_as_list = list(self.game.world.map_.terrain[:]) for t in self.game.world.things: - line_as_list = list(map_lines[t.position[0]]) - line_as_list[t.position[1]] = self.game.symbol_for_type(t.type_) - map_lines[t.position[0]] = ''.join(line_as_list) - return "\n".join(map_lines) + pos_i = self.game.world.map_.get_position_index(t.position) + terrain_as_list[pos_i] = self.game.symbol_for_type(t.type_) + + #terrain = ''.join(terrain_as_list) + #map_lines = [] + #start_cut = 0 + #while start_cut < len(terrain): + # limit = start_cut + self.game.world.map_.size[1] + # map_lines += [terrain[start_cut:limit]] + # start_cut = limit + #return "\n".join(map_lines) + + new_terrain_list = [] + x = 0 + y = 0 + for c in terrain_as_list: + new_terrain_list += [c, ' '] + x += 1 + if x == self.game.world.map_.size[1]: + new_terrain_list += ['\n'] + x = 0 + y += 1 + if y % 2 != 0: + new_terrain_list += [' '] + return ''.join(new_terrain_list) def update(self): """Redraw all non-edit widgets.""" diff --git a/game_common.py b/game_common.py index 39a12f1..b729a29 100644 --- a/game_common.py +++ b/game_common.py @@ -25,6 +25,9 @@ class Map: for y in range(self.size[0]): self.terrain += '?' * self.size[1] + def get_position_index(self, yx): + return yx[0] * self.size[1] + yx[1] + class World: diff --git a/server_/game.py b/server_/game.py index ea36497..5e38daa 100644 --- a/server_/game.py +++ b/server_/game.py @@ -44,14 +44,22 @@ class Map(game_common.Map): directions += [name[5:]] return directions - def get_position_index(self, yx): - return yx[0] * self.size[1] + yx[1] - def new_from_shape(self, init_char): return Map(self.size, init_char*self.size_i) + #def are_neighbors(self, pos_1, pos_2): + # return abs(pos_1[0] - pos_2[0]) <= 1 and abs(pos_1[1] - pos_2[1] <= 1) + def are_neighbors(self, pos_1, pos_2): - return abs(pos_1[0] - pos_2[0]) <= 1 and abs(pos_1[1] - pos_2[1] <= 1) + if pos_1[0] == pos_2[0] and abs(pos_1[1] - pos_2[1] <= 1): + return True + elif abs(pos_1[0] - pos_2[0]) == 1: + if pos_1[0] % 2 == 0: + if pos_2[1] in (pos_1[1], pos_1[1] - 1): + return True + elif pos_2[1] in (pos_1[1], pos_1[1] + 1): + return True + return False def move(self, start_pos, direction): mover = getattr(self, 'move_' + direction) @@ -61,18 +69,42 @@ class Map(game_common.Map): raise GameError('would move outside map bounds') return new_pos - def move_UP(self, start_pos): - return [start_pos[0] - 1, start_pos[1]] - - def move_DOWN(self, start_pos): - return [start_pos[0] + 1, start_pos[1]] - def move_LEFT(self, start_pos): return [start_pos[0], start_pos[1] - 1] def move_RIGHT(self, start_pos): return [start_pos[0], start_pos[1] + 1] + #def move_UP(self, start_pos): + # return [start_pos[0] - 1, start_pos[1]] + + #def move_DOWN(self, start_pos): + # return [start_pos[0] + 1, start_pos[1]] + + def move_UPLEFT(self, start_pos): + if start_pos[0] % 2 == 0: + return [start_pos[0] - 1, start_pos[1] - 1] + else: + return [start_pos[0] - 1, start_pos[1]] + + def move_UPRIGHT(self, start_pos): + if start_pos[0] % 2 == 0: + return [start_pos[0] - 1, start_pos[1]] + else: + return [start_pos[0] - 1, start_pos[1] + 1] + + def move_DOWNLEFT(self, start_pos): + if start_pos[0] % 2 == 0: + return [start_pos[0] + 1, start_pos[1] - 1] + else: + return [start_pos[0] + 1, start_pos[1]] + + def move_DOWNRIGHT(self, start_pos): + if start_pos[0] % 2 == 0: + return [start_pos[0] + 1, start_pos[1]] + else: + return [start_pos[0] + 1, start_pos[1] + 1] + class World(game_common.World): -- 2.30.2