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

Removed: Board in ApplyNextRound, MiniModel constructor

Browse Source 
Added: upperListTribe,lowerListTribe,upperListBuilding,lowerListBuilding in MiniModel constructor
This commit is contained in:
rubenpirreram
2026-05-19 18:28:05 +02:00
parent d37c111c3c
commit 6da5670dff
10 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/View/GUI/LeaderboardFXMLController.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class LeaderboardFXMLController {
public void render() {
rankingList.getChildren().clear();
if(controller.miniModel.standingPlayers!=null)
if(!controller.miniModel.standingPlayers.isEmpty())
{
List<Player> sorted = controller.miniModel.standingPlayers;
src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
+4 -4
View File
@@ -272,7 +272,7 @@ public class MainFXMLController {
upperList.getChildren().clear();
int i = 0;
for (TribeCard card : controller.miniModel.board.upperListTribe) {
for (TribeCard card : controller.miniModel.upperListTribeCards) {
final int index = i;
StackPane img = createCard(card, true, true, upperList);
img.setOnMouseClicked(e -> controller.drawUpperTribeCard(controller.myUsername, index));
@@ -288,7 +288,7 @@ public class MainFXMLController {
lowerList.getChildren().clear();
int i = 0;
for (TribeCard card : controller.miniModel.board.lowerListTribe) {
for (TribeCard card : controller.miniModel.lowerListTribeCards) {
final int index = i;
StackPane img = createCard(card, true, true, lowerList);
img.setOnMouseClicked(e -> controller.drawLowerTribeCard(controller.myUsername, index));
@@ -299,7 +299,7 @@ public class MainFXMLController {
}
private void drawUpperBuilding() {
ArrayList<BuildingCard> cardList = new ArrayList<>(controller.miniModel.board.upperListBuilding);
ArrayList<BuildingCard> cardList = new ArrayList<>(controller.miniModel.upperListBuildingCards);
if (!cardList.isEmpty()) {
StackPane img = createCard(cardList.getLast(), true, true, upperList);
Label label = new Label(String.valueOf(cardList.size()));
@@ -314,7 +314,7 @@ public class MainFXMLController {
}
private void drawLowerBuilding() {
ArrayList<BuildingCard> cardList = new ArrayList<>(controller.miniModel.board.lowerListBuilding);
ArrayList<BuildingCard> cardList = new ArrayList<>(controller.miniModel.lowerListBuildingCards);
if (!cardList.isEmpty()) {
StackPane img = createCard(cardList.getLast(), true, true, lowerList);
Label label = new Label(String.valueOf(cardList.size()));
src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java
+10 -10
View File
@@ -333,15 +333,15 @@ public class TUI implements IView {
List<String> stringLowerListTribe=new ArrayList<>();
stringUpperListTribe.add("Char/Events");
stringLowerListTribe.add("Char/Events");
for(int i=0;i<Math.max(model.board.upperListTribe.size(),model.board.lowerListTribe.size());i++)
for(int i=0;i<Math.max(model.upperListTribeCards.size(),model.lowerListTribeCards.size());i++)
{
if(i<model.board.upperListTribe.size())
if(i<model.upperListTribeCards.size())
{
stringUpperListTribe.add(i+"-"+model.board.upperListTribe.get(i).toStringBoard());
stringUpperListTribe.add(i+"-"+model.upperListTribeCards.get(i).toStringBoard());
}
if(i<model.board.lowerListTribe.size())
if(i<model.lowerListTribeCards.size())
{
stringLowerListTribe.add(i+"-"+model.board.lowerListTribe.get(i).toStringBoard());
stringLowerListTribe.add(i+"-"+model.lowerListTribeCards.get(i).toStringBoard());
}
}
var BuildTableUpper = new AsciiTable(BorderStyle.UNICODE,1);
@@ -349,15 +349,15 @@ public class TUI implements IView {
var BuildTableLower = new AsciiTable(BorderStyle.UNICODE,1);
BuildTableLower.addHeader("Building ");
for(int i=0;i<Math.max(model.board.upperListBuilding.size(),model.board.lowerListBuilding.size());i++)
for(int i=0;i<Math.max(model.upperListBuildingCards.size(),model.lowerListBuildingCards.size());i++)
{
if(i<model.board.upperListBuilding.size())
if(i<model.upperListBuildingCards.size())
{
BuildTableUpper.addRow(i+"-"+model.board.upperListBuilding.get(i).toString());
BuildTableUpper.addRow(i+"-"+model.upperListBuildingCards.get(i).toString());
}
if(i<model.board.lowerListBuilding.size())
if(i<model.lowerListBuildingCards.size())
{
BuildTableLower.addRow(i+"-"+model.board.lowerListBuilding.get(i).toString());
BuildTableLower.addRow(i+"-"+model.lowerListBuildingCards.get(i).toString());
}
}
stringUpperListTribe.forEach(x->TribeTableUpper.addRow(x));