From c482a38ce83a54c16d0ae8625f89691ecb22e0e7 Mon Sep 17 00:00:00 2001
From: Kalyax <kalyax@homail.com>
Date: Mon, 5 Dec 2022 17:23:40 +0100
Subject: [PATCH] sql inventaire marche

---
 game/personnage.py |  16 ++++++++++++----
 graphics/layers.py |  10 ++++------
 jeu.db             | Bin 20480 -> 0 bytes
 3 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 jeu.db

diff --git a/game/personnage.py b/game/personnage.py
index 2e8a165..e378f25 100644
--- a/game/personnage.py
+++ b/game/personnage.py
@@ -14,7 +14,7 @@ class Material:
 class Inventaire:
     def __init__(self, id, item=None):
         self._id = id
-        self._slots = []
+        self._potions = []
         self.append(item)
         self.append(Material.POTION)
 
@@ -22,17 +22,25 @@ class Inventaire:
         conn = Connection()
         conn.db.execute("INSERT INTO inventaire (personnage_id, item_type) VALUES (?, ?);", (self._id, item_type))
         conn.commit()
-        conn.db.execute("SELECT last_insert_rowid();")
-        self._slots.append(conn.db.fetchone()[0])
+        if item_type == "POTION":
+            conn.db.execute("SELECT last_insert_rowid();")
+            slot = conn.db.fetchone()[0]
+            self._potions.append(slot)
         conn.close()
 
     def remove(self, slot):
         conn = Connection()
         conn.db.execute("DELETE FROM inventaire WHERE personnage_id=? AND slot=?", (self._id, slot))
         conn.commit()
-        self._id = conn.db.fetchone()[0]
         conn.close()
 
+    def pop_potion(self):
+        if len(self._potions) == 0:
+            return None
+        v = self._potions[0]
+        del self._potions[0]
+        return v
+
     def has(self, item_type):
         conn = Connection()
         conn.db.execute("SELECT slot FROM inventaire WHERE personnage_id=? AND item_type=?", (self._id, item_type))
diff --git a/graphics/layers.py b/graphics/layers.py
index 258e94a..3a781a6 100644
--- a/graphics/layers.py
+++ b/graphics/layers.py
@@ -71,12 +71,10 @@ class GUI(Layer):
                     self.__buttons = ["Attaquer", "Inventaire"]
                 elif self.__current == 1:
                     perso = Screen.instance.game.personnage
-                    for item in range(len(perso.inventaire)):
-                        if perso.inventaire[item] == "POTION":
-                            perso.change_pdv(-10)
-                            del perso.inventaire[item]
-                            break
-
+                    inv = perso.inventaire
+                    if inv.has("POTION"):
+                        perso.change_pdv(-10)
+                        inv.remove(inv.pop_potion())
 
 
 class StartPopUp(Layer):
diff --git a/jeu.db b/jeu.db
deleted file mode 100644
index 40e81ab13177e4369ec348edf01e0b03b34e7046..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
zcmeI3O>EO<7{~3zP2wbepM2N}p)EMHl!S(6sAJk;VgxW*w>B*yMd~)G%32piOOukO
zh)HOg5SLBthO`SiOmJk<4jiV9BN{s(AsClQXzYN5v~k!0jY->K?}zIo1vCyIq3MYf
z{r!CX{rdO12dBxA!;`hPZ7wxi%hk3yE=43+miC#ZBuTgEyN|xtUmkj(tOr!(uH&a2
z-jc@N{8=N*lA?Jea*eEM9`gFrnlX<AkN^@u0!RP}AOR$R1dsp{c(DXdk9+;ebXq>M
zyIuXDZr2(o>_)p<Yjqtd2g+8VVwsh~{z=R1beNf-+4WknTdU1Rqk7DquPvGrrHWOw
z%DJAF)q1nNUNL9N6H|rqocWG5XBK8F(-S3no++zT>7Aj^XUp^Lk5+8+XrX-ItwK4o
z=asBkny#3o*~!V?-b2%6Yob`<mYJUQWX-a5$SPZ<1J)6<Q(4W_7PCD|oGncpp0&*0
z>72<{-f7H^E52kgElah=qJ47pc%3eCzPi?K@_4?3XnuF+m_1Ae*k;ane96&Kd5!~j
zhF9(5Yj$J7-Vl0w&~GSa8r5YxM<=tVUz7dGp&|LqIQQ(jzOF-0k5^Y=!#;L4?^(B~
z(OiCp%~@GI;qE=VZJxY^_Q{oJ=vtsp>;HW_P_Koiz2y3>pV8g$tVS+K5t8@9w{RbB
z!j~`ypMU{-$xZSX`J7xPC&@f{o8({Y-ypgp0VIF~kN^@u0!RP}AOR$R1dzZ>Mj(~&
zOM|jHC>N`(WAx#>t{2zrR;y;Wf^owyMOmq8callnFQsMGkoVW>b+cG)+pD@&U$O)7
z_!GMI2usS$BDU8xCikUi4~G62Hy!LYb-Q)V_0ViL3!@u7;Bk+s>ap5F&29wspzA@3
z9gn6I?^%Z=rNZ1L)xDCV&APqT^6GxqBa(GJ==_FjQ6FE2+nw?~-ClO>gNNM#YOgD9
zA^e_ONP4-GAs?)^J~WS37n?1y4;uU-dEkZwH{jO|7l$DdKmter2_OL^fCP{L5<mh-
z00|%gB=B+)0NFbvcYU)VK|J2H-1!Oy`#*l9d+8bt^4c{C{)FG)F5H42;d}T7F2EP?
z8GH=KVTpbtU<&rZ9>~BTL_i^r$nWGA@)P-id`G?}Uy*a<Q*w&5h)v!lQ)C|*CnKbv
z5Ta<0v<KQ<?KZW?7ZN}MNB{{S0VIF~kN^@u0!RP}JRbs~ydq1f#LRSMV!EV`(ZEPp
zGnN(F#qx%e&#}D0^P?=Ui+o@w4dOceaX~1{(s8Ff!`kD#eFw`&L_Rdq9c=FohFK7E
z#)oKN#Q69&mXA7TOVc18WoI*4+HqC4vi1mX-@@`B+Jl2MNW%U?Wx5m^U<Kk7`dNV-
zEEH$0&}LT9oD-*LU})TF6U&F4fg~FUi-80ygq(uG3L#O@Ss~~+#c5y!xl@egRVN>1
zd6nlQEFW-;fCkBcSSw)#zcZk*0Y4uIv%Jq42(ba5ICGE{`kaEw3VoswU<Ji-^3%Xj
zxRa0Ny&@mzqe0xus46V&aoWAC-NV|09z~T>PPa^t`Hc{y_g|izmEdo92oK;M+=1J0
z9j?L^xD1!zBAkbFa2C$MDQH6-7U6xUz$6@mH{eys!7vPf4q^JKz#Vd%TqpmKhvWgd
zN3N19^tS_-$VGCVem-#a`P}5_f&`EN5<mh-00|%gB!C2v01`j~{|^H6(N>ld`Ml7v
zF|Nk0T|#p?uKMVx(49NE#<N+WnGDy+jvYcrMucwP&NVhXEOcmyYjoQ-q3JZ&h-nJl
zx|J(z*&=jskSiG&5Zd3*RolE-Xez}uylIorWRhzrkq~MaT!XqUl>YL8U8fq035`a%
z1|kum09^fq2-P&MzHnG*D8#id7!<0iT$MmTsNc`k>+=ci>*MNC6ro<PPf=yrLldg1
F{tNoG@Gk%W