xevion/game-jam-2020
1
0
Fork 0
mirror of https://github.com/n0remac/game-jam-2020.git synced 2025-12-10 18:05:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

general refactoring in map.py, fixing PEP8 conventions

Browse Source
This commit is contained in:
Xevion
2020-04-20 00:01:35 -05:00
parent ce53b0be2b
commit a25f160e1a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
triple-dungeon/map.py
View File

@@ -11,6 +11,7 @@ import arcade
import json import json
import numpy as np import numpy as np
class Dungeon(object): class Dungeon(object):
""" """
Organizes Level objects into an easy to render and path through object. Organizes Level objects into an easy to render and path through object.
@@ -33,11 +34,10 @@ class Dungeon(object):
center = Level() center = Level()
center.load_file('resources/levels/map1/center.json') center.load_file('resources/levels/map1/center.json')
center.render() center.render()
center_floor, center_wall = center.get_lists() center_floor, center_wall = center.floor_list, center.wall_list
self.floor_list.extend(center_floor) self.floor_list.extend(center_floor)
self.wall_list.extend(center_wall) self.wall_list.extend(center_wall)
# get a side room # get a side room
room = Level() room = Level()
room.load_file('resources/levels/map1/room.json') room.load_file('resources/levels/map1/room.json')
@@ -62,7 +62,6 @@ class Dungeon(object):
# self.level_count, self.size = level_count, size # self.level_count, self.size = level_count, size
# self.levels = [[None for y in range(size)] for x in range(size)] # array[x][y] style access # self.levels = [[None for y in range(size)] for x in range(size)] # array[x][y] style access
def render(self) -> None: def render(self) -> None:
""" """
Calls render on all level Calls render on all level
@@ -98,10 +97,10 @@ class Level:
# the dungeon can be mapped by a proper pathfinding system. # the dungeon can be mapped by a proper pathfinding system.
self.floor_list = [] self.floor_list = []
self.wall_list = [] self.wall_list = []
#self.entrances = [] # self.entrances = []
#@staticmethod @staticmethod
def load_file(self, path: str) -> Level: def load_file(path: str) -> Level:
""" """
Builds a Level from a given file path. Builds a Level from a given file path.
@@ -110,10 +109,10 @@ class Level:
""" """
self.floor_list = arcade.SpriteList() self.floor_list = arcade.SpriteList()
self.wall_list = arcade.SpriteList() self.wall_list = arcade.SpriteList()
with open(path) as file: with open(path) as file:
level = json.load(file) level = json.load(file)
self.sprites = level['elements'] self.sprites = level['elements']
self.level = level['structure'] self.level = level['structure']
@@ -134,20 +133,20 @@ class Level:
floor = arcade.Sprite(sprite, Config.TILE_SCALING) floor = arcade.Sprite(sprite, Config.TILE_SCALING)
floor.center_x = x_pos floor.center_x = x_pos
floor.center_y = y_pos floor.center_y = y_pos
if(cur_tile == ' '): if cur_tile == ' ':
self.floor_list.append(floor) self.floor_list.append(floor)
elif(cur_tile == 'w'): elif cur_tile == 'w':
self.wall_list.append(floor) self.wall_list.append(floor)
x += 1 x += 1
x = 0 x = 0
y += 1 y += 1
def get_lists(self): def get_lists(self):
return (self.floor_list, self.wall_list) return self.floor_list, self.wall_list
def rotate_level(self, times_rotated): def rotate_level(self, times_rotated):
m = np.array(self.level) m = np.array(self.level)
print(m) print(m)
for _ in range(0, times_rotated % 4): for _ in range(0, times_rotated % 4):
m = np.rot90(m) m = np.rot90(m)
self.level = m.tolist() self.level = m.tolist()