Merge branch 'master' of https://paul-constans.ac-clermont.fr/gitea/aboulin.a/bataille

2 years ago · 0e7a5a5b6e
5 changed files with 4 additions and 4 deletions
--- a/lib/File.py
+++ b/lib/File.py
--- a/lib/Pile.py
+++ b/lib/Pile.py
--- a/main.py
+++ b/main.py
@ -1,5 +1,5 @@
 from bataille import *
-from pile import Pile_lst
+from lib.Pile import Pile_lst

 def bataille():
    tour = 1
@ -15,4 +15,4 @@ def bataille():
        valeur_carte_j2 = j2.tire_carte()
        p_j1.empile(valeur_carte_j1)
        p_j2.empile(valeur_carte_j2)
-        p_j1.sommet().compare(p_j2.sommet)
+        p_j1.sommet().compare(p_j2.sommet)
--- a/util/bataille.py
+++ b/util/bataille.py
@ -1,5 +1,5 @@
 from random import *
-from File import File_lst as File
+from lib.File import File_lst as File

 class Carte:
    def __init__(self, valeur, couleur):
@ -44,4 +44,4 @@ class Joueur:
        
    def tire_carte(self):
        self.derniere_carte = self.paquet_j.defiler()
-        return self.derniere_carte
+        return self.derniere_carte
--- a/util/window.py
+++ b/util/window.py