diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Christine.class b/bin/game/cards/MoyenAge/Moyen_Age_Christine.class index 4cdc882..56d1486 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_Etienne.class b/bin/game/cards/MoyenAge/Moyen_Age_Etienne.class index b6061b5..a36af99 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_Jean.class b/bin/game/cards/MoyenAge/Moyen_Age_Jean.class index e203520..e97d751 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_Jeanne.class b/bin/game/cards/MoyenAge/Moyen_Age_Jeanne.class index 6c345a0..9c84a78 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..5b80c00 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_PhilippeIV.class b/bin/game/cards/MoyenAge/Moyen_Age_PhilippeIV.class index 25048e6..de2f52e 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_Pierre.class b/bin/game/cards/MoyenAge/Moyen_Age_Pierre.class index 3ae60eb..adf5c54 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..5475b7d 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_Roland.class b/bin/game/cards/MoyenAge/Moyen_Age_Roland.class index cf4a7a0..9db41de 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/Mythes/Mythes_Achille.class b/bin/game/cards/Mythes/Mythes_Achille.class index 2bb2122..1bbfc42 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..7ea15a8 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_Chiron.class b/bin/game/cards/Mythes/Mythes_Chiron.class index c6fd5b9..74cb551 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..fcc1bef 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_Erinyes.class b/bin/game/cards/Mythes/Mythes_Erinyes.class index 52992d6..dff9558 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_Hades.class b/bin/game/cards/Mythes/Mythes_Hades.class index 6362333..9f30364 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..568e27f 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..d979842 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_Minos.class b/bin/game/cards/Mythes/Mythes_Minos.class index 5e52eca..6a6bb41 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..ccb3416 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..fb86bb6 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_Psyché.class b/bin/game/cards/Mythes/Mythes_Psyché.class index e66b956..62754df 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_Thanatos.class b/bin/game/cards/Mythes/Mythes_Thanatos.class index 30514b1..b268836 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/Renaissance/Renaissance_Mehmet.class b/bin/game/cards/Renaissance/Renaissance_Mehmet.class index 5ba0732..37b4357 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..f476604 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..644327a 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_Decouverte_Amerique.class b/bin/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.class index 2cdde0c..1c39ee8 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_Francois.class b/bin/game/cards/Renaissance/Rennaissance_Francois.class index dce2243..a16d773 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_Henri_8.class b/bin/game/cards/Renaissance/Rennaissance_Henri_8.class index ef582b5..c3559f3 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..288ba18 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_Vlad.class b/bin/game/cards/Renaissance/Rennaissance_Vlad.class index 9b1a7b7..93c1bc6 100644 Binary files a/bin/game/cards/Renaissance/Rennaissance_Vlad.class and b/bin/game/cards/Renaissance/Rennaissance_Vlad.class differ diff --git a/src/game/cards/MoyenAge/Moyen_Age_Christine.java b/src/game/cards/MoyenAge/Moyen_Age_Christine.java index ae78fb0..a24ad75 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Christine.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Christine.java @@ -10,7 +10,7 @@ public class Moyen_Age_Christine extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -20,7 +20,7 @@ public class Moyen_Age_Christine extends Card{ */ @Override public int getDefaultHealth() { - return 2; + return 1; } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Etienne.java b/src/game/cards/MoyenAge/Moyen_Age_Etienne.java index f81eac1..1601471 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Etienne.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Etienne.java @@ -1,8 +1,9 @@ package game.cards.MoyenAge; import game.cards.Card; +import game.cards.SpecialCard.VigilanceCard; -public class Moyen_Age_Etienne extends Card{ +public class Moyen_Age_Etienne extends VigilanceCard{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/MoyenAge/Moyen_Age_Jean.java b/src/game/cards/MoyenAge/Moyen_Age_Jean.java index 1553ac8..4c04a3f 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Jean.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Jean.java @@ -1,8 +1,8 @@ package game.cards.MoyenAge; -import game.cards.Card; +import game.cards.SpecialCard.DoubleBufCard; -public class Moyen_Age_Jean extends Card{ +public class Moyen_Age_Jean extends DoubleBufCard{ /** @@ -22,7 +22,7 @@ public class Moyen_Age_Jean extends Card{ */ @Override public int getDefaultHealth() { - return 3; + return 2; } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Jeanne.java b/src/game/cards/MoyenAge/Moyen_Age_Jeanne.java index 1a00bb1..23dc74a 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Jeanne.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Jeanne.java @@ -1,8 +1,9 @@ package game.cards.MoyenAge; import game.cards.Card; +import game.cards.SpecialCard.ILifeSteal; -public class Moyen_Age_Jeanne extends Card{ +public class Moyen_Age_Jeanne extends Card implements ILifeSteal{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/MoyenAge/Moyen_Age_Louis.java b/src/game/cards/MoyenAge/Moyen_Age_Louis.java index 3f79b48..f3b8183 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Louis.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Louis.java @@ -1,8 +1,8 @@ package game.cards.MoyenAge; -import game.cards.Card; +import game.cards.SpecialCard.HealthBufCard; -public class Moyen_Age_Louis extends Card{ +public class Moyen_Age_Louis extends HealthBufCard{ /** diff --git a/src/game/cards/MoyenAge/Moyen_Age_PhilippeIV.java b/src/game/cards/MoyenAge/Moyen_Age_PhilippeIV.java index 1ebf859..661b29e 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_PhilippeIV.java +++ b/src/game/cards/MoyenAge/Moyen_Age_PhilippeIV.java @@ -1,8 +1,9 @@ package game.cards.MoyenAge; import game.cards.Card; +import game.cards.SpecialCard.IInvisible; -public class Moyen_Age_PhilippeIV extends Card{ +public class Moyen_Age_PhilippeIV extends Card implements IInvisible{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/MoyenAge/Moyen_Age_Pierre.java b/src/game/cards/MoyenAge/Moyen_Age_Pierre.java index 6c1529f..0fbc4de 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Pierre.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Pierre.java @@ -1,8 +1,8 @@ package game.cards.MoyenAge; -import game.cards.Card; +import game.cards.SpecialCard.VigilanceCard; -public class Moyen_Age_Pierre extends Card{ +public class Moyen_Age_Pierre extends VigilanceCard{ /** * retourne un entier coresspondant a l'attaque de la carte * diff --git a/src/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.java b/src/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.java index 4f7e2b8..f4e27f1 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.java @@ -11,7 +11,7 @@ public class Moyen_Age_Pierre_Ermite extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** @@ -21,7 +21,7 @@ public class Moyen_Age_Pierre_Ermite extends Card{ */ @Override public int getDefaultHealth() { - return 3; + return 2; } diff --git a/src/game/cards/MoyenAge/Moyen_Age_Roland.java b/src/game/cards/MoyenAge/Moyen_Age_Roland.java index d4e499e..7e23d45 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Roland.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Roland.java @@ -1,8 +1,9 @@ package game.cards.MoyenAge; import game.cards.Card; +import game.cards.SpecialCard.VigilanceCard; -public class Moyen_Age_Roland extends Card{ +public class Moyen_Age_Roland extends VigilanceCard{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/Mythes/Mythes_Achille.java b/src/game/cards/Mythes/Mythes_Achille.java index fbde9f4..bc1454d 100644 --- a/src/game/cards/Mythes/Mythes_Achille.java +++ b/src/game/cards/Mythes/Mythes_Achille.java @@ -1,8 +1,9 @@ package game.cards.Mythes; import game.cards.Card; +import game.cards.SpecialCard.StrongifyBufCard; -public class Mythes_Achille extends Card{ +public class Mythes_Achille extends StrongifyBufCard{ /** @@ -12,7 +13,7 @@ public class Mythes_Achille extends Card{ */ @Override public int getDefaultAttack() { - return 4; + return 5; } /** diff --git a/src/game/cards/Mythes/Mythes_Amazones.java b/src/game/cards/Mythes/Mythes_Amazones.java index 7c42593..0d9a30a 100644 --- a/src/game/cards/Mythes/Mythes_Amazones.java +++ b/src/game/cards/Mythes/Mythes_Amazones.java @@ -1,8 +1,8 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.VigilanceCard; -public class Mythes_Amazones extends Card{ +public class Mythes_Amazones extends VigilanceCard{ /** * retourne un entier coresspondant a l'attaque de la carte * diff --git a/src/game/cards/Mythes/Mythes_Chiron.java b/src/game/cards/Mythes/Mythes_Chiron.java index 140de88..a9831d8 100644 --- a/src/game/cards/Mythes/Mythes_Chiron.java +++ b/src/game/cards/Mythes/Mythes_Chiron.java @@ -33,7 +33,7 @@ public class Mythes_Chiron extends Card{ */ @Override public int getCost() { - return 3; + return 2; } diff --git a/src/game/cards/Mythes/Mythes_Dédale.java b/src/game/cards/Mythes/Mythes_Dédale.java index ccbe931..1cac051 100644 --- a/src/game/cards/Mythes/Mythes_Dédale.java +++ b/src/game/cards/Mythes/Mythes_Dédale.java @@ -1,8 +1,8 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.DoubleBufCard; -public class Mythes_Dédale extends Card{ +public class Mythes_Dédale extends DoubleBufCard{ /** * retourne un entier coresspondant a l'attaque de la carte @@ -33,7 +33,7 @@ public class Mythes_Dédale extends Card{ */ @Override public int getCost() { - return 1; + return 3; } } diff --git a/src/game/cards/Mythes/Mythes_Erinyes.java b/src/game/cards/Mythes/Mythes_Erinyes.java index 9765cea..9792d69 100644 --- a/src/game/cards/Mythes/Mythes_Erinyes.java +++ b/src/game/cards/Mythes/Mythes_Erinyes.java @@ -1,8 +1,8 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.LonerCard; -public class Mythes_Erinyes extends Card{ +public class Mythes_Erinyes extends LonerCard{ /** diff --git a/src/game/cards/Mythes/Mythes_Hades.java b/src/game/cards/Mythes/Mythes_Hades.java index 640a90f..e2b91a5 100644 --- a/src/game/cards/Mythes/Mythes_Hades.java +++ b/src/game/cards/Mythes/Mythes_Hades.java @@ -12,7 +12,7 @@ public class Mythes_Hades extends Card{ */ @Override public int getDefaultAttack() { - return 7; + return 6; } /** @@ -22,7 +22,7 @@ public class Mythes_Hades extends Card{ */ @Override public int getDefaultHealth() { - return 7; + return 6; } @@ -33,7 +33,7 @@ public class Mythes_Hades extends Card{ */ @Override public int getCost() { - return 9; + return 6; } } diff --git a/src/game/cards/Mythes/Mythes_Heracles.java b/src/game/cards/Mythes/Mythes_Heracles.java index 43fd983..6d7cea2 100644 --- a/src/game/cards/Mythes/Mythes_Heracles.java +++ b/src/game/cards/Mythes/Mythes_Heracles.java @@ -1,8 +1,8 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.LonerCard; -public class Mythes_Heracles extends Card{ +public class Mythes_Heracles extends LonerCard{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/Mythes/Mythes_Hermione.java b/src/game/cards/Mythes/Mythes_Hermione.java index 11bfe55..854131d 100644 --- a/src/game/cards/Mythes/Mythes_Hermione.java +++ b/src/game/cards/Mythes/Mythes_Hermione.java @@ -11,7 +11,7 @@ public class Mythes_Hermione extends Card{ */ @Override public int getDefaultAttack() { - return 0; + return 1; } /** diff --git a/src/game/cards/Mythes/Mythes_Minos.java b/src/game/cards/Mythes/Mythes_Minos.java index 6445b92..8cb9396 100644 --- a/src/game/cards/Mythes/Mythes_Minos.java +++ b/src/game/cards/Mythes/Mythes_Minos.java @@ -1,8 +1,8 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.DoubleBufCard; -public class Mythes_Minos extends Card{ +public class Mythes_Minos extends DoubleBufCard{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/Mythes/Mythes_Oedipie.java b/src/game/cards/Mythes/Mythes_Oedipie.java index 8f09e42..822e9ee 100644 --- a/src/game/cards/Mythes/Mythes_Oedipie.java +++ b/src/game/cards/Mythes/Mythes_Oedipie.java @@ -1,8 +1,8 @@ package game.cards.Mythes; -import game.cards.Card; +import game.cards.SpecialCard.SelfHarmCard; -public class Mythes_Oedipie extends Card{ +public class Mythes_Oedipie extends SelfHarmCard{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/Mythes/Mythes_Perséphone.java b/src/game/cards/Mythes/Mythes_Perséphone.java index 179334c..9fc70da 100644 --- a/src/game/cards/Mythes/Mythes_Perséphone.java +++ b/src/game/cards/Mythes/Mythes_Perséphone.java @@ -12,7 +12,7 @@ public class Mythes_Perséphone extends Card{ @Override public int getDefaultHealth() { - return 4; + return 6; } diff --git a/src/game/cards/Mythes/Mythes_Psyché.java b/src/game/cards/Mythes/Mythes_Psyché.java index 2c20f42..7f19922 100644 --- a/src/game/cards/Mythes/Mythes_Psyché.java +++ b/src/game/cards/Mythes/Mythes_Psyché.java @@ -1,8 +1,9 @@ package game.cards.Mythes; import game.cards.Card; +import game.cards.SpecialCard.IShortRange; -public class Mythes_Psyché extends Card{ +public class Mythes_Psyché extends Card implements IShortRange{ /** * retourne un entier coresspondant a l'attaque de la carte diff --git a/src/game/cards/Mythes/Mythes_Thanatos.java b/src/game/cards/Mythes/Mythes_Thanatos.java index e3a8b26..f58a301 100644 --- a/src/game/cards/Mythes/Mythes_Thanatos.java +++ b/src/game/cards/Mythes/Mythes_Thanatos.java @@ -12,7 +12,7 @@ public class Mythes_Thanatos extends Card{ */ @Override public int getDefaultAttack() { - return 2; + return 4; } /** diff --git a/src/game/cards/Renaissance/Renaissance_Mehmet.java b/src/game/cards/Renaissance/Renaissance_Mehmet.java index 890f2f6..0df2a0f 100644 --- a/src/game/cards/Renaissance/Renaissance_Mehmet.java +++ b/src/game/cards/Renaissance/Renaissance_Mehmet.java @@ -27,7 +27,7 @@ public class Renaissance_Mehmet extends Card{ */ @Override public int getCost() { - return 1; + return 2; } diff --git a/src/game/cards/Renaissance/Renaissance_Soliman.java b/src/game/cards/Renaissance/Renaissance_Soliman.java index ab8c3e9..d83203d 100644 --- a/src/game/cards/Renaissance/Renaissance_Soliman.java +++ b/src/game/cards/Renaissance/Renaissance_Soliman.java @@ -17,7 +17,7 @@ public class Renaissance_Soliman extends Card { @Override public int getCost() { - return 9; + return 7; } diff --git a/src/game/cards/Renaissance/Rennaissance_Casimir.java b/src/game/cards/Renaissance/Rennaissance_Casimir.java index 96757a3..0f40905 100644 --- a/src/game/cards/Renaissance/Rennaissance_Casimir.java +++ b/src/game/cards/Renaissance/Rennaissance_Casimir.java @@ -33,7 +33,7 @@ public class Rennaissance_Casimir extends Card{ */ @Override public int getCost() { - return 7; + return 5; } diff --git a/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java b/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java index 7d6600d..e8dd08f 100644 --- a/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java +++ b/src/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.java @@ -1,9 +1,9 @@ package game.cards.Renaissance; -import game.cards.Card; +import game.cards.SpecialCard.HasteCard; import game.cards.SpecialCard.IToxic; -public class Rennaissance_Decouverte_Amerique extends Card implements IToxic{ +public class Rennaissance_Decouverte_Amerique extends HasteCard implements IToxic{ /** diff --git a/src/game/cards/Renaissance/Rennaissance_Francois.java b/src/game/cards/Renaissance/Rennaissance_Francois.java index affd058..d5fb660 100644 --- a/src/game/cards/Renaissance/Rennaissance_Francois.java +++ b/src/game/cards/Renaissance/Rennaissance_Francois.java @@ -32,7 +32,7 @@ public class Rennaissance_Francois extends Card{ */ @Override public int getCost() { - return 5; + return 7; } } diff --git a/src/game/cards/Renaissance/Rennaissance_Henri_8.java b/src/game/cards/Renaissance/Rennaissance_Henri_8.java index f217311..dd630dc 100644 --- a/src/game/cards/Renaissance/Rennaissance_Henri_8.java +++ b/src/game/cards/Renaissance/Rennaissance_Henri_8.java @@ -32,7 +32,7 @@ public class Rennaissance_Henri_8 extends Card{ */ @Override public int getCost() { - return 6; + return 5; } diff --git a/src/game/cards/Renaissance/Rennaissance_Isabelle.java b/src/game/cards/Renaissance/Rennaissance_Isabelle.java index 3d8ade2..e8c66f2 100644 --- a/src/game/cards/Renaissance/Rennaissance_Isabelle.java +++ b/src/game/cards/Renaissance/Rennaissance_Isabelle.java @@ -12,7 +12,7 @@ public class Rennaissance_Isabelle extends Card { */ @Override public int getDefaultAttack() { - return 1; + return 2; } /** diff --git a/src/game/cards/Renaissance/Rennaissance_Vlad.java b/src/game/cards/Renaissance/Rennaissance_Vlad.java index 25e3b0d..9fa88fa 100644 --- a/src/game/cards/Renaissance/Rennaissance_Vlad.java +++ b/src/game/cards/Renaissance/Rennaissance_Vlad.java @@ -32,7 +32,7 @@ public class Rennaissance_Vlad extends Card { */ @Override public int getCost() { - return 8; + return 5; } diff --git a/src/game/cards/SpecialCard/BufCard.java b/src/game/cards/SpecialCard/BufCard.java new file mode 100644 index 0000000..9b22bb4 --- /dev/null +++ b/src/game/cards/SpecialCard/BufCard.java @@ -0,0 +1,7 @@ +package game.cards.SpecialCard; + +import game.cards.Card; + +public abstract class BufCard extends Card{ + +} diff --git a/src/game/cards/SpecialCard/DoubleBufCard.java b/src/game/cards/SpecialCard/DoubleBufCard.java new file mode 100644 index 0000000..07034db --- /dev/null +++ b/src/game/cards/SpecialCard/DoubleBufCard.java @@ -0,0 +1,20 @@ +package game.cards.SpecialCard; + +import java.util.Iterator; + +import game.Board; +import game.cards.Card; + +public abstract class DoubleBufCard extends BufCard{ + @Override + public void onCardPlaced(Board board) { + super.onCardPlaced(board); + Iterator it = board.getIterator(); + while(it.hasNext()) + { + Card card = it.next(); + card.heal(1); + card.makeStronger(1); + } + } +} diff --git a/src/game/cards/SpecialCard/ExtremeLonerCard.java b/src/game/cards/SpecialCard/ExtremeLonerCard.java new file mode 100644 index 0000000..37117e0 --- /dev/null +++ b/src/game/cards/SpecialCard/ExtremeLonerCard.java @@ -0,0 +1,16 @@ +package game.cards.SpecialCard; + +import game.Board; +import game.cards.Card; + +public abstract class ExtremeLonerCard extends Card{ + @Override + public void onCardPlaced(Board board) { + if(board.getBoardSize() == 1) + { + makeStronger(-2); + heal(-2); + } + super.onCardPlaced(board); + } +} diff --git a/src/game/cards/SpecialCard/HealthBufCard.java b/src/game/cards/SpecialCard/HealthBufCard.java new file mode 100644 index 0000000..2163359 --- /dev/null +++ b/src/game/cards/SpecialCard/HealthBufCard.java @@ -0,0 +1,20 @@ +package game.cards.SpecialCard; + +import java.util.Iterator; + +import game.Board; +import game.cards.Card; + +public abstract class HealthBufCard extends BufCard{ + + @Override + public void onCardPlaced(Board board) { + super.onCardPlaced(board); + Iterator it = board.getIterator(); + while(it.hasNext()) + { + Card card = it.next(); + card.heal(1); + } + } +} diff --git a/src/game/cards/SpecialCard/StrongifyBufCard.java b/src/game/cards/SpecialCard/StrongifyBufCard.java new file mode 100644 index 0000000..857d96c --- /dev/null +++ b/src/game/cards/SpecialCard/StrongifyBufCard.java @@ -0,0 +1,19 @@ +package game.cards.SpecialCard; + +import java.util.Iterator; + +import game.Board; +import game.cards.Card; + +public abstract class StrongifyBufCard extends BufCard{ + @Override + public void onCardPlaced(Board board) { + super.onCardPlaced(board); + Iterator it = board.getIterator(); + while(it.hasNext()) + { + Card card = it.next(); + card.heal(1); + } + } +}