diff --git a/class/application/Controller.class b/class/application/Controller.class index be0f785fd6d97e0800b493041aadd8744406ca4b..a393e20a12c8a0779aba81a2046f8e2121bbf637 100644 Binary files a/class/application/Controller.class and b/class/application/Controller.class differ diff --git a/class/logic/Game.class b/class/logic/Game.class index 9e2fd9f9c22dc0f1b41c3b2ef245685d31c800d3..30c9f4d97f0f453d12e3da4b64421989052c693e 100644 Binary files a/class/logic/Game.class and b/class/logic/Game.class differ diff --git a/src/application/Controller.java b/src/application/Controller.java index 6496172886e257f04b067aad25a91ba704da68b6..4de9069bbf5b0804d5a5b61408f1637d78ccee37 100644 --- a/src/application/Controller.java +++ b/src/application/Controller.java @@ -137,7 +137,7 @@ public class Controller drawCounter = 0; // DEBUG - game = new Game(this, 3); + game = new Game(this, 2); setLabelNames(game.getPlayer(), game.getAIs()); game.newGame(5); diff --git a/src/logic/Game.java b/src/logic/Game.java index 4fddf15b144642d12d7f44361edaeed2635a9c6d..d55a95b962c5d82ec52a897e0851640242de653c 100644 --- a/src/logic/Game.java +++ b/src/logic/Game.java @@ -142,27 +142,27 @@ public class Game System.out.println("ROUND: " + counter / 4 + 1); + if(lastCard.getType().equals(CardType.REVERSE) && !lastPlayerDraw) + { + if(direction.equals(Direction.RIGHT)) + { + direction = Direction.LEFT; + controller.setImageViewDirection(Direction.LEFT); + + } + else + { + direction = Direction.RIGHT; + controller.setImageViewDirection(Direction.RIGHT); + } + } + determineNextPlayer(); System.out.println("Player " + currentPlayer + "'s turn"); if(skipped || !lastCard.getType().equals(CardType.SKIP)) - { - if(lastCard.getType().equals(CardType.REVERSE) && !lastPlayerDraw) - { - if(direction.equals(Direction.RIGHT)) - { - direction = Direction.LEFT; - controller.setImageViewDirection(Direction.LEFT); - - } - else - { - direction = Direction.RIGHT; - controller.setImageViewDirection(Direction.RIGHT); - } - } - + { if(currentPlayer == 1) { controller.setLabelCurrentPlayer(player.getName() + " ist am Zug");