From c59836e5499aaa2b0a28edfce19789a7cc5a3004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Szuszert?= <micszu9@st.amu.edu.pl>
Date: Tue, 8 Mar 2022 11:36:15 +0100
Subject: [PATCH] added waiter

---
 cafe.tmx   |   2 +-
 cafe1.tsx  |   2 +-
 tiles.py   |   8 ++++++++
 waiter.png | Bin 0 -> 1831 bytes
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 waiter.png

diff --git a/cafe.tmx b/cafe.tmx
index 81dba74..a62be9e 100644
--- a/cafe.tmx
+++ b/cafe.tmx
@@ -3,7 +3,7 @@
  <editorsettings>
   <export target="cafe.json" format="json"/>
  </editorsettings>
- <tileset firstgid="1" source="../cafe1.tsx"/>
+ <tileset firstgid="1" source="cafe1.tsx"/>
  <layer id="1" name="Warstwa Kafelków 1" width="20" height="20">
   <data encoding="csv">
 1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,6,
diff --git a/cafe1.tsx b/cafe1.tsx
index 528ed65..28917c5 100644
--- a/cafe1.tsx
+++ b/cafe1.tsx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.8" tiledversion="1.8.2" name="cafe1" tilewidth="32" tileheight="32" tilecount="30" columns="6">
- <image source="../Downloads/cafe1.png" width="192" height="160"/>
+ <image source="cafe1.png" width="192" height="160"/>
  <tile id="9">
   <properties>
    <property name="chair" value=""/>
diff --git a/tiles.py b/tiles.py
index 3bb2f5f..0eb1dfc 100644
--- a/tiles.py
+++ b/tiles.py
@@ -8,6 +8,13 @@ clock = pygame.time.Clock()
 
 gameMap = pytmx.load_pygame("cafe.tmx")
 
+waiterImg = pygame.image.load("waiter.png")
+waiterX = 50
+waiterY = 300
+
+def waiter():
+    display.blit(waiterImg, (waiterX, waiterY))
+
 while(True):
 
     clock.tick(60)
@@ -26,4 +33,5 @@ while(True):
                 if(tile != None):
                     display.blit(tile, (x * gameMap.tilewidth, y * gameMap.tileheight))
 
+    waiter()
     pygame.display.update()
\ No newline at end of file
diff --git a/waiter.png b/waiter.png
new file mode 100644
index 0000000000000000000000000000000000000000..4319709a6d3bee476658b65a54471677a160c08f
GIT binary patch
literal 1831
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
VvCX%>Kyv^9002ovPDHLkV1fZBet`f0

literal 0
HcmV?d00001