s444409/DSZI_Survival
s444409/DSZI_Survival
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor TerrainTile

Browse Source
This commit is contained in:
Mateusz Tylka 2020-04-03 20:23:36 +02:00
parent 9f95091ff6
commit 815eb79452
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Game.py
View File

@ -42,7 +42,7 @@ class Game:
# Start Map implement # Start Map implement
self.mapDataFolder = path.dirname("../data/mapdata/") self.mapDataFolder = path.dirname("../data/mapdata/")
self.map = Map(path.join(self.mapDataFolder, 'map.txt'), self, self.screen) self.map = Map(path.join(self.mapDataFolder, 'map.txt'), self.screen)
# End Map implement # End Map implement
self.mainLoop() self.mainLoop()

9
src/game/Map.py
View File

@ -3,8 +3,7 @@ from game.TerrainTile import TerrainTile
from game.Screen import Locations from game.Screen import Locations
class Map: class Map:
def __init__(self, filename, game, screen): def __init__(self, filename, screen):
self.game = game
self.screen = screen self.screen = screen
self.terrain = [] self.terrain = []
self.entities = [] self.entities = []
@ -25,10 +24,10 @@ class Map:
for row, tiles in enumerate(self.terrain): for row, tiles in enumerate(self.terrain):
for col, tile in enumerate(tiles): for col, tile in enumerate(tiles):
if tile == 'w': if tile == 'w':
self.screen.draw(TerrainTile(self.game, col, row, 'wall.png', self.screen.mapSize), Locations.MAP, col, row) self.screen.draw(TerrainTile(col, row, 'wall.png', self.screen.mapSize), Locations.MAP, col, row)
if tile == ',': if tile == ',':
self.screen.draw(TerrainTile(self.game, col, row, 'floor.png', self.screen.mapSize), Locations.MAP, col, row) self.screen.draw(TerrainTile(col, row, 'floor.png', self.screen.mapSize), Locations.MAP, col, row)
if tile == '.': if tile == '.':
self.screen.draw(TerrainTile(self.game, col, row, 'grass.png', self.screen.mapSize), Locations.MAP, col, row) self.screen.draw(TerrainTile(col, row, 'grass.png', self.screen.mapSize), Locations.MAP, col, row)

7
src/game/TerrainTile.py
View File

@ -4,11 +4,8 @@ from os import path
class TerrainTile(pygame.sprite.Sprite): class TerrainTile(pygame.sprite.Sprite):
def __init__(self, game, x, y, texture, mapSize): def __init__(self, x, y, texture, mapSize):
self.tiles = [] super().__init__()
self.groups = game.spritesList
pygame.sprite.Sprite.__init__(self, self.groups)
self.game = game
self.imagesFolder = path.dirname("../data/images/") self.imagesFolder = path.dirname("../data/images/")
self.terrainFolder = path.join(self.imagesFolder, 'terrain') self.terrainFolder = path.join(self.imagesFolder, 'terrain')
self.image = pygame.image.load(os.path.join(self.terrainFolder, texture)).convert() self.image = pygame.image.load(os.path.join(self.terrainFolder, texture)).convert()