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

Merge remote-tracking branch 'origin/MapNew' into MapNew

Browse Source
This commit is contained in:
jonspacz 2020-04-05 21:11:42 +02:00
commit 242635038a
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/images/entities/rabbit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 630 B

BIN
data/images/terrain/sand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 145 KiB

36
data/mapdata/map.txt
View File

@ -1,20 +1,20 @@
xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx
xwwww..w...w...ww..x xssssssssssssssssssx
xw......w.w...w..w.x xs................sx
xwwww,,,,w,,,,wwww,x xs................sx
xw......w.w...w..w.x xs................sx
xwwww..w...w..w..w.x xs................sx
x..................x xs.....wwwwww.....sx
xw...w...ww...w..wwx xs.....w,,,,w.....sx
xww.ww..w..w..w..w.x xs.....w,,,,w.....sx
xw,w,w,,wwww,,w,,wwx xs.....ww,,ww.....sx
xw...w..w.....w..w.x xs................sx
xw...w..w.....ww.wwx xs................sx
x..................x xs................sx
x.w...w...ww...ww..x xs................sx
x.ww.ww..w..w.w..w.x xs................sx
x,w,w,w,,wwww,wwww,x xs................sx
x.w...w..w..w.w....x xs................sx
x.w...w..w..w.w....x xs................sx
x..................x xssssssssssssssssssx
xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx

10
src/game/Map.py
View File

@ -25,10 +25,8 @@ class Map:
def terrainDraw(self): def terrainDraw(self):
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 == 's':
object = TerrainTile(col, row, 'wall.png', self.tileSize) self.screen.draw(TerrainTile(col, row, 'sand.png', self.tileSize), Locations.MAP, 0, 0)
self.screen.draw(object, Locations.MAP, 0, 0)
self.collidables.add(object)
elif tile == ',': elif tile == ',':
self.screen.draw(TerrainTile(col, row, 'floor.png', self.tileSize), Locations.MAP, 0, 0) self.screen.draw(TerrainTile(col, row, 'floor.png', self.tileSize), Locations.MAP, 0, 0)
elif tile == '.': elif tile == '.':
@ -37,6 +35,10 @@ class Map:
object = TerrainTile(col, row, 'water.jpg', self.tileSize) object = TerrainTile(col, row, 'water.jpg', self.tileSize)
self.screen.draw(object, Locations.MAP, 0, 0) self.screen.draw(object, Locations.MAP, 0, 0)
self.collidables.add(object) self.collidables.add(object)
elif tile == 'w':
object = TerrainTile(col, row, 'wall.png', self.tileSize)
self.screen.draw(object, Locations.MAP, 0, 0)
self.collidables.add(object)
def addEntity(self, entity): def addEntity(self, entity):
self.screen.draw(entity, Locations.MAP, 0, 0) self.screen.draw(entity, Locations.MAP, 0, 0)