diff --git a/src/ch/zhaw/catan/Siedler.java b/src/ch/zhaw/catan/Siedler.java index 3149132..c446197 100644 --- a/src/ch/zhaw/catan/Siedler.java +++ b/src/ch/zhaw/catan/Siedler.java @@ -19,7 +19,7 @@ public class Siedler { throwDice(game, parser); diceThrown = true; } - parser.displayPlayerInfo(game.getCurrentPlayerResource(),1); + parser.displayPlayerInfo(game.getCurrentPlayerResource(),game.getWinPoints().get(game.getCurrentPlayerFaction())); switch (parser.getAction()) { case NEXTPLAYER: Config.Faction winner = game.getWinner(); @@ -64,6 +64,7 @@ public class Siedler { Random random = new Random(); //sum of two integers from 0-5 + 2 --> sum of two integers from 1-6 int thrownDices = random.nextInt(6) + random.nextInt(6) + 2; + //todo check if 7 parser.thrownDices(thrownDices); game.throwDice(thrownDices); } diff --git a/src/ch/zhaw/catan/SiedlerGame.java b/src/ch/zhaw/catan/SiedlerGame.java index ff80402..8298fd9 100644 --- a/src/ch/zhaw/catan/SiedlerGame.java +++ b/src/ch/zhaw/catan/SiedlerGame.java @@ -323,7 +323,7 @@ public class SiedlerGame { return null; } - private HashMap getWinPoints(){ + public HashMap getWinPoints(){ HashMap winPoints = new HashMap<>(); List structures = board.getCorners(); for(Structure structure : structures) {