diff --git a/Testing/src/Game.java b/Testing/src/Game.java index 6367d7f..1855220 100644 --- a/Testing/src/Game.java +++ b/Testing/src/Game.java @@ -88,7 +88,6 @@ public class Game { private void newRound(){ round++; - System.out.println(); System.out.println("----- ROUND " + round + " -----"); for (Player p: players) { p.clearHand(); @@ -124,7 +123,12 @@ public class Game { private void winningProcess(){ int highestCardIndex = -1; for (int i = 0; i < pickedCards.size(); i++) { - + if (pickedCards.get(i).getCardValue().getIndex() == 14){ + players.get(i).setTimesWon(players.get(i).getTimesWon()+1); + } + if (pickedCards.get(i).getCardType().getIndex() == leadingType){ + + } } } diff --git a/Testing/src/Participant/Player.java b/Testing/src/Participant/Player.java index 13364d9..8411a5c 100644 --- a/Testing/src/Participant/Player.java +++ b/Testing/src/Participant/Player.java @@ -47,7 +47,7 @@ public class Player { public void displayHand(){ System.out.print("Hand: "); for (int i = 0; i < hand.size(); i++) { - System.out.print("(" + (i+1) + ")" + hand.get(i).getName() + "; "); + System.out.print("(" + (i+1) + ") " + hand.get(i).getName() + "; "); } System.out.println(); } diff --git a/out/production/Testing/Game.class b/out/production/Testing/Game.class index 07bf81c..1ca52c7 100644 Binary files a/out/production/Testing/Game.class and b/out/production/Testing/Game.class differ diff --git a/out/production/Testing/Participant/Player.class b/out/production/Testing/Participant/Player.class index 8e08cce..6abb1b8 100644 Binary files a/out/production/Testing/Participant/Player.class and b/out/production/Testing/Participant/Player.class differ