diff --git a/bin/game/cards/CardRegistery.class b/bin/game/cards/CardRegistery.class index 33e8999..164c65c 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_Croisade.class b/bin/game/cards/MoyenAge/Moyen_Age_Croisade.class index 17484c5..74230d5 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_Guerre_100.class b/bin/game/cards/MoyenAge/Moyen_Age_Guerre_100.class index 6c6ea73..a44383f 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_Heresie_Cathares.class b/bin/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.class index 4e8bae9..d941d45 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_Peste.class b/bin/game/cards/MoyenAge/Moyen_Age_Peste.class index 39bb1b7..7148833 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_Pouvoir_Du_Franc.class b/bin/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.class index 4d59d91..96dd8e4 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 c0999ff..f253c35 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_Traite_Verdun.class b/bin/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.class index 37c53c0..8f68c69 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_Enigme_Sphinx.class b/bin/game/cards/Mythes/Mythes_Enigme_Sphinx.class index 9024bd3..baa01a2 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_Guerre_Sept_Chefs.class b/bin/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.class index 0e8a6a0..3f0dd62 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_Icar.class b/bin/game/cards/Mythes/Mythes_Icar.class index 2ff4600..6c8b7f5 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 082b80f..90b9f15 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_Rapt.class b/bin/game/cards/Mythes/Mythes_Rapt.class index 2b4bfd2..b9c192f 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_Zeus_VS_Typhon.class b/bin/game/cards/Mythes/Mythes_Zeus_VS_Typhon.class index 04b9add..949f832 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/Rennaissance_Chute_Constantinople.class b/bin/game/cards/Renaissance/Rennaissance_Chute_Constantinople.class index e5cd7a5..e743362 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 600f600..6e946d9 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_Fin_Guerre_Cent_Ans.class b/bin/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.class index 84b6056..1094818 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_Guerres_Italie.class b/bin/game/cards/Renaissance/Rennaissance_Guerres_Italie.class index 16b803d..8ecc622 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_Presse_Imprimer.class b/bin/game/cards/Renaissance/Rennaissance_Presse_Imprimer.class index a72bf21..24beaa6 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_Reforme.class b/bin/game/cards/Renaissance/Rennaissance_Reforme.class index cc7322b..b0beb99 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_Succession_Bourgogne.class b/bin/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.class index 08cb161..7c3ffb6 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/deck/MoyeneAge.class b/bin/game/deck/MoyeneAge.class index dc326cb..b6b6510 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 2a723bb..9fbc5ad 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 a107062..1f10f00 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 2eac43f..a34fee5 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Croisade.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Croisade.java @@ -1,6 +1,7 @@ package game.cards.MoyenAge; -import game.cards.Card; +import game.cards.SpecialCard.ILifeSteal; +import game.cards.SpecialCard.SteroidsCard; public class Moyen_Age_Croisade extends SteroidsCard implements ILifeSteal{ diff --git a/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java b/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java index c8ac0fd..aec79ae 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Guerre_100.java @@ -1,6 +1,7 @@ package game.cards.MoyenAge; import game.cards.Card; +import game.cards.SpecialCard.IAntiPlayer; public class Moyen_Age_Guerre_100 extends Card implements IAntiPlayer{ diff --git a/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java b/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java index 593cb87..b69903b 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Heresie_Cathares.java @@ -1,6 +1,7 @@ package game.cards.MoyenAge; import game.cards.Card; +import game.cards.SpecialCard.IShortRange; public class Moyen_Age_Heresie_Cathares extends Card implements IShortRange{ diff --git a/src/game/cards/MoyenAge/Moyen_Age_Peste.java b/src/game/cards/MoyenAge/Moyen_Age_Peste.java index 5239aed..0be67fb 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Peste.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Peste.java @@ -1,6 +1,6 @@ package game.cards.MoyenAge; -import game.cards.Card; +import game.cards.SpecialCard.SelfHarmCard; public class Moyen_Age_Peste extends SelfHarmCard { 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 d5f23e0..ddb5d38 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java @@ -1,6 +1,7 @@ package game.cards.MoyenAge; import game.cards.Card; +import game.cards.SpecialCard.IShortRange; public class Moyen_Age_Pouvoir_Du_Franc extends Card implements IShortRange{ 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 c920f65..27e3328 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java @@ -1,6 +1,6 @@ package game.cards.MoyenAge; -import game.cards.Card; +import game.cards.SpecialCard.LonerCard; public class Moyen_Age_Prise_Sainte_Terre extends LonerCard { diff --git a/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java b/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java index aec5f39..7073fe3 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Traite_Verdun.java @@ -1,6 +1,6 @@ package game.cards.MoyenAge; -import game.cards.Card; +import game.cards.SpecialCard.SelfHarmCard; public class Moyen_Age_Traite_Verdun extends SelfHarmCard{ /** diff --git a/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java b/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java index dc0c89a..f4304e2 100644 --- a/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java +++ b/src/game/cards/Mythes/Mythes_Enigme_Sphinx.java @@ -1,6 +1,7 @@ package game.cards.Mythes; import game.cards.Card; +import game.cards.SpecialCard.IInvisible; public class Mythes_Enigme_Sphinx extends Card implements IInvisible{ diff --git a/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java b/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java index 209c052..2a08bb5 100644 --- a/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java +++ b/src/game/cards/Mythes/Mythes_Guerre_Sept_Chefs.java @@ -1,6 +1,6 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.VigilanceCard; public class Mythes_Guerre_Sept_Chefs extends VigilanceCard{ diff --git a/src/game/cards/Mythes/Mythes_Icar.java b/src/game/cards/Mythes/Mythes_Icar.java index cb7ebe7..4ade725 100644 --- a/src/game/cards/Mythes/Mythes_Icar.java +++ b/src/game/cards/Mythes/Mythes_Icar.java @@ -1,6 +1,6 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.SteroidsCard; public class Mythes_Icar extends SteroidsCard{ diff --git a/src/game/cards/Mythes/Mythes_Kunée.java b/src/game/cards/Mythes/Mythes_Kunée.java index c751165..3f2f4a4 100644 --- a/src/game/cards/Mythes/Mythes_Kunée.java +++ b/src/game/cards/Mythes/Mythes_Kunée.java @@ -1,6 +1,6 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.RegeneratingCard; public class Mythes_Kunée extends RegeneratingCard{ diff --git a/src/game/cards/Mythes/Mythes_Rapt.java b/src/game/cards/Mythes/Mythes_Rapt.java index b8eb4df..d6ba522 100644 --- a/src/game/cards/Mythes/Mythes_Rapt.java +++ b/src/game/cards/Mythes/Mythes_Rapt.java @@ -1,6 +1,6 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.HasteCard; public class Mythes_Rapt extends HasteCard{ diff --git a/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java b/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java index 9b9b055..9449966 100644 --- a/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java +++ b/src/game/cards/Mythes/Mythes_Zeus_VS_Typhon.java @@ -1,6 +1,7 @@ package game.cards.Mythes; import game.cards.Card; +import game.cards.SpecialCard.ILifeSteal; public class Mythes_Zeus_VS_Typhon extends Card implements ILifeSteal{ diff --git a/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java b/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java index 77d70dd..3c61534 100644 --- a/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java +++ b/src/game/cards/Renaissance/Rennaissance_Chute_Constantinople.java @@ -1,6 +1,7 @@ package game.cards.Renaissance; import game.cards.Card; +import game.cards.SpecialCard.IPlayerFocused; public class Rennaissance_Chute_Constantinople extends Card implements IPlayerFocused { diff --git a/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java b/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java index 88dfd78..2de472d 100644 --- a/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java +++ b/src/game/cards/Renaissance/Rennaissance_Concile_Trente.java @@ -1,6 +1,6 @@ package game.cards.Renaissance; -import game.cards.Card; +import game.cards.SpecialCard.VigilanceCard; public class Rennaissance_Concile_Trente extends VigilanceCard { 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 555fbbd..f9c8287 100644 --- a/src/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java +++ b/src/game/cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java @@ -1,6 +1,7 @@ package game.cards.Renaissance; import game.cards.Card; +import game.cards.SpecialCard.ICanDoge; public class Rennaissance_Fin_Guerre_Cent_Ans extends Card implements ICanDoge{ diff --git a/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java b/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java index d319867..e65290d 100644 --- a/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java +++ b/src/game/cards/Renaissance/Rennaissance_Guerres_Italie.java @@ -1,8 +1,8 @@ package game.cards.Renaissance; -import game.cards.Card; +import game.cards.SpecialCard.RegeneratingCard; -public class Rennaissance_Guerres_Italie extends RegenerationCard { +public class Rennaissance_Guerres_Italie extends RegeneratingCard { /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java b/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java index c0a5513..2dc176f 100644 --- a/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java +++ b/src/game/cards/Renaissance/Rennaissance_Presse_Imprimer.java @@ -1,6 +1,6 @@ package game.cards.Renaissance; -import game.cards.Card; +import game.cards.SpecialCard.LonerCard; public class Rennaissance_Presse_Imprimer extends LonerCard{ diff --git a/src/game/cards/Renaissance/Rennaissance_Reforme.java b/src/game/cards/Renaissance/Rennaissance_Reforme.java index eea90a0..7fbeb8c 100644 --- a/src/game/cards/Renaissance/Rennaissance_Reforme.java +++ b/src/game/cards/Renaissance/Rennaissance_Reforme.java @@ -1,6 +1,8 @@ package game.cards.Renaissance; import game.cards.Card; +import game.cards.SpecialCard.IInvisible; +import game.cards.SpecialCard.ILifeSteal; public class Rennaissance_Reforme extends Card implements ILifeSteal,IInvisible{ diff --git a/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java b/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java index b9302e4..12f169f 100644 --- a/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java +++ b/src/game/cards/Renaissance/Rennaissance_Succession_Bourgogne.java @@ -1,6 +1,6 @@ package game.cards.Renaissance; -import game.cards.Card; +import game.cards.SpecialCard.SelfHarmCard; public class Rennaissance_Succession_Bourgogne extends SelfHarmCard{