diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java index 705ebf9..4fd4ae1 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java @@ -5,7 +5,10 @@ import it.polimi.ingsw.gc14.Model.Cards.TribeCard; import it.polimi.ingsw.gc14.Model.Game; import it.polimi.ingsw.gc14.Model.Player; import it.polimi.ingsw.gc14.Model.Slot; +import javafx.beans.value.ChangeListener; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; +import javafx.geometry.Bounds; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.image.*; @@ -103,5 +106,164 @@ public class MainFXMLController { lowerList.getChildren().add(view); i++; } + + + // My hand + myHand.getChildren().clear(); + myHand.setSpacing(6); + //myHand.setAlignment(Pos.CENTER_LEFT); + + myHand.getChildren().add(createCardPane(model.getPlayerByUsername(username).artists.stream().map(x -> (TribeCard) x).toList(), myHand)); + myHand.getChildren().add(createCardPane(model.getPlayerByUsername(username).gatherers.stream().map(x -> (TribeCard) x).toList(), myHand)); + myHand.getChildren().add(createCardPane(model.getPlayerByUsername(username).inventors.stream().map(x -> (TribeCard) x).toList(), myHand)); + myHand.getChildren().add(createCardPane(model.getPlayerByUsername(username).builders.stream().map(x -> (TribeCard) x).toList(), myHand)); + myHand.getChildren().add(createCardPane(model.getPlayerByUsername(username).shamans.stream().map(x -> (TribeCard) x).toList(), myHand)); + myHand.getChildren().add(createCardPane(model.getPlayerByUsername(username).hunters.stream().map(x -> (TribeCard) x).toList(), myHand)); + + + + /** + // Artists + Pane artists = new Pane(); + artists.prefHeightProperty().bind(myHand.heightProperty()); + artists.prefWidthProperty().bind( + artists.heightProperty().multiply(0.63).add((model.getPlayerByUsername(username).artists.size() - 1) * 50) + ); + for (int j=0;j cards, HBox container) { + Pane pane = new Pane(); + int n = cards.size(); + pane.prefHeightProperty().bind(container.heightProperty()); + + for (int j = 0; j < n; j++) { + TribeCard card = cards.get(j); + Image tribeImg = new Image(getClass().getResourceAsStream("/GUIImages/Fronts/card-" + card.getIdIMG() + ".png")); + ImageView view = new ImageView(tribeImg); + view.fitHeightProperty().bind(pane.heightProperty().subtract(10)); + view.setPreserveRatio(true); + view.setLayoutX(j * 50); + view.setLayoutY(5); + pane.getChildren().add(view); + + if (j == 0) { + view.layoutBoundsProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue obs, Bounds old, Bounds bounds) { + if (bounds.getWidth() > 0) { + pane.setPrefWidth(bounds.getWidth() + (n - 1) * 50); + view.layoutBoundsProperty().removeListener(this); + } + } + }); + } + } + return pane; } } diff --git a/src/main/resources/GUIImages/Fronts/card-001.png b/src/main/resources/GUIImages/Fronts/card-001.png index 6b56265..8d105a9 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-001.png and b/src/main/resources/GUIImages/Fronts/card-001.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-002.png b/src/main/resources/GUIImages/Fronts/card-002.png index d4146fb..1571206 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-002.png and b/src/main/resources/GUIImages/Fronts/card-002.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-003.png b/src/main/resources/GUIImages/Fronts/card-003.png index 4e060fc..6200050 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-003.png and b/src/main/resources/GUIImages/Fronts/card-003.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-004.png b/src/main/resources/GUIImages/Fronts/card-004.png index c6bf04f..b11d393 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-004.png and b/src/main/resources/GUIImages/Fronts/card-004.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-005.png b/src/main/resources/GUIImages/Fronts/card-005.png index 70ee4dd..86c7365 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-005.png and b/src/main/resources/GUIImages/Fronts/card-005.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-006.png b/src/main/resources/GUIImages/Fronts/card-006.png index 7401038..402c138 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-006.png and b/src/main/resources/GUIImages/Fronts/card-006.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-007.png b/src/main/resources/GUIImages/Fronts/card-007.png index b487ecf..92ef199 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-007.png and b/src/main/resources/GUIImages/Fronts/card-007.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-008.png b/src/main/resources/GUIImages/Fronts/card-008.png index a6dd5de..3fb1d07 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-008.png and b/src/main/resources/GUIImages/Fronts/card-008.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-009.png b/src/main/resources/GUIImages/Fronts/card-009.png index be7920f..344e441 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-009.png and b/src/main/resources/GUIImages/Fronts/card-009.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-010.png b/src/main/resources/GUIImages/Fronts/card-010.png index c74f545..7fb69c5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-010.png and b/src/main/resources/GUIImages/Fronts/card-010.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-011.png b/src/main/resources/GUIImages/Fronts/card-011.png index 8f5432b..57eaf05 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-011.png and b/src/main/resources/GUIImages/Fronts/card-011.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-012.png b/src/main/resources/GUIImages/Fronts/card-012.png index 2ce6a2e..dab8720 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-012.png and b/src/main/resources/GUIImages/Fronts/card-012.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-013.png b/src/main/resources/GUIImages/Fronts/card-013.png index 06cf152..b72293d 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-013.png and b/src/main/resources/GUIImages/Fronts/card-013.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-014.png b/src/main/resources/GUIImages/Fronts/card-014.png index d144a51..3276be7 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-014.png and b/src/main/resources/GUIImages/Fronts/card-014.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-015.png b/src/main/resources/GUIImages/Fronts/card-015.png index 6bc6920..0ec09e5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-015.png and b/src/main/resources/GUIImages/Fronts/card-015.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-016.png b/src/main/resources/GUIImages/Fronts/card-016.png index d144a51..3276be7 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-016.png and b/src/main/resources/GUIImages/Fronts/card-016.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-017.png b/src/main/resources/GUIImages/Fronts/card-017.png index 43ff517..019e827 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-017.png and b/src/main/resources/GUIImages/Fronts/card-017.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-018.png b/src/main/resources/GUIImages/Fronts/card-018.png index 877e4c3..f83e47b 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-018.png and b/src/main/resources/GUIImages/Fronts/card-018.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-019.png b/src/main/resources/GUIImages/Fronts/card-019.png index 3b6ac1b..666af5e 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-019.png and b/src/main/resources/GUIImages/Fronts/card-019.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-020.png b/src/main/resources/GUIImages/Fronts/card-020.png index 5f3e486..f4f2653 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-020.png and b/src/main/resources/GUIImages/Fronts/card-020.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-021.png b/src/main/resources/GUIImages/Fronts/card-021.png index 63945c2..5e9aea5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-021.png and b/src/main/resources/GUIImages/Fronts/card-021.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-022.png b/src/main/resources/GUIImages/Fronts/card-022.png index 8ecadf9..96c75b6 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-022.png and b/src/main/resources/GUIImages/Fronts/card-022.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-023.png b/src/main/resources/GUIImages/Fronts/card-023.png index 5b761cc..dc30166 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-023.png and b/src/main/resources/GUIImages/Fronts/card-023.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-024.png b/src/main/resources/GUIImages/Fronts/card-024.png index 73d7cc5..65dd47a 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-024.png and b/src/main/resources/GUIImages/Fronts/card-024.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-025.png b/src/main/resources/GUIImages/Fronts/card-025.png index 81d1ce1..1f5c45c 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-025.png and b/src/main/resources/GUIImages/Fronts/card-025.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-026.png b/src/main/resources/GUIImages/Fronts/card-026.png index 05af101..c62374c 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-026.png and b/src/main/resources/GUIImages/Fronts/card-026.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-027.png b/src/main/resources/GUIImages/Fronts/card-027.png index 54786a8..51c7bfc 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-027.png and b/src/main/resources/GUIImages/Fronts/card-027.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-028.png b/src/main/resources/GUIImages/Fronts/card-028.png index 79c8ec4..a612212 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-028.png and b/src/main/resources/GUIImages/Fronts/card-028.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-029.png b/src/main/resources/GUIImages/Fronts/card-029.png index c9f0783..f93b9d5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-029.png and b/src/main/resources/GUIImages/Fronts/card-029.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-030.png b/src/main/resources/GUIImages/Fronts/card-030.png index 8ec9df7..095fd2f 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-030.png and b/src/main/resources/GUIImages/Fronts/card-030.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-031.png b/src/main/resources/GUIImages/Fronts/card-031.png index 4e060fc..206f7b8 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-031.png and b/src/main/resources/GUIImages/Fronts/card-031.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-032.png b/src/main/resources/GUIImages/Fronts/card-032.png index d2e489e..489ba9b 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-032.png and b/src/main/resources/GUIImages/Fronts/card-032.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-033.png b/src/main/resources/GUIImages/Fronts/card-033.png index 6b56265..bdd6ee2 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-033.png and b/src/main/resources/GUIImages/Fronts/card-033.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-034.png b/src/main/resources/GUIImages/Fronts/card-034.png index a45d075..c108396 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-034.png and b/src/main/resources/GUIImages/Fronts/card-034.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-035.png b/src/main/resources/GUIImages/Fronts/card-035.png index 55fb912..49507a4 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-035.png and b/src/main/resources/GUIImages/Fronts/card-035.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-036.png b/src/main/resources/GUIImages/Fronts/card-036.png index d74bb4a..dc5c7c9 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-036.png and b/src/main/resources/GUIImages/Fronts/card-036.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-037.png b/src/main/resources/GUIImages/Fronts/card-037.png index a556bcb..b03aa3c 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-037.png and b/src/main/resources/GUIImages/Fronts/card-037.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-038.png b/src/main/resources/GUIImages/Fronts/card-038.png index 4efd17d..9f914d5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-038.png and b/src/main/resources/GUIImages/Fronts/card-038.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-039.png b/src/main/resources/GUIImages/Fronts/card-039.png index cfaa742..e1462ce 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-039.png and b/src/main/resources/GUIImages/Fronts/card-039.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-040.png b/src/main/resources/GUIImages/Fronts/card-040.png index c74f545..4498129 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-040.png and b/src/main/resources/GUIImages/Fronts/card-040.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-041.png b/src/main/resources/GUIImages/Fronts/card-041.png index a5f73b4..9598ad8 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-041.png and b/src/main/resources/GUIImages/Fronts/card-041.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-042.png b/src/main/resources/GUIImages/Fronts/card-042.png index 97f9071..3d1482f 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-042.png and b/src/main/resources/GUIImages/Fronts/card-042.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-043.png b/src/main/resources/GUIImages/Fronts/card-043.png index 7cf882e..d2c84bb 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-043.png and b/src/main/resources/GUIImages/Fronts/card-043.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-044.png b/src/main/resources/GUIImages/Fronts/card-044.png index 07376e7..5de7ab8 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-044.png and b/src/main/resources/GUIImages/Fronts/card-044.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-045.png b/src/main/resources/GUIImages/Fronts/card-045.png index 6bc6920..a20a9cc 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-045.png and b/src/main/resources/GUIImages/Fronts/card-045.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-046.png b/src/main/resources/GUIImages/Fronts/card-046.png index d144a51..5a62733 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-046.png and b/src/main/resources/GUIImages/Fronts/card-046.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-047.png b/src/main/resources/GUIImages/Fronts/card-047.png index 6bc6920..93dd3ef 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-047.png and b/src/main/resources/GUIImages/Fronts/card-047.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-048.png b/src/main/resources/GUIImages/Fronts/card-048.png index 6521a0f..17f18b5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-048.png and b/src/main/resources/GUIImages/Fronts/card-048.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-049.png b/src/main/resources/GUIImages/Fronts/card-049.png index a112f1d..29f85e3 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-049.png and b/src/main/resources/GUIImages/Fronts/card-049.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-050.png b/src/main/resources/GUIImages/Fronts/card-050.png index ff3fb1e..a38e529 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-050.png and b/src/main/resources/GUIImages/Fronts/card-050.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-051.png b/src/main/resources/GUIImages/Fronts/card-051.png index 33eaac8..eadd030 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-051.png and b/src/main/resources/GUIImages/Fronts/card-051.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-052.png b/src/main/resources/GUIImages/Fronts/card-052.png index 9c12672..a48aa08 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-052.png and b/src/main/resources/GUIImages/Fronts/card-052.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-053.png b/src/main/resources/GUIImages/Fronts/card-053.png index 3b6ac1b..eb63bd8 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-053.png and b/src/main/resources/GUIImages/Fronts/card-053.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-054.png b/src/main/resources/GUIImages/Fronts/card-054.png index 2417082..18e6091 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-054.png and b/src/main/resources/GUIImages/Fronts/card-054.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-055.png b/src/main/resources/GUIImages/Fronts/card-055.png index 54786a8..08d3038 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-055.png and b/src/main/resources/GUIImages/Fronts/card-055.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-056.png b/src/main/resources/GUIImages/Fronts/card-056.png index de23fad..12098e8 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-056.png and b/src/main/resources/GUIImages/Fronts/card-056.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-057.png b/src/main/resources/GUIImages/Fronts/card-057.png index 8aa0fe3..28545a3 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-057.png and b/src/main/resources/GUIImages/Fronts/card-057.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-058.png b/src/main/resources/GUIImages/Fronts/card-058.png index d901205..1e45648 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-058.png and b/src/main/resources/GUIImages/Fronts/card-058.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-059.png b/src/main/resources/GUIImages/Fronts/card-059.png index 4e060fc..d671340 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-059.png and b/src/main/resources/GUIImages/Fronts/card-059.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-060.png b/src/main/resources/GUIImages/Fronts/card-060.png index 8ec9df7..b642ccc 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-060.png and b/src/main/resources/GUIImages/Fronts/card-060.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-061.png b/src/main/resources/GUIImages/Fronts/card-061.png index 6b56265..15e043c 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-061.png and b/src/main/resources/GUIImages/Fronts/card-061.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-062.png b/src/main/resources/GUIImages/Fronts/card-062.png index 231d77e..8625780 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-062.png and b/src/main/resources/GUIImages/Fronts/card-062.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-063.png b/src/main/resources/GUIImages/Fronts/card-063.png index cfaa742..17adf72 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-063.png and b/src/main/resources/GUIImages/Fronts/card-063.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-064.png b/src/main/resources/GUIImages/Fronts/card-064.png index ba715cd..ddca78c 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-064.png and b/src/main/resources/GUIImages/Fronts/card-064.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-065.png b/src/main/resources/GUIImages/Fronts/card-065.png index a94ea31..aae7bdb 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-065.png and b/src/main/resources/GUIImages/Fronts/card-065.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-066.png b/src/main/resources/GUIImages/Fronts/card-066.png index e1f5924..9257558 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-066.png and b/src/main/resources/GUIImages/Fronts/card-066.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-067.png b/src/main/resources/GUIImages/Fronts/card-067.png index ef3f47a..5f4a617 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-067.png and b/src/main/resources/GUIImages/Fronts/card-067.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-068.png b/src/main/resources/GUIImages/Fronts/card-068.png index c74f545..b9b9b83 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-068.png and b/src/main/resources/GUIImages/Fronts/card-068.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-069.png b/src/main/resources/GUIImages/Fronts/card-069.png index 1d77e43..e5077ca 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-069.png and b/src/main/resources/GUIImages/Fronts/card-069.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-070.png b/src/main/resources/GUIImages/Fronts/card-070.png index d144a51..18d9e10 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-070.png and b/src/main/resources/GUIImages/Fronts/card-070.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-071.png b/src/main/resources/GUIImages/Fronts/card-071.png index 6bc6920..327a749 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-071.png and b/src/main/resources/GUIImages/Fronts/card-071.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-072.png b/src/main/resources/GUIImages/Fronts/card-072.png index d144a51..18d9e10 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-072.png and b/src/main/resources/GUIImages/Fronts/card-072.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-073.png b/src/main/resources/GUIImages/Fronts/card-073.png index f0446a3..cd82cf9 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-073.png and b/src/main/resources/GUIImages/Fronts/card-073.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-074.png b/src/main/resources/GUIImages/Fronts/card-074.png index a9e3503..910f24a 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-074.png and b/src/main/resources/GUIImages/Fronts/card-074.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-075.png b/src/main/resources/GUIImages/Fronts/card-075.png index 70334c2..cf5afff 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-075.png and b/src/main/resources/GUIImages/Fronts/card-075.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-076.png b/src/main/resources/GUIImages/Fronts/card-076.png index 6521a0f..86e36dc 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-076.png and b/src/main/resources/GUIImages/Fronts/card-076.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-077.png b/src/main/resources/GUIImages/Fronts/card-077.png index 34f1a6d..4477da4 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-077.png and b/src/main/resources/GUIImages/Fronts/card-077.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-078.png b/src/main/resources/GUIImages/Fronts/card-078.png index 8eed959..546849d 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-078.png and b/src/main/resources/GUIImages/Fronts/card-078.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-079.png b/src/main/resources/GUIImages/Fronts/card-079.png index ff46927..3c218a9 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-079.png and b/src/main/resources/GUIImages/Fronts/card-079.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-080.png b/src/main/resources/GUIImages/Fronts/card-080.png index 7dfaa33..7d984c2 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-080.png and b/src/main/resources/GUIImages/Fronts/card-080.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-081.png b/src/main/resources/GUIImages/Fronts/card-081.png index a2e09a2..f2864ed 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-081.png and b/src/main/resources/GUIImages/Fronts/card-081.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-082.png b/src/main/resources/GUIImages/Fronts/card-082.png index 2417082..cd26abe 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-082.png and b/src/main/resources/GUIImages/Fronts/card-082.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-083.png b/src/main/resources/GUIImages/Fronts/card-083.png index a2e09a2..f2864ed 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-083.png and b/src/main/resources/GUIImages/Fronts/card-083.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-084.png b/src/main/resources/GUIImages/Fronts/card-084.png index d22b90e..828d1a6 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-084.png and b/src/main/resources/GUIImages/Fronts/card-084.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-085.png b/src/main/resources/GUIImages/Fronts/card-085.png index b4ce5ac..a7d2aac 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-085.png and b/src/main/resources/GUIImages/Fronts/card-085.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-086.png b/src/main/resources/GUIImages/Fronts/card-086.png index 6557c97..316127d 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-086.png and b/src/main/resources/GUIImages/Fronts/card-086.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-087.png b/src/main/resources/GUIImages/Fronts/card-087.png index 2ac46e1..86b3aba 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-087.png and b/src/main/resources/GUIImages/Fronts/card-087.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-088.png b/src/main/resources/GUIImages/Fronts/card-088.png index c0e6851..c2406f6 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-088.png and b/src/main/resources/GUIImages/Fronts/card-088.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-089.png b/src/main/resources/GUIImages/Fronts/card-089.png index 7c6071a..e63150d 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-089.png and b/src/main/resources/GUIImages/Fronts/card-089.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-090.png b/src/main/resources/GUIImages/Fronts/card-090.png index 0685a4b..e59d2d8 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-090.png and b/src/main/resources/GUIImages/Fronts/card-090.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-091.png b/src/main/resources/GUIImages/Fronts/card-091.png index ba1af1c..3dc24a0 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-091.png and b/src/main/resources/GUIImages/Fronts/card-091.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-092.png b/src/main/resources/GUIImages/Fronts/card-092.png index b81cf07..1bb50cd 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-092.png and b/src/main/resources/GUIImages/Fronts/card-092.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-093.png b/src/main/resources/GUIImages/Fronts/card-093.png index 3e628fe..04d1f91 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-093.png and b/src/main/resources/GUIImages/Fronts/card-093.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-094.png b/src/main/resources/GUIImages/Fronts/card-094.png index 21fa6d7..d6a7f96 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-094.png and b/src/main/resources/GUIImages/Fronts/card-094.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-095.png b/src/main/resources/GUIImages/Fronts/card-095.png index ebca752..a482357 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-095.png and b/src/main/resources/GUIImages/Fronts/card-095.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-096.png b/src/main/resources/GUIImages/Fronts/card-096.png index 2743bad..ffbf159 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-096.png and b/src/main/resources/GUIImages/Fronts/card-096.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-097.png b/src/main/resources/GUIImages/Fronts/card-097.png index 42ec113..6b3603e 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-097.png and b/src/main/resources/GUIImages/Fronts/card-097.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-098.png b/src/main/resources/GUIImages/Fronts/card-098.png index de64247..7345e13 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-098.png and b/src/main/resources/GUIImages/Fronts/card-098.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-099.png b/src/main/resources/GUIImages/Fronts/card-099.png index 067805c..6f9eaa3 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-099.png and b/src/main/resources/GUIImages/Fronts/card-099.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-100.png b/src/main/resources/GUIImages/Fronts/card-100.png index f9f1bf9..d426acb 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-100.png and b/src/main/resources/GUIImages/Fronts/card-100.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-101.png b/src/main/resources/GUIImages/Fronts/card-101.png index e31fa39..df920fa 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-101.png and b/src/main/resources/GUIImages/Fronts/card-101.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-102.png b/src/main/resources/GUIImages/Fronts/card-102.png index b9ebe66..3f4d62d 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-102.png and b/src/main/resources/GUIImages/Fronts/card-102.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-103.png b/src/main/resources/GUIImages/Fronts/card-103.png index ade84ac..1f00813 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-103.png and b/src/main/resources/GUIImages/Fronts/card-103.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-104.png b/src/main/resources/GUIImages/Fronts/card-104.png index c39591f..d28dfcd 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-104.png and b/src/main/resources/GUIImages/Fronts/card-104.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-105.png b/src/main/resources/GUIImages/Fronts/card-105.png index 9e6ec4c..ff4f0a2 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-105.png and b/src/main/resources/GUIImages/Fronts/card-105.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-106.png b/src/main/resources/GUIImages/Fronts/card-106.png index a0034f2..df161cd 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-106.png and b/src/main/resources/GUIImages/Fronts/card-106.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-107.png b/src/main/resources/GUIImages/Fronts/card-107.png index f9131fc..2a79ad5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-107.png and b/src/main/resources/GUIImages/Fronts/card-107.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-108.png b/src/main/resources/GUIImages/Fronts/card-108.png index bf6b3dc..7871fe5 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-108.png and b/src/main/resources/GUIImages/Fronts/card-108.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-109.png b/src/main/resources/GUIImages/Fronts/card-109.png index ea4b997..79447f7 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-109.png and b/src/main/resources/GUIImages/Fronts/card-109.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-110.png b/src/main/resources/GUIImages/Fronts/card-110.png index 457610b..2635f10 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-110.png and b/src/main/resources/GUIImages/Fronts/card-110.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-111.png b/src/main/resources/GUIImages/Fronts/card-111.png index f5af84e..5100e22 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-111.png and b/src/main/resources/GUIImages/Fronts/card-111.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-112.png b/src/main/resources/GUIImages/Fronts/card-112.png index f21d96c..5fffc6b 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-112.png and b/src/main/resources/GUIImages/Fronts/card-112.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-113.png b/src/main/resources/GUIImages/Fronts/card-113.png index b1d241c..5c598ad 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-113.png and b/src/main/resources/GUIImages/Fronts/card-113.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-114.png b/src/main/resources/GUIImages/Fronts/card-114.png index b1668c5..e99d7ae 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-114.png and b/src/main/resources/GUIImages/Fronts/card-114.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-115.png b/src/main/resources/GUIImages/Fronts/card-115.png index 1f063c1..d222134 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-115.png and b/src/main/resources/GUIImages/Fronts/card-115.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-116.png b/src/main/resources/GUIImages/Fronts/card-116.png index 276758e..01ac2ab 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-116.png and b/src/main/resources/GUIImages/Fronts/card-116.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-117.png b/src/main/resources/GUIImages/Fronts/card-117.png index ae1e1f4..7ff369c 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-117.png and b/src/main/resources/GUIImages/Fronts/card-117.png differ diff --git a/src/main/resources/GUIImages/Fronts/card-118.png b/src/main/resources/GUIImages/Fronts/card-118.png index 2b09acc..6192129 100644 Binary files a/src/main/resources/GUIImages/Fronts/card-118.png and b/src/main/resources/GUIImages/Fronts/card-118.png differ diff --git a/src/main/resources/GUIScene/main.fxml b/src/main/resources/GUIScene/main.fxml index 6088e2a..2a5b6c7 100644 --- a/src/main/resources/GUIScene/main.fxml +++ b/src/main/resources/GUIScene/main.fxml @@ -4,6 +4,7 @@ +