From dd752e9064c58fa9a6f2aca971b776040135d91c Mon Sep 17 00:00:00 2001 From: "s.eser" Date: Tue, 30 Apr 2024 11:01:16 +0200 Subject: [PATCH] category star wars day fix --- bin/domain/Box.class | Bin 10852 -> 11295 bytes bin/domain/Dice.class | Bin 1058 -> 1018 bytes bin/domain/Hand.class | Bin 3086 -> 3086 bytes bin/domain/Player.class | Bin 705 -> 705 bytes bin/facade/YahtzeeGame.class | Bin 10622 -> 10622 bytes bin/ui/TUI$1.class | Bin 373 -> 373 bytes bin/ui/TUI.class | Bin 4907 -> 4877 bytes src/domain/Box.java | 21 +++++++++++++++++---- src/domain/Dice.java | 4 ++-- src/facade/YahtzeeGame.java | 20 ++++++++++---------- src/ui/TUI.java | 1 - 11 files changed, 29 insertions(+), 17 deletions(-) diff --git a/bin/domain/Box.class b/bin/domain/Box.class index 6bf0fb6087bc9c8305c1c464032be5e372d25c39..1e81b540a8ce971be8fcf20e1f9eb50be448e502 100644 GIT binary patch literal 11295 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 literal 10852 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 AegFUf delta 562 zcmZ{gyGz4R7{$*`A4${Lw6)Z}t=3l)HNHAH2!dIi6kH7mijNAl2u__{1nH!sOBWZx zsyH}{|BCt#IH)IS1P8styAM%x=zI;AD0a!xqTzy+tkQ0cmHJ!$W(>Su7 z6BPxNWE2HryUwv=?K|~tYt?D)Xc$CUAlz{3TZab%fr+XeUe3^pD*}NL4IzXTjI|fV zYpcT#iHdF9Lo>`SbTgT_L;oc-Gnr*^ft2xpdM)&f~e9;?<1^apeSLkMKzS+-{}=g(#Fbms~&u5!(Sh}^?o RbNH7}$oCPLcQYj{d;?W~OA7!1 diff --git a/bin/domain/Hand.class b/bin/domain/Hand.class index 6ae2bdc5ba5c75bfc341dc73561518b5ec931082..3fafdcde1674b378ac177b4be54e0e35b4b11f17 100644 GIT binary patch delta 17 YcmeB^=#$_$^>5cc1_lPljT~$|06Ufip#T5? delta 17 YcmeB^=#$_$^>5cc1_lP(jT~$|06T&Ood5s; diff --git a/bin/domain/Player.class b/bin/domain/Player.class index e97c8034e7633a7df7a7201685418f157a34f967..dc8b686b87f79694c69b1fb7ad659e3949d6b96b 100644 GIT binary patch delta 17 ZcmX@edXSal)W2Q(7#J8FH*)M`0sui628sXx delta 17 ZcmX@edXSal)W2Q(7#J9AH*)M`0suh-28I9t diff --git a/bin/facade/YahtzeeGame.class b/bin/facade/YahtzeeGame.class index 6f05a14dd12a45dd57136185590e5f3402b31da5..2d03ee51871dc391242c16e039d16ecf98715f02 100644 GIT binary patch delta 78 zcmewt^e>3x)W2Q(7#J8FH*%bmWL!A;lH@-ic~R;EkUS*)07x#DxdbH3WDfyJOS!E; Z^1a-0AUR!rI*`;?Xk}cud8@)n4gi*wBIN)8 delta 78 zcmewt^e>3x)W2Q(7#J9AH*%bmWLz@&lH@-ic~R;EkUS*)07x#DxdbH3WDfyJOS!E; Z^1a-0AUR!rI*`;?Xk}cod8@)n4gi^JBL4sY diff --git a/bin/ui/TUI$1.class b/bin/ui/TUI$1.class index 7ce44c2558e1266e868e9528d7d098e312a868c3..9f5a14e22669fced43e3394d97c431ac285d1e06 100644 GIT binary patch delta 17 Zcmey$^p%O@)W2Q(7#J8FH*(}M0suy(2A==` delta 17 Zcmey$^p%O@)W2Q(7#J9AH*(}M0suyl2Aco? diff --git a/bin/ui/TUI.class b/bin/ui/TUI.class index 836b3d0a804e130216ad6e23b1812bd51dfb9cd2..625b8630663e28067a10a87688f9f119122b22dd 100644 GIT binary patch delta 1971 zcmYjRX>e0j6#mZ3+LzmfCuJE00>fgbEexWyEW)&dK!=tBf|W7|p?ysQX;PB3Pz9>8 z$)?B!u?U4CQUzIBAYh7!8!9S-y8^D@2I2;a3a$6PBn?t9tMdu4C+ zSZm}kfE?1A)NHdmVdy=TdWpy7%~p|%=?o=ECpdz7Xr!w`uke@ZcIbrmYEFf}$`^9_ z%bb;7SB)MB4szPzCYXoz&&*Qc!Au)w5ZcXfRlE9mT|RfeJYPt6>j4HYDtL>zPj^2< zC1w$lg!))Rq(o{8ja&25?zJPxO_rfl#d9rL*4YemP{Ze2I^6Xj!(1faxNVHE7Lb5XEBXyHqRUyADjFuVd&oXS2M{@Z5 z1^$38eFg1!j<2&-CT}N@Fg64)Fzm!G-oc(_-NVp?Wx}t1`7^Kw=E2ZWTzBY>~L|*8mtgwd6^%#_aFEQ!>iJ(rdPYXRj!bp{s= zr+GiM8-2+O)u}08i^B#({z?_8_?F>2epuZ?=eWy}X}yHMY`DzVIMPf@@Hao=sIUFg zj(;EE_!$thoy zpwlacZzr?3i5L_^tnx!rW83)|mPmGfo(&+CcT4PJP9*f=t&WcTv?IxCBk{&}HI^$9 z=l9qyuFnc6`?Q<#TaY@b866LxOF=W7TF)?gH!7=mM$$xeP`Z{M#^5@oKVP2Ivy@4` z$lxhmn!BC*K=lX*%kPZc>cBaA!3a7ny0hL^?hgD4NfC#gV;3Q1}os`<^yx71cQ zv|Y^XY!2grMjB_zvNTd|W~wEOd3CTh(g3l~SUw!VA|NKPG@1=!c?6FcL?hPACXY*T zDey#m>zadjDuNC1-3GbQz%~Q5@$v=(-?|X zy*GjbvF2T4>}IsTfql_n4Jxu8%y`&Z*H#=a*;s2Bc`0sAI~@0OBwq5GK*Y0lG|EIr z{g$C5W^}#TyAix^s4TQlszr{sp|vG5j1zUOyQEYYA4Tx#^**0TwJ^TuBc;!Xg>l++ z?JIfH*DA#7n_jg0#&Al*2je42m)(osm|7)O;DPt}+}%P^7ZQAAsDAML~>+Jj(<|y?dH=st@h7@Ht<|=zJ4-Rq6QQ~hzd?7fCbMnwi6TZg};(JXJ zl|SMqDCn*%Le9@P4-;9a0T)D}S$yxE@C#~Sp$r-weZoZ{a2rytp|cG`Y)HL|1vccW z*D&3NUwNa}#r>P8Q1Cnc5IGwOxFQ<;W5oZAc+H4yG7=flWJHS*ZAMHGvj;RN#3+eU R&>0zGEq>Ha1hY`g_#c$#3ef-n delta 1921 zcmYjSd0bRg6#mX*mdE3=I7&ikjn$7Op!BCGYMN_Ap^!Uh=?G649cHGP0YOvDl%%rM zn}w*u8IN{5gM|^UnFs{m%B@o#km;(zL^!q5S}c zP`7Pbo@oXfIzHg=O?LSFqa1ZAW)fnDj`!+iPKPT`!w8f!=*S|(`Sn1)qe`#xldRi0{h!0wr4_qrT)y3aqzuEI$$4egWDU&9fUAmh?@WD?= z5M;&1nKDTsj${;MPEt|LPn(9)T;AK~9_EY0Ve*mTKq`<$EnrxP#EW^xiqiZN zTEuV{78BG8;VG)oePQxai7jDRiUxkboNZag(1?5aY4d2hpAWEHX?cL*L4i%T^fWC~ zv5GIUr1W@*VYMtb*5`4#MmfvE86II+gC@Si($DfJ!(&*>Pgw@UEt3g0FtiA$x3y=U zVQ*r1LJ}l8sso-vPuZLT_XV0Zh9_mAac<8Tk53;bQutLo#g|&Wmu)4GUBmTgXLttB z63l+D%PHoRp0RReSALb+-LjqGIqcxW)a=|K!!C3XScM)a)Mo_@s&Lx{Hkc5Sy*Aij zMo1R9k6}L+^A@$c?DQbttM(cA0>g{4P@7)ka8)}3`f!)4$Qy8a+{RE}W_Se+V&0yx zuh{2w2lR3kukp0lOv~#GZ{STnF*dvYErz#cEnR$ipxWo2;0ZWf#U2sux4|0D{~p8p z_&_us-H^ydh{?z_cJvX$QRESlL^G3}Zny3mqx=1i3f%@3qTWvk*Nu17INcR?hs$NJ zbXHXQ%f$Tr_JGG8Sf!v%Hukmv)MhG}2VD3B=#%({+2fd;td8NhL)LN^Vmx zw>#Yz`As5JBfETC{C1bvgi02%mWV6jQTYLuN*X`L`V!;u@#&PvbK|d}E__D(n%JP& zmjzJva!N>{HT=?qiQ0%PTVW7`o0NgPF5zldx9zaoCI^w$ro?91N(=hHkpAiNR^M4%c8?LaN3#2)pvE$2_=q?&@bvyE2GeM z5jn}`AnKc7X`{a4oMGM_!aYEQ;J&anfaM{qFn~5R%Ooo$xg_AxqYrnWIfQl5(+0TS z@NER@qv4Mm{?=wplq{QtTQ*fFyjiv_K|CGAHX~xEX+63}sdt93JCgkJ2)Y4sgkd9u zJqBu6dz-R>(S>A3LU_ku zSz@MSvm9?r=boG(-fik^msCM~7{aj&c|MkGL42AnslO10(QTIPE4lG=y0E_4CNALGLnM$)wyO?{A015iN2a5IfWAx*#- znuf7dg<|qz9MxhxEyP4xg-O(kDYO+Ov=gP&fvFS{dLO3IA>2+!FoTZ5K_|t(#u=0; zRutDOsi;tLP^sj?sSL(!B_DH?BDjN4JEZ@GGyfrI==0ahf;UdRF`<_!RsuMhD~}7XJ#? u{|tG~kmsc&GGvS)&4#oZ(uk)xF>JsFg%T) 0 && (setCategoryChance == null)) res.add("categoryChance: " + categoryChance); + if (categoryStarWarsDay > 0 && (setCategoryStarWarsDay == null)) + res.add("categoryStarWarsDays: " + categoryStarWarsDay); if (categoryR2D2 > 0 && (setCategoryR2D2 == null)) res.add("categoryR2D2: " + categoryR2D2); @@ -229,6 +234,8 @@ public class Box { res.add("categoryYahtzee: " + categoryYahtzee); if (setCategoryChance == null) res.add("categoryChance: " + categoryChance); + if (setCategoryStarWarsDay == null) + res.add("categoryStarWarsDay: " + categoryStarWarsDay); if (setCategoryR2D2 == null && savedGamemode.equals("Special8")) res.add("categoryR2D2: " + categoryR2D2); } @@ -288,6 +295,8 @@ public class Box { } else if (option.equals("categoryChance")) setCategoryChance = categoryChance; + else if (option.equals("categoryStarWarsDay")) + setCategoryStarWarsDay = categoryStarWarsDay; else if (option.equals("categoryR2D2")) setCategoryR2D2 = categoryR2D2; @@ -295,7 +304,7 @@ public class Box { public void resetOptions() { - categoryOne = categoryTwo = categoryThree = categoryFour = categoryFive = categorySix = categorySeven = categoryEight = categoryTripleMatch = categoryFourOfAKind = categoryFullHouse = categorySmallStreet = categoryBigStreet = categoryYahtzee = categoryChance = categoryR2D2 = 0; + categoryOne = categoryTwo = categoryThree = categoryFour = categoryFive = categorySix = categorySeven = categoryEight = categoryTripleMatch = categoryFourOfAKind = categoryFullHouse = categorySmallStreet = categoryBigStreet = categoryYahtzee = categoryChance = categoryStarWarsDay = categoryR2D2 = 0; Arrays.fill(counter, 0); @@ -319,6 +328,7 @@ public class Box { setCategoryBigStreet != null && setCategoryYahtzee != null && setCategoryChance != null && + setCategoryStarWarsDay != null && setCategoryR2D2 != null; else @@ -334,7 +344,8 @@ public class Box { setCategorySmallStreet != null && setCategoryBigStreet != null && setCategoryYahtzee != null && - setCategoryChance != null; + setCategoryChance != null && + setCategoryStarWarsDay != null; } @@ -345,14 +356,14 @@ public class Box { + setCategorySix + setCategorySeven + setCategoryEight + setCategoryTripleMatch + setCategoryFourOfAKind + setCategoryFullHouse + setCategorySmallStreet + setCategoryBigStreet + setCategoryYahtzee - + setCategoryChance + + setCategoryChance + setCategoryStarWarsDay + setCategoryR2D2; else return setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour + setCategoryFive + setCategorySix + setCategoryTripleMatch + setCategoryFourOfAKind + setCategoryFullHouse + setCategorySmallStreet + setCategoryBigStreet + setCategoryYahtzee - + setCategoryChance; + + setCategoryChance + setCategoryStarWarsDay; } @@ -377,6 +388,7 @@ public class Box { sb.append("categoryBigStreet: " + nullCheck(setCategoryBigStreet) + "\n"); sb.append("categoryYahtzee: " + nullCheck(setCategoryYahtzee) + "\n"); sb.append("categoryChance: " + nullCheck(setCategoryChance) + "\n"); + sb.append("categoryStarWarsDay: " + nullCheck(setCategoryStarWarsDay) + "\n"); sb.append("categoryR2D2: " + nullCheck(setCategoryR2D2) + "\n"); } else { sb.append("categoryOne: " + nullCheck(setCategoryOne) + "\n"); @@ -393,6 +405,7 @@ public class Box { sb.append("categoryBigStreet: " + nullCheck(setCategoryBigStreet) + "\n"); sb.append("categoryYahtzee: " + nullCheck(setCategoryYahtzee) + "\n"); sb.append("categoryChance: " + nullCheck(setCategoryChance) + "\n"); + sb.append("categoryStarWarsDay: " + nullCheck(setCategoryStarWarsDay) + "\n"); } return sb.toString(); diff --git a/src/domain/Dice.java b/src/domain/Dice.java index 31e2724..1d22a0f 100644 --- a/src/domain/Dice.java +++ b/src/domain/Dice.java @@ -9,7 +9,7 @@ public class Dice { public Dice(String gamemode) { this.savedGamemode = gamemode; - if (gamemode.equals("Normal") || gamemode.equals("StarWarsDay")) + if (gamemode.equals("Normal")) this.diceNumber = ((int) (Math.random() * 6)) + 1; else if (gamemode.equals("Special8")) this.diceNumber = ((int) (Math.random() * 8)) + 1; @@ -22,7 +22,7 @@ public class Dice { public void rerollDice() { - if (this.savedGamemode.equals("Normal") || this.savedGamemode.equals("StarWarsDay")) + if (this.savedGamemode.equals("Normal")) this.diceNumber = ((int) (Math.random() * 6)) + 1; else if (this.savedGamemode.equals("Special8")) this.diceNumber = ((int) (Math.random() * 8)) + 1; diff --git a/src/facade/YahtzeeGame.java b/src/facade/YahtzeeGame.java index f44051b..cb4c4ce 100644 --- a/src/facade/YahtzeeGame.java +++ b/src/facade/YahtzeeGame.java @@ -207,7 +207,7 @@ public class YahtzeeGame { try { - if (returnTotalPoints(player) > Integer.parseInt(highscores[0][2])) { + if (returnTotalPoints(player) >= Integer.parseInt(highscores[0][2])) { for (int i = 2; i >= 0; i--) { highscoreMem1 = highscores[0][i]; @@ -236,7 +236,7 @@ public class YahtzeeGame { highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[1][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[1][2])) { for (int i = 2; i >= 0; i--) { highscoreMem2 = highscores[1][i]; @@ -262,7 +262,7 @@ public class YahtzeeGame { highscores[8][i] = highscoreMem2; highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[2][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[2][2])) { for (int i = 2; i >= 0; i--) { highscoreMem1 = highscores[2][i]; @@ -286,7 +286,7 @@ public class YahtzeeGame { highscores[8][i] = highscoreMem2; highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[3][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[3][2])) { for (int i = 2; i >= 0; i--) { highscoreMem2 = highscores[3][i]; @@ -308,7 +308,7 @@ public class YahtzeeGame { highscores[8][i] = highscoreMem2; highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[4][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[4][2])) { for (int i = 2; i >= 0; i--) { highscoreMem1 = highscores[4][i]; @@ -328,7 +328,7 @@ public class YahtzeeGame { highscores[8][i] = highscoreMem2; highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[5][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[5][2])) { for (int i = 2; i >= 0; i--) { highscoreMem2 = highscores[5][i]; @@ -346,7 +346,7 @@ public class YahtzeeGame { highscores[8][i] = highscoreMem2; highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[6][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[6][2])) { for (int i = 2; i >= 0; i--) { highscoreMem1 = highscores[6][i]; @@ -362,7 +362,7 @@ public class YahtzeeGame { highscores[8][i] = highscoreMem2; highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[7][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[7][2])) { for (int i = 2; i >= 0; i--) { highscoreMem2 = highscores[7][i]; @@ -376,7 +376,7 @@ public class YahtzeeGame { highscores[8][i] = highscoreMem2; highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[8][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[8][2])) { for (int i = 2; i >= 0; i--) { highscoreMem1 = highscores[8][i]; @@ -388,7 +388,7 @@ public class YahtzeeGame { highscores[8][i] = "" + LocalDate.now(); highscores[9][i] = highscoreMem1; } - } else if (returnTotalPoints(player) > Integer.parseInt(highscores[9][2])) { + } else if (returnTotalPoints(player) >= Integer.parseInt(highscores[9][2])) { for (int i = 2; i >= 0; i--) { if (i == 2) diff --git a/src/ui/TUI.java b/src/ui/TUI.java index c18e9b7..a6dc429 100644 --- a/src/ui/TUI.java +++ b/src/ui/TUI.java @@ -49,7 +49,6 @@ public class TUI { System.out.println("\nChoose your gamemode: "); System.out.println(">Normal"); - System.out.println(">StarWarsDay"); System.out.println(">Special8"); game.setGamemode(sc.nextLine()); System.out.println("\nAmount of players: ");