From 1d41155f21acf1d7456d7149eabf0f223f798129 Mon Sep 17 00:00:00 2001
From: Kyrokx <kyrokxdev@gmail.com>
Date: Sat, 8 May 2021 17:53:02 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=AB=20-=20Collision=20system=20added?=
 =?UTF-8?q?=20(sheeeeeesh)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/house.tsx |   4 ++
 game.py          |  28 +++++++---
 main_map.tmx     | 132 ++++++++++++++++++++++++++++++++++++++++++-----
 src/Player.py    |   9 ++++
 4 files changed, 154 insertions(+), 19 deletions(-)
 create mode 100644 Assets/house.tsx

diff --git a/Assets/house.tsx b/Assets/house.tsx
new file mode 100644
index 0000000..8b1b64c
--- /dev/null
+++ b/Assets/house.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.5" tiledversion="1.6.0" name="house" tilewidth="16" tileheight="16" tilecount="775" columns="31">
+ <image source="house.png" trans="000000" width="500" height="400"/>
+</tileset>
diff --git a/game.py b/game.py
index 1b4ccb2..f7f72b5 100644
--- a/game.py
+++ b/game.py
@@ -27,32 +27,46 @@ def __init__(self):
         # Player instence
         self.player = Player(self.player_spawn.x, self.player_spawn.y)
         # group with map
-        self.group = pyscroll.PyscrollGroup(map_layer=self.map_layer, default_layer=4)
+        self.group = pyscroll.PyscrollGroup(map_layer=self.map_layer, default_layer=3)
         self.group.add(self.player)
 
+        # Collision avec les mur
+        self.objects_in_map = []
+        for obj in tmx_data.objects:
+            if obj.type == "collid":
+                self.objects_in_map.append(pygame.Rect(obj.x, obj.y, obj.width, obj.height))
+
     def handle(self):
         keys = pygame.key.get_pressed()
 
-        if keys[pygame.K_UP]:
+        if keys[pygame.K_UP] or keys[pygame.K_z]:
             self.player.move_up()
             self.player.change_image('up')
-        elif keys[pygame.K_DOWN]:
+        elif keys[pygame.K_DOWN] or keys[pygame.K_s]:
             self.player.move_down()
             self.player.change_image('down')
-        elif keys[pygame.K_LEFT]:
+        elif keys[pygame.K_LEFT] or keys[pygame.K_q]:
             self.player.move_left()
             self.player.change_image('left')
-        elif keys[pygame.K_RIGHT]:
+        elif keys[pygame.K_RIGHT] or keys[pygame.K_d]:
             self.player.move_right()
             self.player.change_image('right')
 
+    def update(self):
+        self.group.update()
+
+        for sprite in self.group.sprites():
+            if sprite.feet.collidelist(self.objects_in_map) > -1:
+                sprite.move_back()
+
     def run(self):
         running = True
         clock = pygame.time.Clock()
 
         while running:
+            self.player.save_location()
             self.handle()
-            self.group.update()
+            self.update()
             self.group.draw(self.screen)
             self.group.center(self.player.rect.center)
             # Refresh window
@@ -66,4 +80,4 @@ def run(self):
                     sys.exit(0)
                     running = False
 
-            clock.tick(60)
\ No newline at end of file
+            clock.tick(60)
diff --git a/main_map.tmx b/main_map.tmx
index e7332b3..9998282 100644
--- a/main_map.tmx
+++ b/main_map.tmx
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="70" height="46" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="5">
+<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="70" height="46" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="69">
  <tileset firstgid="1" source="Assets/RPG Nature Tileset.tsx"/>
+ <tileset firstgid="721" source="Assets/house.tsx"/>
+ <tileset firstgid="1496" source="Assets/IceTileset.tsx"/>
  <layer id="1" name="background" width="70" height="46" locked="1">
   <data encoding="csv">
 324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
@@ -135,18 +137,18 @@
 0,0,0,0,0,0,165,166,166,206,166,0,0,0,0,0,0,0,0,0,0,0,0,0,205,205,206,0,0,0,0,0,0,0,0,165,166,206,165,166,206,206,206,206,206,206,206,206,0,0,0,0,0,205,206,206,166,0,0,0,0,165,166,205,165,166,0,0,0,0,
 0,0,0,0,0,165,166,166,206,205,206,0,0,0,0,0,0,0,0,0,0,0,165,166,205,206,165,166,166,0,0,0,0,0,165,165,165,165,165,166,165,165,165,165,165,165,205,206,0,0,0,0,0,0,0,205,206,166,0,0,0,165,166,165,166,166,0,0,0,0,
 0,0,0,0,0,165,166,206,166,205,206,0,0,0,0,0,0,0,0,0,0,0,165,166,205,206,165,165,165,165,165,165,165,165,165,205,165,166,166,206,205,205,205,205,205,205,206,0,0,0,0,0,0,0,0,0,205,206,166,0,0,165,166,165,166,206,0,0,0,0,
-0,0,0,0,0,165,166,166,165,205,206,0,0,0,0,0,0,0,0,0,0,0,165,166,166,166,166,205,205,205,205,205,205,205,165,165,166,166,206,205,206,206,206,205,205,206,0,0,0,0,0,0,0,0,0,0,205,206,206,166,0,165,165,165,166,0,0,0,0,0,
-0,0,0,0,0,165,166,165,165,205,206,0,0,0,0,0,0,0,0,0,165,166,166,206,206,206,206,166,205,206,206,206,165,166,165,166,166,206,206,206,165,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,205,206,206,0,165,205,165,166,0,0,0,0,0,
+0,0,0,0,0,165,166,166,165,205,206,0,0,0,0,0,0,0,0,0,0,0,165,166,166,166,166,205,205,205,205,205,205,205,165,165,166,166,206,205,206,206,206,205,205,206,0,0,0,0,0,0,0,0,0,0,205,206,206,166,165,165,165,165,166,0,0,0,0,0,
+0,0,0,0,0,165,166,165,165,205,206,0,0,0,0,0,0,0,0,0,165,166,166,206,206,206,206,166,205,206,206,206,165,166,165,166,166,206,206,206,165,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,205,206,206,165,165,205,165,166,0,0,0,0,0,
 0,0,0,0,0,165,165,166,166,166,166,0,0,0,0,0,0,165,166,166,166,206,165,165,165,165,165,165,165,165,165,165,165,166,166,206,206,205,205,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,205,206,166,205,165,166,166,0,0,0,0,0,
-0,0,0,0,0,205,165,166,206,206,206,166,0,0,0,0,165,166,166,206,206,165,205,205,205,205,205,205,205,205,165,165,166,166,166,205,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,205,206,0,165,166,206,0,0,0,0,0,
-0,0,0,0,165,165,165,166,166,205,206,206,166,0,0,165,166,166,166,166,166,205,205,206,206,206,206,165,166,165,166,166,206,206,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,205,206,166,166,206,0,0,0,0,0,0,
-0,0,0,0,165,165,165,166,206,206,205,165,166,165,166,166,166,206,206,206,206,165,165,165,205,165,166,165,165,166,206,206,165,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,205,206,206,0,0,0,0,0,0,0,
-0,0,0,0,165,165,165,165,165,165,165,205,206,165,165,165,165,165,165,165,165,205,205,165,165,165,165,205,205,206,205,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,165,205,205,205,205,205,205,205,206,166,205,205,165,165,205,205,205,165,165,205,205,205,205,206,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,205,205,205,205,205,205,205,206,206,206,165,165,205,205,206,206,206,205,205,206,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,205,205,205,205,205,205,206,205,205,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,205,165,166,206,206,206,166,0,0,0,0,165,166,166,206,206,165,205,205,205,205,205,205,205,205,165,165,166,166,166,205,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1660,1661,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,165,165,165,166,166,205,206,206,166,0,0,165,166,166,166,166,166,205,205,206,206,206,206,165,166,165,166,166,206,206,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1700,1701,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,165,165,165,166,206,206,205,165,166,165,166,166,166,206,206,206,206,165,165,165,205,165,166,165,165,166,206,206,165,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1660,1661,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,165,165,165,165,165,165,165,205,206,165,165,165,165,165,165,165,165,205,205,165,165,165,165,205,205,206,205,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1700,1701,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,165,205,205,205,205,205,205,205,206,166,205,205,165,165,205,205,205,165,165,205,205,205,205,206,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1660,1661,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,205,205,205,205,205,205,205,206,206,206,165,165,205,205,206,206,206,205,205,206,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1660,1661,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,205,205,205,205,205,205,206,205,205,205,205,206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1700,1701,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1660,1660,1661,1660,1661,1660,1661,1660,1661,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1700,1700,1701,1700,1701,1700,1701,1700,1701,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
@@ -199,11 +201,117 @@
 111,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,
 151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,156,
 231,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,235,233,234,236
+</data>
+ </layer>
+ <layer id="6" name="elements" width="70" height="46" locked="1">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,87,87,87,87,87,87,87,87,87,87,87,87,87,88,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,88,88,0,0,0,127,127,127,127,127,87,88,127,127,127,127,127,127,127,128,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,87,87,88,0,0,0,0,0,0,0,0,0,1,2,0,0,1,2,87,88,0,0,87,88,128,128,2,0,87,88,88,88,88,88,88,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,127,127,128,1,2,0,0,0,0,0,0,0,41,42,0,0,41,42,87,87,88,0,127,128,0,41,42,0,127,128,128,128,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,41,42,0,0,0,0,0,0,0,81,82,0,0,81,82,127,87,88,0,0,0,0,81,82,0,0,0,0,85,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,87,88,0,81,82,0,0,0,0,0,0,0,121,122,0,0,121,122,0,127,128,0,0,0,0,121,122,0,0,0,0,125,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,127,128,0,121,122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,87,87,88,0,0,85,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,127,87,88,0,125,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,121,122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,85,86,0,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,125,126,87,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,127,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,87,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,125,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,127,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,86,87,88,0,0,0,0,0,0,0,0,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,87,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,125,126,127,128,0,0,0,0,0,0,0,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,121,122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,6,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,46,0,0,0,41,42,0,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,0,0,0,0,87,88,0,0,0,81,82,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,42,0,0,0,0,127,128,0,0,0,87,88,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,42,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,82,0,0,0,0,0,0,0,87,88,127,128,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,82,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,0,0,121,122,0,0,0,0,0,87,88,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,121,122,0,0,0,0,0,0,0,0,0,0,
+0,0,0,85,86,0,0,0,0,0,0,0,0,0,87,88,0,0,87,88,0,41,42,0,0,0,0,0,0,0,0,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,88,0,0,0,0,0,0,0,0,0,
+0,0,0,125,126,0,0,0,0,0,0,0,87,88,127,128,1,2,127,128,0,81,82,0,0,0,0,0,0,0,0,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,128,0,0,0,0,0,0,0,0,0,
+0,85,86,0,0,0,0,0,0,0,0,0,127,128,0,0,41,42,87,88,0,121,122,0,0,0,0,0,0,0,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,125,126,0,0,0,0,0,0,0,0,0,0,0,0,0,81,82,127,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,121,122,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,121,122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1500,1501,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1540,1541,0,0,
+0,0,85,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,88,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,125,126,0,0,0,0,0,0,0,85,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,87,88,0,0,0,0,0,85,86,0,127,87,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,125,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,87,87,88,0,0,0,0,125,126,0,0,127,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,127,87,87,87,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,127,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <objectgroup id="5" name="Objects" locked="1">
   <object id="4" name="spawn" x="597" y="158">
    <point/>
   </object>
+  <object id="7" type="collid" x="0" y="0" width="14" height="735"/>
+  <object id="10" type="collid" x="16" y="721.333" width="1102.67" height="13.3333"/>
+  <object id="11" type="collid" x="1102.67" y="1.33333" width="17.3333" height="716"/>
+  <object id="12" type="collid" x="16" y="0" width="1085.33" height="18.6667"/>
+  <object id="14" type="collid" x="144.667" y="18" width="62" height="141.333"/>
+  <object id="15" x="144" y="159.333" width="16" height="16.6667"/>
+  <object id="16" type="collid" x="177.333" y="257.333">
+   <polygon points="-0.75,-2.25 -1.16667,13.3333 206,14 206,94.6667 238.667,94.6667 238,78 270,79.3333 270.667,62.6667 286,63.3333 286.667,30 254.667,30 254.667,14.6667 238.667,14 238.667,-2 208.667,-1.33333 206.667,-2 207.333,-17.3333 78.6667,-18 78.4167,-1.41667"/>
+  </object>
+  <object id="17" type="collid" x="240.667" y="674">
+   <polygon points="0,0 -1.33333,12.6667 303.333,13.3333 302.667,-2 318.667,-2.66667 319.333,-17.3333 428.667,-18 431.333,-3.33333 494.667,-2.66667 496,-19.3333 526.667,-18 527.333,-82 558,-82.6667 559.333,-163.333 606,-162 607.333,-178 638,-179.333 638.667,-193.333 608,-194 606.667,-208.667 592,-208.667 592,-195.333 526.667,-194.667 527.333,-178.667 512.667,-179.333 512.667,-163.333 496.667,-162 495.333,-146.667 462,-146 462.667,-116.667 478.667,-114 478.667,-69.3333 495.333,-65.3333 495.333,-52 428.667,-50.6667 431.333,-112.667 382.667,-114 384,-99.3333 317.333,-97.3333 318.667,-68 302,-66 302.667,-50 238,-49.3333 239.333,-34.6667 158,-33.3333 158,-18.6667 64,-18 62,-3.33333"/>
+  </object>
+  <object id="19" type="collid" x="86.6667" y="111" width="16.3333" height="15.3333"/>
+  <object id="20" type="collid" x="232" y="95.6667" width="16.3333" height="13.3333"/>
+  <object id="21" type="collid" x="296.333" y="96" width="15" height="13"/>
+  <object id="22" type="collid" x="227.667" y="542.333" width="21.6667" height="16"/>
+  <object id="23" type="collid" x="259.333" y="495" width="26.3333" height="15.6667"/>
+  <object id="24" type="collid" x="344" y="464" width="16.6667" height="13"/>
+  <object id="25" type="collid" x="405" y="415.667" width="21.6667" height="14.3333"/>
+  <object id="26" type="collid" x="580.667" y="383.667" width="20.6667" height="13"/>
+  <object id="27" type="collid" x="338" y="318.667" width="24" height="18"/>
+  <object id="28" type="collid" x="933" y="414.667" width="20" height="15.6667"/>
+  <object id="29" type="collid" x="850.333" y="143.667" width="27.6667" height="14.6667"/>
+  <object id="31" type="collid" x="437.667" y="96.6667" width="20" height="11.6667"/>
+  <object id="33" type="collid" x="36" y="165.5" width="25.5" height="24.5"/>
+  <object id="34" type="collid" x="50.5" y="438.5" width="29.5" height="26"/>
+  <object id="35" type="collid" x="20" y="470.5" width="21.5" height="23.5"/>
+  <object id="36" type="collid" x="32.5" y="662" width="29" height="24.5"/>
+  <object id="37" type="collid" x="173" y="677" width="33" height="27.5"/>
+  <object id="38" type="collid" x="720" y="677" width="31.5" height="24.5"/>
+  <object id="41" type="collid" x="1062" y="626.5" width="20.5" height="24.5">
+   <polygon points="0,0 20.5,0 20.5,30.5 0.5,31"/>
+  </object>
+  <object id="42" type="collid" x="868.5" y="502" width="23" height="25"/>
+  <object id="43" type="collid" x="464" y="137" width="29" height="23"/>
+  <object id="45" type="collid" x="529" y="84" width="26.5" height="27"/>
+  <object id="46" type="collid" x="675" y="201.5" width="26.5" height="20"/>
+  <object id="47" type="collid" x="641.5" y="227.5" width="28.5" height="29.5"/>
+  <object id="48" type="collid" x="501.75" y="342.5" width="18.75" height="18.75"/>
+  <object id="50" type="collid" x="800.5" y="160" width="158.5" height="16.5"/>
+  <object id="51" type="collid" x="815.5" y="177.5" width="144" height="14.5"/>
+  <object id="52" type="collid" x="832.5" y="193" width="128" height="15"/>
+  <object id="55" type="collid" x="833.5" y="206" width="125.5" height="15.5"/>
+  <object id="56" type="collid" x="752.5" y="176.5" width="13.5" height="224"/>
+  <object id="57" type="collid" x="765.5" y="207.5" width="19" height="161"/>
+  <object id="58" type="collid" x="784.5" y="225" width="14.5" height="141"/>
+  <object id="59" type="collid" x="798.5" y="241" width="12.5" height="125.5"/>
+  <object id="60" type="collid" x="511" y="288" width="242" height="63"/>
+  <object id="61" x="495" y="320.5" width="14" height="30"/>
+  <object id="62" type="collid" x="671.5" y="350.5" width="79.5" height="48.5"/>
+  <object id="63" type="collid" x="672.5" y="399" width="48.5" height="15.5"/>
+  <object id="64" type="collid" x="810.5" y="293" width="149" height="74"/>
+  <object id="65" type="collid" x="886" y="223" width="73" height="68.5"/>
+  <object id="66" type="collid" x="849" y="368" width="79" height="16.5"/>
+  <object id="67" type="collid" x="912" y="383" width="15.5" height="96"/>
+  <object id="68" type="collid" x="897" y="433" width="14.5" height="31"/>
  </objectgroup>
 </map>
diff --git a/src/Player.py b/src/Player.py
index 7b39d16..c206f2d 100644
--- a/src/Player.py
+++ b/src/Player.py
@@ -9,6 +9,8 @@ def __init__(self, x, y):
         self.rect = self.image.get_rect()
         self.position = [x, y]
         self.speed = 2
+        self.feet = pygame.Rect(0, 0, self.rect.width * 0.5, 12)
+        self.old_position = self.position.copy()
         self.images = {
             'down': self.get_image(0, 0),
             'up': self.get_image(0, 96),
@@ -16,9 +18,16 @@ def __init__(self, x, y):
             'right': self.get_image(0, 64)
         }
 
+    def save_location(self): self.old_position = self.position.copy()
+
     def update(self):
         self.rect.topleft = self.position
+        self.feet.midbottom = self.rect.midbottom
 
+    def move_back(self):
+        self.position = self.old_position
+        self.rect.topleft = self.position
+        self.feet.midbottom = self.rect.midbottom
     def get_image(self, x, y):
         image = pygame.Surface([32, 32])
         image.blit(self.sprite_sheet, (0, 0), (x, y, 32, 32))