diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index d3a34a8..dd67a26 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -771,19 +771,10 @@ public class Game implements Serializable { BuildTableLower.addRow(getLowerListBuilding().get(i).toString()); } } - - - //offerTrack.addRow(stringUpperListTribe); stringUpperListTribe.forEach(x->TribeTableUpper.addRow(x)); stringLowerListTribe.forEach(x->TribeTableLower.addRow(x)); - offerTrack.addRow(stringUpOffer); offerTrack.addRow(stringDownOffer); - //offerTrack.addRow(stringLowerListTribe); - - - - return orderLogicCard.toString()+"\n"+ AsciiTable.sideBySide(Arrays.stream((TribeTableUpper.build().split("\n"))).toList(), Arrays.stream(BuildTableUpper.build().split("\n")).toList(),2)+"\n"+offerTrack.build()+"\n"+AsciiTable.sideBySide(List.of(TribeTableLower.build().split("\n")), Arrays.stream(BuildTableLower.build().split("\n")).toList(),2); - //return s.toString()+"\n"++"\nOFFER TRACK\n"+ table.build()+"\n" ; + return "CURRENT STATE\n"+getCurrentState()+"\n"+orderLogicCard.toString()+"\n"+ AsciiTable.sideBySide(Arrays.stream((TribeTableUpper.build().split("\n"))).toList(), Arrays.stream(BuildTableUpper.build().split("\n")).toList(),2)+"\n"+offerTrack.build()+"\n"+AsciiTable.sideBySide(List.of(TribeTableLower.build().split("\n")), Arrays.stream(BuildTableLower.build().split("\n")).toList(),2); } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java index b2489b8..f464e02 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java @@ -3,7 +3,12 @@ package it.polimi.ingsw.gc14.Model.GamePackage; import it.polimi.ingsw.gc14.Model.Player; import it.polimi.ingsw.gc14.Model.Slot; import it.polimi.ingsw.gc14.Model.GamePackage.GameStages; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; +import it.polimi.ingsw.gc14.View.TUI.BorderStyle; + import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * Represents the current state of the game. @@ -194,5 +199,27 @@ public class CurrentState implements Serializable { } } + @Override + public String toString(){ + var table= new AsciiTable(BorderStyle.UNICODE,6); + Listheader= new ArrayList<>(); + header.add("Player"); + header.add("NUpper"); + header.add("NLower"); + header.add("Round"); + header.add("Era"); + header.add("GameStage"); + table.addRow(header); + table.addSeparator(); + Listvalues= new ArrayList<>(); + values.add(player.getUserName()); + values.add(Integer.toString(NUpper)); + values.add(Integer.toString(NLower)); + values.add(Integer.toString(round)); + values.add(Integer.toString(Era)); + values.add(GameStage.toString()); + table.addRow(values); + return table.build(); + } // endregion functions } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java index 0d6087b..eca198a 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java @@ -221,8 +221,6 @@ class GameTest { assertTrue(game.SlotChoiceByIndex(game.getCurrentState().getCurrentPlayer(), i)); } - System.out.println(game.BoardStamp()); - String os = System.getProperty("os.name").toLowerCase(); - System.out.println(game.PlayersStamp()); + System.out.println(game.toString()); } } \ No newline at end of file