From 2dc065118fe199d5099ebbbab28f9e4c6b4a7a37 Mon Sep 17 00:00:00 2001 From: Serhii Hromov Date: Sat, 27 Jun 2020 15:49:50 +0000 Subject: [PATCH] Updated graphics Must change kitchen texture --- main-2.py | 27 +++++++++++++++++++-------- tableWait.png | Bin 0 -> 2782 bytes wall.png | Bin 0 -> 2698 bytes 3 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 tableWait.png create mode 100644 wall.png diff --git a/main-2.py b/main-2.py index 2b28585..dece526 100644 --- a/main-2.py +++ b/main-2.py @@ -32,7 +32,12 @@ MIDDLE = (floor(WIDTH / 2), floor(HEIGHT / 2)) display = pygame.display.set_mode((WIDTH * 32 + 200, HEIGHT * 32)) tileFoil = pygame.image.load('tile.jpg') waiterAct = pygame.image.load('act1.png') -waiterAct.set_colorkey((255, 255, 255)) +tableEmpty = pygame.image.load('table.png') +tableOrder = pygame.image.load('tableOrder.png') +tableDecide = pygame.image.load('tableDecide.png') +tableWait = pygame.image.load('tableWait.png') +tableEat = pygame.image.load('tableEat.png') +wall = pygame.image.load('wall.png') # eating time EAT_TIME = 15 @@ -247,21 +252,27 @@ def drawScreen(): if tile.table: if tile.clientState: if tile.clientState == "decide": - pygame.draw.rect(display, (0, 128, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + #pygame.draw.rect(display, (0, 128, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + display.blit(tableDecide, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) elif tile.clientState == "order": - pygame.draw.rect(display, (0, 255, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + #pygame.draw.rect(display, (0, 255, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + display.blit(tableOrder, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) elif tile.clientState == "wait": - pygame.draw.rect(display, (255, 128, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + #pygame.draw.rect(display, (255, 128, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + display.blit(tableWait, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) elif tile.clientState == "eat": - pygame.draw.rect(display, (128, 64, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + #pygame.draw.rect(display, (128, 64, 0), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + display.blit(tableEat, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) else: - pygame.draw.rect(display, (64, 64, 64), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + #pygame.draw.rect(display, (64, 64, 64), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + display.blit(tableEmpty, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) if tile.kitchen: pygame.draw.rect(display, (255, 0, 255), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) # if tile.visited: - # pygame.draw.rect(display, (64,0,64), (iw * 32 + 1, ih * 32+1, 14, 14)) + # pygame.draw.rect(display, (200, 16, 0), (iw * 32 + 1, ih * 32+1, 14, 14)) else: - pygame.draw.rect(display, (128, 0, 128), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + #pygame.draw.rect(display, (128, 0, 128), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) + display.blit(wall, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) #pygame.draw.circle(display, (255, 255, 255), (waiter.x * 32 + 16, waiter.y * 32 + 16), 16) display.blit(waiterAct, (waiter.x * 32 + 8, waiter.y * 32 + 8)) diff --git a/tableWait.png b/tableWait.png new file mode 100644 index 0000000000000000000000000000000000000000..64574d9dbc636fdd206965f7123a3b383fb01c60 GIT binary patch literal 2782 zcmcgudsGuw9uA2s9StpzdTcAu*3hGlB3FYheW~ ztXB2_d!TSiIj~@GS#cN8s?b_jdsHeEwNMeovX;8I1?fSd?u6Ic)^g`nVIACZK)}8JH=qEwAe3)o9dU- z8H^V$Y88o=MEMpJCk-r2MJfqay1_)F8H~W-bQ6Z_2n(PjQnW@1IC}C72xwIjFhL+^ z%S}>3qm9fo6R&5+DDX@jj;O%kARsUur3nm#1q0FzdLxCVOTZakly2L*VGx*sSacFF z#2yexl*a;6(o6sXmJq@@d;uUrSR5gbk0Aa4m(3BwY%$E?K^!5ei!`Ue90WmNHW%h{AsPWu8Ac114jC!Gc?KCl;byJL zq9u)hoe@)#sTK)HE1gZjU|OIxQgdaZ3kIiSCYZxw+f$kWs_+GzDb=i>39iCnLQfb7 zqlKceoCT~&Lt02mL;ei)!tf6Q(502j7h*h9i@~rEg0h6A(P_*Tc!DBR z%{UR3M$7cGXJbO8W&*R2W(7&==NBq=UNRt++7|`^mQ zVhbUzNWl@Id@(8zZ({RMHhUH-CskT?#!sPQl*^&fKY-G%QDGMBe}YvwswT|_jLunW zz)}dK_e zz&?L=L#Rlc=J>BXwTR7CspzN#ALB!65zVF)iTM!16N_;|NeIP4TK0?u(5+@Iy(cmK z)2wz?Dw>hc=c*AzMDx&F2vT$SB1o*}av&VzD-o3v5p&f%yYpw6BDEB~%o%fg>2>1G zxt3lF%=ibzaQnWHfVkZdgbJMN);^;i&lP!YzEwleq`%;j+2|ChwpcMU5t2gJ?s<#| z|D1jbOZ#Q@h!9tE5D^CP5uOsld3+&+DMe}sQHeN86-T8OBmDX7f2#gR#{HG*=Zb@C zFk=cqAGI*}>+^X&cg_m^|Ky9TcyVXn6R$Ghm_J($3H>B?O3=vp2J3>8SSZ=GW=a{D^=PDf#Nk&+-5>+q8JqsPbxUwpGYXnN?* zI;gzy`u0!%eg2arHD$o{+i;fql_7`pAx-lJmxtZ=9tSZR8yhbKft{TRRd9A%_SB`| zt%3NHo2?Ow#<-1tY#qO^)Vc848N0)q;2m*{W~p3$=C)GTmNVj6`xz$7vt9B^()FZW z&Yc=;@bNEh@8}4ru*Em^tXjL)7Qremw4KvjYO@XuzU?}2ZEGNMZ_o5(-GrOQW98nu z!?mNHzv*9#1Y{ZS?re+pxW+8~bZX);JQ=U`uP7_KReO(T%+Aj48w-l|%SqmOszrBK z^z{b!rtqxq$5%%MlYg%Pxvzj3Zi7R|>+TK>m28op*?9Owv}~1E`62hMRlDo@uKMKe z=K2kv@T*aL@|H`rvzRe3*34|$@u6n(vYy6dJdHw~YNqwFtFAG5-n;6*s`UTM=Kv6m z|Ecqz-mYKfPcsj&U)faOz0Uc=oGqt{3^kkjWIe^c_uq|cV1BnRC42gTG~%z+2gdcb zz8gmH_M*=f5#hS4b=m}?NdNoqcoZr>J2tJZ^kjBFa&f=GxbpGZR6!)w#0^Va+E6KS zOEO!={^0%Mp3;>5$?w0od)a$+_qNlnvTE;w*2|$;)i*BWxOYAI_Sn$dRo%IaBZJqD U^o`?${R=cIEJoH8`n!Gq0SsvibpQYW literal 0 HcmV?d00001 diff --git a/wall.png b/wall.png new file mode 100644 index 0000000000000000000000000000000000000000..c53dc6cfedb1ff3a417d52a04ebe4a015090d4d7 GIT binary patch literal 2698 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 Ef&@+geE