Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small GUI/TUI fix

Browse Source
This commit is contained in:
aleandro
2026-06-19 18:06:19 +02:00
parent 9bca2b969f
commit 13009ac6ac
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java
+2 -2
View File
@@ -191,7 +191,7 @@ public class ClientLauncherTUI {
System.out.println("Errore: " + err); System.out.println("Errore: " + err);
return false; return false;
} }
System.out.println("Connected via RMI."); System.out.println("Connected via RMI, waiting for other players...");
controller.setClient(client); controller.setClient(client);
} else if (networkStr.equals("tcp")) { } else if (networkStr.equals("tcp")) {
@@ -203,7 +203,7 @@ public class ClientLauncherTUI {
System.out.println("Errore: " + err); System.out.println("Errore: " + err);
return false; return false;
} }
System.out.println("Connected via TCP."); System.out.println("Connected via TCP, waiting for other players...");
controller.setClient(client); controller.setClient(client);
} else { } else {
src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
+12 -4
View File
@@ -558,8 +558,13 @@ public class MainFXMLController {
int i = 0; int i = 0;
for (TribeCard card : controller.getMiniModel().upperListTribeCards) { for (TribeCard card : controller.getMiniModel().upperListTribeCards) {
final int index = i; final int index = i;
StackPane img = createCard(card, true, true, upperList); StackPane img;
if(!card.isEventCard()) {
img = createCard(card, true, true, upperList);
img.setOnMouseClicked(e -> controller.drawUpperTribeCard(index)); img.setOnMouseClicked(e -> controller.drawUpperTribeCard(index));
} else {
img = createCard(card, false, false, upperList);
}
upperList.getChildren().add(img); upperList.getChildren().add(img);
i++; i++;
} }
@@ -575,8 +580,13 @@ public class MainFXMLController {
int i = 0; int i = 0;
for (TribeCard card : controller.getMiniModel().lowerListTribeCards) { for (TribeCard card : controller.getMiniModel().lowerListTribeCards) {
final int index = i; final int index = i;
StackPane img = createCard(card, true, true, lowerList); StackPane img;
if(!card.isEventCard()) {
img = createCard(card, true, true, lowerList);
img.setOnMouseClicked(e -> controller.drawLowerTribeCard(index)); img.setOnMouseClicked(e -> controller.drawLowerTribeCard(index));
} else {
img = createCard(card, false, false, lowerList);
}
lowerList.getChildren().add(img); lowerList.getChildren().add(img);
i++; i++;
} }
@@ -619,8 +629,6 @@ public class MainFXMLController {
back.fitHeightProperty().bind(board.sceneProperty().get().heightProperty().subtract(56).divide(4).multiply(0.94)); back.fitHeightProperty().bind(board.sceneProperty().get().heightProperty().subtract(56).divide(4).multiply(0.94));
back.setPreserveRatio(true); back.setPreserveRatio(true);
addClip(back); addClip(back);
addShadow(back);
addHoverZoom(back);
board.getChildren().add(back); board.getChildren().add(back);
} }
src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java
+2 -1
View File
@@ -90,6 +90,7 @@ public class TUI implements IView {
GameStages stage = model.currentState.getGameStage(); GameStages stage = model.currentState.getGameStage();
if (stage == GameStages.TOTEM_CHOICE) { if (stage == GameStages.TOTEM_CHOICE) {
display(buildTotemsContent()); display(buildTotemsContent());
printLine("Type: totem <pos>");
} else if (stage == GameStages.ENDED) { } else if (stage == GameStages.ENDED) {
display(buildStandingContent()); display(buildStandingContent());
printLine("Type 'rematch' to play again or 'quit' to exit"); 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 String current = model.currentState.getCurrentPlayer() != null
? model.currentState.getCurrentPlayer().getUserName() + " — " ? model.currentState.getCurrentPlayer().getUserName() + " — "
: ""; : "";
return current + "TOTEMS AVAILABLE:\n" + table.build() + "\nType: totem <pos>"; return current + "TOTEMS AVAILABLE:\n" + table.build();
} }
private String buildStandingContent() { private String buildStandingContent() {