Skip to content

Commit

Permalink
Recréation du paquet
Browse files Browse the repository at this point in the history
Lorsque plus de cartes dans le paquet on met les cartes du tas dans le
paquet.
  • Loading branch information
florianess committed Nov 22, 2017
1 parent 725c67b commit 6e6c618
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 deletions.
5 changes: 5 additions & 0 deletions LO02/src/main/Manche.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ public Manche() {
// TODO Auto-generated catch block
e.printStackTrace();
}
if (lePaquet.getCartes().size() == 0) {
lePaquet.setCartes(leTas.getCartesDessous());
System.out.println("Le paquet a été changé et se mélange");
lePaquet.melanger();
}
jouerTour(leTas,lePaquet);
}
}
Expand Down
8 changes: 8 additions & 0 deletions LO02/src/main/Paquet.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ public Carte piocherUneCarte() {
cartes.remove(0);
return cartePioche;
}

public ArrayList<Carte> getCartes() {
return cartes;
}

public void setCartes(ArrayList<Carte> cartes) {
this.cartes = cartes;
}
}


Expand Down
6 changes: 3 additions & 3 deletions LO02/src/main/Tas.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
public class Tas {
private Carte carteVisible;
private ArrayList<Carte> cartesDessous;

public Tas(Paquet lePaquet) {
carteVisible = lePaquet.piocherUneCarte();
cartesDessous = new ArrayList<Carte>();
Expand All @@ -22,13 +22,13 @@ public void addCartesDessous(Carte cartesDessous) {
public Carte getCarteVisible() {
return carteVisible;
}

public void afficherCarteVisible() {
System.out.println("La carte visible est : " + carteVisible + "\n");
}

public void setCarteVisible(Carte carteVisible) {
this.carteVisible = carteVisible;
}

}
5 changes: 5 additions & 0 deletions LO02/src/main/Variante.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package main;

public interface Variante {

}

0 comments on commit 6e6c618

Please sign in to comment.