diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..761c063 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,2 @@ +/Serveur.class +/game/ diff --git a/bin/Serveur.class b/bin/Serveur.class index dc5862b..3b7b28e 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 d863c10..f4ae23c 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 5dd74be..0df80dd 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 e2e8c3e..6fd28fa 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 b9f419c..03f1d29 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 438057a..b546650 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 cf14f54..cb93607 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 3366620..3518493 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 cd5581a..b7e751f 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 03b4562..640604b 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 075eacb..33e8999 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 9e7c1fd..5c90ad6 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 d388bc0..02146bc 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 6f0d031..b73604e 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 3648844..bf8ecdc 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 4cdc882..42c8cd0 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 d20ed9c..7ea2bb9 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 e17773e..17484c5 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 b6061b5..78404bc 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 d04e87b..4047de7 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 fd2f3db..6c6ea73 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 eff0cd2..9e94296 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 fe0d3eb..4e8bae9 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 3af66e0..d8fffeb 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 cff1d72..1cdb6a0 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 e203520..8acf655 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 f4a2d09..8fd2570 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 6c345a0..9195a06 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 0c81fd9..e56c41c 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 0aefcec..9414243 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 cdd78fd..39bb1b7 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 b68c4f0..88f7198 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 25048e6..8c86ea0 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 4a5a51b..b2e73bd 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 3ae60eb..cf51b68 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 2da6475..1287b6a 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 2fa8fc4..4d59d91 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 592f73f..c0999ff 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 cf4a7a0..5c2782e 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 e7f4d17..ccf83fb 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 6437dbd..37c53c0 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 30c87e9..19e1d81 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 2bb2122..72f8235 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 f8ad415..c5bf492 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 0f99aa7..3dd6ffe 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 88f0873..062f492 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 481b59d..4a5b491 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 b0d8ef4..bbc6548 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 c6fd5b9..2e8b896 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 d11db17..f9fc8b8 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 5678995..9024bd3 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 fbb8261..93a1a7c 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 52992d6..f51f69b 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 81158a3..0e8a6a0 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 6362333..12d7d69 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 2789a3b..e44a2a1 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 aeb621f..5411b1f 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 9157a72..2ff4600 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 049dd53..082b80f 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 5e52eca..488d2b1 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 c1983f8..6776e93 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 e38bff7..5e3a592 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 c597136..c804910 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 e66b956..6681954 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 54e52b9..2b4bfd2 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 cf283c7..987d585 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 30514b1..9b2fd7b 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 185d0a7..ff6a398 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 a7cb09a..a8a51f1 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 09ce36f..f3eb720 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 b1fbcd3..04b9add 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 9135e73..f8f1f2f 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 5ba0732..3b36616 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 a16cb9f..f760b2d 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 c258ec1..fba7d11 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 22b9b05..573e333 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 00b0ab2..679524f 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 7266961..e5cd7a5 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 c5d2b3f..600f600 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 f654430..dd33a54 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 6c8777b..317b66d 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 3a927f9..f729ea5 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 74b3200..d3a436b 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 241d41d..84b6056 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 dce2243..111989f 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 059fddf..16b803d 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 515d6b8..385a6ff 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 ef582b5..8deccb7 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 7bd6ded..177dcb2 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 c1d5a5a..1f38398 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 979d7a1..fc899ff 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 5e56e29..f60c817 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 95bc126..0f2a80f 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 efa76a3..06e4f85 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 a32e14d..a72bf21 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 b02c203..e676aad 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 e614c9e..cc7322b 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 9a9a749..a400bcc 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 c83888e..bd144ad 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 dca8767..08cb161 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 9b1a7b7..4889e37 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 100b3cc..14b7c7d 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 357cdec..c8d99e7 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 d8f389c..b5ea736 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 89e4469..4d2d57c 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 5b41933..a8a104c 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 bf2a287..dc326cb 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 792e5f5..2a723bb 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 add599d..a107062 100644 Binary files a/bin/game/deck/Renaissance.class and b/bin/game/deck/Renaissance.class differ diff --git a/src/game/cards/MoyenAge/Moyen_Age_Croisade.java b/src/game/cards/MoyenAge/Moyen_Age_Croisade.java index 050a3ba..2eac43f 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Croisade.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Croisade.java @@ -2,7 +2,7 @@ package game.cards.MoyenAge; import game.cards.Card; -public class Moyen_Age_Croisade extends Card{ +public class Moyen_Age_Croisade extends SteroidsCard implements ILifeSteal{ /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Moyen_Age_Croisade extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -21,7 +21,7 @@ public class Moyen_Age_Croisade extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 3; } @@ -32,6 +32,6 @@ public class Moyen_Age_Croisade extends Card{ */ @Override public int getCost() { - return 3; + return 5; } } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java b/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java index 3837bf2..c8ac0fd 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java @@ -2,7 +2,7 @@ package game.cards.MoyenAge; import game.cards.Card; -public class Moyen_Age_Guerre_100 extends Card{ +public class Moyen_Age_Guerre_100 extends Card implements IAntiPlayer{ /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Moyen_Age_Guerre_100 extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 2; } /** @@ -21,7 +21,7 @@ public class Moyen_Age_Guerre_100 extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 2; } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java b/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java index 80ac01d..593cb87 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java @@ -2,7 +2,7 @@ package game.cards.MoyenAge; import game.cards.Card; -public class Moyen_Age_Heresie_Cathares extends Card{ +public class Moyen_Age_Heresie_Cathares extends Card implements IShortRange{ /** @@ -12,7 +12,7 @@ public class Moyen_Age_Heresie_Cathares extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 6; } /** @@ -22,7 +22,7 @@ public class Moyen_Age_Heresie_Cathares extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 6; } /** @@ -32,6 +32,6 @@ public class Moyen_Age_Heresie_Cathares extends Card{ */ @Override public int getCost() { - return 8; + return 7; } } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.java b/src/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.java index 0451a5b..d847793 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Malediction_Templier.java @@ -12,7 +12,7 @@ public class Moyen_Age_Malediction_Templier extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -22,7 +22,7 @@ public class Moyen_Age_Malediction_Templier extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 1; } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Peste.java b/src/game/cards/MoyenAge/Moyen_Age_Peste.java index d4ded41..5239aed 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Peste.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Peste.java @@ -2,7 +2,7 @@ package game.cards.MoyenAge; import game.cards.Card; -public class Moyen_Age_Peste extends Card{ +public class Moyen_Age_Peste extends SelfHarmCard { /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Moyen_Age_Peste extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 3; } /** @@ -21,7 +21,7 @@ public class Moyen_Age_Peste extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 5; } @@ -32,7 +32,7 @@ public class Moyen_Age_Peste extends Card{ */ @Override public int getCost() { - return 4; + return 5; } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java b/src/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java index 1ea0a9a..d5f23e0 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java @@ -2,7 +2,7 @@ package game.cards.MoyenAge; import game.cards.Card; -public class Moyen_Age_Pouvoir_Du_Franc extends Card{ +public class Moyen_Age_Pouvoir_Du_Franc extends Card implements IShortRange{ /** @@ -12,7 +12,7 @@ public class Moyen_Age_Pouvoir_Du_Franc extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 5; } /** @@ -22,7 +22,7 @@ public class Moyen_Age_Pouvoir_Du_Franc extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 5; } /** diff --git a/src/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java b/src/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java index ecfec6e..c920f65 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java @@ -2,7 +2,7 @@ package game.cards.MoyenAge; import game.cards.Card; -public class Moyen_Age_Prise_Sainte_Terre extends Card{ +public class Moyen_Age_Prise_Sainte_Terre extends LonerCard { /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Moyen_Age_Prise_Sainte_Terre extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 5; } /** @@ -21,7 +21,7 @@ public class Moyen_Age_Prise_Sainte_Terre extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 6; } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java b/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java index 23aac87..aec5f39 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java @@ -2,7 +2,7 @@ package game.cards.MoyenAge; import game.cards.Card; -public class Moyen_Age_Traite_Verdun extends Card{ +public class Moyen_Age_Traite_Verdun extends SelfHarmCard{ /** * retourne un entier coresspondant a l'attaque de la carte * @@ -10,7 +10,7 @@ public class Moyen_Age_Traite_Verdun extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -20,7 +20,7 @@ public class Moyen_Age_Traite_Verdun extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 4; } diff --git a/src/game/cards/Mythes/Mythes_12_Travaux.java b/src/game/cards/Mythes/Mythes_12_Travaux.java index 433a973..04d7291 100644 --- a/src/game/cards/Mythes/Mythes_12_Travaux.java +++ b/src/game/cards/Mythes/Mythes_12_Travaux.java @@ -1,8 +1,9 @@ package game.cards.Mythes; import game.cards.Card; +import game.cards.SpecialCard.ICanDoge; -public class Mythes_12_Travaux extends Card{ +public class Mythes_12_Travaux extends Card implements ICanDoge{ /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +12,7 @@ public class Mythes_12_Travaux extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 3; } /** @@ -21,7 +22,7 @@ public class Mythes_12_Travaux extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 1; } diff --git a/src/game/cards/Mythes/Mythes_Cheval_Troie.java b/src/game/cards/Mythes/Mythes_Cheval_Troie.java index b777282..63a2569 100644 --- a/src/game/cards/Mythes/Mythes_Cheval_Troie.java +++ b/src/game/cards/Mythes/Mythes_Cheval_Troie.java @@ -11,7 +11,7 @@ public class Mythes_Cheval_Troie extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -21,7 +21,7 @@ public class Mythes_Cheval_Troie extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 4; } diff --git a/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java b/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java index 956a683..dc0c89a 100644 --- a/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java +++ b/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java @@ -2,7 +2,7 @@ package game.cards.Mythes; import game.cards.Card; -public class Mythes_Enigme_Sphinx extends Card{ +public class Mythes_Enigme_Sphinx extends Card implements IInvisible{ /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Mythes_Enigme_Sphinx extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 2; } /** @@ -21,7 +21,7 @@ public class Mythes_Enigme_Sphinx extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 5; } diff --git a/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java b/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java index 296695c..209c052 100644 --- a/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java +++ b/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java @@ -2,7 +2,7 @@ package game.cards.Mythes; import game.cards.Card; -public class Mythes_Guerre_Sept_Chefs extends Card{ +public class Mythes_Guerre_Sept_Chefs extends VigilanceCard{ /** @@ -12,7 +12,7 @@ public class Mythes_Guerre_Sept_Chefs extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 6; } /** @@ -22,7 +22,7 @@ public class Mythes_Guerre_Sept_Chefs extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 5; } diff --git a/src/game/cards/Mythes/Mythes_Icar.java b/src/game/cards/Mythes/Mythes_Icar.java index e7c8af2..cb7ebe7 100644 --- a/src/game/cards/Mythes/Mythes_Icar.java +++ b/src/game/cards/Mythes/Mythes_Icar.java @@ -2,7 +2,7 @@ package game.cards.Mythes; import game.cards.Card; -public class Mythes_Icar extends Card{ +public class Mythes_Icar extends SteroidsCard{ /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Mythes_Icar extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -21,7 +21,7 @@ public class Mythes_Icar extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 1; } /** @@ -31,7 +31,7 @@ public class Mythes_Icar extends Card{ */ @Override public int getCost() { - return 3; + return 2; } diff --git a/src/game/cards/Mythes/Mythes_Kunée.java b/src/game/cards/Mythes/Mythes_Kunée.java index d5c1b63..c751165 100644 --- a/src/game/cards/Mythes/Mythes_Kunée.java +++ b/src/game/cards/Mythes/Mythes_Kunée.java @@ -2,7 +2,7 @@ package game.cards.Mythes; import game.cards.Card; -public class Mythes_Kunée extends Card{ +public class Mythes_Kunée extends RegeneratingCard{ /** @@ -12,7 +12,7 @@ public class Mythes_Kunée extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -22,7 +22,7 @@ public class Mythes_Kunée extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 1; } diff --git a/src/game/cards/Mythes/Mythes_Rapt.java b/src/game/cards/Mythes/Mythes_Rapt.java index 72fed0d..b8eb4df 100644 --- a/src/game/cards/Mythes/Mythes_Rapt.java +++ b/src/game/cards/Mythes/Mythes_Rapt.java @@ -2,7 +2,7 @@ package game.cards.Mythes; import game.cards.Card; -public class Mythes_Rapt extends Card{ +public class Mythes_Rapt extends HasteCard{ /** @@ -12,7 +12,7 @@ public class Mythes_Rapt extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 3; } /** @@ -22,7 +22,7 @@ public class Mythes_Rapt extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 5; } diff --git a/src/game/cards/Mythes/Mythes_Titanomachie.java b/src/game/cards/Mythes/Mythes_Titanomachie.java index 9b1dd55..9e40567 100644 --- a/src/game/cards/Mythes/Mythes_Titanomachie.java +++ b/src/game/cards/Mythes/Mythes_Titanomachie.java @@ -1,8 +1,9 @@ package game.cards.Mythes; import game.cards.Card; +import game.cards.SpecialCard.IToxic; -public class Mythes_Titanomachie extends Card{ +public class Mythes_Titanomachie extends Card implements IToxic { /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +12,7 @@ public class Mythes_Titanomachie extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 5; } /** @@ -21,7 +22,7 @@ public class Mythes_Titanomachie extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 3; } /** diff --git a/src/game/cards/Mythes/Mythes_Toison.java b/src/game/cards/Mythes/Mythes_Toison.java index 5cd67df..71d30cd 100644 --- a/src/game/cards/Mythes/Mythes_Toison.java +++ b/src/game/cards/Mythes/Mythes_Toison.java @@ -12,7 +12,7 @@ public class Mythes_Toison extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 2; } /** @@ -22,7 +22,7 @@ public class Mythes_Toison extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 4; } diff --git a/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java b/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java index 163ab72..9b9b055 100644 --- a/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java +++ b/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java @@ -2,7 +2,7 @@ package game.cards.Mythes; import game.cards.Card; -public class Mythes_Zeus_VS_Typhon extends Card{ +public class Mythes_Zeus_VS_Typhon extends Card implements ILifeSteal{ /** @@ -12,7 +12,7 @@ public class Mythes_Zeus_VS_Typhon extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 6; } /** @@ -22,7 +22,7 @@ public class Mythes_Zeus_VS_Typhon extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 8; } @@ -34,7 +34,7 @@ public class Mythes_Zeus_VS_Typhon extends Card{ */ @Override public int getCost() { - return 6; + return 8; } diff --git a/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java b/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java index fef3e8c..77d70dd 100644 --- a/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java +++ b/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java @@ -2,7 +2,7 @@ package game.cards.Renaissance; import game.cards.Card; -public class Rennaissance_Chute_Constantinople extends Card { +public class Rennaissance_Chute_Constantinople extends Card implements IPlayerFocused { /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Rennaissance_Chute_Constantinople extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 4; } /** @@ -21,7 +21,7 @@ public class Rennaissance_Chute_Constantinople extends Card { */ @Override public int getDefaultHealth() { - return 0; + return 6; } diff --git a/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java b/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java index 5fa9bdf..88dfd78 100644 --- a/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java +++ b/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java @@ -2,7 +2,7 @@ package game.cards.Renaissance; import game.cards.Card; -public class Rennaissance_Concile_Trente extends Card { +public class Rennaissance_Concile_Trente extends VigilanceCard { /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Rennaissance_Concile_Trente extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 2; } /** @@ -21,7 +21,7 @@ public class Rennaissance_Concile_Trente extends Card { */ @Override public int getDefaultHealth() { - return 0; + return 4; } diff --git a/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java b/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java index 4c08b83..7d6600d 100644 --- a/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java +++ b/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java @@ -1,8 +1,9 @@ package game.cards.Renaissance; import game.cards.Card; +import game.cards.SpecialCard.IToxic; -public class Rennaissance_Decouverte_Amerique extends Card { +public class Rennaissance_Decouverte_Amerique extends Card implements IToxic{ /** @@ -12,7 +13,7 @@ public class Rennaissance_Decouverte_Amerique extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -22,7 +23,7 @@ public class Rennaissance_Decouverte_Amerique extends Card { */ @Override public int getDefaultHealth() { - return 0; + return 1; } @@ -34,7 +35,7 @@ public class Rennaissance_Decouverte_Amerique extends Card { */ @Override public int getCost() { - return 2; + return 6; } diff --git a/src/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java b/src/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java index 8653a0d..555fbbd 100644 --- a/src/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java +++ b/src/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java @@ -2,7 +2,7 @@ package game.cards.Renaissance; import game.cards.Card; -public class Rennaissance_Fin_Guerre_Cent_Ans extends Card { +public class Rennaissance_Fin_Guerre_Cent_Ans extends Card implements ICanDoge{ /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Rennaissance_Fin_Guerre_Cent_Ans extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 5; } /** @@ -21,7 +21,7 @@ public class Rennaissance_Fin_Guerre_Cent_Ans extends Card { */ @Override public int getDefaultHealth() { - return 0; + return 3; } @@ -33,7 +33,7 @@ public class Rennaissance_Fin_Guerre_Cent_Ans extends Card { */ @Override public int getCost() { - return 3; + return 4; } diff --git a/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java b/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java index bff87b2..d319867 100644 --- a/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java +++ b/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java @@ -2,7 +2,7 @@ package game.cards.Renaissance; import game.cards.Card; -public class Rennaissance_Guerres_Italie extends Card { +public class Rennaissance_Guerres_Italie extends RegenerationCard { /** * retourne un entier coresspondant a l'attaque de la carte @@ -11,7 +11,7 @@ public class Rennaissance_Guerres_Italie extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 2; } /** @@ -21,7 +21,7 @@ public class Rennaissance_Guerres_Italie extends Card { */ @Override public int getDefaultHealth() { - return 0; + return 3; } diff --git a/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java b/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java index 76ca950..c0a5513 100644 --- a/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java +++ b/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java @@ -2,7 +2,7 @@ package game.cards.Renaissance; import game.cards.Card; -public class Rennaissance_Presse_Imprimer extends Card{ +public class Rennaissance_Presse_Imprimer extends LonerCard{ @@ -13,7 +13,7 @@ public class Rennaissance_Presse_Imprimer extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 4; } /** @@ -23,7 +23,7 @@ public class Rennaissance_Presse_Imprimer extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 6; } diff --git a/src/game/cards/Renaissance/Rennaissance_Reforme.java b/src/game/cards/Renaissance/Rennaissance_Reforme.java index 5e85c24..eea90a0 100644 --- a/src/game/cards/Renaissance/Rennaissance_Reforme.java +++ b/src/game/cards/Renaissance/Rennaissance_Reforme.java @@ -2,7 +2,7 @@ package game.cards.Renaissance; import game.cards.Card; -public class Rennaissance_Reforme extends Card { +public class Rennaissance_Reforme extends Card implements ILifeSteal,IInvisible{ /** @@ -12,7 +12,7 @@ public class Rennaissance_Reforme extends Card { */ @Override public int getDefaultAttack() { - return 0; + return 2; } /** @@ -22,7 +22,7 @@ public class Rennaissance_Reforme extends Card { */ @Override public int getDefaultHealth() { - return 0; + return 3; } diff --git a/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java b/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java index 9c1c23b..b9302e4 100644 --- a/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java +++ b/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java @@ -2,7 +2,7 @@ package game.cards.Renaissance; import game.cards.Card; -public class Rennaissance_Succession_Bourgogne extends Card{ +public class Rennaissance_Succession_Bourgogne extends SelfHarmCard{ @@ -13,7 +13,7 @@ public class Rennaissance_Succession_Bourgogne extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -23,7 +23,7 @@ public class Rennaissance_Succession_Bourgogne extends Card{ */ @Override public int getDefaultHealth() { - return 0; + return 6; }