From 6bc7d96db3cca3bc2b51392db00ed47c40161e4c Mon Sep 17 00:00:00 2001
From: "theo@manjaro" <ayte@tutanota.com>
Date: Fri, 25 Jun 2021 18:57:40 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20gravit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamedata/objects/combat/player.py  | 26 ++++++++++++++++++++++++--
 gamedata/objects/combat/tileset.py |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py
index 2e26039..78c092c 100644
--- a/gamedata/objects/combat/player.py
+++ b/gamedata/objects/combat/player.py
@@ -13,11 +13,33 @@ class Player(BaseObject):
         self.tilew = tileset.tilew
         self.tileh = tileset.tileh
 
+        self.speed = 300
+
+        self.gravity = 200
+
     def step(self):
         keys = self.game.inputs["keys"]
         hor=keys["right"]["pressed"]-keys["left"]["pressed"]
-        ver=keys["down"]["pressed"]-keys["up"]["pressed"]
-        self.move(hor*300*self.game.dt,ver*300*self.game.dt)
+
+        # Check if on ground
+        self.onground = False
+        targetpos = self.getgridpos(0,1)
+        pos = [targetpos["dl"],targetpos["dr"]]
+        for x in range(pos[0]["x"],pos[1]["x"]+1):
+            if pos[0]["y"]>=0 and pos[0]["y"]<len(self.grid):
+                if x>=0 and x<len(self.grid[pos[0]["y"]]):
+                    if self.grid[pos[0]["y"]][x]==1:
+                        self.onground = True
+                        break
+
+        print(self.onground)
+
+        if not self.onground:
+            ver = self.gravity
+        else:
+            ver = 0
+
+        self.move(hor*self.speed*self.game.dt,ver*self.game.dt)
 
     def getgridpos(self,modx=0,mody=0):
         result = {}
diff --git a/gamedata/objects/combat/tileset.py b/gamedata/objects/combat/tileset.py
index 0d2aae2..09c6d02 100644
--- a/gamedata/objects/combat/tileset.py
+++ b/gamedata/objects/combat/tileset.py
@@ -17,7 +17,7 @@ class TilesetRenderer(BaseObject):
             [1,0,0,0,1,0,0],
             [1,1,0,0,0,0,0],
             [1,1,0,0,0,0,0],
-            [1,1,0,0,0,1,1],
+            [1,1,0,1,0,1,1],
             [1,1,0,1,1,1,0],
         ]