diff --git a/bataille.py b/bataille.py index 5f1cd15..e819f82 100644 --- a/bataille.py +++ b/bataille.py @@ -45,20 +45,22 @@ def partie(jeu1, jeu2): c1 = jeu1.defiler() c2 = jeu2.defiler() resultat = c1.compare(c2) - while resulat == 0: - if resultat == 1: jeu1.enfiler(c1) jeu1.enfiler(c2) elif resultat == -1 : jeu2.enfiler(c1) jeu2.enfiler(c2) - elif resultat == 0: - - c1_1 = jeu1.defiler() - c2_1 = jeu2.defiler() + elif resultat == 0 : + gain = File() + gain.enfiler(c1) + gain.enfiler(c2) + while resulat == 0: + gain.enfiler(jeu1.defiler()) + gain.enfiler(jeu2.defiler()) c1_2 = jeu1.defiler() c2_2 = jeu2.defiler() + gain resultat = c1_2.compare() \ No newline at end of file diff --git a/mainscript.py b/mainscript.py new file mode 100644 index 0000000..820a54d --- /dev/null +++ b/mainscript.py @@ -0,0 +1,8 @@ +from bataille import * +from tkinter import * + +frame = Tk() +frame.title("Projet bataille avec Enono") +frame.minsize(600, 400) + +frame.mainloop() \ No newline at end of file