diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java index 34464b4..cc68507 100644 --- a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java @@ -191,7 +191,7 @@ public class ClientLauncherTUI { System.out.println("Errore: " + err); return false; } - System.out.println("Connected via RMI."); + System.out.println("Connected via RMI, waiting for other players..."); controller.setClient(client); } else if (networkStr.equals("tcp")) { @@ -203,7 +203,7 @@ public class ClientLauncherTUI { System.out.println("Errore: " + err); return false; } - System.out.println("Connected via TCP."); + System.out.println("Connected via TCP, waiting for other players..."); controller.setClient(client); } else { 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 dc33570..fb1e0ae 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 @@ -558,8 +558,13 @@ public class MainFXMLController { int i = 0; for (TribeCard card : controller.getMiniModel().upperListTribeCards) { final int index = i; - StackPane img = createCard(card, true, true, upperList); - img.setOnMouseClicked(e -> controller.drawUpperTribeCard(index)); + StackPane img; + if(!card.isEventCard()) { + img = createCard(card, true, true, upperList); + img.setOnMouseClicked(e -> controller.drawUpperTribeCard(index)); + } else { + img = createCard(card, false, false, upperList); + } upperList.getChildren().add(img); i++; } @@ -575,8 +580,13 @@ public class MainFXMLController { int i = 0; for (TribeCard card : controller.getMiniModel().lowerListTribeCards) { final int index = i; - StackPane img = createCard(card, true, true, lowerList); - img.setOnMouseClicked(e -> controller.drawLowerTribeCard(index)); + StackPane img; + if(!card.isEventCard()) { + img = createCard(card, true, true, lowerList); + img.setOnMouseClicked(e -> controller.drawLowerTribeCard(index)); + } else { + img = createCard(card, false, false, lowerList); + } lowerList.getChildren().add(img); i++; } @@ -619,8 +629,6 @@ public class MainFXMLController { back.fitHeightProperty().bind(board.sceneProperty().get().heightProperty().subtract(56).divide(4).multiply(0.94)); back.setPreserveRatio(true); addClip(back); - addShadow(back); - addHoverZoom(back); board.getChildren().add(back); } diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java index 5d581b9..1e1c94d 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java @@ -90,6 +90,7 @@ public class TUI implements IView { GameStages stage = model.currentState.getGameStage(); if (stage == GameStages.TOTEM_CHOICE) { display(buildTotemsContent()); + printLine("Type: totem "); } else if (stage == GameStages.ENDED) { display(buildStandingContent()); printLine("Type 'rematch' to play again or 'quit' to exit"); @@ -184,7 +185,7 @@ public class TUI implements IView { String current = model.currentState.getCurrentPlayer() != null ? model.currentState.getCurrentPlayer().getUserName() + " — " : ""; - return current + "TOTEMS AVAILABLE:\n" + table.build() + "\nType: totem "; + return current + "TOTEMS AVAILABLE:\n" + table.build(); } private String buildStandingContent() {