From 6c4176ab7feb026247dfb754d09aa4383f9f4933 Mon Sep 17 00:00:00 2001 From: MonoYuku Date: Mon, 12 Apr 2021 18:55:44 +0200 Subject: [PATCH] sth new --- main/src/__pycache__/settings.cpython-38.pyc | Bin 0 -> 313 bytes main/src/__pycache__/trash.cpython-38.pyc | Bin 0 -> 1474 bytes main/src/__pycache__/truck.cpython-38.pyc | Bin 0 -> 2729 bytes main/src/__pycache__/truck1.cpython-38.pyc | Bin 0 -> 3356 bytes main/src/__pycache__/walls.cpython-38.pyc | Bin 0 -> 1203 bytes main/src/img/house.png | Bin 0 -> 2190 bytes main/src/img/house1.png | Bin 0 -> 18033 bytes main/src/img/trash.png | Bin 0 -> 2860 bytes main/src/img/trash1.png | Bin 0 -> 2524 bytes main/src/img/truck.png | Bin 0 -> 3486 bytes main/src/main.py | 84 ++++++++++++++ main/src/map.txt | 18 +++ main/src/settings.py | 7 ++ main/src/trash.py | 32 ++++++ main/src/truck.py | 83 ++++++++++++++ main/src/truck1.py | 110 +++++++++++++++++++ main/src/walls.py | 30 +++++ 17 files changed, 364 insertions(+) create mode 100644 main/src/__pycache__/settings.cpython-38.pyc create mode 100644 main/src/__pycache__/trash.cpython-38.pyc create mode 100644 main/src/__pycache__/truck.cpython-38.pyc create mode 100644 main/src/__pycache__/truck1.cpython-38.pyc create mode 100644 main/src/__pycache__/walls.cpython-38.pyc create mode 100644 main/src/img/house.png create mode 100644 main/src/img/house1.png create mode 100644 main/src/img/trash.png create mode 100644 main/src/img/trash1.png create mode 100644 main/src/img/truck.png create mode 100644 main/src/main.py create mode 100644 main/src/map.txt create mode 100644 main/src/settings.py create mode 100644 main/src/trash.py create mode 100644 main/src/truck.py create mode 100644 main/src/truck1.py create mode 100644 main/src/walls.py diff --git a/main/src/__pycache__/settings.cpython-38.pyc b/main/src/__pycache__/settings.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..174633b5bf6977edd59bb15f311a96ddd1d32564 GIT binary patch literal 313 zcmYk0y-ve06osAtsL*%FNEf^#gn-0KqJ|bFjt~|SM6rcTnjhKe&~6Mo3~$5im8lyu z6V6o5)%~u{aF0$opU;5S$1uLU>-#;K|1z|>)++-I3J9PEF{nvQY7vXt#AY^es6$-p z7GU9V-~hnCOaRENXgRBSC7SARrk@v~Wu{OBfM#yNUa-fbMNvvp2Ra9)PX=i(lr=o1Kk3ZC$rgcq=sOh|ZF)ttQrE6(Vi zvyE&xjF@c3et@FicPx=%P>T9VvT@|yt2`fe%D-%Ty4|p=skJ=Su#MyV E0oYSaHUIzs literal 0 HcmV?d00001 diff --git a/main/src/__pycache__/trash.cpython-38.pyc b/main/src/__pycache__/trash.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4292d0492ea18dcb4aaaea11ad6343770d17ea26 GIT binary patch literal 1474 zcmZWp&5qkP5GEyx*7|RMvTc44q858VM;}g5ygnjO zp1?GZ03;bvLBJ&y(MK|hgToOMiQu3oq9syzbFl+%+b%iNxp_Ci+ieC10rjUa&7T04 z%;*XnuIUH%Nsd5H8aj(%vh%1RSpqA3)>@?vX~-;DN0c-a>^qjM+O}gm=kN{aFu_}Q z4ZE_Qm-`J9vEPq=cAFS*uZe8u5IyzKvX#N!#QwbfhO7?OghCD>5H_rPYCauXjOKVz zPV4?weT@2Lq$z~rVQ|Yui>XW0JfBL(iYgbblNUv17FtvXBl^NAd#XD?r!oW2~LxO6IQrsc#s7VvGMtfRj>dg0PVWt3G_ z=?-*WifXQEnQd$X?wFCqx$fg_Zy_8aU{M_RH-3Cc^j%Q@IeGfi_>Ga;j9=#yC1*!N zB}J`dVcx6pGil!2YBAPTUCJY4mqO)ZqsH@Gm1CnPn^axs9{5UNn)?8RcH!yM1Ip>1 zmpDjhYty>#$#T32e}Wm^43yD}XU(@DK;0>la2<*GaHFxH`3eH-k=a9EldG@bldJC# z_5lX5;~_b&g>O|_{RP-BslE*_AAf**sD256%LZG4(E3ie=>OAusd*vTN3FP(! zj%N%AAAg_?)juGiSKPKR7$6)HH1)XiiG0sBHcTK_Tcc0i0dT#*oJmy_N=RQ*#}`F@ zA+@ilKESPa5VoZrL_S2v-YIMT6R6ukS3oN%@FU}YIrNY+s2Hd9ZU}q3=SH+xAdJ`- zs0#u#5ZN{mg@23w8m#&V0r~Ygzm6{#BDWH2v`KL{oD~*^gBEs03Eco)(ay4YC6)!s z-7NcUnHOQjQ_UAE9QDoil$+=27#1+2CIv`ox|haj%UcI6{Qzu`#S82`pKF&IX{{=! f#%En)aDMZ(F#G|?6_@@TF82#2#9&{+0r30_IL=3d literal 0 HcmV?d00001 diff --git a/main/src/__pycache__/truck.cpython-38.pyc b/main/src/__pycache__/truck.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fb084ea848dbb74519b119d41a0d5582fc87da8e GIT binary patch literal 2729 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 literal 0 HcmV?d00001 diff --git a/main/src/img/house.png b/main/src/img/house.png new file mode 100644 index 0000000000000000000000000000000000000000..909c694669fd072d0408694e696f85802ab3ba96 GIT binary patch literal 2190 zcmV;92yyp`P);FWwyIpT)U_(ZI_*KRkrpq z?XI?UTwT^}$Bwpk?X2Php*tc43l#y;77R}zgh#?7A>@7U&JD&!2ynxrv(wq%Urc`I zoZtD}?>)cs`(0T0i44|HgaiKv`Cn6VE{e>>$Hq-9)&p=hsU4f1jQ^bH%7?{lfPQ?0 zab6Tj4OP^(?gDU@v6B;q&Vb~eFD@t!^z#9m%>lvlfIDA|?v@*jmZK;N>M=cb>?$6l zfZqZ*&&ZLX5mS&Y1$o&eKhIh>B`n`32&03YFq?ERjE^!}_VY`((bz24);4zi0>EWP zPO}&>0m(ae;?<9&fudw<#(dO0%!AO zJkKF`V6zFhdI-_mR>Rn@?ST^eiq1D_^~Q?;3TJYB41~+&u6|>8PF+^&YQ~E>Yv?Um zhLOPz=*Ltr8OIs9->mPz$+OkyRt!f2kO8nvcC-h1{lvR39gd3*VHA8mMmB|9+yqc` z)G@B@dol$MeQ>o_HKL^pZ;yQr_8`U0w=U#rlx^0o{bLQGZx}{Z51<`Uz--bpTDGaB z7jGRe!+=UdzyAu_=`oOh6m7{B`!7ZG>dhF}3__bIl& z4AjDR^9JxjG!`f_}BMTQ`MH>9i%av1AoqZ}vBSwU3OK9m`< zC^~r{qmaX4gCr^ZuBZ$dDKQ8R@I+jsH~giMcw+6-=la<)M$L4u2Ww@PuYv<-X@7PdSY<`AOw!7%Q&D$%Im;YfZm zE|u3TE{IJbi-km9Q5iNTFUJyJPb97M1>Z}AgtVPdv`-uoeF9dX>hdvMxGsl8$U;*5 z)I%xVLtZ}o6`~W@BOyH#&2_cdlOgO)r78z zFUs1%BP_^CkDQ`JX>})>)xJo|+6p#%qAu^%R4*RLUD+`DR3@aY^L4m)(=}u?S+M)f za%@bDgvi^&nv_mdZuYgYJM>x{kx(luinzdl%oXY*eJU+DAb_eBM{(=v?cFfX)p zjzQqbg}Vy}Vj*wJ6Yd=x!@1HH2s|d{+}#K~lM#&@b=_zka>4D|J2-VX2ih@>b>0f{ z`vRzkRPdFCfamJExQf_7xC9$!Gle0w5qD&xNKbtHN=$?3^k#%fy{(CkX!IyNT8ZZh z4uH$!;gdfX;?$ej4nb&Dyu=dR{iYgwGZ(2w>_KcYT)(BnQ)}qP`@^t-Nd5UJzSa*d z>5ivzc04lp=fT$PcSrCCI4^`?IaJgLg1^>{! z9f7>~r?>FQ+lTP88RU^8k^reZ(U6{$2#^*U4 z)=RJDu1gLJ_Qu`&Bi3DuE_Nn0VpD`gQ4lYYVyM3lec#o}hZ^?8= zf9F(fwb^X>6u_~W6qr261jObO6(I4vCHCff?tVVrX%K->go~&ChWB6D1Of)IC=<-) ziJK?gNULu57!^uw9Do*Q0Bp9-fY^Mt0yubJ*ZP$~etfXmEX=fP(TW^7T@QbW0EhB3 z(cjnePyq_veHt7%R@FdK)O!F<&jnyUAU5AsA%TKx;lV<2kiXxwH4+*q09XWET?o)y zD?R>I)vE zZlY9gFyrW_b@cZ68~|qjIGHW_H1mrAVp}Tn;U8D#n442>iwWXXBJ(x=FMIsTS<1*~ Q`Tzg`07*qoM6N<$f*l+UdjJ3c literal 0 HcmV?d00001 diff --git a/main/src/img/house1.png b/main/src/img/house1.png new file mode 100644 index 0000000000000000000000000000000000000000..cf9c5be4a857cdf915b856730db6eb9b5a92d7bc GIT binary patch literal 18033 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 Eg0lh{yZ`_I literal 0 HcmV?d00001 diff --git a/main/src/img/trash.png b/main/src/img/trash.png new file mode 100644 index 0000000000000000000000000000000000000000..ce64e3782498b3ccb46163f02de10b94f396f0f1 GIT binary patch literal 2860 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 KMNUMnLSTYSn_67} literal 0 HcmV?d00001 diff --git a/main/src/img/trash1.png b/main/src/img/trash1.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4e1f64b716b5f3ad62fd500571be6a1cee2cd7 GIT binary patch literal 2524 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 M07*qoM6N<$g7N#ATL1t6 literal 0 HcmV?d00001 diff --git a/main/src/main.py b/main/src/main.py new file mode 100644 index 0000000..8497f93 --- /dev/null +++ b/main/src/main.py @@ -0,0 +1,84 @@ +import pygame as pg +import sys +from os import path +from trash import * +from truck1 import * +from walls import * +from settings import * + +class Game: + def __init__(self): + pg.init() + self.screen = pg.display.set_mode((WIDTH, HEIGHT)) + pg.display.set_caption(TITLE) + self.clock = pg.time.Clock() + pg.key.set_repeat(500, 100) + self.load_data() + + def load_data(self): + game_folder = path.dirname(__file__) + self.map_data = [] + with open(path.join(game_folder, 'map.txt'), 'rt') as f: + for line in f: + self.map_data.append(line) + + def new(self): + self.all_sprites = pg.sprite.Group() + self.walls = pg.sprite.Group() + self.trash = pg.sprite.Group() + self.player = pg.sprite.Group() + for row, tiles in enumerate(self.map_data): + for col, tile in enumerate(tiles): + if tile == 'b': + Wall(self, col, row) + if tile == 'w': + Wall1(self, col,row) + if tile == 'P': + garbageTruck(self, col, row) + if tile == 't': + Trash(self, col, row) + + def run(self): + self.playing = True + while self.playing: + self.dt = self.clock.tick(40) / 1000 + self.events() + self.update() + self.draw() + + def quit(self): + pg.quit() + sys.exit() + + def update(self): + self.all_sprites.update() + + def draw(self): + bg = pg.image.load("img\\bg.png") + self.screen.blit(bg,(0,0)) + self.screen.fill(BGCOLOR) + self.all_sprites.draw(self.screen) + pg.display.flip() + + def events(self): + # catch all events here + for event in pg.event.get(): + if event.type == pg.QUIT: + self.quit() + if event.type == pg.KEYDOWN: + if event.key == pg.K_ESCAPE: + self.quit() + + def show_start_screen(self): + pass + + def show_go_screen(self): + pass + +g = Game() +g.show_start_screen() +while True: + g.new() + g.run() + g.show_go_screen() + diff --git a/main/src/map.txt b/main/src/map.txt new file mode 100644 index 0000000..a3b6600 --- /dev/null +++ b/main/src/map.txt @@ -0,0 +1,18 @@ +bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +bbbbb bbb bbb bb bb b bb +b t w b +b w w b +b wwwwww wwwww bbb +bbb w w w w b +b w t w b +b wwwww wwwwwww t bb +b wwwwww w w b +b t w w www wwww bbbb +b w w w b +b wwwww www www w b +b w P ww w b +b t b +b w www w www w ww b +b w wwww bb +b bbbb b b bb t b +bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb \ No newline at end of file diff --git a/main/src/settings.py b/main/src/settings.py new file mode 100644 index 0000000..6533bbd --- /dev/null +++ b/main/src/settings.py @@ -0,0 +1,7 @@ +WIDTH = 1280 +HEIGHT = 720 +TITLE = "Smieciarka" +TILESIZE = 40 +DARKGREY = (40, 40, 40) +BGCOLOR = DARKGREY +TRUCK_SPEED = 240 diff --git a/main/src/trash.py b/main/src/trash.py new file mode 100644 index 0000000..888432c --- /dev/null +++ b/main/src/trash.py @@ -0,0 +1,32 @@ +import random +import pygame as pg +from settings import * +class Trash(pg.sprite.Sprite): + def __init__(self, game, x, y): + image = pg.image.load("img\\trash.png") + image1 = pg.image.load("img\\trash1.png") + self.groups = game.all_sprites, game.trash + pg.sprite.Sprite.__init__(self, self.groups) + self.game = game + self.image = pg.Surface((TILESIZE, TILESIZE)) + self.rect = self.image.get_rect() + self.image.blit(image,(0,0)) + self.x = x + self.y = y + self.rect.x = x * TILESIZE + self.rect.y = y * TILESIZE + self.position = (x,y) + self.randomize_position() + + def randomize_position(self): + self.position = (random.randint(0, 32-1)*40, random.randint(0, 18-1)*40) + + def collected(self): + hits = pg.sprite.spritecollide(self, self.game.player, False) + if hits: + self.image.blit(image1,(0,0)) + self.x=0 + self.y=0 + + def update(self): + self.collected() diff --git a/main/src/truck.py b/main/src/truck.py new file mode 100644 index 0000000..9c8f817 --- /dev/null +++ b/main/src/truck.py @@ -0,0 +1,83 @@ +import pygame as pg +from settings import * +class garbageTruck(pg.sprite.Sprite): + def __init__(self, game, x, y): + image = pg.image.load("img\\truck.png") + self.groups = game.all_sprites + pg.sprite.Sprite.__init__(self, self.groups) + self.game = game + self.image = pg.Surface((TILESIZE, TILESIZE)) + self.image.blit(image,(0,0)) + self.rect = self.image.get_rect() + self.capacity = 0 + self.vx, self.vy = 0, 0 + self.max_capacity=3000 + self.x=x*TILESIZE + self.y=y*TILESIZE + self.position=[((self.x),(self.y))] + self.direction=0 + + def get_position(self): + return self.position[0] + + def turn(self): + if self.direction==0: + self.direction=1 + else: + self.direction=0 + + def move(self, r): + current = self.get_position() + if self.direction==0: + new = (((current[0]+(r*40))%1280),current[1]%720) + else: + new = (current[0]%1280,(current[1]+(r*40))%720) + self.position.insert(0,new) + self.position.pop() + + def throw(self): + self.capacity=0 + + + def handle_keys(self): + keys = pg.key.get_pressed() + if keys[pg.K_LEFT] or keys[pg.K_a]: + if self.direction == 0: + self.move(-1) + else: self.turn() + elif keys[pg.K_RIGHT] or keys[pg.K_d]: + if self.direction == 0: + self.move(1) + else: self.turn() + elif keys[pg.K_UP] or keys[pg.K_w]: + if self.direction == 1: + self.move(-1) + else: self.turn() + elif keys[pg.K_DOWN] or keys[pg.K_s]: + if self.direction == 1: + self.move(1) + else: self.turn() + + def get_keys(self): + self.vx, self.vy = 0, 0 + keys = pg.key.get_pressed() + if keys[pg.K_LEFT] or keys[pg.K_a]: + self.vx = -TRUCK_SPEED + if keys[pg.K_RIGHT] or keys[pg.K_d]: + self.vx = TRUCK_SPEED + if keys[pg.K_UP] or keys[pg.K_w]: + self.vy = -TRUCK_SPEED + if keys[pg.K_DOWN] or keys[pg.K_s]: + self.vy = TRUCK_SPEED + if self.vx != 0 and self.vy != 0: + self.vx *= 1 + self.vy *= 1 + + def update(self): + self.get_keys() + self.x += self.vx * self.game.dt + self.y += self.vy * self.game.dt + + + + diff --git a/main/src/truck1.py b/main/src/truck1.py new file mode 100644 index 0000000..1c63dcf --- /dev/null +++ b/main/src/truck1.py @@ -0,0 +1,110 @@ +import pygame as pg +from settings import * +class garbageTruck(pg.sprite.Sprite): + def __init__(self, game, x, y): + image = pg.image.load("img\\truck.png") + self.groups = game.all_sprites, game.player + pg.sprite.Sprite.__init__(self, self.groups) + self.game = game + self.image = pg.Surface((TILESIZE, TILESIZE)) + self.image.blit(image,(0,0)) + self.rect = self.image.get_rect() + self.vx, self.vy = 0, 0 + self.x = x * TILESIZE + self.y = y * TILESIZE + self.capacity = 0 + self.max_capacity=3000 + self.position=[((self.x),(self.y))] + self.direction=0 + + def get_position(self): + return self.position[0] + + def turn(self): + if self.direction==0: + self.direction=1 + else: + self.direction=0 + + def move(self, r): + if self.direction==0: + self.vx=(TRUCK_SPEED*r) + else: + self.vy=(TRUCK_SPEED*r) + + def throw(self): + self.capacity=0 + + def get_keys(self): + self.vx, self.vy = 0, 0 + keys = pg.key.get_pressed() + if keys[pg.K_LEFT] or keys[pg.K_a]: + if self.direction == 0: + self.move(-1) + else: self.turn() + if keys[pg.K_RIGHT] or keys[pg.K_d]: + if self.direction == 0: + self.move(1) + else: self.turn() + if keys[pg.K_UP] or keys[pg.K_w]: + if self.direction == 1: + self.move(-1) + else: self.turn() + if keys[pg.K_DOWN] or keys[pg.K_s]: + if self.direction == 1: + self.move(1) + else: self.turn() + if self.vx != 0 and self.vy != 0: + self.vx *= 1 + self.vy *= 1 + + def collide_with_walls(self, dir): + if dir == 'x': + hits = pg.sprite.spritecollide(self, self.game.walls, False) + if hits: + if self.vx > 0: + self.x = hits[0].rect.left - self.rect.width + if self.vx < 0: + self.x = hits[0].rect.right + self.vx = 0 + self.rect.x = self.x + if dir == 'y': + hits = pg.sprite.spritecollide(self, self.game.walls, False) + if hits: + if self.vy > 0: + self.y = hits[0].rect.top - self.rect.height + if self.vy < 0: + self.y = hits[0].rect.bottom + self.vy = 0 + self.rect.y = self.y + + def collecting_trash(self, dir): + if dir == 'x': + hits = pg.sprite.spritecollide(self, self.game.trash, False) + if hits: + if self.vx > 0: + self.x = hits[0].rect.left - self.rect.width + if self.vx < 0: + self.x = hits[0].rect.right + self.vx = 0 + self.rect.x = self.x + if dir == 'y': + hits = pg.sprite.spritecollide(self, self.game.trash, False) + if hits: + if self.vy > 0: + self.y = hits[0].rect.top - self.rect.height + if self.vy < 0: + self.y = hits[0].rect.bottom + self.vy = 0 + self.rect.y = self.y + + def update(self): + self.get_keys() + self.x += self.vx * self.game.dt + self.y += self.vy * self.game.dt + self.rect.x = self.x + self.collide_with_walls('x') + self.collecting_trash('x') + self.rect.y = self.y + self.collide_with_walls('y') + self.collecting_trash('y') diff --git a/main/src/walls.py b/main/src/walls.py new file mode 100644 index 0000000..968c72f --- /dev/null +++ b/main/src/walls.py @@ -0,0 +1,30 @@ +import pygame as pg +from settings import * + +class Wall(pg.sprite.Sprite): + def __init__(self, game, x, y): + image = pg.image.load("img\\house1.png") + self.groups = game.all_sprites, game.walls + pg.sprite.Sprite.__init__(self, self.groups) + self.game = game + self.image = pg.Surface((TILESIZE, TILESIZE)) + self.rect = self.image.get_rect() + self.image.blit(image,(0,0)) + self.x = x + self.y = y + self.rect.x = x * TILESIZE + self.rect.y = y * TILESIZE + +class Wall1(pg.sprite.Sprite): + def __init__(self, game, x, y): + image = pg.image.load("img\\house.png") + self.groups = game.all_sprites, game.walls + pg.sprite.Sprite.__init__(self, self.groups) + self.game = game + self.image = pg.Surface((TILESIZE, TILESIZE)) + self.rect = self.image.get_rect() + self.image.blit(image,(-1,-1)) + self.x = x + self.y = y + self.rect.x = x * TILESIZE + self.rect.y = y * TILESIZE