s434810/SZI2020Project
4
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

change-map

Browse Source
This commit is contained in:
Maciej Scigacz 2020-03-31 23:57:19 +02:00
parent 9c16b0ffe8
commit f62678e964
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config.py
View File

@ -3,7 +3,7 @@ WINDOW_HEIGHT = 10 * CELL_SIZE
WINDOW_WIDTH = 16 * CELL_SIZE
MAP_HEIGHT = 10
MAP_WIDTH = 16
'''
MAP = {
0: {0: "House", 1: "Road", 2: "Road", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "Road",
8: "Road", 9: "House", 10: "Grass", 11: "House", 12: "Road", 13: "Road", 14: "Road", 15: "House"},
@ -26,3 +26,26 @@ MAP = {
9: {0: "House", 1: "Road", 2: "Road", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "Grass",
8: "Grass", 9: "Grass", 10: "Glass", 11: "Grass", 12: "Grass", 13: "Grass", 14: "Road", 15: "House"},
}
'''
MAP = {
0: {0: "Glass", 1: "Road", 2: "Road", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "House",
8: "Road", 9: "House", 10: "House", 11: "Road", 12: "Road", 13: "Road", 14: "Road", 15: "Paper"},
1: {0: "Grass", 1: "Road", 2: "Grass", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "House",
8: "Road", 9: "House", 10: "House", 11: "Road", 12: "House", 13: "House", 14: "Road", 15: "Grass"},
2: {0: "House", 1: "Road", 2: "Grass", 3: "Road", 4: "Road", 5: "Road", 6: "Road", 7: "House",
8: "Road", 9: "House", 10: "House", 11: "Road", 12: "House", 13: "House", 14: "Road", 15: "House"},
3: {0: "House", 1: "Road", 2: "Grass", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "Road",
8: "Road", 9: "Road", 10: "Road", 11: "Road", 12: "Road", 13: "Road", 14: "Road", 15: "House"},
4: {0: "House", 1: "Road", 2: "Grass", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "Grass",
8: "Grass", 9: "Grass", 10: "Grass", 11: "Road", 12: "Grass", 13: "Grass", 14: "Road", 15: "House"},
5: {0: "House", 1: "Road", 2: "Grass", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "Grass",
8: "Grass", 9: "Grass", 10: "Grass", 11: "Road", 12: "Grass", 13: "Grass", 14: "Road", 15: "House"},
6: {0: "House", 1: "Road", 2: "Grass", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "Road",
8: "Road", 9: "Road", 10: "Road", 11: "Road", 12: "Road", 13: "Road", 14: "Road", 15: "House"},
7: {0: "House", 1: "Road", 2: "Grass", 3: "Road", 4: "Road", 5: "Road", 6: "Road", 7: "House",
8: "Road", 9: "House", 10: "House", 11: "Road", 12: "House", 13: "House", 14: "Road", 15: "House"},
8: {0: "Grass", 1: "Road", 2: "Grass", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "House",
8: "Road", 9: "House", 10: "House", 11: "Road", 12: "House", 13: "House", 14: "Road", 15: "Grass"},
9: {0: "Mixed", 1: "Road", 2: "Road", 3: "Road", 4: "House", 5: "House", 6: "Road", 7: "House",
8: "Road", 9: "House", 10: "House", 11: "Road", 12: "Road", 13: "Road", 14: "Road", 15: "Plastic"},
}

3
helpler.py
View File

@ -5,6 +5,7 @@ from models.House import House
from models.Trash_Glass import Trash_Glass
from models.Trash_Paper import Trash_Paper
from models.Trash_Plastic import Trash_Plastic
from models.Trash_Mixed import Trash_Mixed
def Render_Element(x, y):
@ -21,3 +22,5 @@ def Render_Element(x, y):
return Trash_Paper(x, y)
elif item == "Plastic":
return Trash_Plastic(x, y)
elif item == "Mixed":
return Trash_Mixed(x, y)

2
models/Garbage_Collector.py
View File

@ -123,8 +123,6 @@ class Garbage_Collector(pygame.sprite.Sprite):
elif isinstance(draw_items[field["row"]][field["col"]], Trash_Mixed):
while self.mixed > 0:
print(
{"mixed": draw_items[field["row"]][field["col"]].mixed})
draw_items[field["row"]][field["col"]].put_trash()
self.mixed -= 1