diff --git a/Partie_2/src/main/java/ch/hepia/App.java b/Partie_2/src/main/java/ch/hepia/App.java
index 342c31da3185fb97e565c42c74072e6668344e51..8516d850a9ea04ae55c3ea5675582e9ee490211f 100644
--- a/Partie_2/src/main/java/ch/hepia/App.java
+++ b/Partie_2/src/main/java/ch/hepia/App.java
@@ -1,20 +1,83 @@
package ch.hepia;
+import java.util.Scanner;
+
public class App {
- public static void main(String[] args) {
+ public static final Scanner in = new Scanner(System.in);
+ public static final String ANSI_RESET = "\u001B[0m";
+ public static final String ANSI_BLACK = "\u001B[30m";
+ public static final String ANSI_RED = "\u001B[31m";
+ public static final String ANSI_GREEN = "\u001B[32m";
+ public static final String ANSI_YELLOW = "\u001B[33m";
+ public static final String ANSI_BLUE = "\u001B[34m";
+ public static final String ANSI_PURPLE = "\u001B[35m";
+ public static final String ANSI_CYAN = "\u001B[36m";
+ public static final String ANSI_WHITE = "\u001B[37m";
+
+ public static void BlackJack() {
+
+ System.out.print("\033[H\033[2J");
+ System.out.flush();
+
+ System.out.println("*~-~* " + App.ANSI_RED + "BlackJack" + App.ANSI_RESET + " *~-~*\n");
+
+ int numPlayers;
+ int startMoney;
+
+ while (true) {
+ System.out.print("How many players ? ");
+
+ while (!App.in.hasNextInt()) {
+ System.out.println(
+ App.ANSI_YELLOW + "Please enter a valid number for the number of players." + App.ANSI_RESET);
+ System.out.print("How many players ? ");
+ App.in.next();
+ }
+
+ numPlayers = App.in.nextInt();
- Paquet BlackJack = new Paquet(6, 52);
+ if (numPlayers >= 1 && numPlayers <= 7) {
+ System.out.print("");
+ break;
+ } else {
+ System.out.println(
+ App.ANSI_YELLOW + "Please enter a number of players between 1 and 7." + App.ANSI_RESET);
+ }
+ }
- BlackJack.getPaquet().get(0).ShowPaquet();
+ while (true) {
+ System.out.print("How much money do you start with ? ");
- BlackJack.getPaquet().get(1).ShowPaquet();
+ while (!App.in.hasNextInt()) {
+ System.out.println(App.ANSI_YELLOW + "Please enter a valid number for your Money." + App.ANSI_RESET);
+ System.out.print("How much money do you start with ? ");
+ App.in.next();
+ }
- BlackJack.getPaquet().get(2).ShowPaquet();
+ startMoney = App.in.nextInt();
+
+ if (startMoney >= 10) {
+ System.out.print("");
+ break;
+ } else {
+ System.out.println(App.ANSI_YELLOW + "Please enter an amount above 10." + App.ANSI_RESET);
+ }
+ }
+
+ GameManager BlackJack = new GameManager(numPlayers, startMoney);
+
+ BlackJack.StartTurn();
+
+ BlackJack.DisplayTurn();
+
+ App.in.close();
+ }
+
+ public static void main(String[] args) {
- BlackJack.getPaquet().get(3).ShowPaquet();
+ BlackJack();
- BlackJack.getPaquet().get(4).ShowPaquet();
}
}
diff --git a/Partie_2/src/main/java/ch/hepia/Carte.java b/Partie_2/src/main/java/ch/hepia/Carte.java
index 1afe323a25c62c4899f7b0ebc326ceaeeb455be1..62822203bf0183413c004347b06fb1605f0dc9e6 100644
--- a/Partie_2/src/main/java/ch/hepia/Carte.java
+++ b/Partie_2/src/main/java/ch/hepia/Carte.java
@@ -11,7 +11,7 @@ public class Carte {
final private COULEUR couleur;
final private int rang;
- private int force;
+ final private int force;
private static final int NOMBRE_DE_RANGS = 13;
@@ -31,18 +31,12 @@ public class Carte {
this.couleur = couleur;
this.rang = rang;
- }
-
- public Carte(COULEUR couleur, int rang, int force) {
-
- if (rang < 0 || rang > NOMBRE_DE_RANGS) {
- throw new IllegalArgumentException("Carte invalide : rang incorrect");
+ if (rang <= 10) {
+ this.force = rang;
+ } else {
+ this.force = 10;
}
- this.couleur = couleur;
- this.rang = rang;
- this.force = force;
-
}
public COULEUR getCouleur() {
diff --git a/Partie_2/src/main/java/ch/hepia/GameManager.java b/Partie_2/src/main/java/ch/hepia/GameManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..ada0f80ab24bcf6ea836ab158641fa319dc17c30
--- /dev/null
+++ b/Partie_2/src/main/java/ch/hepia/GameManager.java
@@ -0,0 +1,79 @@
+package ch.hepia;
+
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class GameManager {
+
+ private JeudeCarte Deck;
+ private ArrayList<Joueur> Players;
+ private JoueurCroupier Dealer;
+
+ public GameManager(int nbPlayer, int startMoney) {
+
+ this.Deck = new JeudeCarte(new Paquet(6, 52));
+
+ this.Players = new ArrayList<>();
+
+ this.Players.add(new JoueurHumain(Deck, startMoney));
+
+ if (nbPlayer > 1) {
+ for (int x = 1; x < nbPlayer; x++) {
+ this.Players.add(new JoueurOrdinateur(Deck, startMoney));
+ }
+ }
+
+ this.Dealer = new JoueurCroupier(Deck);
+ }
+
+ public void DisplayTurn() {
+
+ System.out.print("\033[H\033[2J");
+ System.out.flush();
+
+ System.out.println("*~-~* " + App.ANSI_RED + "BlackJack" + App.ANSI_RESET + " *~-~*\n");
+
+ System.out.println("Dealer Score : " + App.ANSI_PURPLE + this.Dealer.GetForce(0) + App.ANSI_RESET);
+ this.Dealer.ShowHands();
+
+ System.out.println("\nMoney : " + App.ANSI_BLUE + this.Players.get(0).GetMoney() + App.ANSI_RESET + " // Bet : "
+ + App.ANSI_BLUE + this.Players.get(0).GetBet(0) + App.ANSI_RESET);
+ System.out.println("Player Score : " + App.ANSI_PURPLE + this.Players.get(0).GetForce(0) + App.ANSI_RESET);
+ this.Players.get(0).ShowHands();
+
+ }
+
+ public void StartTurn() {
+
+ System.out.print("\033[H\033[2J");
+ System.out.flush();
+
+ System.out.println("*~-~* " + App.ANSI_RED + "BlackJack" + App.ANSI_RESET + " *~-~*\n");
+
+ double bet;
+
+ System.out.println("Money : " + App.ANSI_BLUE + this.Players.get(0).GetMoney() + App.ANSI_RESET);
+
+ while (true) {
+
+ System.out.print("How much do you want to bet ? ");
+
+ while (!App.in.hasNextDouble()) {
+ System.out.println(App.ANSI_YELLOW + "Please enter a valid number to bet." + App.ANSI_RESET);
+ System.out.print("How much do you want to bet ?");
+ App.in.next();
+ }
+
+ bet = App.in.nextDouble();
+
+ if (bet <= this.Players.get(0).GetMoney()) {
+ break;
+ } else {
+ System.out.println(App.ANSI_YELLOW + "You don't have enough money." + App.ANSI_RESET);
+ }
+ }
+
+ Players.get(0).SetBet(bet, 0);
+ }
+
+}
diff --git a/Partie_2/src/main/java/ch/hepia/Hand.java b/Partie_2/src/main/java/ch/hepia/Hand.java
index 001bdb521f7ada59612186a2d7e7253fe99abf86..8d9c55a1a9590b4b872c99cf5cd677ba48e6c16c 100644
--- a/Partie_2/src/main/java/ch/hepia/Hand.java
+++ b/Partie_2/src/main/java/ch/hepia/Hand.java
@@ -3,11 +3,11 @@ package ch.hepia;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.List;
public class Hand implements Comparable<Hand> {
- private List<Carte> Hand;
+ private ArrayList<Carte> Hand;
+ private double Bet;
public Hand(Carte... cartes) {
@@ -27,6 +27,22 @@ public class Hand implements Comparable<Hand> {
this.DrawCardFromGame(game, nb);
}
+ public void SetBet(double amount) {
+ if (amount < 0) {
+ throw new RuntimeException("Can't bet negative amout of money.");
+ }
+
+ this.Bet = amount;
+ }
+
+ public double GetBet() {
+ return this.Bet;
+ }
+
+ public Carte GetCarte(int cardNb) {
+ return this.Hand.get(cardNb);
+ }
+
public void AddCardToHand(Carte... cartes) {
for (Carte carte : cartes) {
@@ -83,13 +99,35 @@ public class Hand implements Comparable<Hand> {
}
- public void ShowHand() {
+ public int GetForce() {
- this.SortHand();
+ int force = 0;
+ int as = 0;
- System.out.println("-------- Main --------");
+ for (Carte carte : Hand) {
+ if (carte.getForce() == 1) {
+ as++;
+ }
+ force += carte.getForce();
+ }
+
+ while (force < 21 && as > 0) {
+ force += 10;
+
+ as--;
+
+ if (force > 21) {
+ force -= 10;
+ as = 0;
+ }
+ }
- COULEUR currentcolor = null;
+ return force;
+ }
+
+ public void ShowHand() {
+
+ this.SortHand();
for (Carte carte : Hand) {
@@ -97,7 +135,7 @@ public class Hand implements Comparable<Hand> {
}
- System.out.println("\n----------------------");
+ System.out.println("");
}
@Override
diff --git a/Partie_2/src/main/java/ch/hepia/JeudeCarte.java b/Partie_2/src/main/java/ch/hepia/JeudeCarte.java
index fa401b82dd35dc37e4b8ffe6e09db85983104bad..66d165a56c2cfaa45cc1e855d1b1526fd9795404 100644
--- a/Partie_2/src/main/java/ch/hepia/JeudeCarte.java
+++ b/Partie_2/src/main/java/ch/hepia/JeudeCarte.java
@@ -56,6 +56,23 @@ public class JeudeCarte {
}
+ public JeudeCarte(Paquet paquet) {
+
+ jeuDeCartes = new ArrayList<>();
+
+ List<JeudeCarte> paquets = paquet.getPaquet();
+
+ for (JeudeCarte deck : paquets) {
+ List<Carte> cartes = deck.getCartes();
+ jeuDeCartes.addAll(cartes);
+ }
+
+ }
+
+ public List<Carte> getCartes() {
+ return jeuDeCartes;
+ }
+
public Carte GetTopCarteOfGame() {
return this.jeuDeCartes.get(0);
diff --git a/Partie_2/src/main/java/ch/hepia/Joueur.java b/Partie_2/src/main/java/ch/hepia/Joueur.java
new file mode 100644
index 0000000000000000000000000000000000000000..6ae23fc28814964028276527f4b6e8572e35a93e
--- /dev/null
+++ b/Partie_2/src/main/java/ch/hepia/Joueur.java
@@ -0,0 +1,323 @@
+package ch.hepia;
+
+import java.util.ArrayList;
+
+interface Joueur {
+
+ public void DefineStrategy();
+
+ public void AddMoney(double amount);
+
+ public void RemoveMoney(double amount);
+
+ public double GetMoney();
+
+ public void SetBet(double amount, int handNb);
+
+ public double GetBet(int handNb);
+
+ public void DrawCard(int handNb, JeudeCarte Jeu);
+
+ public void ShowHand(int handNb);
+
+ public void ShowHands();
+
+ public void Split(int handNb);
+
+ public int GetForce(int handNb);
+}
+
+class JoueurHumain implements Joueur {
+
+ private ArrayList<Hand> Hands;
+ private double Money;
+
+ public JoueurHumain(JeudeCarte Jeu, int Money) {
+ this.Hands = new ArrayList<>();
+
+ this.Hands.add(new Hand(Jeu, 2));
+
+ this.Hands.get(0).SetBet(0);
+
+ this.Money = Money;
+ }
+
+ public void DefineStrategy() {
+ // Le Joueur Humain n'a pas de strategie
+ throw new RuntimeException("Humain Player has no Strategy.");
+ }
+
+ public void AddMoney(double amount) {
+ if (amount < 0) {
+ throw new RuntimeException("Can't add negative amount of Money.");
+ } else if (this.Money > 0 && this.Money + amount < 0) {
+ throw new RuntimeException("Money Underflow.");
+ }
+
+ this.Money += amount;
+ }
+
+ public void RemoveMoney(double amount) {
+ if (amount < 0) {
+ throw new RuntimeException("Can't subtract negative amount of Money.");
+ } else if (this.Money < 0 && this.Money + amount > 0) {
+ throw new RuntimeException("Money Overflow.");
+ }
+
+ this.Money -= amount;
+ }
+
+ public double GetMoney() {
+ return this.Money;
+ }
+
+ public int GetForce(int handNb) {
+ return this.Hands.get(handNb).GetForce();
+ }
+
+ public void SetBet(double amount, int handNb) {
+ if (amount <= 0) {
+ throw new RuntimeException("Can't bet a negative or null amount.");
+ } else if (amount > this.Money) {
+ throw new RuntimeException("Can't bet more than the Money you have.");
+ }
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ this.Money -= amount;
+ this.Hands.get(handNb).SetBet(amount);
+ }
+
+ public double GetBet(int handNb) {
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ return this.Hands.get(handNb).GetBet();
+ }
+
+ public void DrawCard(int handNb, JeudeCarte Jeu) {
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ this.Hands.get(handNb).DrawCardFromGame(Jeu);
+ }
+
+ public void ShowHands() {
+ for (Hand hand : this.Hands) {
+ hand.ShowHand();
+ }
+ }
+
+ public void ShowHand(int handNb) {
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ this.Hands.get(handNb).ShowHand();
+ }
+
+ public void Split(int handNb) {
+
+ if (Hands.size() == 3) {
+ throw new RuntimeException("Max number of slipts.");
+ }
+
+ Carte card = this.Hands.get(handNb).GetCarte(handNb);
+
+ this.Hands.get(handNb).RemoveCardFromHand(card);
+
+ this.Hands.add(new Hand(card));
+ }
+}
+
+class JoueurOrdinateur implements Joueur {
+
+ private ArrayList<Hand> Hands;
+ private double Money;
+
+ public JoueurOrdinateur(JeudeCarte Jeu, int Money) {
+ this.Hands = new ArrayList<>();
+
+ Hands.add(new Hand(Jeu, 2));
+
+ Hands.get(0).SetBet(0);
+
+ this.Money = Money;
+ }
+
+ public void DefineStrategy() {
+ // TODO
+
+ }
+
+ public void AddMoney(double amount) {
+ if (amount <= 0) {
+ throw new RuntimeException("Can't add negative amount of Money.");
+ } else if (this.Money > 0 && this.Money + amount < 0) {
+ throw new RuntimeException("Money Underflow.");
+ }
+
+ this.Money += amount;
+ }
+
+ public void RemoveMoney(double amount) {
+ if (amount < 0) {
+ throw new RuntimeException("Can't subtract negative amount of Money.");
+ } else if (this.Money < 0 && this.Money - amount > 0) {
+ throw new RuntimeException("Money Overflow.");
+ }
+
+ this.Money -= amount;
+ }
+
+ public double GetMoney() {
+ return this.Money;
+ }
+
+ public int GetForce(int handNb) {
+ return this.Hands.get(handNb).GetForce();
+ }
+
+ public void SetBet(double amount, int handNb) {
+ if (amount <= 0) {
+ throw new RuntimeException("Can't bet a negative or null amount.");
+ } else if (amount > this.Money) {
+ throw new RuntimeException("Can't bet more than the Money you have.");
+ }
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ this.Money -= amount;
+ this.Hands.get(handNb).SetBet(amount);
+ }
+
+ public double GetBet(int handNb) {
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ return Hands.get(handNb).GetBet();
+ }
+
+ public void DrawCard(int handNb, JeudeCarte Jeu) {
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ this.Hands.get(handNb).DrawCardFromGame(Jeu);
+ }
+
+ public void ShowHands() {
+ for (Hand hand : this.Hands) {
+ hand.ShowHand();
+ }
+ }
+
+ public void ShowHand(int handNb) {
+
+ if (handNb < 0 || handNb > Hands.size()) {
+ throw new RuntimeException("Hand number not valid.");
+ }
+
+ this.Hands.get(handNb).ShowHand();
+ }
+
+ public void Split(int handNb) {
+
+ if (Hands.size() == 3) {
+ throw new RuntimeException("Max number of slipts.");
+ }
+
+ Carte card = this.Hands.get(handNb).GetCarte(handNb);
+
+ this.Hands.get(handNb).RemoveCardFromHand(card);
+
+ this.Hands.add(new Hand(card));
+ }
+}
+
+class JoueurCroupier implements Joueur {
+
+ private Hand Hand;
+
+ public JoueurCroupier(JeudeCarte Jeu) {
+ this.Hand = new Hand(Jeu, 2);
+ }
+
+ public void DefineStrategy() {
+ // TODO
+
+ }
+
+ public void AddMoney(double amount) {
+ // La Banque n'a pas d'argent
+ throw new RuntimeException("Bank has no Money.");
+ }
+
+ public void RemoveMoney(double amount) {
+ // La Banque n'a pas d'argent
+ throw new RuntimeException("Bank has no Money.");
+ }
+
+ public double GetMoney() {
+ // La Banque n'a pas d'argent
+ throw new RuntimeException("Bank has no Money.");
+ }
+
+ public void SetBet(double amount, int handNb) {
+ // La Banque ne parie pas
+ throw new RuntimeException("Bank doesn't Bet.");
+ }
+
+ public double GetBet(int handNb) {
+ // La Banque ne parie pas
+ throw new RuntimeException("Bank doesn't Bet.");
+ }
+
+ public void DrawCard(int handNb, JeudeCarte Jeu) {
+
+ if (handNb != 0) {
+ throw new RuntimeException("Bank has only 1 hand.");
+ }
+
+ this.Hand.DrawCardFromGame(Jeu);
+ }
+
+ public void ShowHands() {
+ this.Hand.ShowHand();
+ }
+
+ public void ShowHand(int handNb) {
+
+ if (handNb != 0) {
+ throw new RuntimeException("Bank has only 1 hand.");
+ }
+
+ this.Hand.ShowHand();
+ }
+
+ public int GetForce(int handNb) {
+
+ if (handNb != 0) {
+ throw new RuntimeException("Bank has only 1 hand.");
+ }
+
+ return this.Hand.GetForce();
+ }
+
+ public void Split(int handNb) {
+ // La Banque ne peut pas slip
+ throw new RuntimeException("Bank can't Split.");
+ }
+}
diff --git a/Partie_2/target/classes/ch/hepia/App.class b/Partie_2/target/classes/ch/hepia/App.class
index f7311f97a007d3a3a5afb84aa9256f7b6fc83a88..998649ba6f5768b7ff59fd742b6d46eadcb6f43b 100644
Binary files a/Partie_2/target/classes/ch/hepia/App.class and b/Partie_2/target/classes/ch/hepia/App.class differ
diff --git a/Partie_2/target/classes/ch/hepia/COULEUR.class b/Partie_2/target/classes/ch/hepia/COULEUR.class
index c582fd28bd308c74abcc31d7c543625ab96af75b..c38a76f38b5f56aec3100849ad749e77c1255bcd 100644
Binary files a/Partie_2/target/classes/ch/hepia/COULEUR.class and b/Partie_2/target/classes/ch/hepia/COULEUR.class differ
diff --git a/Partie_2/target/classes/ch/hepia/Carte.class b/Partie_2/target/classes/ch/hepia/Carte.class
index 341e2309b35bffef294182e2a3233fa317f33bff..bb77e1a2cf2b2c55d68d07f73a271f6ad870f1c6 100644
Binary files a/Partie_2/target/classes/ch/hepia/Carte.class and b/Partie_2/target/classes/ch/hepia/Carte.class differ
diff --git a/Partie_2/target/classes/ch/hepia/GameManager.class b/Partie_2/target/classes/ch/hepia/GameManager.class
new file mode 100644
index 0000000000000000000000000000000000000000..7226155cb75926f7fc3c4f4862943474c91eab01
Binary files /dev/null and b/Partie_2/target/classes/ch/hepia/GameManager.class differ
diff --git a/Partie_2/target/classes/ch/hepia/Hand$1.class b/Partie_2/target/classes/ch/hepia/Hand$1.class
index 908aad6a87b844477dcbcdc972021120b67c4dcc..a8bc740546856cee4b41e4cfb3e1d26a464d6de7 100644
Binary files a/Partie_2/target/classes/ch/hepia/Hand$1.class and b/Partie_2/target/classes/ch/hepia/Hand$1.class differ
diff --git a/Partie_2/target/classes/ch/hepia/Hand.class b/Partie_2/target/classes/ch/hepia/Hand.class
index 6d7bd2ac1a5d5ea193a65f676b466df1e45e3039..ad363bf8d905b7cfbc4a9c8e5bad819297676ea1 100644
Binary files a/Partie_2/target/classes/ch/hepia/Hand.class and b/Partie_2/target/classes/ch/hepia/Hand.class differ
diff --git a/Partie_2/target/classes/ch/hepia/JeudeCarte$1.class b/Partie_2/target/classes/ch/hepia/JeudeCarte$1.class
index 2735eb7c27de1aa52aa4584d2c1ef9d746a2b524..e87f2ad85071fb1b622c4a955974eae6caf97a63 100644
Binary files a/Partie_2/target/classes/ch/hepia/JeudeCarte$1.class and b/Partie_2/target/classes/ch/hepia/JeudeCarte$1.class differ
diff --git a/Partie_2/target/classes/ch/hepia/JeudeCarte.class b/Partie_2/target/classes/ch/hepia/JeudeCarte.class
index 9db2f435378dabe844941e28f2ab1ffb196c1d54..d4ddff183e9cf28c6ac28b70552d4d214022baff 100644
Binary files a/Partie_2/target/classes/ch/hepia/JeudeCarte.class and b/Partie_2/target/classes/ch/hepia/JeudeCarte.class differ
diff --git a/Partie_2/target/classes/ch/hepia/Joueur.class b/Partie_2/target/classes/ch/hepia/Joueur.class
new file mode 100644
index 0000000000000000000000000000000000000000..455ae8e3d5d3b73cf7c6b9a46b235bea191911ed
Binary files /dev/null and b/Partie_2/target/classes/ch/hepia/Joueur.class differ
diff --git a/Partie_2/target/classes/ch/hepia/JoueurCroupier.class b/Partie_2/target/classes/ch/hepia/JoueurCroupier.class
new file mode 100644
index 0000000000000000000000000000000000000000..a4e1c259ee886a8733884a95595ef85a14b310b8
Binary files /dev/null and b/Partie_2/target/classes/ch/hepia/JoueurCroupier.class differ
diff --git a/Partie_2/target/classes/ch/hepia/JoueurHumain.class b/Partie_2/target/classes/ch/hepia/JoueurHumain.class
new file mode 100644
index 0000000000000000000000000000000000000000..b8f42854962650befa0899a29206b537071ffb3f
Binary files /dev/null and b/Partie_2/target/classes/ch/hepia/JoueurHumain.class differ
diff --git a/Partie_2/target/classes/ch/hepia/JoueurOrdinateur.class b/Partie_2/target/classes/ch/hepia/JoueurOrdinateur.class
new file mode 100644
index 0000000000000000000000000000000000000000..d366926e71ddda91c377e09f4585de936f9bb295
Binary files /dev/null and b/Partie_2/target/classes/ch/hepia/JoueurOrdinateur.class differ
diff --git a/Partie_2/target/classes/ch/hepia/Paquet.class b/Partie_2/target/classes/ch/hepia/Paquet.class
index 287773450d9a2e8fcd9120c796067e1f9f2a10cf..79dc7afd66ab47cc77bb82fcf6c5682425eccc23 100644
Binary files a/Partie_2/target/classes/ch/hepia/Paquet.class and b/Partie_2/target/classes/ch/hepia/Paquet.class differ
diff --git a/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 88fcb47184538c4dc2609ac5ab60b5a32e81b4c3..814b85978aca0dc13df7846ffc2a5d7617a2ea2d 100644
--- a/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,7 +1,7 @@
-ch/hepia/App.class
ch/hepia/Hand.class
+ch/hepia/JeudeCarte.class
+ch/hepia/Carte.class
+ch/hepia/App.class
ch/hepia/COULEUR.class
ch/hepia/Hand$1.class
ch/hepia/Paquet.class
-ch/hepia/JeudeCarte.class
-ch/hepia/Carte.class
diff --git a/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 27e74050a7644854626e836c4d3f851a22f78ce5..8643c6b1229fa6a0b75a7a07c874984c3b9ad5f8 100644
--- a/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/Partie_2/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,5 +1,7 @@
/home/padi/Git/java-card-game/Partie_2/src/main/java/ch/hepia/Hand.java
/home/padi/Git/java-card-game/Partie_2/src/main/java/ch/hepia/Carte.java
+/home/padi/Git/java-card-game/Partie_2/src/main/java/ch/hepia/Joueur.java
+/home/padi/Git/java-card-game/Partie_2/src/main/java/ch/hepia/GameManager.java
/home/padi/Git/java-card-game/Partie_2/src/main/java/ch/hepia/App.java
/home/padi/Git/java-card-game/Partie_2/src/main/java/ch/hepia/Paquet.java
/home/padi/Git/java-card-game/Partie_2/src/main/java/ch/hepia/JeudeCarte.java
diff --git a/Partie_2/target/test-classes/ch/hepia/CarteTest.class b/Partie_2/target/test-classes/ch/hepia/CarteTest.class
index 60dcda85d37ead5584d2ad54aaa8affb1935c4b2..655456ed1f9c7073c51fefd5a6f05ec8d78d542b 100644
Binary files a/Partie_2/target/test-classes/ch/hepia/CarteTest.class and b/Partie_2/target/test-classes/ch/hepia/CarteTest.class differ