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

updateBonus fix

main
s.eser 2024-04-30 11:41:41 +02:00
parent 02370d8069
commit 2bfdeacb54
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/domain/Box.class
View File

Binary file not shown.

16
src/domain/Box.java
View File

@ -355,15 +355,15 @@ public class Box {
if(savedGamemode.equals("Special8")){
if(setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour
+ setCategoryFive + setCategorySix + setCategorySeven + setCategoryEight >= 108){
if(nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo) + nullCheckInt(setCategoryThree) + nullCheckInt(setCategoryFour)
+ nullCheckInt(setCategoryFive) + nullCheckInt(setCategorySix) + nullCheckInt(setCategorySeven) + nullCheckInt(setCategoryEight) >= 108){
this.bonus = 35;
}
} else
if(setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour
+ setCategoryFive + setCategorySix >= 63){
if(nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo) + nullCheckInt(setCategoryThree) + nullCheckInt(setCategoryFour)
+ nullCheckInt(setCategoryFive) + nullCheckInt(setCategorySix) >= 63){
this.bonus = 35;
}
@ -440,4 +440,12 @@ public class Box {
else
return "" + i;
}
public int nullCheckInt(Integer i) {
if(i == null)
return 0;
else
return i;
}
}