diff --git a/bataille.py b/bataille.py index e819f82..3e27f2c 100644 --- a/bataille.py +++ b/bataille.py @@ -44,23 +44,27 @@ def partie(jeu1, jeu2): while not jeu1.est_vide() and not jeu2.est_vide(): c1 = jeu1.defiler() c2 = jeu2.defiler() + gain = File() + gain.enfiler(c1) + gain.enfiler(c2) resultat = c1.compare(c2) - if resultat == 1: - jeu1.enfiler(c1) - jeu1.enfiler(c2) - elif resultat == -1 : - jeu2.enfiler(c1) - jeu2.enfiler(c2) elif resultat == 0 : - gain = File() - gain.enfiler(c1) - gain.enfiler(c2) - while resulat == 0: + while jeu1.taille()>=2 and jeu2.taille()>=2 and resulat == 0: gain.enfiler(jeu1.defiler()) gain.enfiler(jeu2.defiler()) - c1_2 = jeu1.defiler() - c2_2 = jeu2.defiler() - gain - resultat = c1_2.compare() + c1 = jeu1.defiler() + c2 = jeu2.defiler() + gain.enfiler(c1) + gain.enfiler(c2) + resultat = c1.compare(c2) + if jeu1 + if resultat == 1: + while not gain.est_vide(): + jeu1.enfiler(gain.defiler()) + elif resultat == -1 : + while not gain.est_vide(): + jeu2.enfiler(gain.defiler()) + + \ No newline at end of file