From b389e8865b348d5661da56740b88356b97b82c7d Mon Sep 17 00:00:00 2001 From: Mattheo Date: Wed, 14 Dec 2022 10:37:18 +0100 Subject: [PATCH 1/2] etude des piles --- main.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 6dd014b..414f4ac 100644 --- a/main.py +++ b/main.py @@ -15,4 +15,15 @@ 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) + gagne = p_j1.sommet().compare(p_j2.sommet()) + if gagne == 1: + j1.paquet_j.append(p_j2.depiler()) + elif gagne == 2: + j2.paquet_j.append(p_j1.depiler()) + else: + for loop in range(2): + valeur_carte_j1 = j1.tire_carte() + valeur_carte_j2 = j2.tire_carte() + p_j1.empile(valeur_carte_j1) + p_j2.empile(valeur_carte_j2) + From 1e77854e17fe024c1f6a70032980da31dec5b296 Mon Sep 17 00:00:00 2001 From: Mattheo Date: Wed, 14 Dec 2022 10:45:41 +0100 Subject: [PATCH 2/2] main presque bon --- main.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/main.py b/main.py index 414f4ac..60edc97 100644 --- a/main.py +++ b/main.py @@ -2,7 +2,6 @@ from bataille import * from lib.Pile import Pile_lst def bataille(): - tour = 1 jeux = Jeux() carte_j1, carte_j2 = jeux.depiler() nom = str(input("Entrez votre nom")) @@ -11,19 +10,23 @@ def bataille(): p_j1 = Pile_lst() p_j2 = Pile_lst() while not j1.paquet_j.est_vide() and not j2.paquet_j.est_vide(): - valeur_carte_j1 = j1.tire_carte() - valeur_carte_j2 = j2.tire_carte() - p_j1.empile(valeur_carte_j1) - p_j2.empile(valeur_carte_j2) + p_j1.empile(j1.tire_carte()) + p_j2.empile(j2.tire_carte()) gagne = p_j1.sommet().compare(p_j2.sommet()) + if gagne == 1: j1.paquet_j.append(p_j2.depiler()) + elif gagne == 2: j2.paquet_j.append(p_j1.depiler()) + else: for loop in range(2): - valeur_carte_j1 = j1.tire_carte() - valeur_carte_j2 = j2.tire_carte() - p_j1.empile(valeur_carte_j1) - p_j2.empile(valeur_carte_j2) + p_j1.empile(j1.tire_carte()) + p_j2.empile(j2.tire_carte()) + + if j1.paquet_j.est_vide(): + print("Le perdant est le joueur 1") + else: + print("Le perdant est le joueur 2")