From e2d9e58c354bc39b3cff5e3f70fec2513622f4ab Mon Sep 17 00:00:00 2001 From: "s.eser" Date: Tue, 30 Apr 2024 12:32:29 +0200 Subject: [PATCH] final version --- bin/csv/highscores.csv | 10 ++ bin/domain/Box.class | Bin 11935 -> 12960 bytes bin/facade/YahtzeeGame.class | Bin 10667 -> 10833 bytes src/csv/highscores.csv | 10 ++ src/domain/Box.java | 223 ++++++++++++++++++++++------------- src/facade/YahtzeeGame.java | 7 +- 6 files changed, 165 insertions(+), 85 deletions(-) diff --git a/bin/csv/highscores.csv b/bin/csv/highscores.csv index e69de29..e361fb1 100644 --- a/bin/csv/highscores.csv +++ b/bin/csv/highscores.csv @@ -0,0 +1,10 @@ +2024-04-30: Selim: 172 +___: ___: 0 +___: ___: 0 +___: ___: 0 +___: ___: 0 +___: ___: 0 +___: ___: 0 +___: ___: 0 +___: ___: 0 +___: ___: 0 diff --git a/bin/domain/Box.class b/bin/domain/Box.class index 28040e7bda74e222655b5ae73537b92e3e968167..f5e47dedf965c093575e3ba32fc1801f94e4ae37 100644 GIT binary patch literal 12960 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 MpWvVJ)71XI0Xi*hPyhe` literal 11935 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 PSWdj-Hg delta 4081 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 res = new ArrayList<>(); if (categoryOne > 0 && (setCategoryOne == null)) - res.add("categoryOne: " + categoryOne); + res.add("One: " + categoryOne); if (categoryTwo > 0 && (setCategoryTwo == null)) - res.add("categoryTwo: " + categoryTwo); + res.add("Two: " + categoryTwo); if (categoryThree > 0 && (setCategoryThree == null)) - res.add("categoryThree: " + categoryThree); + res.add("Three: " + categoryThree); if (categoryFour > 0 && (setCategoryFour == null)) - res.add("categoryFour: " + categoryFour); + res.add("Four: " + categoryFour); if (categoryFive > 0 && (setCategoryFive == null)) - res.add("categoryFive: " + categoryFive); + res.add("Five: " + categoryFive); if (categorySix > 0 && (setCategorySix == null)) - res.add("categorySix: " + categorySix); + res.add("Six: " + categorySix); if (categorySeven > 0 && (setCategorySeven == null)) - res.add("categorySeven: " + categorySeven); + res.add("Seven: " + categorySeven); if (categoryEight > 0 && (setCategoryEight == null)) - res.add("categoryEight: " + categoryEight); + res.add("Eight: " + categoryEight); if (categoryTripleMatch > 0 && (setCategoryTripleMatch == null)) - res.add("categoryTripleMatch: " + categoryTripleMatch); + res.add("TripleMatch: " + categoryTripleMatch); if (categoryFourOfAKind > 0 && (setCategoryFourOfAKind == null)) - res.add("categoryFourOfAKind: " + categoryFourOfAKind); + res.add("FourOfAKind: " + categoryFourOfAKind); if (categoryFullHouse > 0 && (setCategoryFullHouse == null)) - res.add("categoryFullHouse: " + categoryFullHouse); + res.add("FullHouse: " + categoryFullHouse); if (categorySmallStreet > 0 && (setCategorySmallStreet == null)) - res.add("categorySmallStreet: " + categorySmallStreet); + res.add("SmallStreet: " + categorySmallStreet); if (categoryBigStreet > 0 && (setCategoryBigStreet == null)) - res.add("categoryBigStreet: " + categoryBigStreet); + res.add("BigStreet: " + categoryBigStreet); if (categoryYahtzee > 0) - res.add("categoryYahtzee: " + categoryYahtzee); + res.add("Yahtzee: " + categoryYahtzee); if (categoryChance > 0 && (setCategoryChance == null)) - res.add("categoryChance: " + categoryChance); + res.add("Chance: " + categoryChance); if (categoryStarWarsDay > 0 && (setCategoryStarWarsDay == null)) - res.add("categoryStarWarsDay: " + categoryStarWarsDay); + res.add("StarWarsDay: " + categoryStarWarsDay); if (categoryR2D2 > 0 && (setCategoryR2D2 == null)) - res.add("categoryR2D2: " + categoryR2D2); + res.add("R2D2: " + categoryR2D2); if (res.isEmpty()) { if (setCategoryOne == null) - res.add("categoryOne: " + categoryOne); + res.add("One: " + categoryOne); if (setCategoryTwo == null) - res.add("categoryTwo: " + categoryTwo); + res.add("Two: " + categoryTwo); if (setCategoryThree == null) - res.add("categoryThree: " + categoryThree); + res.add("Three: " + categoryThree); if (setCategoryFour == null) - res.add("categoryFour: " + categoryFour); + res.add("Four: " + categoryFour); if (setCategoryFive == null) - res.add("categoryFive: " + categoryFive); + res.add("Five: " + categoryFive); if (setCategorySix == null) - res.add("categorySix: " + categorySix); + res.add("Six: " + categorySix); if (setCategorySeven == null && savedGamemode.equals("Special8")) - res.add("categorySeven: " + categorySeven); + res.add("Seven: " + categorySeven); if (setCategoryEight == null && savedGamemode.equals("Special8")) - res.add("categoryEight: " + categoryEight); + res.add("Eight: " + categoryEight); if (setCategoryTripleMatch == null) - res.add("categoryTrippleMatch: " + categoryTripleMatch); + res.add("TripleMatch: " + categoryTripleMatch); if (setCategoryFourOfAKind == null) - res.add("categoryFourOfAKind: " + categoryFourOfAKind); + res.add("FourOfAKind: " + categoryFourOfAKind); if (setCategoryFullHouse == null) - res.add("categoryFullHouse: " + categoryFullHouse); + res.add("FullHouse: " + categoryFullHouse); if (setCategorySmallStreet == null) - res.add("categorySmallStreet: " + categorySmallStreet); + res.add("SmallStreet: " + categorySmallStreet); if (setCategoryBigStreet == null) - res.add("categoryBigStreet: " + categoryBigStreet); + res.add("BigStreet: " + categoryBigStreet); if (setCategoryYahtzee == null) - res.add("categoryYahtzee: " + categoryYahtzee); + res.add("Yahtzee: " + categoryYahtzee); if (setCategoryChance == null) - res.add("categoryChance: " + categoryChance); + res.add("Chance: " + categoryChance); if (setCategoryStarWarsDay == null) - res.add("categoryStarWarsDay: " + categoryStarWarsDay); + res.add("StarWarsDay: " + categoryStarWarsDay); if (setCategoryR2D2 == null && savedGamemode.equals("Special8")) - res.add("categoryR2D2: " + categoryR2D2); + res.add("R2D2: " + categoryR2D2); } return res; @@ -247,33 +253,33 @@ public class Box { public void selectOption(String option) { - if (option.equals("categoryOne")) + if (option.equals("One")) setCategoryOne = categoryOne; - else if (option.equals("categoryTwo")) + else if (option.equals("Two")) setCategoryTwo = categoryTwo; - else if (option.equals("categoryThree")) + else if (option.equals("Three")) setCategoryThree = categoryThree; - else if (option.equals("categoryFour")) + else if (option.equals("Four")) setCategoryFour = categoryFour; - else if (option.equals("categoryFive")) + else if (option.equals("Five")) setCategoryFive = categoryFive; - else if (option.equals("categorySix")) + else if (option.equals("Six")) setCategorySix = categorySix; - else if (option.equals("categorySeven")) + else if (option.equals("Seven")) setCategorySeven = categorySeven; - else if (option.equals("categoryEight")) + else if (option.equals("Eight")) setCategoryEight = categoryEight; - else if (option.equals("categoryTripleMatch")) + else if (option.equals("TripleMatch")) setCategoryTripleMatch = categoryTripleMatch; - else if (option.equals("categoryFourOfAKind")) + else if (option.equals("FourOfAKind")) setCategoryFourOfAKind = categoryFourOfAKind; - else if (option.equals("categoryFullHouse")) + else if (option.equals("FullHouse")) setCategoryFullHouse = categoryFullHouse; - else if (option.equals("categorySmallStreet")) + else if (option.equals("SmallStreet")) setCategorySmallStreet = categorySmallStreet; - else if (option.equals("categoryBigStreet")) + else if (option.equals("BigStreet")) setCategoryBigStreet = categoryBigStreet; - else if (option.equals("categoryYahtzee")) { + else if (option.equals("Yahtzee")) { if (setCategoryYahtzee != null) { setCategoryYahtzee += 50; if (counter[0] == 5) @@ -297,9 +303,11 @@ public class Box { } else if (option.equals("categoryChance")) setCategoryChance = categoryChance; - else if (option.equals("categoryStarWarsDay")) + else if (option.equals("Chance")) + setCategoryChance = categoryChance; + else if (option.equals("StarWarsDay")) setCategoryStarWarsDay = categoryStarWarsDay; - else if (option.equals("categoryR2D2")) + else if (option.equals("R2D2")) setCategoryR2D2 = categoryR2D2; } @@ -392,47 +400,96 @@ public class Box { StringBuilder sb = new StringBuilder(); if (savedGamemode.equals("Special8")) { - sb.append("categoryOne: " + nullCheck(setCategoryOne) + "\n"); - sb.append("categoryTwo: " + nullCheck(setCategoryTwo) + "\n"); - sb.append("categoryThree: " + nullCheck(setCategoryThree) + "\n"); - sb.append("categoryFour: " + nullCheck(setCategoryFour) + "\n"); - sb.append("categoryFive: " + nullCheck(setCategoryFive) + "\n"); - 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"); - sb.append("categoryFullHouse: " + nullCheck(setCategoryFullHouse) + "\n"); - sb.append("categorySmallStreet: " + nullCheck(setCategorySmallStreet) + "\n"); - 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"); + sb.append("One: " + nullCheck(setCategoryOne) + "\n"); + sb.append("Two: " + nullCheck(setCategoryTwo) + "\n"); + sb.append("Three: " + nullCheck(setCategoryThree) + "\n"); + sb.append("Four: " + nullCheck(setCategoryFour) + "\n"); + sb.append("Five: " + nullCheck(setCategoryFive) + "\n"); + sb.append("Six: " + nullCheck(setCategorySix) + "\n"); + sb.append("Seven: " + nullCheck(setCategorySeven) + "\n"); + sb.append("Eight: " + nullCheck(setCategoryEight) + "\n"); + sb.append("\nbonus: " + nullCheck(bonus) + "\n"); + sb.append("\ntotal upper box: " + nullCheck(upperBoxScore) + "\n"); + sb.append("\n--------------------------\n\n"); + sb.append("TripleMatch: " + nullCheck(setCategoryTripleMatch) + "\n"); + sb.append("FourOfAKind: " + nullCheck(setCategoryFourOfAKind) + "\n"); + sb.append("FullHouse: " + nullCheck(setCategoryFullHouse) + "\n"); + sb.append("SmallStreet: " + nullCheck(setCategorySmallStreet) + "\n"); + sb.append("BigStreet: " + nullCheck(setCategoryBigStreet) + "\n"); + sb.append("Yahtzee: " + nullCheck(setCategoryYahtzee) + "\n"); + sb.append("Chance: " + nullCheck(setCategoryChance) + "\n"); + sb.append("StarWarsDay: " + nullCheck(setCategoryStarWarsDay) + "\n"); + sb.append("R2D2: " + nullCheck(setCategoryR2D2) + "\n"); + sb.append("\ntotal lower box: " + nullCheck(lowerBoxScore) + "\n"); + sb.append("\n--------------------------\n\n"); + sb.append("\ntotal score: " + nullCheck(totalScore) + "\n"); } else { - sb.append("categoryOne: " + nullCheck(setCategoryOne) + "\n"); - sb.append("categoryTwo: " + nullCheck(setCategoryTwo) + "\n"); - sb.append("categoryThree: " + nullCheck(setCategoryThree) + "\n"); - 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"); - sb.append("categoryFullHouse: " + nullCheck(setCategoryFullHouse) + "\n"); - sb.append("categorySmallStreet: " + nullCheck(setCategorySmallStreet) + "\n"); - 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("One: " + nullCheck(setCategoryOne) + "\n"); + sb.append("Two: " + nullCheck(setCategoryTwo) + "\n"); + sb.append("Three: " + nullCheck(setCategoryThree) + "\n"); + sb.append("Four: " + nullCheck(setCategoryFour) + "\n"); + sb.append("Five: " + nullCheck(setCategoryFive) + "\n"); + sb.append("Six: " + nullCheck(setCategorySix) + "\n"); + sb.append("\nbonus: " + nullCheck(bonus) + "\n"); + sb.append("\ntotal upper box: " + nullCheck(upperBoxScore) + "\n"); + sb.append("\n--------------------------\n\n"); + sb.append("TripleMatch: " + nullCheck(setCategoryTripleMatch) + "\n"); + sb.append("FourOfAKind: " + nullCheck(setCategoryFourOfAKind) + "\n"); + sb.append("FullHouse: " + nullCheck(setCategoryFullHouse) + "\n"); + sb.append("SmallStreet: " + nullCheck(setCategorySmallStreet) + "\n"); + sb.append("BigStreet: " + nullCheck(setCategoryBigStreet) + "\n"); + sb.append("Yahtzee: " + nullCheck(setCategoryYahtzee) + "\n"); + sb.append("Chance: " + nullCheck(setCategoryChance) + "\n"); + sb.append("StarWarsDay: " + nullCheck(setCategoryStarWarsDay) + "\n"); + sb.append("\ntotal lower box: " + nullCheck(lowerBoxScore) + "\n"); + sb.append("\n--------------------------\n\n"); + sb.append("\ntotal score: " + nullCheck(totalScore) + "\n"); } return sb.toString(); } + public void updateUpperBoxScore(){ + + if(savedGamemode.equals("Special8")) + + this.upperBoxScore = nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo) + nullCheckInt(setCategoryThree) + nullCheckInt(setCategoryFour) + + nullCheckInt(setCategoryFive) + nullCheckInt(setCategorySix) + nullCheckInt(setCategorySeven) + nullCheckInt(setCategoryEight) + nullCheckInt(bonus); + + + + else + + this.upperBoxScore = nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo) + nullCheckInt(setCategoryThree) + nullCheckInt(setCategoryFour) + + nullCheckInt(setCategoryFive) + nullCheckInt(setCategorySix) + nullCheckInt(bonus); + + + + } + + public void updateLowerBoxScore(){ + + if(savedGamemode.equals("Special8")) + + this.lowerBoxScore = nullCheckInt(setCategoryTripleMatch) + nullCheckInt(setCategoryFourOfAKind) + nullCheckInt(setCategoryFullHouse) + nullCheckInt(setCategorySmallStreet) + + nullCheckInt(setCategoryBigStreet) + nullCheckInt(setCategoryYahtzee) + nullCheckInt(setCategoryChance) + nullCheckInt(setCategoryStarWarsDay) + nullCheckInt(setCategoryR2D2); + + + + else + + this.lowerBoxScore = nullCheckInt(setCategoryTripleMatch) + nullCheckInt(setCategoryFourOfAKind) + nullCheckInt(setCategoryFullHouse) + nullCheckInt(setCategorySmallStreet) + + nullCheckInt(setCategoryBigStreet) + nullCheckInt(setCategoryYahtzee) + nullCheckInt(setCategoryChance) + nullCheckInt(setCategoryStarWarsDay); + + } + + public void updateTotalScore(){ + + this.totalScore = nullCheckInt(upperBoxScore) + nullCheckInt(lowerBoxScore); + } + public String nullCheck(Integer i) { if (i == null) diff --git a/src/facade/YahtzeeGame.java b/src/facade/YahtzeeGame.java index addadc9..96cbb9e 100644 --- a/src/facade/YahtzeeGame.java +++ b/src/facade/YahtzeeGame.java @@ -118,6 +118,9 @@ public class YahtzeeGame { players.get(player).box.resetOptions(); players.get(player).getNewHand(); players.get(player).box.updateBonus(); + players.get(player).box.updateUpperBoxScore(); + players.get(player).box.updateLowerBoxScore(); + players.get(player).box.updateTotalScore(); } @@ -405,8 +408,8 @@ public class YahtzeeGame { for (int i = 0; i < 10; i++) { - out.print(LocalDate.now() + ": " + players.get(player).name + ": " - + returnTotalPoints(player)); + out.print(highscores[i][0] + ": " + highscores[i][1] + ": " + + highscores[i][2]); out.println(); }