diff --git a/bin/Serveur.class b/bin/Serveur.class index 3b7b28e..dc5862b 100644 Binary files a/bin/Serveur.class and b/bin/Serveur.class differ diff --git a/bin/game/Board.class b/bin/game/Board.class index 3fd0e72..197b800 100644 Binary files a/bin/game/Board.class and b/bin/game/Board.class differ diff --git a/bin/game/Command.class b/bin/game/Command.class index 8da1170..72f25df 100644 Binary files a/bin/game/Command.class and b/bin/game/Command.class differ diff --git a/bin/game/ComsJoueur.class b/bin/game/ComsJoueur.class index 6fd28fa..d747b07 100644 Binary files a/bin/game/ComsJoueur.class and b/bin/game/ComsJoueur.class differ diff --git a/bin/game/DeckSerializer.class b/bin/game/DeckSerializer.class index 03f1d29..b9f419c 100644 Binary files a/bin/game/DeckSerializer.class and b/bin/game/DeckSerializer.class differ diff --git a/bin/game/Hand.class b/bin/game/Hand.class index b546650..d591da1 100644 Binary files a/bin/game/Hand.class and b/bin/game/Hand.class differ diff --git a/bin/game/Joueur.class b/bin/game/Joueur.class index 620ede3..5041bb8 100644 Binary files a/bin/game/Joueur.class and b/bin/game/Joueur.class differ diff --git a/bin/game/Match.class b/bin/game/Match.class index f3802ff..fec2052 100644 Binary files a/bin/game/Match.class and b/bin/game/Match.class differ diff --git a/bin/game/PlayerTesteur.class b/bin/game/PlayerTesteur.class index b7e751f..cd5581a 100644 Binary files a/bin/game/PlayerTesteur.class and b/bin/game/PlayerTesteur.class differ diff --git a/bin/game/cards/Card.class b/bin/game/cards/Card.class index 1b0e913..44104ce 100644 Binary files a/bin/game/cards/Card.class and b/bin/game/cards/Card.class differ diff --git a/bin/game/cards/CardRegistery.class b/bin/game/cards/CardRegistery.class index 164c65c..075eacb 100644 Binary files a/bin/game/cards/CardRegistery.class and b/bin/game/cards/CardRegistery.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Charlemagne.class b/bin/game/cards/MoyenAge/Moyen_Age_Charlemagne.class index 59e21db..b8cb228 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Charlemagne.class and b/bin/game/cards/MoyenAge/Moyen_Age_Charlemagne.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_CharlesV.class b/bin/game/cards/MoyenAge/Moyen_Age_CharlesV.class index 02146bc..d388bc0 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_CharlesV.class and b/bin/game/cards/MoyenAge/Moyen_Age_CharlesV.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_CharlesVII.class b/bin/game/cards/MoyenAge/Moyen_Age_CharlesVII.class index b73604e..6f0d031 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_CharlesVII.class and b/bin/game/cards/MoyenAge/Moyen_Age_CharlesVII.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.class b/bin/game/cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.class index bf8ecdc..3648844 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.class and b/bin/game/cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Christine.class b/bin/game/cards/MoyenAge/Moyen_Age_Christine.class index 42c8cd0..4cdc882 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Christine.class and b/bin/game/cards/MoyenAge/Moyen_Age_Christine.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Clovis.class b/bin/game/cards/MoyenAge/Moyen_Age_Clovis.class index 7ea2bb9..d20ed9c 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Clovis.class and b/bin/game/cards/MoyenAge/Moyen_Age_Clovis.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Croisade.class b/bin/game/cards/MoyenAge/Moyen_Age_Croisade.class index 74230d5..73e90d7 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Croisade.class and b/bin/game/cards/MoyenAge/Moyen_Age_Croisade.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Etienne.class b/bin/game/cards/MoyenAge/Moyen_Age_Etienne.class index 78404bc..b6061b5 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Etienne.class and b/bin/game/cards/MoyenAge/Moyen_Age_Etienne.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Ferré.class b/bin/game/cards/MoyenAge/Moyen_Age_Ferré.class index 4047de7..d04e87b 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Ferré.class and b/bin/game/cards/MoyenAge/Moyen_Age_Ferré.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Guerre_100.class b/bin/game/cards/MoyenAge/Moyen_Age_Guerre_100.class index a44383f..061b0f4 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Guerre_100.class and b/bin/game/cards/MoyenAge/Moyen_Age_Guerre_100.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Guillaume.class b/bin/game/cards/MoyenAge/Moyen_Age_Guillaume.class index 9e94296..eff0cd2 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Guillaume.class and b/bin/game/cards/MoyenAge/Moyen_Age_Guillaume.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.class b/bin/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.class index d941d45..95dbd85 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.class and b/bin/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Hugue.class b/bin/game/cards/MoyenAge/Moyen_Age_Hugue.class index d8fffeb..3af66e0 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Hugue.class and b/bin/game/cards/MoyenAge/Moyen_Age_Hugue.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Isabelle.class b/bin/game/cards/MoyenAge/Moyen_Age_Isabelle.class index 1cdb6a0..cff1d72 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Isabelle.class and b/bin/game/cards/MoyenAge/Moyen_Age_Isabelle.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Jean.class b/bin/game/cards/MoyenAge/Moyen_Age_Jean.class index 8acf655..e203520 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Jean.class and b/bin/game/cards/MoyenAge/Moyen_Age_Jean.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Jean_Vienne.class b/bin/game/cards/MoyenAge/Moyen_Age_Jean_Vienne.class index 8fd2570..f4a2d09 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Jean_Vienne.class and b/bin/game/cards/MoyenAge/Moyen_Age_Jean_Vienne.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Jeanne.class b/bin/game/cards/MoyenAge/Moyen_Age_Jeanne.class index 9195a06..6c345a0 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Jeanne.class and b/bin/game/cards/MoyenAge/Moyen_Age_Jeanne.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Louis.class b/bin/game/cards/MoyenAge/Moyen_Age_Louis.class index e56c41c..0c81fd9 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Louis.class and b/bin/game/cards/MoyenAge/Moyen_Age_Louis.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.class b/bin/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.class index 9414243..c32c8f4 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.class and b/bin/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Peste.class b/bin/game/cards/MoyenAge/Moyen_Age_Peste.class index 7148833..730fe4a 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Peste.class and b/bin/game/cards/MoyenAge/Moyen_Age_Peste.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Philippe.class b/bin/game/cards/MoyenAge/Moyen_Age_Philippe.class index 88f7198..b68c4f0 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Philippe.class and b/bin/game/cards/MoyenAge/Moyen_Age_Philippe.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_PhilippeIV.class b/bin/game/cards/MoyenAge/Moyen_Age_PhilippeIV.class index 8c86ea0..25048e6 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_PhilippeIV.class and b/bin/game/cards/MoyenAge/Moyen_Age_PhilippeIV.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.class b/bin/game/cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.class index b2e73bd..4a5a51b 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.class and b/bin/game/cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Pierre.class b/bin/game/cards/MoyenAge/Moyen_Age_Pierre.class index cf51b68..3ae60eb 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Pierre.class and b/bin/game/cards/MoyenAge/Moyen_Age_Pierre.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.class b/bin/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.class index 1287b6a..2da6475 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.class and b/bin/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.class b/bin/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.class index 96dd8e4..e85c02e 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.class and b/bin/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.class b/bin/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.class index f253c35..663bb2b 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.class and b/bin/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Roland.class b/bin/game/cards/MoyenAge/Moyen_Age_Roland.class index 5c2782e..cf4a7a0 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Roland.class and b/bin/game/cards/MoyenAge/Moyen_Age_Roland.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Sire_Jean.class b/bin/game/cards/MoyenAge/Moyen_Age_Sire_Jean.class index ccf83fb..e7f4d17 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Sire_Jean.class and b/bin/game/cards/MoyenAge/Moyen_Age_Sire_Jean.class differ diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.class b/bin/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.class index 8f68c69..e38f4f5 100644 Binary files a/bin/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.class and b/bin/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.class differ diff --git a/bin/game/cards/Mythes/Mythes_12_Travaux.class b/bin/game/cards/Mythes/Mythes_12_Travaux.class index 19e1d81..8b5534c 100644 Binary files a/bin/game/cards/Mythes/Mythes_12_Travaux.class and b/bin/game/cards/Mythes/Mythes_12_Travaux.class differ diff --git a/bin/game/cards/Mythes/Mythes_Achille.class b/bin/game/cards/Mythes/Mythes_Achille.class index 72f8235..2bb2122 100644 Binary files a/bin/game/cards/Mythes/Mythes_Achille.class and b/bin/game/cards/Mythes/Mythes_Achille.class differ diff --git a/bin/game/cards/Mythes/Mythes_Amazones.class b/bin/game/cards/Mythes/Mythes_Amazones.class index c5bf492..f8ad415 100644 Binary files a/bin/game/cards/Mythes/Mythes_Amazones.class and b/bin/game/cards/Mythes/Mythes_Amazones.class differ diff --git a/bin/game/cards/Mythes/Mythes_Castor_Pollux.class b/bin/game/cards/Mythes/Mythes_Castor_Pollux.class index 3dd6ffe..0f99aa7 100644 Binary files a/bin/game/cards/Mythes/Mythes_Castor_Pollux.class and b/bin/game/cards/Mythes/Mythes_Castor_Pollux.class differ diff --git a/bin/game/cards/Mythes/Mythes_Chant_Sirene.class b/bin/game/cards/Mythes/Mythes_Chant_Sirene.class index 062f492..1c185e3 100644 Binary files a/bin/game/cards/Mythes/Mythes_Chant_Sirene.class and b/bin/game/cards/Mythes/Mythes_Chant_Sirene.class differ diff --git a/bin/game/cards/Mythes/Mythes_Chaos.class b/bin/game/cards/Mythes/Mythes_Chaos.class index 4a5b491..481b59d 100644 Binary files a/bin/game/cards/Mythes/Mythes_Chaos.class and b/bin/game/cards/Mythes/Mythes_Chaos.class differ diff --git a/bin/game/cards/Mythes/Mythes_Cheval_Troie.class b/bin/game/cards/Mythes/Mythes_Cheval_Troie.class index bbc6548..7d26765 100644 Binary files a/bin/game/cards/Mythes/Mythes_Cheval_Troie.class and b/bin/game/cards/Mythes/Mythes_Cheval_Troie.class differ diff --git a/bin/game/cards/Mythes/Mythes_Chiron.class b/bin/game/cards/Mythes/Mythes_Chiron.class index 2e8b896..c6fd5b9 100644 Binary files a/bin/game/cards/Mythes/Mythes_Chiron.class and b/bin/game/cards/Mythes/Mythes_Chiron.class differ diff --git a/bin/game/cards/Mythes/Mythes_Dédale.class b/bin/game/cards/Mythes/Mythes_Dédale.class index f9fc8b8..d11db17 100644 Binary files a/bin/game/cards/Mythes/Mythes_Dédale.class and b/bin/game/cards/Mythes/Mythes_Dédale.class differ diff --git a/bin/game/cards/Mythes/Mythes_Enigme_Sphinx.class b/bin/game/cards/Mythes/Mythes_Enigme_Sphinx.class index baa01a2..28db9d4 100644 Binary files a/bin/game/cards/Mythes/Mythes_Enigme_Sphinx.class and b/bin/game/cards/Mythes/Mythes_Enigme_Sphinx.class differ diff --git a/bin/game/cards/Mythes/Mythes_Eole.class b/bin/game/cards/Mythes/Mythes_Eole.class index 93a1a7c..fbb8261 100644 Binary files a/bin/game/cards/Mythes/Mythes_Eole.class and b/bin/game/cards/Mythes/Mythes_Eole.class differ diff --git a/bin/game/cards/Mythes/Mythes_Erinyes.class b/bin/game/cards/Mythes/Mythes_Erinyes.class index f51f69b..52992d6 100644 Binary files a/bin/game/cards/Mythes/Mythes_Erinyes.class and b/bin/game/cards/Mythes/Mythes_Erinyes.class differ diff --git a/bin/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.class b/bin/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.class index 3f0dd62..0dd4127 100644 Binary files a/bin/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.class and b/bin/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.class differ diff --git a/bin/game/cards/Mythes/Mythes_Hades.class b/bin/game/cards/Mythes/Mythes_Hades.class index 12d7d69..6362333 100644 Binary files a/bin/game/cards/Mythes/Mythes_Hades.class and b/bin/game/cards/Mythes/Mythes_Hades.class differ diff --git a/bin/game/cards/Mythes/Mythes_Heracles.class b/bin/game/cards/Mythes/Mythes_Heracles.class index e44a2a1..2789a3b 100644 Binary files a/bin/game/cards/Mythes/Mythes_Heracles.class and b/bin/game/cards/Mythes/Mythes_Heracles.class differ diff --git a/bin/game/cards/Mythes/Mythes_Hermione.class b/bin/game/cards/Mythes/Mythes_Hermione.class index 5411b1f..aeb621f 100644 Binary files a/bin/game/cards/Mythes/Mythes_Hermione.class and b/bin/game/cards/Mythes/Mythes_Hermione.class differ diff --git a/bin/game/cards/Mythes/Mythes_Icar.class b/bin/game/cards/Mythes/Mythes_Icar.class index 6c8b7f5..11068a1 100644 Binary files a/bin/game/cards/Mythes/Mythes_Icar.class and b/bin/game/cards/Mythes/Mythes_Icar.class differ diff --git a/bin/game/cards/Mythes/Mythes_Kunée.class b/bin/game/cards/Mythes/Mythes_Kunée.class index 90b9f15..cfdaecb 100644 Binary files a/bin/game/cards/Mythes/Mythes_Kunée.class and b/bin/game/cards/Mythes/Mythes_Kunée.class differ diff --git a/bin/game/cards/Mythes/Mythes_Minos.class b/bin/game/cards/Mythes/Mythes_Minos.class index 488d2b1..5e52eca 100644 Binary files a/bin/game/cards/Mythes/Mythes_Minos.class and b/bin/game/cards/Mythes/Mythes_Minos.class differ diff --git a/bin/game/cards/Mythes/Mythes_Oedipie.class b/bin/game/cards/Mythes/Mythes_Oedipie.class index 6776e93..c1983f8 100644 Binary files a/bin/game/cards/Mythes/Mythes_Oedipie.class and b/bin/game/cards/Mythes/Mythes_Oedipie.class differ diff --git a/bin/game/cards/Mythes/Mythes_Perséphone.class b/bin/game/cards/Mythes/Mythes_Perséphone.class index 5e3a592..e38bff7 100644 Binary files a/bin/game/cards/Mythes/Mythes_Perséphone.class and b/bin/game/cards/Mythes/Mythes_Perséphone.class differ diff --git a/bin/game/cards/Mythes/Mythes_Poseidon.class b/bin/game/cards/Mythes/Mythes_Poseidon.class index c804910..c597136 100644 Binary files a/bin/game/cards/Mythes/Mythes_Poseidon.class and b/bin/game/cards/Mythes/Mythes_Poseidon.class differ diff --git a/bin/game/cards/Mythes/Mythes_Psyché.class b/bin/game/cards/Mythes/Mythes_Psyché.class index 6681954..e66b956 100644 Binary files a/bin/game/cards/Mythes/Mythes_Psyché.class and b/bin/game/cards/Mythes/Mythes_Psyché.class differ diff --git a/bin/game/cards/Mythes/Mythes_Rapt.class b/bin/game/cards/Mythes/Mythes_Rapt.class index b9c192f..aa7f1c6 100644 Binary files a/bin/game/cards/Mythes/Mythes_Rapt.class and b/bin/game/cards/Mythes/Mythes_Rapt.class differ diff --git a/bin/game/cards/Mythes/Mythes_Sémélé.class b/bin/game/cards/Mythes/Mythes_Sémélé.class index 987d585..cf283c7 100644 Binary files a/bin/game/cards/Mythes/Mythes_Sémélé.class and b/bin/game/cards/Mythes/Mythes_Sémélé.class differ diff --git a/bin/game/cards/Mythes/Mythes_Thanatos.class b/bin/game/cards/Mythes/Mythes_Thanatos.class index 9b2fd7b..30514b1 100644 Binary files a/bin/game/cards/Mythes/Mythes_Thanatos.class and b/bin/game/cards/Mythes/Mythes_Thanatos.class differ diff --git a/bin/game/cards/Mythes/Mythes_Titanomachie.class b/bin/game/cards/Mythes/Mythes_Titanomachie.class index ff6a398..43ecddb 100644 Binary files a/bin/game/cards/Mythes/Mythes_Titanomachie.class and b/bin/game/cards/Mythes/Mythes_Titanomachie.class differ diff --git a/bin/game/cards/Mythes/Mythes_Toison.class b/bin/game/cards/Mythes/Mythes_Toison.class index a8a51f1..bd86f43 100644 Binary files a/bin/game/cards/Mythes/Mythes_Toison.class and b/bin/game/cards/Mythes/Mythes_Toison.class differ diff --git a/bin/game/cards/Mythes/Mythes_Zeus.class b/bin/game/cards/Mythes/Mythes_Zeus.class index f3eb720..09ce36f 100644 Binary files a/bin/game/cards/Mythes/Mythes_Zeus.class and b/bin/game/cards/Mythes/Mythes_Zeus.class differ diff --git a/bin/game/cards/Mythes/Mythes_Zeus_VS_Typhon.class b/bin/game/cards/Mythes/Mythes_Zeus_VS_Typhon.class index 949f832..fea583f 100644 Binary files a/bin/game/cards/Mythes/Mythes_Zeus_VS_Typhon.class and b/bin/game/cards/Mythes/Mythes_Zeus_VS_Typhon.class differ diff --git a/bin/game/cards/Renaissance/Renaissance_Copernic.class b/bin/game/cards/Renaissance/Renaissance_Copernic.class index f8f1f2f..9135e73 100644 Binary files a/bin/game/cards/Renaissance/Renaissance_Copernic.class and b/bin/game/cards/Renaissance/Renaissance_Copernic.class differ diff --git a/bin/game/cards/Renaissance/Renaissance_Mehmet.class b/bin/game/cards/Renaissance/Renaissance_Mehmet.class index 3b36616..5ba0732 100644 Binary files a/bin/game/cards/Renaissance/Renaissance_Mehmet.class and b/bin/game/cards/Renaissance/Renaissance_Mehmet.class differ diff --git a/bin/game/cards/Renaissance/Renaissance_Soliman.class b/bin/game/cards/Renaissance/Renaissance_Soliman.class index f760b2d..a16cb9f 100644 Binary files a/bin/game/cards/Renaissance/Renaissance_Soliman.class and b/bin/game/cards/Renaissance/Renaissance_Soliman.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Casimir.class b/bin/game/cards/Renaissance/Rennaissance_Casimir.class index fba7d11..c258ec1 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Casimir.class and b/bin/game/cards/Renaissance/Rennaissance_Casimir.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Charles.class b/bin/game/cards/Renaissance/Rennaissance_Charles.class index 573e333..22b9b05 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Charles.class and b/bin/game/cards/Renaissance/Rennaissance_Charles.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Chatherine.class b/bin/game/cards/Renaissance/Rennaissance_Chatherine.class index 679524f..00b0ab2 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Chatherine.class and b/bin/game/cards/Renaissance/Rennaissance_Chatherine.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Chute_Constantinople.class b/bin/game/cards/Renaissance/Rennaissance_Chute_Constantinople.class index e743362..573c185 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Chute_Constantinople.class and b/bin/game/cards/Renaissance/Rennaissance_Chute_Constantinople.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Concile_Trente.class b/bin/game/cards/Renaissance/Rennaissance_Concile_Trente.class index 6e946d9..62869e9 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Concile_Trente.class and b/bin/game/cards/Renaissance/Rennaissance_Concile_Trente.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Constantin.class b/bin/game/cards/Renaissance/Rennaissance_Constantin.class index dd33a54..f654430 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Constantin.class and b/bin/game/cards/Renaissance/Rennaissance_Constantin.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.class b/bin/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.class index 317b66d..2cdde0c 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.class and b/bin/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Elisabeth.class b/bin/game/cards/Renaissance/Rennaissance_Elisabeth.class index f729ea5..3a927f9 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Elisabeth.class and b/bin/game/cards/Renaissance/Rennaissance_Elisabeth.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Ferdinand.class b/bin/game/cards/Renaissance/Rennaissance_Ferdinand.class index d3a436b..74b3200 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Ferdinand.class and b/bin/game/cards/Renaissance/Rennaissance_Ferdinand.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.class b/bin/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.class index 1094818..8bbb63a 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.class and b/bin/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Francois.class b/bin/game/cards/Renaissance/Rennaissance_Francois.class index 111989f..dce2243 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Francois.class and b/bin/game/cards/Renaissance/Rennaissance_Francois.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Guerres_Italie.class b/bin/game/cards/Renaissance/Rennaissance_Guerres_Italie.class index 8ecc622..51c9316 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Guerres_Italie.class and b/bin/game/cards/Renaissance/Rennaissance_Guerres_Italie.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Henri.class b/bin/game/cards/Renaissance/Rennaissance_Henri.class index 385a6ff..515d6b8 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Henri.class and b/bin/game/cards/Renaissance/Rennaissance_Henri.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Henri_8.class b/bin/game/cards/Renaissance/Rennaissance_Henri_8.class index 8deccb7..ef582b5 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Henri_8.class and b/bin/game/cards/Renaissance/Rennaissance_Henri_8.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Isabelle.class b/bin/game/cards/Renaissance/Rennaissance_Isabelle.class index 177dcb2..7bd6ded 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Isabelle.class and b/bin/game/cards/Renaissance/Rennaissance_Isabelle.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Ivan.class b/bin/game/cards/Renaissance/Rennaissance_Ivan.class index 1f38398..c1d5a5a 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Ivan.class and b/bin/game/cards/Renaissance/Rennaissance_Ivan.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Leonard.class b/bin/game/cards/Renaissance/Rennaissance_Leonard.class index fc899ff..979d7a1 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Leonard.class and b/bin/game/cards/Renaissance/Rennaissance_Leonard.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Machiavel.class b/bin/game/cards/Renaissance/Rennaissance_Machiavel.class index f60c817..5e56e29 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Machiavel.class and b/bin/game/cards/Renaissance/Rennaissance_Machiavel.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Michel_Ange.class b/bin/game/cards/Renaissance/Rennaissance_Michel_Ange.class index 0f2a80f..95bc126 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Michel_Ange.class and b/bin/game/cards/Renaissance/Rennaissance_Michel_Ange.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Nobunaga.class b/bin/game/cards/Renaissance/Rennaissance_Nobunaga.class index 06e4f85..efa76a3 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Nobunaga.class and b/bin/game/cards/Renaissance/Rennaissance_Nobunaga.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Presse_Imprimer.class b/bin/game/cards/Renaissance/Rennaissance_Presse_Imprimer.class index 24beaa6..dca31b0 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Presse_Imprimer.class and b/bin/game/cards/Renaissance/Rennaissance_Presse_Imprimer.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Rabelais.class b/bin/game/cards/Renaissance/Rennaissance_Rabelais.class index e676aad..b02c203 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Rabelais.class and b/bin/game/cards/Renaissance/Rennaissance_Rabelais.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Reforme.class b/bin/game/cards/Renaissance/Rennaissance_Reforme.class index b0beb99..ff9be63 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Reforme.class and b/bin/game/cards/Renaissance/Rennaissance_Reforme.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Shakespeare.class b/bin/game/cards/Renaissance/Rennaissance_Shakespeare.class index a400bcc..9a9a749 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Shakespeare.class and b/bin/game/cards/Renaissance/Rennaissance_Shakespeare.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Skanderberg.class b/bin/game/cards/Renaissance/Rennaissance_Skanderberg.class index bd144ad..c83888e 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Skanderberg.class and b/bin/game/cards/Renaissance/Rennaissance_Skanderberg.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.class b/bin/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.class index 7c3ffb6..db41cdd 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.class and b/bin/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.class differ diff --git a/bin/game/cards/Renaissance/Rennaissance_Vlad.class b/bin/game/cards/Renaissance/Rennaissance_Vlad.class index 4889e37..9b1a7b7 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Vlad.class and b/bin/game/cards/Renaissance/Rennaissance_Vlad.class differ diff --git a/bin/game/cards/SpecialCard/HasteCard.class b/bin/game/cards/SpecialCard/HasteCard.class index 14b7c7d..100b3cc 100644 Binary files a/bin/game/cards/SpecialCard/HasteCard.class and b/bin/game/cards/SpecialCard/HasteCard.class differ diff --git a/bin/game/cards/SpecialCard/ICanDoge.class b/bin/game/cards/SpecialCard/ICanDoge.class index c8d99e7..357cdec 100644 Binary files a/bin/game/cards/SpecialCard/ICanDoge.class and b/bin/game/cards/SpecialCard/ICanDoge.class differ diff --git a/bin/game/cards/SpecialCard/IToxic.class b/bin/game/cards/SpecialCard/IToxic.class index b5ea736..d8f389c 100644 Binary files a/bin/game/cards/SpecialCard/IToxic.class and b/bin/game/cards/SpecialCard/IToxic.class differ diff --git a/bin/game/deck/Deck.class b/bin/game/deck/Deck.class index 4d2d57c..89e4469 100644 Binary files a/bin/game/deck/Deck.class and b/bin/game/deck/Deck.class differ diff --git a/bin/game/deck/DeckRegistery.class b/bin/game/deck/DeckRegistery.class index a8a104c..5b41933 100644 Binary files a/bin/game/deck/DeckRegistery.class and b/bin/game/deck/DeckRegistery.class differ diff --git a/bin/game/deck/MoyeneAge.class b/bin/game/deck/MoyeneAge.class index b6b6510..bf2a287 100644 Binary files a/bin/game/deck/MoyeneAge.class and b/bin/game/deck/MoyeneAge.class differ diff --git a/bin/game/deck/Mythes.class b/bin/game/deck/Mythes.class index 9fbc5ad..792e5f5 100644 Binary files a/bin/game/deck/Mythes.class and b/bin/game/deck/Mythes.class differ diff --git a/bin/game/deck/Renaissance.class b/bin/game/deck/Renaissance.class index 1f10f00..add599d 100644 Binary files a/bin/game/deck/Renaissance.class and b/bin/game/deck/Renaissance.class differ diff --git a/src/game/ComsJoueur.java b/src/game/ComsJoueur.java index dc49af3..60bd4df 100644 --- a/src/game/ComsJoueur.java +++ b/src/game/ComsJoueur.java @@ -39,7 +39,8 @@ public class ComsJoueur { public String recieve() { try { - return (String) serverIn.readObject(); + String message = (String) serverIn.readObject(); + return message; } catch (ClassNotFoundException e) { System.err.println("ERREUR une classe non trouvé a éte transimise , essayer de n'evoyer que des String"); return ""; diff --git a/src/game/Hand.java b/src/game/Hand.java index fe91683..f81169e 100644 --- a/src/game/Hand.java +++ b/src/game/Hand.java @@ -63,4 +63,11 @@ public class Hand { public boolean isFull() { return hand.size() == MAX_CARD_IN_HAND; } + + public void print() { + for(Card c : hand) + { + System.out.println(c.getClass().getSimpleName()); + } + } } diff --git a/src/game/Joueur.java b/src/game/Joueur.java index 5bc35f7..fbed9f9 100644 --- a/src/game/Joueur.java +++ b/src/game/Joueur.java @@ -176,7 +176,7 @@ public class Joueur { int cardId = Integer.parseInt(info); Class cardClass = CardRegistery.get(cardId); - System.out.println(cardClass.getName()); + System.out.println("searching :"+cardClass.getSimpleName()); int zone = Integer.parseInt(coms.recieve()); @@ -185,7 +185,16 @@ public class Joueur { // si la carte n'est pas trouve ou si elle coute trop cher if (handCard == null || mana < handCard.getCost()) { // on refuse le placement - System.out.println("no mana or no card"); + System.out.println("no mana or no card printing hand"); + + hand.print(); + + System.out.println("hand status :"); + System.out.println(handCard); + + System.out.println("mana :" + mana); + System.out.println("cost :" + handCard.getCost()); + coms.send(Command.NOK); } else { if (board.isZoneAvaliable(zone)) { @@ -325,20 +334,23 @@ public class Joueur { throw new RuntimeException("non number zone recived in attack phase"); Card attackingCard = board.getCardInZone(Integer.parseInt(carteAttaquante)); - Card attackedCard = adversaire.getBoard().getCardInZone(Integer.parseInt(carteCible)); if (attackingCard == null) { throw new RuntimeException("invalid attack"); } else { - if (carteCible.equals("100") && !attackingCard.hasAlreadyAttacked()) { - boolean isadvDead = handleAttackAgainstPlayer(attackingCard, adversaire); - if(isadvDead) + if (carteCible.contains("100")) { + if(!attackingCard.hasAlreadyAttacked()) { - phaseActive = false; + boolean isadvDead = handleAttackAgainstPlayer(attackingCard, adversaire); + if(isadvDead) + { + phaseActive = false; + } + attackingCard.hasAttacked(); } - attackingCard.hasAttacked(); } else { + Card attackedCard = adversaire.getBoard().getCardInZone(Integer.parseInt(carteCible)); if (!attackingCard.hasAlreadyAttacked() && !(attackedCard instanceof IInvisible) && !(attackingCard instanceof IPlayerFocused)) { handleAttackAgainstCard(carteAttaquante, carteCible, adversaire); attackingCard.hasAttacked(); @@ -404,7 +416,7 @@ public class Joueur { if (isDestroyed || attackingCard instanceof IToxic) { // on suprime la carte du terrain - board.setCard(Integer.parseInt(carteCible), null); + adversaire.board.setCard(Integer.parseInt(carteCible), null); // demande a l'adversaire de retirer la carte de son terrain adversaire.getComs().send(Command.DESTROY_CARD); @@ -427,7 +439,7 @@ public class Joueur { if(isDestroyed) { // on suprime la carte du terrain - adversaire.board.setCard(Integer.parseInt(carteAttaquante), null); + board.setCard(Integer.parseInt(carteAttaquante), null); // demande a l'adversaire de retirer la carte de son terrain adversaire.getComs().send(Command.DESTROY_ADV_CARD); @@ -469,7 +481,7 @@ public class Joueur { } /** - * met a jorus les hp d'une carte tout ce passe du poin de vue du joueur + * met a jorus les dmg d'une carte tout ce passe du poin de vue du joueur * @param cardToUpDate * @param adversaire * @throws IOException diff --git a/src/game/Match.java b/src/game/Match.java index 2f43ed9..cf7f431 100644 --- a/src/game/Match.java +++ b/src/game/Match.java @@ -112,12 +112,15 @@ public class Match extends Thread { } //on prepare la mana joueur.prepMana(); + + //avant que je joueur agit on déclanche les evenement de debuts de tours + joueur.onTurnStart(enemy); + //on dit au joueur que c'est a lui de jouer joueur.yourturn(); //et on dit au joueur oposé que ce n'est pas le tien enemy.debutTourEnemie(); - joueur.onTurnStart(enemy); joueur.mainPhase1(enemy); //Joue autant de carte qu'il veut/peut joueur.battlePhase(enemy);//lance des attaques à son adversaire qui peut répliquer //cette phases ne serira surment pas car nous manquon de temps pour implrementer les fonctionnalité specifique de certaine cartes diff --git a/src/game/cards/Mythes/Mythes_Chant_Sirene.java b/src/game/cards/Mythes/Mythes_Chant_Sirene.java index f733585..441eb0a 100644 --- a/src/game/cards/Mythes/Mythes_Chant_Sirene.java +++ b/src/game/cards/Mythes/Mythes_Chant_Sirene.java @@ -1,8 +1,9 @@ package game.cards.Mythes; import game.cards.Card; +import game.cards.SpecialCard.ILifeSteal; -public class Mythes_Chant_Sirene extends Card{ +public class Mythes_Chant_Sirene extends Card implements ILifeSteal{ /** @@ -12,7 +13,7 @@ public class Mythes_Chant_Sirene extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 2; } /** @@ -22,7 +23,7 @@ public class Mythes_Chant_Sirene extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 1; } /**