|
|
@ -32,7 +32,7 @@ public class Game { |
|
|
|
clearScreen(); |
|
|
|
System.out.println(g.printGameboard(g, p)); |
|
|
|
} |
|
|
|
} while (g.checkDice(dice, p, c)); |
|
|
|
} while (g.checkDice(dice, p, c, g)); |
|
|
|
if(p.checkGameWin(p.figures)) { |
|
|
|
winner = p; |
|
|
|
System.out.println("Spieler " + winner.name + " gewinnt!"); |
|
|
@ -68,12 +68,21 @@ public class Game { |
|
|
|
* @param dice Value of dice got from rolldice() |
|
|
|
* @param p active Player |
|
|
|
* @param countRolls Counter how often the Player already rolled the dice |
|
|
|
* @param g game instance |
|
|
|
* @return true if Player can roll the dice another time |
|
|
|
*/ |
|
|
|
public boolean checkDice(int dice, Player p, int countRolls) { |
|
|
|
public boolean checkDice(int dice, Player p, int countRolls, Game g) { |
|
|
|
int figuresInBase = p.checkFigureInBase(p.figures); |
|
|
|
if(figuresInBase == 4) { |
|
|
|
return countRolls < 3; |
|
|
|
if(countRolls >= 3) return false; |
|
|
|
if(figuresInBase == 4) { |
|
|
|
return true; |
|
|
|
} else if (figuresInBase < 4) { |
|
|
|
for(int i = 0; i < 4 - figuresInBase; i++) { |
|
|
|
if(checkFieldClear(p.startHome+3-i,p,g) == 0) { |
|
|
|
return dice == 6; |
|
|
|
} |
|
|
|
} |
|
|
|
return true; |
|
|
|
} else return dice == 6; |
|
|
|
} |
|
|
|
|
|
|
|