ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merged master

This commit is contained in:
Nicolas Margulies 2020-10-23 14:45:03 +02:00
parent d264fb7dfe 7a2e1173d9
commit 759ddf7685
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dungeonbattle/interfaces.py
View File

@ -2,7 +2,6 @@
from enum import Enum from enum import Enum
class Map: class Map:
""" """
Object that represents a Map with its width, height Object that represents a Map with its width, height
@ -12,7 +11,7 @@ class Map:
height: int height: int
tiles: list tiles: list
def __init__(self, width: int, height: int, tiles: list, entities: list): def __init__(self, width: int, height: int, tiles: list, entities = []: list):
self.width = width self.width = width
self.height = height self.height = height
self.tiles = tiles self.tiles = tiles
@ -38,7 +37,11 @@ class Map:
width = len(lines[0]) width = len(lines[0])
tiles = [[Tile(c) tiles = [[Tile(c)
for x, c in enumerate(line)] for y, line in enumerate(lines)] for x, c in enumerate(line)] for y, line in enumerate(lines)]
<<<<<<< HEAD
return Map(width, height, tiles) return Map(width, height, tiles)
=======
return Map(width, height, tiles, [])
>>>>>>> master
def draw_string(self) -> str: def draw_string(self) -> str:
""" """