diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java index 99c8bba..ba405ce 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java @@ -60,6 +60,12 @@ public abstract class Character extends TribeCard implements Cloneable { return super.toString(); } + @Override + public String toStringBoard() + { + return super.toStringBoard()+" "+getType().toString()+" "; + } + /** * Creates and returns a copy of this character card. * diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java index efdc01d..975fa6f 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java @@ -89,6 +89,12 @@ public class Builder extends Character public String toString() { return super.toString() + " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue); } + @Override + public String toStringBoard() + { + return super.toStringBoard()+" "+ " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue); + } + /** * Creates and returns a copy of this Builder card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java index 15aa9fe..0137dd2 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java @@ -53,6 +53,15 @@ public class Hunter extends Character { } return toPrint; } + @Override + public String toStringBoard() { + String toPrint = super.toStringBoard(); + if(this.icon){ + toPrint += " I"; + } + return toPrint; + } + /** * Creates and returns a copy of this Hunter card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java index 39eba77..4d6b77b 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java @@ -54,6 +54,10 @@ public class Inventor extends Character { public String toString() { return super.toString() + " I_ID:" + String.valueOf(icon); } + @Override + public String toStringBoard() { + return super.toStringBoard() + " I_ID:" + String.valueOf(icon); + } /** * Creates and returns a copy of this Inventor card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java index 158a1de..10b3360 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java @@ -51,6 +51,11 @@ public class Shaman extends Character { public String toString() { return super.toString() + " *:" + String.valueOf(icon); } + @Override + public String toStringBoard() { + return super.toStringBoard() + " *:" + String.valueOf(icon); + } + /** * Creates and returns a copy of this Shaman card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java index 82d10b6..43b937a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java @@ -62,7 +62,11 @@ public abstract class EventCard extends TribeCard { */ @Override public String toString() { - return super.toString()+", "+type.toString(); + return super.toString()+" "+type.toString(); + } + @Override + public String toStringBoard() { + return super.toString()+" "+type.toString(); } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java index cbb1458..5a70bfb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java @@ -85,4 +85,9 @@ public class CavePaintings extends EventCard { { return new CavePaintings(getEra(), NLower, NPrestigeRem, NPrestigeMul) ; } + + @Override + public String toStringBoard() { + return super.toString()+" 0-"+(NLower-1)+":"+NPrestigeRem+" "+NLower+"+:"+NPrestigeMul; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java index cfe472d..59898d3 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java @@ -70,5 +70,9 @@ public class Hunt extends EventCard { public EventCard clone() { return new Hunt(getEra(), prestigeMultiplier); } + @Override + public String toStringBoard() { + return super.toString()+" 1F+"+prestigeMultiplier+"PP"+" X N Hunter"; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java index b447c13..573f1f0 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java @@ -96,6 +96,9 @@ public class ShamanicRitual extends EventCard { public EventCard clone() { return new ShamanicRitual(getEra(), prestigeToAdd, prestigeToRemove); } - + @Override + public String toStringBoard() { + return super.toString()+" *>:"+prestigeToAdd+" *<:"+prestigeToRemove; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java index 59be90f..0d92015 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java @@ -89,4 +89,9 @@ public class Sustenance extends EventCard { public EventCard clone() { return new Sustenance(getEra(), PrestigeDebt); } + + @Override + public String toStringBoard() { + return super.toString()+" -1F/-"+PrestigeDebt+"PP"; + } } 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 4985a2d..893ea24 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -721,21 +721,72 @@ public class Game implements Serializable { table.addRow(stringUp); table.addRow(stringEmpty); table.addRow(stringDown); - StringBuilder s=new StringBuilder(); - ListtempLines=new ArrayList<>(); - List> playersString=new ArrayList<>(); - for(Player p:playersList) - { - tempLines=List.of(p.toString().split("\n")); - playersString.add(tempLines); - } - Listlines=List.of(orderLogicCard.toString().split("\n")); List lines2=new ArrayList<>(); lines2.add("OFFER TRACK"); lines2.addAll(List.of(table.build().split("\n"))); - return AsciiTable.sideBySide(lines,lines2,1)+AsciiTable.sideBySide(playersString.get(0),playersString.get(1),1); - //return s.toString()+"\n"++"\nOFFER TRACK\n"+ table.build()+"\n" ; + + String boardToString=AsciiTable.sideBySide(lines,lines2,1); + + + + var table2 = new AsciiTable(BorderStyle.UNICODE, Math.max(getUpperListTribeCards().size(),getLowerListTribeCards().size())); + List stringUp2=new ArrayList<>(); + List stringDown2=new ArrayList<>(); + for(int i=0;i stringUp3=new ArrayList<>(); + List stringDown3=new ArrayList<>(); + for(int i=0;i