From 86fdd1543fc5fb85ea1c91140cf4182d44501195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20Pierzy=C5=84ski?= Date: Mon, 1 Apr 2019 13:29:13 +0200 Subject: [PATCH] Male bugfixy --- DataModels/GC.py | 6 +++++ DataModels/__pycache__/Cell.cpython-36.pyc | Bin 1429 -> 1429 bytes DataModels/__pycache__/GC.cpython-36.pyc | Bin 0 -> 562 bytes DataModels/__pycache__/Road.cpython-36.pyc | Bin 0 -> 653 bytes Resources/Maps/map_000.txt | 2 +- Resources/Maps/map_001.txt | 3 ++- Resources/Maps/map_004.txt | 2 +- main.py | 27 ++++++++++++++++++--- 8 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 DataModels/GC.py create mode 100644 DataModels/__pycache__/GC.cpython-36.pyc create mode 100644 DataModels/__pycache__/Road.cpython-36.pyc diff --git a/DataModels/GC.py b/DataModels/GC.py new file mode 100644 index 0000000..b685404 --- /dev/null +++ b/DataModels/GC.py @@ -0,0 +1,6 @@ +from DataModels.Cell import Cell + +class GC( Cell ): + def __init__( self, x, y, max_rubbish, yellow = 0, green = 0, blue = 0): + Cell.__init__(self, x, y, max_rubbish, yellow, green, blue ) + \ No newline at end of file diff --git a/DataModels/__pycache__/Cell.cpython-36.pyc b/DataModels/__pycache__/Cell.cpython-36.pyc index 1cf07f17e27934ec5926a0ac100a643685a07f9c..186a46b1c87e325960c76dc59c0b22276288360a 100644 GIT binary patch delta 15 WcmbQrJ(Ziyn3tEU@WV#7epUb=D+Eda delta 15 WcmbQrJ(Ziyn3tE!`1MA%epUb;o&*N~ diff --git a/DataModels/__pycache__/GC.cpython-36.pyc b/DataModels/__pycache__/GC.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c3ac277ed2dec98c495341fe6d86402977ddf3eb GIT binary patch literal 562 zcmYjOJx{|h5cMVLhe|6p1}4@l4YXa55TXjGs!%&nP^AdTN^1jwqyak-w8~a~1sfxO zh9BUSiHV(wvk|nG-t*Z$zk5En8;#n_*X!jwA>;$`KOBsX5ON2J5e6|yAOIje!YpP# z6J~Q*+JVKK5pheOm_=Mrj?d$GsuzF5#^4Acw~#mqfDyb@G9nPz=6YFKJzoGOOe;uw z=(&pU5po+TBezhH0t&0J3#TX*d+gn$3HM}{Gd|0tCp(>1yWRGVxxCBL zdv6q+U--eWOGktLiQn&@opy1r-`d^VA0-i=Mxj`YlgK*`vv80y9!sz1H}B^{_ftb^ zp9B^gxcz5#=-TG-D{>wElv$W?N>z>0BxQN5<2t1ec^Lnm7*XSUjT$H~bkj9VwJMl3 hR#BTPUrqf}rfcSOO+hz8Xc<*K_$_>>zs6|QtsfCOebE2_ literal 0 HcmV?d00001 diff --git a/DataModels/__pycache__/Road.cpython-36.pyc b/DataModels/__pycache__/Road.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..db9525cedc5f8c72195565379175096d6a030241 GIT binary patch literal 653 zcmYjP&2G~`5T3EuPFgjG%^?OMETom?-3A-~gx!rqqTJFK z;lP1c+A9adD{x}gQKXDCe>>xEzZvhK*E|0C=f~$u1o#aH!YIBX)z8QX5LiOuyjNo7 zB_6^J2w$)V5KKbh7i{Y%fxsC0!C(3UrhT+Wqw(!6k0;4Eb4PpeD7Yfkr(`4~C?N3! z3hx0DU-$&UESoi{$b4#W;(S0lBGs?S7$~st3V#DzM3=D*n&1>Rp0g$}!Io`+hg9hl zU4dJqtRsN1z3KYtOzLK-GO43UmCpB$yE~sR>UsajhKtoat)vb0Lgj{hyz^bo^Ex-2 z6GNF9N{rGRsr7{#fPFb!yVPM#xe}JIX87 zA$+$X9g+cjglD+!wZ%Q*DQ%V5*EAKeKjyq@#Ikhp3FqIIX}PPkNG;t1^Mo*!`w8w< xXg6~g+q@qtcVxq?sqgc7yAI`eD9591Ie>9XP!7v>-|TLGOV19pgXrRk_a7q~nD+nx literal 0 HcmV?d00001 diff --git a/Resources/Maps/map_000.txt b/Resources/Maps/map_000.txt index 0cf75ee..c6fbefd 100644 --- a/Resources/Maps/map_000.txt +++ b/Resources/Maps/map_000.txt @@ -1,3 +1,3 @@ 2 2 E H -H B +H Y diff --git a/Resources/Maps/map_001.txt b/Resources/Maps/map_001.txt index 3a0d379..4333db7 100644 --- a/Resources/Maps/map_001.txt +++ b/Resources/Maps/map_001.txt @@ -7,4 +7,5 @@ H R E H R H E R E R R R R R E R R E E B R H E R R H E E E R R R R E E E -E E E E H R R R H \ No newline at end of file +E E E E H R R R H +3 1 diff --git a/Resources/Maps/map_004.txt b/Resources/Maps/map_004.txt index d0c8747..01a932b 100644 --- a/Resources/Maps/map_004.txt +++ b/Resources/Maps/map_004.txt @@ -8,4 +8,4 @@ E E H R E E R R E H R E E R R R R R R H E R R R H R E E R H E E E R E G E R E H R E R R R R R R -E R B R R R R E H E E H \ No newline at end of file +E R B R R R R E H E E H diff --git a/main.py b/main.py index b279024..80e49b0 100644 --- a/main.py +++ b/main.py @@ -6,6 +6,8 @@ from config import WINDOW_HEIGHT, WINDOW_WIDTH, GRID_HEIGHT, GRID_WIDTH, HOUSE_C from DataModels.Grass import Grass from DataModels.House import House from DataModels.Dump import Dump +from DataModels.Road import Road +from DataModels.GC import GC pygame_sprites = pygame.sprite.Group() @@ -18,18 +20,22 @@ map.readline() map_objects = [ [ None for y in range(0,GRID_WIDTH)] for x in range(0, GRID_HEIGHT)] def generate( letter ): + key = 'D' if letter in ['B','G','Y'] else letter letter_mapping = { 'E': lambda x, y: Grass(x,y), 'H': lambda x, y, max_rubbish, yellow, green, blue: House( x, y, max_rubbish, yellow, green, blue ), - 'B': lambda x, y, max_rubbish, dump_type: Dump( x, y, max_rubbish, dump_type ) + 'D': lambda x, y, max_rubbish, dump_type: Dump( x, y, max_rubbish, dump_type ), + 'R': lambda x, y: Road(x,y) } - return letter_mapping[letter] + + return letter_mapping[key] i = 0 for y in map.readlines(): for x in y.split(): - x_coord = i%GRID_WIDTH - y_coord = i //GRID_HEIGHT + x_coord = i % GRID_WIDTH + y_coord = i // GRID_WIDTH + yellow, green, blue = [randint(0, HOUSE_CAPACITY //2),randint(0, HOUSE_CAPACITY //2),randint(0, HOUSE_CAPACITY //2)] if x is 'E': map_objects[x_coord][y_coord] = generate(x)(x_coord, y_coord) @@ -37,12 +43,25 @@ for y in map.readlines(): map_objects[x_coord][y_coord] = generate(x)(x_coord, y_coord, HOUSE_CAPACITY, yellow, green, blue) elif x is 'B': map_objects[x_coord][y_coord] = generate(x)(x_coord, y_coord, 100, "Dump_Blue") + elif x is 'G': + map_objects[x_coord][y_coord] = generate(x)(x_coord, y_coord, 100, "Dump_Green") + elif x is 'Y': + map_objects[x_coord][y_coord] = generate(x)(x_coord, y_coord, 100, "Dump_Yellow") + elif x is 'R': + map_objects[x_coord][y_coord] = generate(x)(x_coord, y_coord) i += 1 + +print( GRID_WIDTH, GRID_HEIGHT ) +print( map_objects ) + + for line in map_objects: for item in line: pygame_sprites.add(item) +pygame_sprites.add( GC(0,0,2) ) + while True: for event in pygame.event.get():