From 992812a5e933ba258916ddbb5e58ad13f4a20b6c Mon Sep 17 00:00:00 2001
From: deadlocker8 <goldi.96@gmx.de>
Date: Fri, 22 Apr 2016 16:06:49 +0200
Subject: [PATCH] Fixed #1
---
class/application/Controller.class | Bin 20904 -> 20904 bytes
class/logic/Game.class | Bin 9067 -> 9067 bytes
src/application/Controller.java | 2 +-
src/logic/Game.java | 32 ++++++++++++++---------------
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/class/application/Controller.class b/class/application/Controller.class
index be0f785fd6d97e0800b493041aadd8744406ca4b..a393e20a12c8a0779aba81a2046f8e2121bbf637 100644
GIT binary patch
delta 16
YcmZ3nm~q8o#tmO}8Cf@f)7_*D06x(N8~^|S
delta 16
YcmZ3nm~q8o#tmO}8QC^})7_*D06y0T9RL6T
diff --git a/class/logic/Game.class b/class/logic/Game.class
index 9e2fd9f9c22dc0f1b41c3b2ef245685d31c800d3..30c9f4d97f0f453d12e3da4b64421989052c693e 100644
GIT binary patch
delta 425
zcmaFu_S$X3E6#dOh7FADJd7L+TNoMGgIvR0gMwYT7%~~QaWZ5wa`Q0qFi0^nu=u#T
zg>W%2GV<{-@-wJ2G6<)nmZTQtX6B{(rB;*#<Rn(67I82NGBU73*a{qs!i)^;>ct8r
zrA2vM3||;Uc^LjMiZL?iYWQR&mL=-vB<7{-2bWB?=ThdC;9-;m+0PQ}?HRCnCRaaS
z{T7C#Z49e7F|uuA*gBKJMr#X0@hk>Ytt||>n;0^-F>=mi5ZBto$hDOrS8EG{#wJFt
zZ4CL#8AP-;F=W8R7&5jo<ZEqb<lV&ZZa2f1NMS~S?F>J(wlLh-#_&s+QD_^Z$To(5
z+ZY+OwlI{=Vi4AX*(tt_fo1C~hTW4_ODZvnOg<->$|y3~L~5~e4Z~!HPKK!r6Bwp3
z%wm|qFqdIA!xDx$4C@#cFl=I2#BhmW$>d*Bv$*0J7}*&Z85jhtCeM?WX5^o|OIn(d
zbMiIm(|jN&Xm4W_5oQeB#wap*y^JoS$mF{+wTvQ@qh*~KMK;fqHDX~DnS4>vo>648
Ipi&eg0Ekz3LjV8(
delta 359
zcmaFu_S$X3D^3nB21Z799!8GIGF(!sT#O9t0Xd14sYMDLj694C?CQk|C8b4qTnt|r
z`FI%qF!D1p=uU2A5}usLC1)<k!zjeCg^__J*xNIJlVJm+2oIwuNPs=aHOw_A*p-VR
zlVKYtLnfmH52GZ56e9zRkE>hA=9ygme6rga*)}n}+s*JLQkao*JHrpHEetodG5iu{
z<le@}JGoC%Oi*AO!`4}hELvL_lD09d-oz+8*-%nUQ*0)KxYi~{@vRKGT3Z-2HZh8C
zW5{35AfmO2Ap<7Hkg<&+fAVTcB}U%K=Oj}Zc_*7lEmqECn9R`0FqL5e!*qu23^N&y
zFwAB+%`k`ID#JX68w?8>?lUZ!{7Y&UR}upwI|CyFgSo)udD7C19FuoROEZd1z9xN|
z59CnoZH&CajDa9mu9wke<ehw1rk0U+a<r@yBk$&UvPLY7ypt~~+B5QQ7F3F21OT(_
BU<d#J
diff --git a/src/application/Controller.java b/src/application/Controller.java
index 6496172..4de9069 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 4fddf15..d55a95b 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");
--
GitLab