From 0654fc7740dffa99b73bdd952ad9f133becdd829 Mon Sep 17 00:00:00 2001 From: marc barbier Date: Sat, 9 Jan 2021 14:31:19 +0100 Subject: [PATCH] re equilibrage --- .../cards/MoyenAge/Moyen_Age_Christine.class | Bin 549 -> 549 bytes .../cards/MoyenAge/Moyen_Age_Etienne.class | Bin 543 -> 564 bytes bin/game/cards/MoyenAge/Moyen_Age_Jean.class | Bin 534 -> 555 bytes .../cards/MoyenAge/Moyen_Age_Jeanne.class | Bin 540 -> 581 bytes bin/game/cards/MoyenAge/Moyen_Age_Louis.class | Bin 538 -> 559 bytes .../cards/MoyenAge/Moyen_Age_PhilippeIV.class | Bin 552 -> 593 bytes .../cards/MoyenAge/Moyen_Age_Pierre.class | Bin 540 -> 561 bytes .../MoyenAge/Moyen_Age_Pierre_Ermite.class | Bin 561 -> 561 bytes .../cards/MoyenAge/Moyen_Age_Roland.class | Bin 540 -> 561 bytes bin/game/cards/Mythes/Mythes_Achille.class | Bin 530 -> 554 bytes bin/game/cards/Mythes/Mythes_Amazones.class | Bin 533 -> 554 bytes bin/game/cards/Mythes/Mythes_Chiron.class | Bin 527 -> 527 bytes bin/game/cards/Mythes/Mythes_Dédale.class | Bin 530 -> 551 bytes bin/game/cards/Mythes/Mythes_Erinyes.class | Bin 532 -> 549 bytes bin/game/cards/Mythes/Mythes_Hades.class | Bin 527 -> 527 bytes bin/game/cards/Mythes/Mythes_Heracles.class | Bin 533 -> 550 bytes bin/game/cards/Mythes/Mythes_Hermione.class | Bin 533 -> 533 bytes bin/game/cards/Mythes/Mythes_Minos.class | Bin 524 -> 545 bytes bin/game/cards/Mythes/Mythes_Oedipie.class | Bin 530 -> 550 bytes bin/game/cards/Mythes/Mythes_Perséphone.class | Bin 543 -> 544 bytes bin/game/cards/Mythes/Mythes_Psyché.class | Bin 530 -> 572 bytes bin/game/cards/Mythes/Mythes_Thanatos.class | Bin 533 -> 533 bytes .../Renaissance/Renaissance_Mehmet.class | Bin 552 -> 552 bytes .../Renaissance/Renaissance_Soliman.class | Bin 557 -> 557 bytes .../Renaissance/Rennaissance_Casimir.class | Bin 559 -> 558 bytes .../Rennaissance_Decouverte_Amerique.class | Bin 632 -> 649 bytes .../Renaissance/Rennaissance_Francois.class | Bin 563 -> 564 bytes .../Renaissance/Rennaissance_Henri_8.class | Bin 559 -> 558 bytes .../Renaissance/Rennaissance_Isabelle.class | Bin 561 -> 561 bytes .../cards/Renaissance/Rennaissance_Vlad.class | Bin 550 -> 549 bytes .../cards/MoyenAge/Moyen_Age_Christine.java | 4 ++-- .../cards/MoyenAge/Moyen_Age_Etienne.java | 3 ++- src/game/cards/MoyenAge/Moyen_Age_Jean.java | 6 +++--- src/game/cards/MoyenAge/Moyen_Age_Jeanne.java | 3 ++- src/game/cards/MoyenAge/Moyen_Age_Louis.java | 4 ++-- .../cards/MoyenAge/Moyen_Age_PhilippeIV.java | 3 ++- src/game/cards/MoyenAge/Moyen_Age_Pierre.java | 4 ++-- .../MoyenAge/Moyen_Age_Pierre_Ermite.java | 4 ++-- src/game/cards/MoyenAge/Moyen_Age_Roland.java | 3 ++- src/game/cards/Mythes/Mythes_Achille.java | 5 +++-- src/game/cards/Mythes/Mythes_Amazones.java | 4 ++-- src/game/cards/Mythes/Mythes_Chiron.java | 2 +- src/game/cards/Mythes/Mythes_Dédale.java | 6 +++--- src/game/cards/Mythes/Mythes_Erinyes.java | 4 ++-- src/game/cards/Mythes/Mythes_Hades.java | 6 +++--- src/game/cards/Mythes/Mythes_Heracles.java | 4 ++-- src/game/cards/Mythes/Mythes_Hermione.java | 2 +- src/game/cards/Mythes/Mythes_Minos.java | 4 ++-- src/game/cards/Mythes/Mythes_Oedipie.java | 4 ++-- src/game/cards/Mythes/Mythes_Perséphone.java | 2 +- src/game/cards/Mythes/Mythes_Psyché.java | 3 ++- src/game/cards/Mythes/Mythes_Thanatos.java | 2 +- .../cards/Renaissance/Renaissance_Mehmet.java | 2 +- .../Renaissance/Renaissance_Soliman.java | 2 +- .../Renaissance/Rennaissance_Casimir.java | 2 +- .../Rennaissance_Decouverte_Amerique.java | 4 ++-- .../Renaissance/Rennaissance_Francois.java | 2 +- .../Renaissance/Rennaissance_Henri_8.java | 2 +- .../Renaissance/Rennaissance_Isabelle.java | 2 +- .../cards/Renaissance/Rennaissance_Vlad.java | 2 +- src/game/cards/SpecialCard/BufCard.java | 7 ++++++ src/game/cards/SpecialCard/DoubleBufCard.java | 20 ++++++++++++++++++ .../cards/SpecialCard/ExtremeLonerCard.java | 16 ++++++++++++++ src/game/cards/SpecialCard/HealthBufCard.java | 20 ++++++++++++++++++ .../cards/SpecialCard/StrongifyBufCard.java | 19 +++++++++++++++++ 65 files changed, 135 insertions(+), 47 deletions(-) create mode 100644 src/game/cards/SpecialCard/BufCard.java create mode 100644 src/game/cards/SpecialCard/DoubleBufCard.java create mode 100644 src/game/cards/SpecialCard/ExtremeLonerCard.java create mode 100644 src/game/cards/SpecialCard/HealthBufCard.java create mode 100644 src/game/cards/SpecialCard/StrongifyBufCard.java diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Christine.class b/bin/game/cards/MoyenAge/Moyen_Age_Christine.class index 4cdc88202a08627b85008b456b4c6d91b87cca50..56d148643f93f786313f541b9701bbca44a01ee5 100644 GIT binary patch delta 19 ZcmZ3=vXo^*Gb1C* delta 21 dcmZ3=vXo^*Gvnm%jDnM=FlsWgPTt3u4ggf=2QvTw diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Etienne.class b/bin/game/cards/MoyenAge/Moyen_Age_Etienne.class index b6061b58a6ed52a638aa3d22b49a73702931d0a2..a36af997696751af651de25bf42cc7d70a926675 100644 GIT binary patch delta 80 zcmbQwvV~=Wm7+>|Vs5H_a$-?Rv3_ttYI0^`jx&&>AC{S(nUk28oVwACkCBmWawwxE dBmd-nASnqXMJL~5RAE#BvDk$e7#NrsgaI8o7J2{x delta 47 zcmdnOGM{CF6%T)UVs5H_a$-?RvHr$rK1N2?$ytn+jC_-q07;3-_kg7GWC?~-4dl#}XInzqq7n{o0BM#0JZ G8N&hPDiYKH delta 29 kcmZ3@GL2<|IS+q&Vs5H_a$-?RvHr%0Y(_@5$wwH|0gW*UYybcN diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Jeanne.class b/bin/game/cards/MoyenAge/Moyen_Age_Jeanne.class index 6c345a0a9920706e3e227cdcc408d075dfe185b9..9c84a78aabede4036c34adc1d781f0603f1c069b 100644 GIT binary patch literal 581 zcma)&%}T>S6ot>EX`-LicL5HKx1<5!j8>WC; znDlwxh9yuh6kB%`Dj8)xuNkO5wKT~{z&cj3(kB9?o!z#8=_fsMP{Kk5Hs*M7pklh3 zjJlLw%Wgyh)gTFF)Rw8r^3S5FhiWXa9TcwoQ}L0&@__Uy_2nee4XtH(n+s@uYn-z{ zJruBc)=$P-z-c9uG^8_?>8R!V3m*-tExV&mjtU}a#NIALc!P?&**ff2+7lI%d9K9FVv z(yUtB88|iq8B7dZKoTSk6lCBAk~~m04+Afd$H>6Pzz-xrnstCQNF5W~8W4%3lMhKJ i6VL>RPIdu^*2xzch1C((NMKbgh*hl$R<%N4>xBVQ-VuiY diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Louis.class b/bin/game/cards/MoyenAge/Moyen_Age_Louis.class index 0c81fd9a3df1cc66ff6735c2d9eb2a605979abf9..5b80c00befd4672e02b5d2e300692c534935c954 100644 GIT binary patch delta 44 ycmbQmvYusvg`!G&Vs5H_a$-?Rv3_ttYI0^`jx&&>?~$6AQ-_^j6Nfeof%-^J$nj(}jGdeCnS$1c7D1n*{@qylYC0vi zXTuaIXS&ZEwV79{{6_LYc2{sBm zxT6BPolOQ5-OH4ybV5)1JsGJa|0$Y!tYU#iC$sWj)n@`bBhr`jAZNaAX)V2{RD}EI z;+mwd#{xF@w!>Hp6uaRp^5{w>>Z|FFr4KoMlyiw1cpRTR|EbBIU&D5TGl#ukpKrXO z_{xES5?d=RTG-;av}nLK%ABzx?6OVZ6ZQ#g|*OGgyWMP>+ LT1)Py$_~B(+jeZY literal 552 zcmaKo!A`?#zDwe0~8q#jXpB&=`ubY=t5jq^+CyRZiMNxiCF;y}OZ$)O0Gl zfeV{Z&2)E|Ar#NmMCl7cp>Y%t>`pw89tzkf!$FY=UrprgY}}X0gXl++Q1|0dM1e?@ z$(Kc2k5o!%`k4p*9p{Wt8%ljCAH^)vZLLN4JRhR_=ipk3NRJ3E_jck`6TJI)mW1+3 znOXMdZ{#*Tc@i%I2jJ`YqX3&7@51VG*5XJUo#qEh?`$l1tmc@D*kmm)eHmMv5h|#% q8u*x_>9d?SqZzW2AuYaPLDp8uVxHVvOKz`{r964KmaNYw+xZ0t(O=vE diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Pierre.class b/bin/game/cards/MoyenAge/Moyen_Age_Pierre.class index 3ae60ebdcdd4e2d7edff4b4ae10e3f21730466c2..adf5c54ee77851985af06cd67bd643b7f9727527 100644 GIT binary patch delta 44 ycmbQkvXNzirJ_oDVs5H_a$-?Rv3_ttYI0^`jx&&>AC{S(nUk28oVwBVIwJsFHV`ua delta 23 ecmdnUGKXb?B@cgkVs5H_a$-?RvHr%W>x=+gG6*67 diff --git a/bin/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.class b/bin/game/cards/MoyenAge/Moyen_Age_Pierre_Ermite.class index 2da6475d91cb88faf45a961b132970c860b581f1..5475b7d5a3ef48c72cea8c57e83f1f0b648f87d5 100644 GIT binary patch delta 21 dcmdnUvXNy&KjUO(Cc()I7&RGLC!bAC{S(nUk28oVwAKhmnzOauA~> YBmX2O(a8%LRTw2fjN3ql@+2l10CqAJ$^ZZW delta 59 zcmdnUGKXb?B@cgkVs5H_a$-?RvHr#=9!5si$?1%ijC_+90!axVDLVNBqY9%Eh{Z0% Kz`(%7APfNiRSvWO diff --git a/bin/game/cards/Mythes/Mythes_Achille.class b/bin/game/cards/Mythes/Mythes_Achille.class index 2bb2122a39600e2d0963c08ddfd870f5e50ee2c0..1bbfc42e6580d7614c713b316ad30f83bdf176b1 100644 GIT binary patch delta 112 zcmbQlvWjJbsfv1fVs5H_a$-?Rv3_ttYI0^`jx&&>A6!zDpO>DQR_Rolw$YJ|k&$h( z2cw1%#~KC(1||kBAj!tS2qXn2H!)f=N=@FwXeq18zzr1P0gE#MXAC{S(nUk28oVwBJG9v(4RuCHi delta 23 ecmZ3*GL>b584rJYVs5H_a$-?RvHr&J%Zvb8w+IRV diff --git a/bin/game/cards/Mythes/Mythes_Chiron.class b/bin/game/cards/Mythes/Mythes_Chiron.class index c6fd5b9129b1b4863cb2b51fdbc2c1214ecf3cea..74cb5518e97b83ef962d89f394462c652fc91f2b 100644 GIT binary patch delta 15 WcmeBY>1WySka6;IM#0IS7-a!3Lj|Y+ delta 15 WcmeBY>1WySka2P@qu}IEjIsbNtp#oX diff --git a/bin/game/cards/Mythes/Mythes_Dédale.class b/bin/game/cards/Mythes/Mythes_Dédale.class index d11db1742344ce21197e2c38375f859de39a6c29..fcc1bef497adec8830d1aba26a6b3e6e6f671e62 100644 GIT binary patch delta 50 zcmbQlvYcgtsiI1HVs5H_a$-?Rv3_ttYI0^`jx&&>?~-4dl#}XInzqq#F(V_}_r3DG{ diff --git a/bin/game/cards/Mythes/Mythes_Erinyes.class b/bin/game/cards/Mythes/Mythes_Erinyes.class index 52992d6a7fd8f049f0016480ec72e5bda4074d91..dff95581a68cded3652a94f0982d37217645a850 100644 GIT binary patch delta 40 ucmbQjvXo_lsjNbJVs5H_a$-?Rv3_ttYI0^`jx&&>?~|XGTC~yeG9v&Q0uFfq delta 23 ecmZ3=GKFP=DGz^oVs5H_a$-?RvHr%O%Zvb84hQ}K diff --git a/bin/game/cards/Mythes/Mythes_Hades.class b/bin/game/cards/Mythes/Mythes_Hades.class index 6362333ed2fc35761133b059a3b73f08d135be55..9f3036478f8ec8f74c28c53f003234aad2e70244 100644 GIT binary patch delta 25 bcmeBY>1WxH&B(|$Ifu~-NG=DHj~I0USV{(} delta 25 ecmeBY>1WxH&B(|;Ifu~-NG=DGoRc3h>H+{*bq22h diff --git a/bin/game/cards/Mythes/Mythes_Heracles.class b/bin/game/cards/Mythes/Mythes_Heracles.class index 2789a3b5f6b7c9235fcb66a02c22946114a819f5..568e27fa8c1ebedc08b5e57a57f40885ee3121b0 100644 GIT binary patch delta 40 ucmbQrvW#VdnXE#3Vs5H_a$-?Rv3_ttYI0^`jx&&>?~|XGTC~yWG9v&Qb`E_2 delta 23 ecmZ3+GL>b584rJYVs5H_a$-?RvHr&3%Zvb8PY414 diff --git a/bin/game/cards/Mythes/Mythes_Hermione.class b/bin/game/cards/Mythes/Mythes_Hermione.class index aeb621f1852ff4dc2e6e05594e773aecbb7b574b..d979842657fa650a4b272a367b6e53b66ccb0935 100644 GIT binary patch delta 13 UcmbQrGL>aRF(V_(aRF(V`MADo(#=8;&GyV3C?BLGIk4~_r; delta 23 ecmZ3+GKpn^DGz^oVs5H_a$-?RvHr%;i;MtT00;g6 diff --git a/bin/game/cards/Mythes/Mythes_Perséphone.class b/bin/game/cards/Mythes/Mythes_Perséphone.class index e38bff70274de1c5fbaaa318a17df36442732da0..fb86bb65a089db8017bff1cf75f95fb4af5b0674 100644 GIT binary patch delta 52 vcmbQwvVdj7T1E|B21X!cU|<$tTLYw+7`T8W8(4^+fg8x?fk;oj!srbEv?m3! delta 21 dcmZ3$GM{C`TE@x6j8cp_Wk4K6~G>rEocm@UEUXNz>`kuo()wfCUSj|4ukOR!Gg|E zEp#=g*MiBgUMTu^B9J`F-`u7j#)-P*gRWpO59C0qLx#%cR*OMz#2sOyf*A)Erf9M! z2jV>Iw?%Tr+Yu2pFAjLr;)%@jucEF(nbJzHu(QSx?NBV&mjtU}a#N*t@wND9pgZzzE_3Np>JlA4oF- zX;!W63>+JQ3?>FHAPJHN3Nmm5NggPhhk+N!V`SiC;0KZ*%{o9Dq>hPo4Twb2$%mwq e31|XDXSD#PR(5o)5?Hkg5}{KCt4<-X(}V$&r4VBP diff --git a/bin/game/cards/Mythes/Mythes_Thanatos.class b/bin/game/cards/Mythes/Mythes_Thanatos.class index 30514b1abe67c7e9103c5a03e22f349c3dd20ec4..b26883627adbc7bc3e941d130a5175d4164928e2 100644 GIT binary patch delta 13 UcmbQrGL>aRF(V`UaRG2`U5jDnL}7$*V%D)R+W diff --git a/bin/game/cards/Renaissance/Renaissance_Mehmet.class b/bin/game/cards/Renaissance/Renaissance_Mehmet.class index 5ba0732ad31530fd2186637021fb3f4f69033a98..37b435751f9134336a5918502e6cbd1ea5bacaff 100644 GIT binary patch delta 15 XcmZ3%vVvv9FUH9S7zHPDGsyw~F!co{ delta 13 UcmZ3%vVvv9FGfa|$-fzO0VA>m#Q*>R diff --git a/bin/game/cards/Renaissance/Renaissance_Soliman.class b/bin/game/cards/Renaissance/Renaissance_Soliman.class index a16cb9fff652dd01d688d92727cf56eb8e8e9c31..f4766047c684c1b502daf3e92c11daa94ef17769 100644 GIT binary patch delta 12 TcmZ3>vX*7Te?~_3Nldx`9l-vX*7Te?~^mNldx`9mxaU diff --git a/bin/game/cards/Renaissance/Rennaissance_Casimir.class b/bin/game/cards/Renaissance/Rennaissance_Casimir.class index c258ec18e6b3e0b498aca0c0d3ed74fd364179b8..644327aa145d6524b634f35c7273850acecf0186 100644 GIT binary patch delta 63 zcmZ3_vW{iLcSds^21X!cU|`}{10or?fFv7OM1_GH$mW5_0%=|#kC8zLtV$RF_^SlF delta 41 scmZ3-vYutbcSdeq21X!cU|<$tpUlW4Bgo9a!@vvVGcpJPNhSti0FZYCX#fBK diff --git a/bin/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.class b/bin/game/cards/Renaissance/Rennaissance_Decouverte_Amerique.class index 2cdde0c8b3f9b27e340d5ce0fd0b036e7c546741..1c39ee84cba1987a20a0c7f225c7772af0146bcf 100644 GIT binary patch delta 40 ucmeyt(#bl(M^+&{F*j8|Ik70ESUCA4UsZ21X!cU|<$tUjw9=7`T8W8(2u0fg8x?fk*>sULcQ=K?tl$7ytty B1l#}s delta 63 zcmdnOvYBPWA4YQ>21X!cU|`}{10or?fFv7OM45pb$mW5_0%=|#kC8zLtV$RF{2TKg+ delta 41 scmZ3-vYutbcSdeq21X!cU|<$to6N{0Bgo9a!@vvVGcpJPNhSti0FYn=XaE2J diff --git a/bin/game/cards/Renaissance/Rennaissance_Isabelle.class b/bin/game/cards/Renaissance/Rennaissance_Isabelle.class index 7bd6deddf32ab1d8bc26b49df59cd870e030dcce..288ba18dc076d7713e86322d3f6092eaf6557055 100644 GIT binary patch delta 13 UcmdnUvXNy&KO-aS 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); + } + } +}