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

Merge remote-tracking branch 'origin/terrainTilesList' into NewMovementFinishing

Browse Source
This commit is contained in:
Michał Czekański 2020-04-26 01:39:18 +02:00
commit 39b689d8f0
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/Map.py
View File

@ -16,6 +16,7 @@ class Map:
self.screen = screen self.screen = screen
self.terrain = [] self.terrain = []
self.collidableTerrain = [] self.collidableTerrain = []
self.terrainTilesList = []
self.collidables = pygame.sprite.Group() self.collidables = pygame.sprite.Group()
with open(filename, 'rt') as f: with open(filename, 'rt') as f:
@ -75,17 +76,24 @@ 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 == 's': if tile == 's':
self.screen.draw(TerrainTile(col, row, 'sand.png', self.tileSize, 15), Locations.MAP, 0, 0) object = TerrainTile(col, row, 'sand.png', self.tileSize, 15)
self.screen.draw(object, Locations.MAP, 0, 0)
self.terrainTilesList.append(object)
elif tile == ',': elif tile == ',':
self.screen.draw(TerrainTile(col, row, 'floor.png', self.tileSize, 0), Locations.MAP, 0, 0) object = TerrainTile(col, row, 'floor.png', self.tileSize, 0)
self.screen.draw(object, Locations.MAP, 0, 0)
self.terrainTilesList.append(object)
elif tile == '.': elif tile == '.':
object = TerrainTile(col, row, 'grass.png', self.tileSize, 10)
self.screen.draw(TerrainTile(col, row, 'grass.png', self.tileSize, 10), Locations.MAP, 0, 0) self.screen.draw(TerrainTile(col, row, 'grass.png', self.tileSize, 10), Locations.MAP, 0, 0)
self.terrainTilesList.append(object)
elif tile == 'c': elif tile == 'c':
self.screen.draw(TerrainTile(col, row, 'clay.png', self.tileSize, 20), Locations.MAP, 0, 0) object = TerrainTile(col, row, 'clay.png', self.tileSize, 20)
self.screen.draw(object, Locations.MAP, 0, 0)
self.terrainTilesList.append(object)
elif tile == 'x': elif tile == 'x':
object = TerrainTile(col, row, 'water.png', self.tileSize, 0) object = TerrainTile(col, row, 'water.png', self.tileSize, 0)
self.screen.draw(object, Locations.MAP, 0, 0) self.screen.draw(object, Locations.MAP, 0, 0)
self.collidables.add(object)
elif tile == 'w': elif tile == 'w':
object = TerrainTile(col, row, 'wall.png', self.tileSize, 0) object = TerrainTile(col, row, 'wall.png', self.tileSize, 0)
self.screen.draw(object, Locations.MAP, 0, 0) self.screen.draw(object, Locations.MAP, 0, 0)
@ -100,7 +108,7 @@ class Map:
def getTileOnCoord(self, coord): def getTileOnCoord(self, coord):
result = None result = None
for entity in self.terrain: for entity in self.:
if entity.rect.x == coord[0] and entity.rect.y == coord[1]: if entity.rect.x == coord[0] and entity.rect.y == coord[1]:
result = entity result = entity
return result return result