From 02370d806919219285d56f180fe6f12c30c2c3e7 Mon Sep 17 00:00:00 2001 From: "s.eser" Date: Tue, 30 Apr 2024 11:28:46 +0200 Subject: [PATCH] final fixes --- bin/domain/Box.class | Bin 11318 -> 11774 bytes bin/facade/YahtzeeGame.class | Bin 10622 -> 10667 bytes src/domain/Box.java | 25 +++++++++++++++++++++++-- src/facade/YahtzeeGame.java | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/bin/domain/Box.class b/bin/domain/Box.class index d102beaeecd17d170463e912ce84644257f925b7..142c7d1d8674b07f801cdeaf11ec5c4ebe136fb6 100644 GIT binary patch literal 11774 zcmcIq34D~*wf~=QlFX2NKp4WlZvq(!6%`jYSwwa$VUb11B$*@w$xO&h2mujM>Wboq zY?hK1J1t6!MWT+y(pp2cw!YVDTcLK**1FW%#n;ygmiNE+`{tV)!S~wtdoMcY-1|Rw zKj)r%?)`Z2AL(ZSOqSh#Sc3e@cwIOe8$Bhy-j5tX;p*_Z@aWobta|kP^3{=wq@bW8 zoQzb*8=B|GA_AFdAPbw~f{q#a!kUH%OW2wG^mt=~nT@Wa)N8FYy56W;8d(>K8TqTD z)ivz9QzDX_YIfgsPIiDZV;oncVO;xSdQ62zJ$G204agZ;J46r8>`sr*Y{wm<3Av-} znwjy!hG>0lWNtWFQ6unB)!Y24$+M%eN#MGKIncVVttT7?*SHv4>60|vMIjyu~ zBD^kAc}=)3QWvk}!UPS|;d(}6)wG;iv>ATSvem*jImLIiv_+B zBNumo;8GjK2&vR%HZH^{LFYNqSY%#fU3sKoVYs|jcNwn;*Dek>L{;7ebCNYtj@F)& z-Fh5IpxPT~kI1@kZ6mFIQGI=+fje`4eKH!4u})8Skd4V`?dZu34dLcF(L{2b8fS;n zXmu={Y;0h+qt07wyfMMd)|tq<`Iv%feoUpsowK)WT#e~mSv8=@{3;sGh?yhL(@s8S zV3r?T^{%>&_5-vr8*@0tig+wZXTyoKTW!bDj2pR3wKC7fd|b|oh!QQg;YXfIU2h}cq*mGJ;H1Jf z@|{$LjRGeXv0*!@Y8xGqM-NsRt#H+>X5y?y`w3H@66IpeX{Y|?`iuz_pRdyS^+P)@ zO@=Gh%njGO_T!nyoOqLI9%@$gHu^iGZLrbLNhNLca8m1R^mJ0|ZS-|g8*KD)Qa9M> z?WAtB(Z@;MWMhDubLT{39bH&$tz+Jtx9}It7;4r=^Ersm*_eQdDs`KU7`VAQQkksm z*>R5%t`VKHY@zc@%(Zd%?!<9Q!(-H}@3zqior65qw%fQD_X&E`h1W!;#$$AjOQOjd zrV`0;EU7K8odLUzsiq#V@t`tOU%0YTwfc~aLe;8ZyUOmi(M4q~C;PCCpvwB3>=$fw zRoNUT`$Zc?Dx2$MAF1wg+jRdZf?TxIkf@ob0nUhO2C6C;M$1BUH8!+tsYUYvXyeaf?S2 zSJ%}ic~sEBEemq4Y%r)uS4D~x>840`Y!Bdv+<2w+k&0-z_VRrE8-C=+zqbn>oOQMF zW3{4rk+qHC+C-3c$Od{U(o2!viu6&WuOj`N0sh>^Fg3vb3LBuvKt%>&JIB@#p$^Y$ zJm)nLy4ggemSK!zdI97H;13`WK!*VG11Jc<4xnQIJp$+%K(7FL2hb;gz5(EeBpV;4JdwF0@8t}LyXbJ)S5`e8o_Y$q{|!xrc-zKL=c0efcr^o!3Aa= zSAL!<>{mM3(pd^Q?=Vj<74c+FBOO$JYF&5a1wjl|WSAlsC^B4;5sHjdq*w|9 z(p%6kf7GY`<>vzE>&c#B9|$0xgu96a-|~U z6dA9`1Vtt)GD(rE6q&5Z6e&=vaEUFK%2+Br8F!{ED9X4tb0N4+^|j$<9ke9M1-*>J z)v1_Sn1Jw9@vU05iu+9_@L(1?)^>WyoTKM7!9|@a1q}8}8HrXzrbkt55}?yAQT9U% zo)V8I6Ul~f{oF{hCSIAymuWKHFINkOW-TllTNhsw8SRY9@vYOt6-izUl#yH`*ku}t zTiR)GMmSbk8%YeE6OXTHtRHvo01c#F#f3aG&r^K4QT{x$cAJ>0g6U{7GOlx;Oby5^ zBUt8D=E{NG8gx!x0L_bo#^!NBGC{SzJ7|<4i5GmUz*vI|OprGS4Km*F+T>`mMtrViD`{h%EOWcik}{)~5v6Mxjn1p( z1?pPDy&KH5=f>(9XBg<+O`LFD!@Tl%<7UW`xqBqEaJ8{gDr(mty`wi7qlT98GU%VQ}0%zUVA;V-t9&`Q;`(iY1}ch znxtTxp<+*!#P2aX%IeY?#l6NFy1HbQ`xz6elWb-z7HODT8%`u53BT+R3_Hh#oX;uv zWv8J3e_xc&((xb+2IvbJ?+s%(##o;zO9l3tGpyH~LA~Y-={09SuQ|hc%^A#V&d^bF z278(_%F|p$OsZYRb(%Av)0~l<<_zI9XK<}KLu<_$PHWC!T62cdnls?moME}<4AeDe zfUP-WK+OlaoKc_7Gu+dhah~Q3jx=YCr#XW=%^B5c&PYOY-cB{=-IUzsij`nA>1UW* zzf4IB$1$Z9pUv5i9>q(a zz#;=HJBmeHE$JI-#gdk@uZD6zwRWysds+M1%gow&pIST5t-Yds?GU+aKw|-{)Rqg9n8TFMh*WMi%1^OM-edZ&2x|kc;$4d-n=x>v zY7nJ?cf>_l&CP1D|4ix*FLff5l3Xt}joU}pkgZ@-voP=s z3T3eM5&UO(Dfpigg)+n`{K*7I%Io(hw&V-cNG^Bi65j;h#1!5R^)q*3Veu2V#J8d( zr)+)-FBr1i{m`-;S9Zvd(Gs;R*OlF8$Y^C+mgmYE4H+#+%lxivsUcJ5t%U(sINlVp z)h=qJg_&min^LyhNlTrExB8@?<4C%z85i|6%9c&YO5ZJ3mGVmbHH!O70yW%D@#4Nm zu~yY9S7^VIycPr$mT#8F!ZAnD-87!3(`>Q-QEXI=1X|9XPz_9X z8`zI4yax8Wjj0CqyN#&^_9NSv9^Qzf*rXcsx14=O)%K|}BUDOHpubAxDNN6*(65pl zL-A2;&Tjc!)#g8m#y^iHznmt&nnv1$IBrEf9-ssG5*lzA z2^>cfKSU#bfpvI?ZG4Dk{2d#_k7fyClMKg=av^S#i?Bt;;byrCx5zAPmHGIbEXA#| z3b#uHcgP0ZDK{~FH_PtkBf>sD5WR%^h2(s<01H9E3GuB1Q5j=;t*LG!%2v15de&NX5MFfrdtY;em!Ke(8bK z!8sG5K7QpC2p#5@)`6Au$2Ckp%E#kF^sry!Yw*|UVGlE$dYm5i8(4uO^fpgmJq_ws zTH=Fv5?`bN9j3iJi!@%sGdM~6cpJy)!Jd^Ie2d=oxD3R%>Bqh!P2}3-d-#$39Y3~!SFBEW)#`?y zSVQnrs~A7CF2`%uB%HM7;*_-zKex*9xw*H29th0F6*Aegeitu~iV7%`ei9h%*!w0^J_@i$Q{^VPQKl|!< zW_ULiU)*(Z0bezKtpmD@i*t}S+yHDO2A{!DKW1nL?2;nIi`3u1ftsllE4-PxQu&(b zTRB^6UMTn*$2wIwv54XSQEW?DSA>GU&BDtxydz}|4h7%J!YeeqD`gdgg1^hcD>b|~ zB_D=@Z)f2$4ev|I>!IK~S-4!oEh%XW1>eoWl^Q;flCOt??`7dC4X0AFD-`^F7EWmR zU`n=xg70VHMhzcI$?8z>4_UZb!-rE+8VY`pg*R&WNJ_?sf`81yn>5^-l3}6XpEP`u zD|M<3&#PC8cwB9 zs&w9@bEi_cIu!hKcG_z-oKB%66#PpTj%)Z>3Oz!>4>jCLHL_X5$FpbmNsQ%2|A+y} zY4pGu48+I0(EkIM;Vj>R!Ml&}PGcd$J5hq$_y*oX?vy+{z<{ZRccg>T0Z&Ojw{-zt z78^g4j(AHt;RET6kNIGqCtajSg3?dAN{FdTq#IwHyYq>(hb)$!5|&=FhL7$|(nq#P zU%8tlcS?Wxk_?bTGEknDLGqjomX~FSoRp#RmJE|W$p!L}4402(gcXott4KoDV7br= z$tddzDY2%=XlpJ5IB%0$^D=P=Q~#l#73w(aKIqk>yYY8vH}%)Od&lnGyK)o$RmVc= zUE^N9)^IJbviOsKzGVzf`HS2-VcaF>!QqkhRq4-e*IZGwepDx3xiC zA9l1MMz*UB)nt3yP)4?|4NJ*d+OUA^KpSS0rP?r!>|h%vkR58nShB-y7)^GhO-Jgj zZ92f`uIf!N-G;7Y$J$_%9dAQ!&SSpEm}J+g7j~_BVb`h`cCC70*QytGt$JZ+suy;q zdSPekKETe@orImKUf7xHg`KHh*qQEy6LzA{JNY3KG6A+sL|2)F-VE6X$z*=lnZmC! zQ~B9t8o#St4SsvTY~J7($PC`tXQGS;P_@iPOy;0b=F+m~G1Q-k+vKyjM;2g*l;UAo zh%d<^TKQr;&YS;JJg~mSYe1VU=dWsh->Ty0t!jS1s^aIXYJQ)p;>VzB%p#vn zey!ASk=M|5)M2B%;>PGY>TnnNy%NW6X)qRSkFj8U3^|Pzw$l9b}Zg*wU|HauHHeHA9DF&mmhI?tIO3nqO_8B`7xItS6rJu6O{k6+WSB0 zpBDvpGqmxM2z;8drHT4kPyIAeKkKQVChBKB_0vTCtmh_Z;uF?-K3g?mxiq7kyn=Vy z)#Pi)8^{yn8^|}3-%NfBBeXlo?;^jS`~kTEd&nP_&5Y)5V$`;oQQJ+7&^F`8#JBWG$(_r!cg;f9|BAJ2cY8Kz3<_|J1`PvsWWs z4P>82iVUPhBitBXtpghAZXhX*^e~XK8tLgGU8R>-`=FNeG0Gm&NM8dvtdV{OazrEj z4Wv~g0}SMpMg|&4S|fuDoaG#5AkK1LU?9$N4mS{I zIY$_Xvz&a;^#jsU&l}+ck$mDY~$ztySef1p)=gh)8<}27~RJWbUzNr z18nm_UXOP0dh-xB%1(SJyBIU=W@NNSie;~imxpDZd|t|ApH#>fq*3`vP|a54cWsJdj>n6sp)J@ z=W04%)6Z&Js_7z4muR|F)8(38ujwjH!4ri99F|$u9Kz EF9Y9GPyhe` literal 11318 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 AmH+?% diff --git a/bin/facade/YahtzeeGame.class b/bin/facade/YahtzeeGame.class index 2d03ee51871dc391242c16e039d16ecf98715f02..81c150ffa94d890094b7bf15a3928002e8427509 100644 GIT binary patch delta 4097 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 delta 4030 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 108){ + this.bonus = 35; + } + + } else + + if(setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour + + setCategoryFive + setCategorySix >= 63){ + this.bonus = 35; + } + + } + public int returnTotalPoints() { if (savedGamemode.equals("Special8")) return setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour + setCategoryFive - + setCategorySix + setCategorySeven + setCategoryEight + setCategoryTripleMatch + + setCategorySix + setCategorySeven + setCategoryEight + bonus + setCategoryTripleMatch + setCategoryFourOfAKind + setCategoryFullHouse + setCategorySmallStreet + setCategoryBigStreet + setCategoryYahtzee + setCategoryChance + setCategoryStarWarsDay @@ -362,7 +381,7 @@ public class Box { else return setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour + setCategoryFive - + setCategorySix + setCategoryTripleMatch + setCategoryFourOfAKind + + setCategorySix + bonus + setCategoryTripleMatch + setCategoryFourOfAKind + setCategoryFullHouse + setCategorySmallStreet + setCategoryBigStreet + setCategoryYahtzee + setCategoryChance + setCategoryStarWarsDay; @@ -381,6 +400,7 @@ public class Box { sb.append("categorySix: " + nullCheck(setCategorySix) + "\n"); sb.append("categorySeven: " + nullCheck(setCategorySeven) + "\n"); sb.append("categoryEight: " + nullCheck(setCategoryEight) + "\n"); + sb.append("\nbonus: " + nullCheck(bonus) + "\n"); sb.append("\n--------------------------\n\n"); sb.append("categoryTripleMatch: " + nullCheck(setCategoryTripleMatch) + "\n"); sb.append("categoryFourOfAKind: " + nullCheck(setCategoryFourOfAKind) + "\n"); @@ -398,6 +418,7 @@ public class Box { sb.append("categoryFour: " + nullCheck(setCategoryFour) + "\n"); sb.append("categoryFive: " + nullCheck(setCategoryFive) + "\n"); sb.append("categorySix: " + nullCheck(setCategorySix) + "\n"); + sb.append("\nbonus: " + nullCheck(bonus) + "\n"); sb.append("\n--------------------------\n\n"); sb.append("categoryTripleMatch: " + nullCheck(setCategoryTripleMatch) + "\n"); sb.append("categoryFourOfAKind: " + nullCheck(setCategoryFourOfAKind) + "\n"); diff --git a/src/facade/YahtzeeGame.java b/src/facade/YahtzeeGame.java index cb4c4ce..addadc9 100644 --- a/src/facade/YahtzeeGame.java +++ b/src/facade/YahtzeeGame.java @@ -117,6 +117,7 @@ public class YahtzeeGame { players.get(player).box.selectOption(selectedOption); players.get(player).box.resetOptions(); players.get(player).getNewHand(); + players.get(player).box.updateBonus(); }