diff --git a/class/application/Controller.class b/class/application/Controller.class
index 693e15ae6cb6d6f6a9355d224d8a1c1b1c15623f..9e09295f37fd6a40e3d5de34efcbe6a8cde20d4e 100644
Binary files a/class/application/Controller.class and b/class/application/Controller.class differ
diff --git a/class/application/MainGUI.fxml b/class/application/MainGUI.fxml
index 76578be43c1997bfc72174998074bee1130ecbc5..e92780c0a7a3a7bb2b4113422cae8dfd6ccc9a13 100644
--- a/class/application/MainGUI.fxml
+++ b/class/application/MainGUI.fxml
@@ -1,20 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
<AnchorPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.Controller">
<children>
- <Rectangle fx:id="iconLastCard" arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="90.0" layoutX="326.0" layoutY="230.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="2.0" width="57.0" />
- <Label fx:id="labelLastCard" alignment="CENTER" contentDisplay="CENTER" layoutX="326.0" layoutY="256.0" prefHeight="38.0" prefWidth="57.0" text="+4" textAlignment="CENTER" textFill="WHITE">
- <font>
- <Font name="System Bold" size="26.0" />
- </font></Label>
<HBox fx:id="hboxPlayerDeck" layoutX="83.0" layoutY="450.0" prefHeight="107.0" prefWidth="634.0" />
- <StackPane fx:id="iconDeck" layoutX="458.0" layoutY="230.0" prefHeight="90.0" prefWidth="57.0" />
+ <ImageView fx:id="iconDeck" fitHeight="90.0" fitWidth="57.0" layoutX="447.0" layoutY="230.0" pickOnBounds="true" preserveRatio="true" />
+ <ImageView fx:id="iconLastCard" fitHeight="90.0" fitWidth="57.0" layoutX="277.0" layoutY="230.0" pickOnBounds="true" preserveRatio="true" />
</children>
</AnchorPane>
diff --git a/class/images/DRAW_FOUR-BLACK.png b/class/images/DRAW_FOUR-BLACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0f3d6927da39185e9233a0603aadc162dd61a6f
Binary files /dev/null and b/class/images/DRAW_FOUR-BLACK.png differ
diff --git a/class/images/DRAW_TWO-BLUE.png b/class/images/DRAW_TWO-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..a90e6df86d9ede9aac770879c73154698fdfdee0
Binary files /dev/null and b/class/images/DRAW_TWO-BLUE.png differ
diff --git a/class/images/DRAW_TWO-GREEN.png b/class/images/DRAW_TWO-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..2341e3e8906ff1541bea353219202bff76a12399
Binary files /dev/null and b/class/images/DRAW_TWO-GREEN.png differ
diff --git a/class/images/DRAW_TWO-RED.png b/class/images/DRAW_TWO-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..31484420aef30c863836278ac8cb2a27c5bb53b0
Binary files /dev/null and b/class/images/DRAW_TWO-RED.png differ
diff --git a/class/images/DRAW_TWO-YELLOW.png b/class/images/DRAW_TWO-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb076577d81f3a62b5c7116c6a4807d2dc5f56e3
Binary files /dev/null and b/class/images/DRAW_TWO-YELLOW.png differ
diff --git a/class/images/EIGHT-BLUE.png b/class/images/EIGHT-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..5485f8c00b894776b6467522dad78436ab95b55b
Binary files /dev/null and b/class/images/EIGHT-BLUE.png differ
diff --git a/class/images/EIGHT-GREEN.png b/class/images/EIGHT-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e839793b092b5d86fac314f4f2c7910766740a0
Binary files /dev/null and b/class/images/EIGHT-GREEN.png differ
diff --git a/class/images/EIGHT-RED.png b/class/images/EIGHT-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..13532ab3916ac36db9c37abf7f982f7ccbdfba88
Binary files /dev/null and b/class/images/EIGHT-RED.png differ
diff --git a/class/images/EIGHT-YELLOW.png b/class/images/EIGHT-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..208d4a4ffd8667430027ac39c11af6ad7f1a2f2c
Binary files /dev/null and b/class/images/EIGHT-YELLOW.png differ
diff --git a/class/images/FIVE-BLUE.png b/class/images/FIVE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..247e86896231595f8858ac78cdcf7561da965941
Binary files /dev/null and b/class/images/FIVE-BLUE.png differ
diff --git a/class/images/FIVE-GREEN.png b/class/images/FIVE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c25d45619c9e26e5ed589216c8b0db5e30ca095
Binary files /dev/null and b/class/images/FIVE-GREEN.png differ
diff --git a/class/images/FIVE-RED.png b/class/images/FIVE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa23f46ee9bb319ec60d01ac4c0cc79640875c33
Binary files /dev/null and b/class/images/FIVE-RED.png differ
diff --git a/class/images/FIVE-YELLOW.png b/class/images/FIVE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..d449aca2f055b1ab5c27e49448bbaa61b2761410
Binary files /dev/null and b/class/images/FIVE-YELLOW.png differ
diff --git a/class/images/FOUR-BLUE.png b/class/images/FOUR-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..5886920ac4e701a3d548643d3d7bba6fec07e3c5
Binary files /dev/null and b/class/images/FOUR-BLUE.png differ
diff --git a/class/images/FOUR-GREEN.png b/class/images/FOUR-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..43f5f35a25fca999b756a3542b19e58e40036fae
Binary files /dev/null and b/class/images/FOUR-GREEN.png differ
diff --git a/class/images/FOUR-RED.png b/class/images/FOUR-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..05a5de9301365703a4251c49eb92596b7fcb6d01
Binary files /dev/null and b/class/images/FOUR-RED.png differ
diff --git a/class/images/FOUR-YELLOW.png b/class/images/FOUR-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..d022c1bc6577c8c8323844125368140b4db34331
Binary files /dev/null and b/class/images/FOUR-YELLOW.png differ
diff --git a/class/images/NINE-BLUE.png b/class/images/NINE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d633f836681187097979424f78caf2a1fb4e80
Binary files /dev/null and b/class/images/NINE-BLUE.png differ
diff --git a/class/images/NINE-GREEN.png b/class/images/NINE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfa86a94cdd9761a3527d349f404cda02a04b766
Binary files /dev/null and b/class/images/NINE-GREEN.png differ
diff --git a/class/images/NINE-RED.png b/class/images/NINE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8be5141f2700bb5c387bac028a013294fdf3b40
Binary files /dev/null and b/class/images/NINE-RED.png differ
diff --git a/class/images/NINE-YELLOW.png b/class/images/NINE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..615bb8e95cf20178f3b054b5812877cdb3275187
Binary files /dev/null and b/class/images/NINE-YELLOW.png differ
diff --git a/class/images/ONE-BLUE.png b/class/images/ONE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a00d08a4bfcccf4e26b28b7e15f0638c6e2bd32
Binary files /dev/null and b/class/images/ONE-BLUE.png differ
diff --git a/class/images/ONE-GREEN.png b/class/images/ONE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f22ea716a8d2479c91ac192a0f833fd94a0d0e2
Binary files /dev/null and b/class/images/ONE-GREEN.png differ
diff --git a/class/images/ONE-RED.png b/class/images/ONE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33698a0202f6712835fc6966cb369d3b6a3bb58
Binary files /dev/null and b/class/images/ONE-RED.png differ
diff --git a/class/images/ONE-YELLOW.png b/class/images/ONE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..58a407c2a0e130d36651b261bc3db70a83cb79cf
Binary files /dev/null and b/class/images/ONE-YELLOW.png differ
diff --git a/class/images/REVERSE-BLUE.png b/class/images/REVERSE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d6f890e0a062479eed073f310b3e7312e031e85
Binary files /dev/null and b/class/images/REVERSE-BLUE.png differ
diff --git a/class/images/REVERSE-GREEN.png b/class/images/REVERSE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..6073569a2650d735e58b7c3016b2cbad9cb1926f
Binary files /dev/null and b/class/images/REVERSE-GREEN.png differ
diff --git a/class/images/REVERSE-RED.png b/class/images/REVERSE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..c26f07b914cbfe0c8b9a4a13ba1d33fd59655bd4
Binary files /dev/null and b/class/images/REVERSE-RED.png differ
diff --git a/class/images/REVERSE-YELLOW.png b/class/images/REVERSE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..a259b9ea1028f4bd9c7ead387838c1f9eea62d5d
Binary files /dev/null and b/class/images/REVERSE-YELLOW.png differ
diff --git a/class/images/SEVEN-BLUE.png b/class/images/SEVEN-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..69df6a59df96d279c1592f9401d8555d0b265aaa
Binary files /dev/null and b/class/images/SEVEN-BLUE.png differ
diff --git a/class/images/SEVEN-GREEN.png b/class/images/SEVEN-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..04d0ccf7fb9d9e16f180a580ef3d01c53c35c8cf
Binary files /dev/null and b/class/images/SEVEN-GREEN.png differ
diff --git a/class/images/SEVEN-RED.png b/class/images/SEVEN-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..af1a1efcea594e4a043ece36f4dd1e7a10e45eeb
Binary files /dev/null and b/class/images/SEVEN-RED.png differ
diff --git a/class/images/SEVEN-YELLOW.png b/class/images/SEVEN-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..04d0ccf7fb9d9e16f180a580ef3d01c53c35c8cf
Binary files /dev/null and b/class/images/SEVEN-YELLOW.png differ
diff --git a/class/images/SIX-BLUE.png b/class/images/SIX-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d36a7285a0d897fe0c8edb7c1d187b93607e94
Binary files /dev/null and b/class/images/SIX-BLUE.png differ
diff --git a/class/images/SIX-GREEN.png b/class/images/SIX-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..d065996fb0665f462ee7576df4af1a7c2f4fa160
Binary files /dev/null and b/class/images/SIX-GREEN.png differ
diff --git a/class/images/SIX-RED.png b/class/images/SIX-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..31bf838754af51ff7fee876e14af2768ef2984d8
Binary files /dev/null and b/class/images/SIX-RED.png differ
diff --git a/class/images/SIX-YELLOW.png b/class/images/SIX-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9218f2f82de885da9f29b3c73d407e1cc029fbe
Binary files /dev/null and b/class/images/SIX-YELLOW.png differ
diff --git a/class/images/SKIP-BLUE.png b/class/images/SKIP-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b5b2cd10e29502b299a1359892c2f384cc120ea
Binary files /dev/null and b/class/images/SKIP-BLUE.png differ
diff --git a/class/images/SKIP-GREEN.png b/class/images/SKIP-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1619b2922431b7aab3acf594b0b59d04b8be5ab
Binary files /dev/null and b/class/images/SKIP-GREEN.png differ
diff --git a/class/images/SKIP-RED.png b/class/images/SKIP-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..acc3fc88048c0ac5f7cde6d908bc2b95f65caaeb
Binary files /dev/null and b/class/images/SKIP-RED.png differ
diff --git a/class/images/SKIP-YELLOW.png b/class/images/SKIP-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5bdc1ccce511dc4cd048010eb5f1076ad541ce0
Binary files /dev/null and b/class/images/SKIP-YELLOW.png differ
diff --git a/class/images/THREE-BLUE.png b/class/images/THREE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..d23a1d0ee77957dbde8daa80f9b688dbebea480d
Binary files /dev/null and b/class/images/THREE-BLUE.png differ
diff --git a/class/images/THREE-GREEN.png b/class/images/THREE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..86c92450f31672815d8112b1f4b4496ea570bfc0
Binary files /dev/null and b/class/images/THREE-GREEN.png differ
diff --git a/class/images/THREE-RED.png b/class/images/THREE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..92a536f1d7af28d0739e5ee49e998488a4e2d5d2
Binary files /dev/null and b/class/images/THREE-RED.png differ
diff --git a/class/images/THREE-YELLOW.png b/class/images/THREE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d8292006d17ad5920921860aeff3a8e9458422a
Binary files /dev/null and b/class/images/THREE-YELLOW.png differ
diff --git a/class/images/TWO-BLUE.png b/class/images/TWO-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7fa9660d0464ecf63be4e13195b08f98f898ca0
Binary files /dev/null and b/class/images/TWO-BLUE.png differ
diff --git a/class/images/TWO-GREEN.png b/class/images/TWO-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..07214c4eae5220aac68456e9bdf0fddd57730eb5
Binary files /dev/null and b/class/images/TWO-GREEN.png differ
diff --git a/class/images/TWO-RED.png b/class/images/TWO-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..e684476c5ae448ae6e134bce97e4c11e34340691
Binary files /dev/null and b/class/images/TWO-RED.png differ
diff --git a/class/images/TWO-YELLOW.png b/class/images/TWO-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b863a208f2695ddb6e0f15bcebb1d27ad19bdb8
Binary files /dev/null and b/class/images/TWO-YELLOW.png differ
diff --git a/class/images/WILD-BLACK.png b/class/images/WILD-BLACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..409f5989b9098998ddf0ea6b3fa80de0a2d5965d
Binary files /dev/null and b/class/images/WILD-BLACK.png differ
diff --git a/class/images/ZERO-BLUE.png b/class/images/ZERO-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..43014a8807081e664917a81406298e1c2e3e3606
Binary files /dev/null and b/class/images/ZERO-BLUE.png differ
diff --git a/class/images/ZERO-GREEN.png b/class/images/ZERO-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..f55ff27d2e26d055a276e52842903d4317a89b22
Binary files /dev/null and b/class/images/ZERO-GREEN.png differ
diff --git a/class/images/ZERO-RED.png b/class/images/ZERO-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae8af106c1c115df5bf2e1cadd44e7257706d439
Binary files /dev/null and b/class/images/ZERO-RED.png differ
diff --git a/class/images/ZERO-YELLOW.png b/class/images/ZERO-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..7da61e3bff6e1f3c089d28b8e421a3aff475cf6a
Binary files /dev/null and b/class/images/ZERO-YELLOW.png differ
diff --git a/class/logic/Game.class b/class/logic/Game.class
index 0e40b90d3e10a9ab79fae8f2d218fa8c628eb63c..2c08991143131323f6c047ab596d63d1fabdf01e 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 03864e4c0309411aa8a90d696fc7d30b94628f05..d048273a24a8c3b1960d98023e93a548e7629223 100644
--- a/src/application/Controller.java
+++ b/src/application/Controller.java
@@ -8,23 +8,20 @@ import javafx.fxml.FXML;
import javafx.geometry.Insets;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
import javafx.stage.Stage;
import logic.Card;
+import logic.CardType;
+import logic.Color;
import logic.Game;
public class Controller
{
- @FXML private Label labelLastCard;
- @FXML private Rectangle iconLastCard;
- @FXML private HBox hboxPlayerDeck;
- @FXML private StackPane iconDeck;
+ @FXML private ImageView iconLastCard;
+ @FXML private ImageView iconDeck;
+ @FXML private HBox hboxPlayerDeck;
public Game game;
@@ -34,10 +31,7 @@ public class Controller
public void init()
{
- iconLastCard.setArcWidth(20);
- iconLastCard.setArcHeight(20);
-
- iconDeck = createBackCard();
+ iconDeck.setImage(createBackCard());
game = new Game(this, 3);
game.newGame(5);
@@ -48,48 +42,23 @@ public class Controller
this.stage = stage;
}
- public void setLastCard(String color, String text)
+ public void setLastCard(Card card)
{
- iconLastCard.setFill(Color.web(color));
- labelLastCard.setText(text);
+ iconLastCard.setImage(createCard(card, true).getImage());
}
- private StackPane createBackCard()
+ private Image createBackCard()
{
- Rectangle newCard = new Rectangle(57.0, 90.0);
- newCard.setStroke(Color.BLACK);
- newCard.setStrokeWidth(2.0);
- newCard.setArcWidth(20);
- newCard.setArcHeight(20);
-
- ImageView imageView = new ImageView(new Image("images/card-back.png"));
- imageView.setFitHeight(90.0);
- imageView.setFitWidth(57.0);
-
- StackPane pane = new StackPane();
- pane.getChildren().add(newCard);
- pane.getChildren().add(imageView);
-
- return pane;
+ return new Image("images/card-back.png");
}
- private StackPane createCard(Card card, boolean valid)
- {
- Rectangle newCard = new Rectangle(57.0, 90.0);
- newCard.setStroke(Color.BLACK);
- newCard.setStrokeWidth(2.0);
- newCard.setArcWidth(20);
- newCard.setArcHeight(20);
-
+ private ImageView createCard(Card card, boolean valid)
+ {
ImageView imageView = new ImageView(new Image("images/" + card.getType() + "-" + card.getColor() + ".png"));
imageView.setFitHeight(90.0);
- imageView.setFitWidth(57.0);
-
- StackPane pane = new StackPane();
- pane.getChildren().add(newCard);
- pane.getChildren().add(imageView);
-
- return pane;
+ imageView.setFitWidth(57.0);
+
+ return imageView;
}
public void setPlayerDeck(ArrayList<Card> deck)
diff --git a/src/application/MainGUI.fxml b/src/application/MainGUI.fxml
index 76578be43c1997bfc72174998074bee1130ecbc5..e92780c0a7a3a7bb2b4113422cae8dfd6ccc9a13 100644
--- a/src/application/MainGUI.fxml
+++ b/src/application/MainGUI.fxml
@@ -1,20 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
<AnchorPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.Controller">
<children>
- <Rectangle fx:id="iconLastCard" arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="90.0" layoutX="326.0" layoutY="230.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="2.0" width="57.0" />
- <Label fx:id="labelLastCard" alignment="CENTER" contentDisplay="CENTER" layoutX="326.0" layoutY="256.0" prefHeight="38.0" prefWidth="57.0" text="+4" textAlignment="CENTER" textFill="WHITE">
- <font>
- <Font name="System Bold" size="26.0" />
- </font></Label>
<HBox fx:id="hboxPlayerDeck" layoutX="83.0" layoutY="450.0" prefHeight="107.0" prefWidth="634.0" />
- <StackPane fx:id="iconDeck" layoutX="458.0" layoutY="230.0" prefHeight="90.0" prefWidth="57.0" />
+ <ImageView fx:id="iconDeck" fitHeight="90.0" fitWidth="57.0" layoutX="447.0" layoutY="230.0" pickOnBounds="true" preserveRatio="true" />
+ <ImageView fx:id="iconLastCard" fitHeight="90.0" fitWidth="57.0" layoutX="277.0" layoutY="230.0" pickOnBounds="true" preserveRatio="true" />
</children>
</AnchorPane>
diff --git a/src/images/DRAW_TWO-BLUE.png b/src/images/DRAW_TWO-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..a90e6df86d9ede9aac770879c73154698fdfdee0
Binary files /dev/null and b/src/images/DRAW_TWO-BLUE.png differ
diff --git a/src/images/DRAW_TWO-GREEN.png b/src/images/DRAW_TWO-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..2341e3e8906ff1541bea353219202bff76a12399
Binary files /dev/null and b/src/images/DRAW_TWO-GREEN.png differ
diff --git a/src/images/DRAW_TWO-RED.png b/src/images/DRAW_TWO-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..31484420aef30c863836278ac8cb2a27c5bb53b0
Binary files /dev/null and b/src/images/DRAW_TWO-RED.png differ
diff --git a/src/images/DRAW_TWO-YELLOW.png b/src/images/DRAW_TWO-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb076577d81f3a62b5c7116c6a4807d2dc5f56e3
Binary files /dev/null and b/src/images/DRAW_TWO-YELLOW.png differ
diff --git a/src/images/EIGHT-BLUE.png b/src/images/EIGHT-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..5485f8c00b894776b6467522dad78436ab95b55b
Binary files /dev/null and b/src/images/EIGHT-BLUE.png differ
diff --git a/src/images/EIGHT-GREEN.png b/src/images/EIGHT-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e839793b092b5d86fac314f4f2c7910766740a0
Binary files /dev/null and b/src/images/EIGHT-GREEN.png differ
diff --git a/src/images/EIGHT-RED.png b/src/images/EIGHT-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..13532ab3916ac36db9c37abf7f982f7ccbdfba88
Binary files /dev/null and b/src/images/EIGHT-RED.png differ
diff --git a/src/images/EIGHT-YELLOW.png b/src/images/EIGHT-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..208d4a4ffd8667430027ac39c11af6ad7f1a2f2c
Binary files /dev/null and b/src/images/EIGHT-YELLOW.png differ
diff --git a/src/images/FIVE-BLUE.png b/src/images/FIVE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..247e86896231595f8858ac78cdcf7561da965941
Binary files /dev/null and b/src/images/FIVE-BLUE.png differ
diff --git a/src/images/FIVE-GREEN.png b/src/images/FIVE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c25d45619c9e26e5ed589216c8b0db5e30ca095
Binary files /dev/null and b/src/images/FIVE-GREEN.png differ
diff --git a/src/images/FIVE-RED.png b/src/images/FIVE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa23f46ee9bb319ec60d01ac4c0cc79640875c33
Binary files /dev/null and b/src/images/FIVE-RED.png differ
diff --git a/src/images/FIVE-YELLOW.png b/src/images/FIVE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..d449aca2f055b1ab5c27e49448bbaa61b2761410
Binary files /dev/null and b/src/images/FIVE-YELLOW.png differ
diff --git a/src/images/FOUR-BLUE.png b/src/images/FOUR-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..5886920ac4e701a3d548643d3d7bba6fec07e3c5
Binary files /dev/null and b/src/images/FOUR-BLUE.png differ
diff --git a/src/images/FOUR-GREEN.png b/src/images/FOUR-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..43f5f35a25fca999b756a3542b19e58e40036fae
Binary files /dev/null and b/src/images/FOUR-GREEN.png differ
diff --git a/src/images/FOUR-RED.png b/src/images/FOUR-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..05a5de9301365703a4251c49eb92596b7fcb6d01
Binary files /dev/null and b/src/images/FOUR-RED.png differ
diff --git a/src/images/FOUR-YELLOW.png b/src/images/FOUR-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..d022c1bc6577c8c8323844125368140b4db34331
Binary files /dev/null and b/src/images/FOUR-YELLOW.png differ
diff --git a/src/images/NINE-BLUE.png b/src/images/NINE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d633f836681187097979424f78caf2a1fb4e80
Binary files /dev/null and b/src/images/NINE-BLUE.png differ
diff --git a/src/images/NINE-GREEN.png b/src/images/NINE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfa86a94cdd9761a3527d349f404cda02a04b766
Binary files /dev/null and b/src/images/NINE-GREEN.png differ
diff --git a/src/images/NINE-RED.png b/src/images/NINE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8be5141f2700bb5c387bac028a013294fdf3b40
Binary files /dev/null and b/src/images/NINE-RED.png differ
diff --git a/src/images/NINE-YELLOW.png b/src/images/NINE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..615bb8e95cf20178f3b054b5812877cdb3275187
Binary files /dev/null and b/src/images/NINE-YELLOW.png differ
diff --git a/src/images/REVERSE-BLUE.png b/src/images/REVERSE-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d6f890e0a062479eed073f310b3e7312e031e85
Binary files /dev/null and b/src/images/REVERSE-BLUE.png differ
diff --git a/src/images/REVERSE-GREEN.png b/src/images/REVERSE-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..6073569a2650d735e58b7c3016b2cbad9cb1926f
Binary files /dev/null and b/src/images/REVERSE-GREEN.png differ
diff --git a/src/images/REVERSE-RED.png b/src/images/REVERSE-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..c26f07b914cbfe0c8b9a4a13ba1d33fd59655bd4
Binary files /dev/null and b/src/images/REVERSE-RED.png differ
diff --git a/src/images/REVERSE-YELLOW.png b/src/images/REVERSE-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..a259b9ea1028f4bd9c7ead387838c1f9eea62d5d
Binary files /dev/null and b/src/images/REVERSE-YELLOW.png differ
diff --git a/src/images/SEVEN-BLUE.png b/src/images/SEVEN-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..69df6a59df96d279c1592f9401d8555d0b265aaa
Binary files /dev/null and b/src/images/SEVEN-BLUE.png differ
diff --git a/src/images/SEVEN-GREEN.png b/src/images/SEVEN-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..04d0ccf7fb9d9e16f180a580ef3d01c53c35c8cf
Binary files /dev/null and b/src/images/SEVEN-GREEN.png differ
diff --git a/src/images/SEVEN-RED.png b/src/images/SEVEN-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..af1a1efcea594e4a043ece36f4dd1e7a10e45eeb
Binary files /dev/null and b/src/images/SEVEN-RED.png differ
diff --git a/src/images/SEVEN-YELLOW.png b/src/images/SEVEN-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..04d0ccf7fb9d9e16f180a580ef3d01c53c35c8cf
Binary files /dev/null and b/src/images/SEVEN-YELLOW.png differ
diff --git a/src/images/SIX-BLUE.png b/src/images/SIX-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d36a7285a0d897fe0c8edb7c1d187b93607e94
Binary files /dev/null and b/src/images/SIX-BLUE.png differ
diff --git a/src/images/SIX-GREEN.png b/src/images/SIX-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..d065996fb0665f462ee7576df4af1a7c2f4fa160
Binary files /dev/null and b/src/images/SIX-GREEN.png differ
diff --git a/src/images/SIX-RED.png b/src/images/SIX-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..31bf838754af51ff7fee876e14af2768ef2984d8
Binary files /dev/null and b/src/images/SIX-RED.png differ
diff --git a/src/images/SIX-YELLOW.png b/src/images/SIX-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9218f2f82de885da9f29b3c73d407e1cc029fbe
Binary files /dev/null and b/src/images/SIX-YELLOW.png differ
diff --git a/src/images/SKIP-BLUE.png b/src/images/SKIP-BLUE.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b5b2cd10e29502b299a1359892c2f384cc120ea
Binary files /dev/null and b/src/images/SKIP-BLUE.png differ
diff --git a/src/images/SKIP-GREEN.png b/src/images/SKIP-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1619b2922431b7aab3acf594b0b59d04b8be5ab
Binary files /dev/null and b/src/images/SKIP-GREEN.png differ
diff --git a/src/images/SKIP-RED.png b/src/images/SKIP-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..acc3fc88048c0ac5f7cde6d908bc2b95f65caaeb
Binary files /dev/null and b/src/images/SKIP-RED.png differ
diff --git a/src/images/SKIP-YELLOW.png b/src/images/SKIP-YELLOW.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5bdc1ccce511dc4cd048010eb5f1076ad541ce0
Binary files /dev/null and b/src/images/SKIP-YELLOW.png differ
diff --git a/src/logic/Game.java b/src/logic/Game.java
index 4989ec4f33325065dfe7dc80e6082fb81f400a45..e4e4aae7dd3ae2fd0ac7df9bfdc7a3e796b2bf77 100644
--- a/src/logic/Game.java
+++ b/src/logic/Game.java
@@ -188,7 +188,7 @@ public class Game
challengeCounter += 4;
}
- controller.setLastCard(lastCard.getColorAsHex(), lastCard.getTypeBeautyfied());
+ controller.setLastCard(lastCard);
System.out.println("new lastCard: " + lastCard);
System.out.println("new wishColor: " + this.wishColor);