ajout des decks

src/game/DeckRegistery.java

@@ -1,13 +0,0 @@
-package game;
-
-import game.deck.Deck;
-
-public class DeckRegistery {
-	public static Deck get(String name)
-	{
-		switch (name) {
-		default:
-			return null;
-		}
-	}
-}

src/game/Joueur.java

@@ -6,6 +6,7 @@ import java.net.Socket;
 import game.cards.Card;
 import game.cards.CardRegistery;
 import game.deck.Deck;
+import game.deck.DeckRegistery;
 
 public class Joueur {
 

src/game/deck/Deck.java

@@ -1,13 +1,11 @@
 package game.deck;
 
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.Stack;
 
 import game.cards.Card;
 
-public abstract class Deck implements Serializable{
+public abstract class Deck {
-	private static final long serialVersionUID = -4305303353908447343L;
 
 	public abstract Stack<Card> getCards();
 
@@ -16,10 +14,4 @@ public abstract class Deck implements Serializable{
         Collections.shuffle(getCards());
     }
 
-    /**
-     * retourne le nom du deck ex: ww2 , science
-     * ce nom doit être unique
-     * @return
-     */
-    public abstract String getDeckName();
 }

src/game/deck/DeckRegistery.java

@@ -0,0 +1,17 @@
+package game.deck;
+
+public class DeckRegistery {
+	public static Deck get(String name)
+	{
+		switch (name) {
+		case "mythes":
+			return new Mythes();
+		case "moyenage":
+			return new MoyeneAge();
+		case "rennaissance":
+			return new Renaissance();
+		default:
+			return new MoyeneAge();
+		}
+	}
+}

src/game/deck/MoyeneAge.java

@@ -0,0 +1,81 @@
+package game.deck;
+
+import java.util.Stack;
+
+import game.cards.Card;
+import game.cards.MoyenAge.Moyen_Age_Charlemagne;
+import game.cards.MoyenAge.Moyen_Age_CharlesV;
+import game.cards.MoyenAge.Moyen_Age_CharlesVII;
+import game.cards.MoyenAge.Moyen_Age_Chretien_De_Troyes;
+import game.cards.MoyenAge.Moyen_Age_Christine;
+import game.cards.MoyenAge.Moyen_Age_Clovis;
+import game.cards.MoyenAge.Moyen_Age_Croisade;
+import game.cards.MoyenAge.Moyen_Age_Etienne;
+import game.cards.MoyenAge.Moyen_Age_Ferré;
+import game.cards.MoyenAge.Moyen_Age_Guerre_100;
+import game.cards.MoyenAge.Moyen_Age_Guillaume;
+import game.cards.MoyenAge.Moyen_Age_Heresie_Cathares;
+import game.cards.MoyenAge.Moyen_Age_Hugue;
+import game.cards.MoyenAge.Moyen_Age_Isabelle;
+import game.cards.MoyenAge.Moyen_Age_Jean;
+import game.cards.MoyenAge.Moyen_Age_Jean_Vienne;
+import game.cards.MoyenAge.Moyen_Age_Jeanne;
+import game.cards.MoyenAge.Moyen_Age_Louis;
+import game.cards.MoyenAge.Moyen_Age_Malediction_Templier;
+import game.cards.MoyenAge.Moyen_Age_Peste;
+import game.cards.MoyenAge.Moyen_Age_Philippe;
+import game.cards.MoyenAge.Moyen_Age_PhilippeIV;
+import game.cards.MoyenAge.Moyen_Age_Philippe_Cacqueray;
+import game.cards.MoyenAge.Moyen_Age_Pierre;
+import game.cards.MoyenAge.Moyen_Age_Pierre_Ermite;
+import game.cards.MoyenAge.Moyen_Age_Pouvoir_Du_Franc;
+import game.cards.MoyenAge.Moyen_Age_Prise_Sainte_Terre;
+import game.cards.MoyenAge.Moyen_Age_Roland;
+import game.cards.MoyenAge.Moyen_Age_Sire_Jean;
+import game.cards.MoyenAge.Moyen_Age_Traite_Verdun;
+
+public class MoyeneAge extends Deck{
+	Stack<Card> cards;
+	public MoyeneAge()
+	{
+		cards = new Stack<>();
+		cards.add(new  Moyen_Age_Charlemagne());
+		cards.add(new  Moyen_Age_CharlesVII());
+		cards.add(new  Moyen_Age_CharlesV());
+		cards.add(new  Moyen_Age_Chretien_De_Troyes());
+		cards.add(new  Moyen_Age_Christine());
+		cards.add(new  Moyen_Age_Clovis());
+		cards.add(new  Moyen_Age_Croisade());
+		cards.add(new  Moyen_Age_Etienne());
+		cards.add(new  Moyen_Age_Ferré());
+		cards.add(new  Moyen_Age_Guerre_100());
+		cards.add(new  Moyen_Age_Guillaume());
+		cards.add(new  Moyen_Age_Heresie_Cathares());
+		cards.add(new  Moyen_Age_Hugue());
+		cards.add(new  Moyen_Age_Isabelle());
+		cards.add(new  Moyen_Age_Jean());
+		cards.add(new  Moyen_Age_Jeanne());
+		cards.add(new  Moyen_Age_Jean_Vienne());
+		cards.add(new  Moyen_Age_Louis());
+		cards.add(new  Moyen_Age_Malediction_Templier());
+		cards.add(new  Moyen_Age_Peste());
+		cards.add(new  Moyen_Age_Philippe_Cacqueray());
+		cards.add(new  Moyen_Age_PhilippeIV());
+		cards.add(new  Moyen_Age_Philippe());
+		cards.add(new  Moyen_Age_Pierre_Ermite());
+		cards.add(new  Moyen_Age_Pierre());
+		cards.add(new  Moyen_Age_Pouvoir_Du_Franc());
+		cards.add(new  Moyen_Age_Prise_Sainte_Terre());
+		cards.add(new  Moyen_Age_Roland());
+		cards.add(new  Moyen_Age_Sire_Jean());
+		cards.add(new  Moyen_Age_Traite_Verdun());
+	}
+	
+	
+	@Override
+	public Stack<Card> getCards() {
+		return cards;
+	}
+
+	
+}

src/game/deck/Mythes.java

@@ -0,0 +1,80 @@
+package game.deck;
+
+import java.util.Stack;
+
+import game.cards.Card;
+import game.cards.Mythes.Mythes_12_Travaux;
+import game.cards.Mythes.Mythes_Achille;
+import game.cards.Mythes.Mythes_Amazones;
+import game.cards.Mythes.Mythes_Castor_Pollux;
+import game.cards.Mythes.Mythes_Chant_Sirene;
+import game.cards.Mythes.Mythes_Chaos;
+import game.cards.Mythes.Mythes_Cheval_Troie;
+import game.cards.Mythes.Mythes_Chiron;
+import game.cards.Mythes.Mythes_Dédale;
+import game.cards.Mythes.Mythes_Enigme_Sphinx;
+import game.cards.Mythes.Mythes_Eole;
+import game.cards.Mythes.Mythes_Erinyes;
+import game.cards.Mythes.Mythes_Guerre_Sept_Chefs;
+import game.cards.Mythes.Mythes_Hades;
+import game.cards.Mythes.Mythes_Heracles;
+import game.cards.Mythes.Mythes_Hermione;
+import game.cards.Mythes.Mythes_Icar;
+import game.cards.Mythes.Mythes_Kunée;
+import game.cards.Mythes.Mythes_Minos;
+import game.cards.Mythes.Mythes_Oedipie;
+import game.cards.Mythes.Mythes_Perséphone;
+import game.cards.Mythes.Mythes_Poseidon;
+import game.cards.Mythes.Mythes_Psyché;
+import game.cards.Mythes.Mythes_Rapt;
+import game.cards.Mythes.Mythes_Sémélé;
+import game.cards.Mythes.Mythes_Thanatos;
+import game.cards.Mythes.Mythes_Titanomachie;
+import game.cards.Mythes.Mythes_Toison;
+import game.cards.Mythes.Mythes_Zeus;
+import game.cards.Mythes.Mythes_Zeus_VS_Typhon;
+
+public class Mythes extends Deck{
+	Stack<Card> cards;
+	public Mythes()
+	{
+		cards = new Stack<>();
+		cards.add(new Mythes_12_Travaux());         
+		cards.add(new Mythes_Hermione());
+		cards.add(new Mythes_Achille());            
+		cards.add(new Mythes_Icar());
+		cards.add(new Mythes_Amazones());           
+		cards.add(new Mythes_Kunée());
+		cards.add(new Mythes_Castor_Pollux());      
+		cards.add(new Mythes_Minos());
+		cards.add(new Mythes_Chant_Sirene());       
+		cards.add(new Mythes_Oedipie());
+		cards.add(new Mythes_Chaos());              
+		cards.add(new Mythes_Perséphone());
+		cards.add(new Mythes_Cheval_Troie());       
+		cards.add(new Mythes_Poseidon());
+		cards.add(new Mythes_Chiron());             
+		cards.add(new Mythes_Psyché());
+		cards.add(new Mythes_Dédale());             
+		cards.add(new Mythes_Rapt());
+		cards.add(new Mythes_Enigme_Sphinx());      
+		cards.add(new Mythes_Sémélé());
+		cards.add(new Mythes_Eole());               
+		cards.add(new Mythes_Thanatos());
+		cards.add(new Mythes_Erinyes());            
+		cards.add(new Mythes_Titanomachie());
+		cards.add(new Mythes_Guerre_Sept_Chefs());  
+		cards.add(new Mythes_Toison());
+		cards.add(new Mythes_Hades());              
+		cards.add(new Mythes_Zeus());
+		cards.add(new Mythes_Heracles());           
+		cards.add(new Mythes_Zeus_VS_Typhon());
+	}
+	
+	
+	@Override
+	public Stack<Card> getCards() {
+		return cards;
+	}
+	
+}

src/game/deck/Renaissance.java

@@ -0,0 +1,81 @@
+package game.deck;
+
+import java.util.Stack;
+
+import game.cards.Card;
+import game.cards.Renaissance.Renaissance_Copernic;
+import game.cards.Renaissance.Renaissance_Mehmet;
+import game.cards.Renaissance.Renaissance_Soliman;
+import game.cards.Renaissance.Rennaissance_Casimir;
+import game.cards.Renaissance.Rennaissance_Charles;
+import game.cards.Renaissance.Rennaissance_Chatherine;
+import game.cards.Renaissance.Rennaissance_Chute_Constantinople;
+import game.cards.Renaissance.Rennaissance_Concile_Trente;
+import game.cards.Renaissance.Rennaissance_Constantin;
+import game.cards.Renaissance.Rennaissance_Decouverte_Amerique;
+import game.cards.Renaissance.Rennaissance_Elisabeth;
+import game.cards.Renaissance.Rennaissance_Ferdinand;
+import game.cards.Renaissance.Rennaissance_Fin_Guerre_Cent_Ans;
+import game.cards.Renaissance.Rennaissance_Francois;
+import game.cards.Renaissance.Rennaissance_Guerres_Italie;
+import game.cards.Renaissance.Rennaissance_Henri;
+import game.cards.Renaissance.Rennaissance_Henri_8;
+import game.cards.Renaissance.Rennaissance_Isabelle;
+import game.cards.Renaissance.Rennaissance_Ivan;
+import game.cards.Renaissance.Rennaissance_Leonard;
+import game.cards.Renaissance.Rennaissance_Machiavel;
+import game.cards.Renaissance.Rennaissance_Michel_Ange;
+import game.cards.Renaissance.Rennaissance_Nobunaga;
+import game.cards.Renaissance.Rennaissance_Presse_Imprimer;
+import game.cards.Renaissance.Rennaissance_Rabelais;
+import game.cards.Renaissance.Rennaissance_Reforme;
+import game.cards.Renaissance.Rennaissance_Shakespeare;
+import game.cards.Renaissance.Rennaissance_Skanderberg;
+import game.cards.Renaissance.Rennaissance_Succession_Bourgogne;
+import game.cards.Renaissance.Rennaissance_Vlad;
+
+public class Renaissance extends Deck{
+	Stack<Card> cards;
+	public Renaissance()
+	{
+		cards = new Stack<>();
+		cards.add(new  Renaissance_Copernic());
+		cards.add(new  Renaissance_Mehmet());
+		cards.add(new  Renaissance_Soliman());
+		cards.add(new  Rennaissance_Casimir());
+		cards.add(new  Rennaissance_Charles());
+		cards.add(new  Rennaissance_Chatherine());
+		cards.add(new  Rennaissance_Chute_Constantinople());
+		cards.add(new  Rennaissance_Concile_Trente());
+		cards.add(new  Rennaissance_Constantin());
+		cards.add(new  Rennaissance_Decouverte_Amerique());
+		cards.add(new  Rennaissance_Elisabeth());
+		cards.add(new  Rennaissance_Ferdinand());
+		cards.add(new  Rennaissance_Fin_Guerre_Cent_Ans());
+		cards.add(new  Rennaissance_Francois());
+		cards.add(new  Rennaissance_Guerres_Italie());
+		cards.add(new  Rennaissance_Henri_8());
+		cards.add(new  Rennaissance_Henri());
+		cards.add(new  Rennaissance_Isabelle());
+		cards.add(new  Rennaissance_Ivan());
+		cards.add(new  Rennaissance_Leonard());
+		cards.add(new  Rennaissance_Machiavel());
+		cards.add(new  Rennaissance_Michel_Ange());
+		cards.add(new  Rennaissance_Nobunaga());
+		cards.add(new  Rennaissance_Presse_Imprimer());
+		cards.add(new  Rennaissance_Rabelais());
+		cards.add(new  Rennaissance_Reforme());
+		cards.add(new  Rennaissance_Shakespeare());
+		cards.add(new  Rennaissance_Skanderberg());
+		cards.add(new  Rennaissance_Succession_Bourgogne());
+		cards.add(new  Rennaissance_Vlad());
+	}
+	
+	@Override
+	public Stack<Card> getCards() {
+		return cards;
+	}
+
+
+	
+}