diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java index 6bb3579..e0b064c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java @@ -46,6 +46,6 @@ public class Building1 extends BuildingCard { @Override public String toString() { - return super.toString() + " Icon: " + this.icon.toString(); + return super.toString() + " Icon: " + this.icon.toString().charAt(0); } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java index 59f86c0..543adcf 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java @@ -70,6 +70,6 @@ public class Building11 extends BuildingCard { @Override public String toString() { - return super.toString() + " Icon: " + this.icon.toString(); + return super.toString() + " Icon: " + this.icon.toString().charAt(0) + " MP: " + this.PrestigeMul; } } \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java index 2167441..24e41a1 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java @@ -182,6 +182,6 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf */ @Override public String toString() { - return "Era:"+String.valueOf(getEra())+" P:"+String.valueOf(getPrice())+" PR:"+String.valueOf(getPrestigeValue()); + return "⎕:" + " ID:" + String.valueOf(getEffectId())+ " $:"+String.valueOf(getPrice())+" PV:"+String.valueOf(getPrestigeValue()); } } 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 0bbacc0..efdc01d 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 @@ -87,7 +87,7 @@ public class Builder extends Character */ @Override public String toString() { - return super.toString() + " RV: " + String.valueOf(reductionValue) + " PV: " + String.valueOf(prestigeValue); + return super.toString() + " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue); } /** 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 18977a0..15aa9fe 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 @@ -49,7 +49,7 @@ public class Hunter extends Character { public String toString() { String toPrint = super.toString(); if(this.icon){ - toPrint += " 🏹"; + toPrint += " I"; } return toPrint; } 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 f70dc94..158a1de 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 @@ -49,7 +49,7 @@ public class Shaman extends Character { */ @Override public String toString() { - return super.toString() + " ★: " + String.valueOf(icon); + return super.toString() + " *:" + String.valueOf(icon); } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java index 0382754..09439cb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java @@ -43,6 +43,6 @@ public abstract class PlayableCard implements Serializable { */ @Override public String toString() { - return "⌛:"+String.valueOf(Era); + return "⎕:"; } } diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java index f3258a2..e26018c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java @@ -45,6 +45,6 @@ public class AsciiTable { private String rpad(String s, int w) { if (s.length() >= w) return s.substring(0, w); - return s + " ".repeat(w - s.length()) + "\t"; + return s + " ".repeat(w - s.length()); } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java index d0544df..31cd1b0 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java @@ -1,6 +1,6 @@ package it.polimi.ingsw.gc14.Model; -import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building1; +import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.*; import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; @@ -218,6 +218,27 @@ class PlayerTest { p.buildingCards.add(new BuildingCard(2, 1,2, 5)); p.buildingCards.add(new BuildingCard(2, 2,3, 6)); p.buildingCards.add(new Building1(2, 5, 5, CharacterType.INVENTOR)); - System.out.println(p.toString()); + p.buildingCards.add(new Building1(2, 5, 5, CharacterType.SHAMAN)); + p.buildingCards.add(new Building11(1, 5, 7, CharacterType.ARTIST , 3)); + //System.out.println(p.toString()); + assertEquals(""+ + "╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗\n" + + "║ test_usr ║\n" + + "├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" + + "║ RESOURCES: ║\n" + + "║ Food: 7 ║\n" + + "║ Prestige: 15 ║\n" + + "├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" + + "║ CHARACTERS: ║\n" + + "║ Artists: [⎕:, ⎕:, ⎕:, ⎕:, ⎕:, ⎕:, ⎕:] ║\n" + + "║ Builders: [⎕: RV:5 PV:1] ║\n" + + "║ Gatherers: [⎕:] ║\n" + + "║ Shamans: [⎕: *:3, ⎕: *:3] ║\n" + + "║ Inventors: [⎕: I_ID:1] ║\n" + + "║ Hunters: [⎕: I, ⎕:] ║\n" + + "├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" + + "║ BUILDING CARDS: ║\n" + + "║ Buildings: [⎕: ID:2 $:2 PV:5, ⎕: ID:2 $:3 PV:6, ⎕: ID:1 $:5 PV:5 Icon: I, ⎕: ID:1 $:5 PV:5 Icon: S, ⎕: ID:11 $:5 PV:7 Icon: A MP: 3]║\n" + + "╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝", p.toString()); } } \ No newline at end of file