2211482
/
PR2-YahtzeeStarWarsSpecial
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ignorecase all

main
selim 2024-05-05 00:28:57 +02:00
parent 47e7b160e3
commit 24eafc0b0d
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
YahtzeeStarWarsSpecial.jar
View File

Binary file not shown.

4
bin/csv/highscores.csv
View File

@ -1,10 +1,10 @@
2024-04-30 Selim 254
2024-04-30 Enes 127
2024-05-05 Daniil 121
2024-05-05 Selim 112
2024-04-30 David 82
2024-04-30 Olaf 72
___ ___ 0
___ ___ 0
___ ___ 0
___ ___ 0
___ ___ 0
___ ___ 0

1 2024-04-30 Selim 254
2 2024-04-30 Enes 127
3 2024-05-05 Daniil 121
4 2024-05-05 Selim 112
5 2024-04-30 David 82
6 2024-04-30 Olaf 72
7 ___ ___ 0
8 ___ ___ 0
9 ___ ___ 0
10 ___ ___ 0
___ ___ 0
___ ___ 0

BIN
bin/domain/Box.class
View File

Binary file not shown.

BIN
bin/domain/Dice.class
View File

Binary file not shown.

BIN
bin/facade/YahtzeeGame.class
View File

Binary file not shown.

4
src/csv/highscores.csv
View File

@ -1,10 +1,10 @@
2024-04-30 Selim 254
2024-04-30 Enes 127
2024-05-05 Daniil 121
2024-05-05 Selim 112
2024-04-30 David 82
2024-04-30 Olaf 72
___ ___ 0
___ ___ 0
___ ___ 0
___ ___ 0
___ ___ 0
___ ___ 0

1 2024-04-30 Selim 254
2 2024-04-30 Enes 127
3 2024-05-05 Daniil 121
4 2024-05-05 Selim 112
5 2024-04-30 David 82
6 2024-04-30 Olaf 72
7 ___ ___ 0
8 ___ ___ 0
9 ___ ___ 0
10 ___ ___ 0
___ ___ 0
___ ___ 0

18
src/domain/Box.java
View File

@ -224,9 +224,9 @@ public class Box {
res.add("Five: " + categoryFive);
if (setCategorySix == null)
res.add("Six: " + categorySix);
if (setCategorySeven == null && savedGamemode.equals("Special8"))
if (setCategorySeven == null && savedGamemode.equalsIgnoreCase("Special8"))
res.add("Seven: " + categorySeven);
if (setCategoryEight == null && savedGamemode.equals("Special8"))
if (setCategoryEight == null && savedGamemode.equalsIgnoreCase("Special8"))
res.add("Eight: " + categoryEight);
if (setCategoryTripleMatch == null)
res.add("TripleMatch: " + categoryTripleMatch);
@ -244,7 +244,7 @@ public class Box {
res.add("Chance: " + categoryChance);
if (setCategoryStarWarsDay == null)
res.add("StarWarsDay: " + categoryStarWarsDay);
if (setCategoryR2D2 == null && savedGamemode.equals("Special8"))
if (setCategoryR2D2 == null && savedGamemode.equalsIgnoreCase("Special8"))
res.add("R2D2: " + categoryR2D2);
}
@ -329,7 +329,7 @@ public class Box {
public boolean gameOver() {
if (this.savedGamemode.equals("Special8"))
if (this.savedGamemode.equalsIgnoreCase("Special8"))
return setCategoryOne != null &&
setCategoryTwo != null &&
setCategoryThree != null &&
@ -368,7 +368,7 @@ public class Box {
public void updateBonus() {
if (savedGamemode.equals("Special8")) {
if (savedGamemode.equalsIgnoreCase("Special8")) {
if (nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo) + nullCheckInt(setCategoryThree)
+ nullCheckInt(setCategoryFour)
@ -389,7 +389,7 @@ public class Box {
public int returnTotalPoints() {
if (savedGamemode.equals("Special8"))
if (savedGamemode.equalsIgnoreCase("Special8"))
return setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour + setCategoryFive
+ setCategorySix + setCategorySeven + setCategoryEight + nullCheckInt(bonus)
+ setCategoryTripleMatch
@ -410,7 +410,7 @@ public class Box {
StringBuilder sb = new StringBuilder();
if (savedGamemode.equals("Special8")) {
if (savedGamemode.equalsIgnoreCase("Special8")) {
sb.append("\n--------------------------\n\n");
sb.append("One: " + nullCheck(setCategoryOne) + "\n");
sb.append("Two: " + nullCheck(setCategoryTwo) + "\n");
@ -464,7 +464,7 @@ public class Box {
public void updateUpperBoxScore() {
if (savedGamemode.equals("Special8"))
if (savedGamemode.equalsIgnoreCase("Special8"))
this.upperBoxScore = nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo)
+ nullCheckInt(setCategoryThree) + nullCheckInt(setCategoryFour)
@ -481,7 +481,7 @@ public class Box {
public void updateLowerBoxScore() {
if (savedGamemode.equals("Special8"))
if (savedGamemode.equalsIgnoreCase("Special8"))
this.lowerBoxScore = nullCheckInt(setCategoryTripleMatch) + nullCheckInt(setCategoryFourOfAKind)
+ nullCheckInt(setCategoryFullHouse) + nullCheckInt(setCategorySmallStreet)

8
src/domain/Dice.java
View File

@ -9,9 +9,9 @@ public class Dice {
public Dice(String gamemode) {
this.savedGamemode = gamemode;
if (gamemode.equals("Normal"))
if (gamemode.equalsIgnoreCase("Normal"))
this.diceNumber = ((int) (Math.random() * 6)) + 1;
else if (gamemode.equals("Special8"))
else if (gamemode.equalsIgnoreCase("Special8"))
this.diceNumber = ((int) (Math.random() * 8)) + 1;
}
@ -22,9 +22,9 @@ public class Dice {
public void rerollDice() {
if (this.savedGamemode.equals("Normal"))
if (this.savedGamemode.equalsIgnoreCase("Normal"))
this.diceNumber = ((int) (Math.random() * 6)) + 1;
else if (this.savedGamemode.equals("Special8"))
else if (this.savedGamemode.equalsIgnoreCase("Special8"))
this.diceNumber = ((int) (Math.random() * 8)) + 1;
}

6
src/facade/YahtzeeGame.java
View File

@ -186,7 +186,7 @@ public class YahtzeeGame {
Scanner scSp = new Scanner(new File("src/csv/highscoresSpecial8.csv"));
String mem[] = new String[3];
if (savedGamemode.equals("Special8"))
if (savedGamemode.equalsIgnoreCase("Special8"))
for (int i = 0; i < 10; i++) {
@ -440,7 +440,7 @@ public class YahtzeeGame {
PrintWriter out = new PrintWriter(new FileWriter("src/csv/highscores.csv", false));
PrintWriter outSp = new PrintWriter(new FileWriter("src/csv/highscoresSpecial8.csv", false));
if (savedGamemode.equals("Special8"))
if (savedGamemode.equalsIgnoreCase("Special8"))
for (int i = 0; i < 10; i++) {
outSp.print(highscores[i][0] + " " + highscores[i][1] + " "
@ -494,7 +494,7 @@ public class YahtzeeGame {
PrintWriter out = new PrintWriter(new FileWriter("src/csv/highscores.csv", false));
PrintWriter outSp = new PrintWriter(new FileWriter("src/csv/highscoresSpecial8.csv", false));
if (savedGamemode.equals("Special8"))
if (savedGamemode.equalsIgnoreCase("Special8"))
outSp.print("");
else
out.print("");