From 627d6594aa6471119a8ede51a7cc46eaa9b7ac12 Mon Sep 17 00:00:00 2001
From: "Hannes F. Kuchelmeister" <hannes@kuchelmeister.org>
Date: Fri, 5 Nov 2021 22:12:11 +0100
Subject: [PATCH] add image for vacuum cleaner

Co-authored-by: Laura Januleviciute <januleviciute.laura@gmail.com>
---
 Vacuum.py          |   9 +++++----
 main.py            |  12 +++++++-----
 sprites/vacuum.png | Bin 0 -> 2986 bytes
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 sprites/vacuum.png

diff --git a/Vacuum.py b/Vacuum.py
index a34b6cd..94f3a4c 100644
--- a/Vacuum.py
+++ b/Vacuum.py
@@ -6,13 +6,14 @@ class Vacuum:
     def __init__(self, bubble_objects):
         self.posX = -50
         self.posY = -50
-        self.width = 50
-        self.height = 50
+        self.width = 124
+        self.height = 57
         self.bubble_objects = bubble_objects
+        self.image = pygame.image.load("sprites/vacuum.png")
 
     def draw(self, screen):
-        pygame.draw.rect(screen, (255, 0, 0), pygame.Rect(self.posX, self.posY, self.width, self.height))
-    
+        screen.blit(self.image, (self.posX, self.posY))
+        
     def update(self, screen):
         x, y = pygame.mouse.get_pos()
         self.posX = x -(self.width / 2)
diff --git a/main.py b/main.py
index ab79eb6..1f0b22e 100644
--- a/main.py
+++ b/main.py
@@ -41,7 +41,7 @@ for i in range(3, 6):
     game_objects.append(Lane(i * 80 + 60, SCREEN_WIDTH, 80, add_markings=markings))
     game_objects.append(Car(random.uniform(0, SCREEN_WIDTH), i * 80 + 60, bubble_objects, directionX= - random.uniform(1, 5)))
 
-game_objects.append(Vacuum(bubble_objects))
+vacuum = Vacuum(bubble_objects)
 
 while True:
     SCREEN.fill(BACKGROUND)
@@ -50,17 +50,19 @@ while True:
     if len(bubble_objects) < BUBBLE_LIMIT:
         for game_object in game_objects:
             game_object.update(SCREEN)
-        for game_object in game_objects:
-            game_object.draw(SCREEN)
-        
         for game_object in bubble_objects:
             game_object.update(SCREEN)
+        vacuum.update(SCREEN)
+
+        for game_object in game_objects:
+            game_object.draw(SCREEN)
         for game_object in bubble_objects:
             game_object.draw(SCREEN)
+        vacuum.draw(SCREEN)
     else:
         # TODO game over screen with message to reduce driving cars
         SCREEN.blit(TEXT_SCREEN, TEXT_RECT)
-        pass
+        
 
 
     pygame.display.flip()
diff --git a/sprites/vacuum.png b/sprites/vacuum.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb88dd79ec421c539a53a680eb55fbfffbe984f1
GIT binary patch
literal 2986
zcmV;b3sv-qP)<h;3K|Lk000e1NJLTq004Xd0021%1^@s6^ovhn000EtdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1Yuj^j8C{nshx2;wT~I9e#6Z_vk|C&#Hu3PGbW
z7`g1IB$~_PBjpsof9>=S21(0FtyFLB8AF>k?wHj47-v3kGw$_Rs-B;Na=V__NM(L4
zzimjnm-&7D`AhwWBE7BCc;9%gbN!)+Z$rlb=A^fxc27vK{K2xfTC#rs-){r^4$+IL
z*J8<+GiMPFX}IZOP0mfyai3=v<FmroT<{dRw44X57kHF!kK`c;q#B)#=lT_Z+{nMI
zLmolM1=i7(euk3yvGM%>D;e^>{!GSmq{}_Qw!A3w&zbpCV$z>7bA|N+wCX+M_jN$3
z>D9fxSKT`<3GM12sNW2G22ZyfXsRa$LnL~xgo!<-_&t{c(g|*t``Y04fWMO{Z(>~M
z_Y5JYNd>=3J&|3D75kMsEnNG$gbFh&GX*PN2&~1IFLawNm*L1Y!FE7Mp-d_M`<4Dy
zaPPwdgjFA@2QA<ipR}A{2^gIph#?C!zo6xd5|lp;zd}MjpcHbCcatpo<}U%}atYeo
zt54Mc;G_e98#x0;BNMa6O;VsB2&JZETu>gQV#-cMI~*4+JZQ3Daqv8uc=+y@zb`(g
zkIuut`-Mi7U$4*N2O~5tlq%ACy5R-j4d1~I0DyinJ4X&@vyw+0r8aM+#%{qhkO^^?
z<Sh?&K(a*kT;9#lZ@JH@K|>E8TX!xQmP)m`taV8ApAzXsguNMi?E?*>`pPmn(AU}&
zudrK0KkK+ur2j$3r6N6b4BqABRANeN6>zh94CJX(v9?+#4`XiItyZKRMKjxG8_VaY
zk`9PbQ0k;$fVXC~gy$7`_M!Ha4xg|@vz8?a4pJT#;80cAu-Z5c>L}5MI-6q**xD66
za&&Z7Y<Xvpb1UMtnD7xU!-au)k<k|oINC_Lre4q^X2d`sRbTeGc2bj7HA=BA<<L~x
zT3*-6O)YnB-wIPl3;$Ns8R6@Ged9$Dws?rSuC|u}UAR}!T#AdPJ!OMIVpt<^3E{-T
zK?0nB0)UhvGmk}W8m!phyqp%8kJEg+?r3EL*+kk`>9%({us#HY;k8SNKDzsoA#k<~
zpU8m?LCr-|@Ph&V9B9g+j<bIN5X3))H+tXdj*inqCr&}H7Nx4SxzR|YYn!9Dfv5RI
zz8o?7g0@mpLx;rii7vlN1lVGE2U-h{y-Jm-bbJIa1j(DRh7VLxQ~-d;N?jw6n7vX9
z@!hNO<f>p{Q|<VK>B}l?zlwfIF7$dNRe(N<(jPksTly`p1AVJrs+zuO0t6k#e1lpj
zoZUvvcAX!ju~2Kq;5?2nxUi4`=`6_JL^=+T)+6dd0S+GMjKi};-?dTeC`c)#F>1@}
z)>J|K!6>teueLeIEI>VwS+tu0dQF7fi^44{zKauB1V7v4Q;}pX;|~reJ4VplY~j1_
zBx@lV=x-<?bi24Ro@)ib9mgEkdY&1mBaxuR1Rp?BkJKm4IZNAB!a{pTRiUS!;zOsf
ziNb3Lv!iAa3}EmcD2;lEo}-%d+RzIvshkX8xh>>N80oc6+2^iQ;-r2W&S<B$0*F+Q
z2r(`29cnhMRpu_G=Y&rej%mX-`qYj}do)|{N%R`$JkJGDo{y=20lqt}tD2gvS^xk5
z1am@3R0s$N2z&@+hyVZvcu7P-RCt{2oXu-nR~m<Z?>XmQUCFNPeCS>!G_;gyQsR~&
zo6^O=Fi=vu=@%rFu3AbL{UZjGMVUWgHbc4$B+J=k+CqmRi=h<KPHU&>cS$1KvTRwg
zrAYVVyj@($b~17#SvS6l?|H!3m}~jyJn#8<-*aqwVfF=vAv1`y8(`R9jPQ(Mgl7yR
zJYyK)8N&$A7)E%;Fv2s25uP#BAP+G!08@|~ZwN%x_o=?Zi3pZu5A<S&^k8O$VbB?z
zyR)lsB0>-ZaNQDSpZ_B^HZ~!pgc<4M1|f<fJTW<m`T4I=sVu>=tX;+T9pOR<luF0I
zyogq-1tDbOO*ZTutu-bmCs8UL!;Kr?^nJds@NT3Oi$zo_m5y|?*Bb}4)^HpL#bOa4
z^qtOu0e9)l3?hQ-x^Nr^TI-P;YZ#4Kb`GxVf`|r^4GfW%F*Ae^a9tO<T+T>O5v?_H
zxg1>AgAih1*}xFOyHO;Bfakf$<!mE81+-?^whh;Hw`32KK@Gha$I>NS*Mn^v>HA46
zTfy@@NGXRJ*<JRu`(kEDDdBnULsI}laxgP2OTl&bE*lu3v>HoSD3v@YrHu4P2s1;e
zcw~>-*CXXuUFn|ZL5&b~hTVx}$Fpe?18d}jx*L7&2<wWWH{GSvbv-DR%+i@i1%)}@
zIeMN8DThlF484hE#~G1r+llpQVkI-JHEertxuM~HcGf&>JK35?qBYX(f`Dsk?jx{W
z;7Y!#Ina6dFho&=LZN`k$pXIr{$^)gPx`kUOo-zCJ9+XH3WWlKAV~aJI&tB^b`jri
zw;@f+HZVklFbn|<b`Y``9*OWSM1$SJFvRRff0=X6jA4Xl3?n>a7~vVi2+tS;-%IbN
z31-(lUUa<-n#K(zTqz4gaV0H^qWh{pCII%AonnO$P)ZGTsZ=p@)boV_NGVaPt>NFF
z{|iO8gri4_n3|q}lg~qt=mbExBLIj1bUzHE!^~iGYL(l9C73l@trphSs;E|1P^m1T
zR$GOX5}LPu<o{4gsoq6z#@5x>#l<qp<=c=_VPaweGc$)#EP6O{w1}yxX*iApB7rE1
z5ClG$Ioh!d>^j#lvml~O?IW036Va{(a%QG(-w~0tEQ_R!tCj6`EO@nA#Y%M<wb~k*
zjRwLn08tzaN~tY(y-;Bo{<B{rg%ki3pf&1u>sVb~#ScH;gl*fHnLdQlvEz91#MAQd
zp+lb5m@O3Yj+1j>Sr+6&&v7|(cjAN)0_Yv&-R05AImqYp*xcM~2SKn<U8yYHy7g<g
zSiXbx`a0Tv8-fIsr67fbR5pNkx$TGgcH!ICl6*sRbANj}^!*q8z<)6eqY|@*<_F@9
znTSMmuhskmz%SvUF?nF<yhr+P-YNXZtR;x<8wrBIQN-~5_Hx?~zKpc~;-ioL`csmP
zpmR94_jAm1olocDFV3Go-#^55Fg4-4{p5*fE(xL#kGQTs285bf-M;nnJ9itcOT+x&
z<;#~P09?6pCH}^hy*DE9Q8hO=CuV17X?}j578VwI&gIvyUsq?&oC&Y}=ks@u94Y;S
zG9sLr)oOL=gFpTGFCTaNpx1+^PoM63(HAaUNOa9hYZ_GmLa%uEy<+kB#ViS5sg&Pe
zuC84~rw{hK5t-T{8;tPGk+$%x{Vx#)rTczU70#M-6qAKyoQa57b1uzBq$OMfphnBT
zwz;`c6++lR?-K99fFmiTwb|IH1}*;@;>~g@L7vuKVg?|BAgK7w#%Id5-^%9;lgv8W
ztqS${!jY6p*6*%Ymn(N(*=V-DMm*3mB^-#Qt3d0r-)wv$ZR@Q<e&UIPCA}lNURzl%
zmtSeNgX@U<Jhde(?Y|b#h@~$E&E^4<9?M>@*On_Q<+IIp@D<|RJJqEtZQ;QE(yuDp
zelwphOg-Mxx2Ex>m3U<T4=EK|9%LMZ1KZM<8qLPloNc|4&reK0p3=M1`1<1Q@}0A-
zAovDjA{!VV;Xp^a)_S>l@7`70Qm^Op6EmF)8jp+g?wVb`T`r#uf?ytFBpVpdBS{4y
zv~8R^UV7@&nVCZ;q9_V6_R?8PsZ_mQE8kiC?PcG`4UCy=U_6Bb+tQyse(b5M(^E6g
zq}`xFsNY@xrM&pttG<t$7(>~>_zDNMq}$JVN00tpNLgTx3pQyt>;aevLPt?^xmx|u
g_x<lMrm_LxcM^UIw-QcrRR91007*qoM6N<$f?ckvfB*mh

literal 0
HcmV?d00001