From 80410b843877b7faaad17816fd290dcb7bdeb4f5 Mon Sep 17 00:00:00 2001
From: s444427 <pawlew2@st.amu.edu.pl>
Date: Fri, 3 Apr 2020 21:27:42 +0200
Subject: [PATCH] graphics of table, double render

---
 resources/images/table2.png | Bin 0 -> 876 bytes
 resources/images/table3.png | Bin 0 -> 1057 bytes
 src/graphics.py             |  10 +++++++++-
 src/matrix.py               |   2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 resources/images/table2.png
 create mode 100644 resources/images/table3.png

diff --git a/resources/images/table2.png b/resources/images/table2.png
new file mode 100644
index 0000000000000000000000000000000000000000..789547282e1c5a2d2d04e7970d3371ed890a1a40
GIT binary patch
literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&0009sNkl<ZXhZFp
zO>Y}j6o#L3=GvigY^uaT1o06eS|Jt)u^>q80@etL|G<_dKZ7N|fi)81A5e)RR1m5V
z3l;?`@sZRqt>+{2aSsbO!Jccd7mdeh{YaKPqjyH<y>rgJI`_gHRP{r^n*2SC;s4{D
zC%7m)QATW@U<u5P!PRfPeL%bXZEvHcY5?E<@#iIM?t9LaNcGaeb9-9=h4<oK`2FPT
zo8*%ksXz3TlaKPsJ_gLduD!b7eedA)e(8N(x)hu$U*7!T=*CZX9>_ReX-D!&R@$di
zy845qvF(kQ&IC?*cKd0Hs;o<wLMw7Or+qW}r+HBt+jU)F1eh9nGpM{#`DW5f#b#x8
zkRFQ^`-LF*B9*tP9ICuWL=XweX(@;ZRjoejF#@=D6umofZO`v?u57egm>++?-Cmb8
zOM{m!i&6`AdtI*X?Vx}toD{{CyZ7RECMPSY&(ZI{^%@^sdy~8@5fS2e#L?kVV_(F~
z=<oLFbha=v+RpL$jaz*2&5u*M$EHTsMplhr))L`tmJ-p%YGabqSm1O94K;z0G|3nY
zk12`@5h2g>M$L!_qftVhmzWu?Rz#X)fi5(Xp78hakg}@I?loxyAWdS@BnH4m5ovl7
zXaXZTky@+5WGo_r&Is+XDfYFIRby>r)mR%@HP%K}jkS?gV{K&BnB7>ZApT#EX3gxN
zoHA~z9{$$_8>=KsI35lu%W*%_Zg0@p+-%H@h!Q6Wc|PtzoQp`ZB+$)htTKkj1Io%{
zW^}iDbT&7G2bW0_$2=I_M?`RulBNrEh*Iy7wfQm<)u}y%SuJ1lQ9dHpMplhr@3$2R
zy(q!}kMYWGhc{k)2H()}n~L!LuYd9LVT>}akNZ_cQBB7a6njw__a;uK2BVZb%P1R~
zew`?TQOYo{s4-RZu683Bb`=R0$Ymlb=mJ|)%|v$&%sN91P=Tl+%d<A)W)T>1Dr`l1
zcG~D7Wsv6hrVc}Oyqfn~(fAq|Ri3gI&s@LP_b=O5cZTz1=gRf{%e=hPrSyi2gj>HH
zar-b0iv2<$z-Qmx{m+4KDDxjZPmYm>*1;(jiQylemONo!GMCH%0000<MNUMnLSTYc
CS)_FU

literal 0
HcmV?d00001

diff --git a/resources/images/table3.png b/resources/images/table3.png
new file mode 100644
index 0000000000000000000000000000000000000000..31869a12e1e5f1da936d2ccd16e75822cdc77baa
GIT binary patch
literal 1057
zcmV++1m63JP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&000B%Nkl<ZXhZFo
zzi%8x6vsbrcKzdQa<;LZM209rAb}i&6r><3Bzlnf2dI%Ks3`aYfd7D!J`xQSloW^*
z6o?RtgdmI(Bj=1A|GGWjoo{E}qgY>JhqHIrI!h7kM_OsL``*la=gpg$9jK_NsHmu@
zsHmu@sHmu@_%AUDd<)naJP$?Wv%C&GiOVxMhJK@Gftgw9y5l^9!_;cEg)~j4f!c+M
zvAQ}y^SsJo&c&jBexsc(I_J8xv$GqGMkC4dlRSgNIFT>a?ETn@efZ8>@#5tL=R?SI
zD~yQH?WO#9XE}Uz<5qC+E6#nYs^8@KmWqg)IbZ|?=U_CBky1l(GEN|9j6eiL3NfmM
zS}0=lb-%Fm=9Sl9xOo1OT3~7{W-N-ZA*YG~?Vi$3JxRCQym@!!w_onBH2|FBx+>QP
z`4x%CQonFvW{RsXUB(B`gS7^&R)P#OBpA-c%udyLd2Wu?huihr_txI%e^uq?ah^ql
zJfhRxr@7a{`#=Z*5gD=&0hImJ(`>ca>vTxdG|vgj3Tf^(S#PZ2^(;hWm_d85MZ1--
z)#}jcbn;x_H2a8fHUgeRoRsQbam%NiO32g3|5J#Wq83n9PI0a)jG3arP%VD^DYg7=
zZEvv}2Z9;%vvZ8sYM2f8)M#cTtv1c(F1wu`dwcCX7bq*lVTc)Gib%E;Bc+0RA|eoi
zB7g)%P^91ysFaZ3*IR5f_lY97Vk6AfyXcUom<D5YbC*BYH|cs~y;E#@l@hYn_N=u%
z4w!#to0_DgIy@l`NL6{TwacB&{XFv{loB!;IVPMC38VqG+daY%BO-uWHpiw%B2qKD
z!3woeO31b6>by9Ajx-oQEdR}om0}0FGQ<vEouB00*B02>>v3y!i<Kn5ozj^q2hWff
ztH)UO_guDPr6STtfUB2gSoDE_^3(k$%`^bCMfli^<pMu#<08Cm#zzk1`T7X2oUenx
z#Au9_%)L_yLEzcRQ9uZ4j7JI0Ec$5_@xAxl&Z`2L6k)~;6G5g%V=hil9Nf)V>4=|B
z2oMy&P}9RJy<m)-;C2|v{{J)dU^CPM0cEFFS^GTlrqdu!<MS_yM5Na*7{sdP^ibRn
zHbj3gsQZPt;*0?FBoh;P)u`{C-2j?tW}{?^kIkIi(TL-Cv0t7L``nBrJ=)hc@WDRr
zXF$F8_kixe%8ufIdK||KF`R?&UW9z|_@e;aMdXW)@g3O(;YN}q8-ps#jfnUDQQ{^d
z+XGI$3j6_DB*71(z>fER$3q>sHsBVv<DC0THLE*Gj=yj$l_PSzeeQtdAY_+vgWl)P
b8i0QQ1v|#D67?o000000NkvXXu0mjfMR*N2

literal 0
HcmV?d00001

diff --git a/src/graphics.py b/src/graphics.py
index 9369b74..3210f72 100644
--- a/src/graphics.py
+++ b/src/graphics.py
@@ -7,11 +7,19 @@ class Graphics:
             'floor': pygame.image.load('../resources/images/floor.jpg'),
             'table': pygame.image.load('../resources/images/table.png'),
             'waiter': pygame.image.load('../resources/images/waiter.png'),
+            'table2': pygame.image.load('../resources/images/table2.png'),
+            'table3': pygame.image.load('../resources/images/table3.png')
         }
-        self.screen = pygame.display.set_mode((700, 750))
         self.block_size = 50
+        self.height = 15
+        self.width = 14
+        self.screen = pygame.display.set_mode((self.block_size*self.width, self.block_size*self.height))
 
     def drawBackground(self, matrix):
+        for y in range(15):
+            for x in range(14):
+                self.screen.blit(self.image['floor'], (x * self.block_size, y * self.block_size))
+
         for y in range(15):
             for x in range(14):
                 self.screen.blit(self.image[matrix.get_type(x, y)], (x * self.block_size, y * self.block_size))
diff --git a/src/matrix.py b/src/matrix.py
index bedfffe..af8d07c 100644
--- a/src/matrix.py
+++ b/src/matrix.py
@@ -10,7 +10,7 @@ class Matrix:
         for x in range(14):
             for y in range(15):
                 self.matrix[x][y] = Tile(type_='floor', watch_through=1)
-        self.matrix[1][0].type = 'waiter'
+        self.matrix[1][0].type = 'table3'
         self.matrix[1][0].walk_through = 0
 
     def get_type(self, x, y):