From ef82b217188f0141cf39c96d4d06d4d018626761 Mon Sep 17 00:00:00 2001 From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com> Date: Sun, 26 Apr 2026 17:15:20 +0200 Subject: [PATCH] Fix: Fixed "toString" Methods For Most Classes + AsciiTable.java Attempted Fix. --- .../ingsw/gc14/Model/Cards/BuildingCard.java | 2 +- .../gc14/Model/Cards/TribeCards/Character.java | 2 +- .../Model/Cards/TribeCards/Characters/Builder.java | 2 +- .../Model/Cards/TribeCards/Characters/Hunter.java | 6 +++++- .../Cards/TribeCards/Characters/Inventor.java | 2 +- .../Model/Cards/TribeCards/Characters/Shaman.java | 2 +- .../it/polimi/ingsw/gc14/Model/OrderLogicCard.java | 2 +- .../it/polimi/ingsw/gc14/Model/PlayableCard.java | 2 +- .../java/it/polimi/ingsw/gc14/Model/Player.java | 14 ++++++++++++-- .../it/polimi/ingsw/gc14/View/TUI/AsciiTable.java | 2 +- 10 files changed, 25 insertions(+), 11 deletions(-) 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 352f25a..2167441 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())+" Price:"+String.valueOf(getPrice())+" Prestige:"+String.valueOf(getPrestigeValue()); + return "Era:"+String.valueOf(getEra())+" P:"+String.valueOf(getPrice())+" PR:"+String.valueOf(getPrestigeValue()); } } 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 d8d1284..99c8bba 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 @@ -57,7 +57,7 @@ public abstract class Character extends TribeCard implements Cloneable { */ @Override public String toString() { - return type.toString() + " -- " + super.toString(); + return super.toString(); } /** 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 deef818..0bbacc0 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() + " Reduction Value: " + String.valueOf(reductionValue) + " Prestige Value: " + 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 b956a18..18977a0 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 @@ -47,7 +47,11 @@ public class Hunter extends Character { */ @Override public String toString() { - return super.toString() + "Icon: " + String.valueOf(icon); + String toPrint = super.toString(); + if(this.icon){ + toPrint += " 🏹"; + } + return toPrint; } /** 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 d8c5f45..39eba77 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 @@ -52,7 +52,7 @@ public class Inventor extends Character { */ @Override public String toString() { - return super.toString() + " Symbol:" + String.valueOf(icon); + return super.toString() + " I_ID:" + String.valueOf(icon); } /** 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 b04098f..f70dc94 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() + "Icon: " + String.valueOf(icon); + return super.toString() + " ★: " + String.valueOf(icon); } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java index 7a51f3e..22a8678 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java @@ -15,7 +15,7 @@ public abstract class OrderLogicCard implements Serializable { /** * The queue of players associated with this order logic card. */ - private Queue players; + protected Queue players; /** * Creates an order logic card with the specified list of players. 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 a6c61d7..0382754 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 "Era:"+String.valueOf(Era); + return "⌛:"+String.valueOf(Era); } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index 76db84c..fd0a3ba 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -230,7 +230,7 @@ public class Player implements Serializable { // region Functions @Override public String toString() { - int Last = 5; + int Last = 6; var table = new AsciiTable(UNICODE, 1); @@ -241,6 +241,9 @@ public class Player implements Serializable { table.addRow("Prestige: " + this.getPrestigeValue()); if(!this.hunters.isEmpty()){ + Last = 6; + } + else if(!this.inventors.isEmpty()){ Last = 5; } else if(!this.shamans.isEmpty()){ @@ -252,7 +255,7 @@ public class Player implements Serializable { else if(!this.builders.isEmpty()){ Last = 2; } - else if(!this.inventors.isEmpty()){ + else if(!this.artists.isEmpty()){ Last = 1; } else{ @@ -291,6 +294,13 @@ public class Player implements Serializable { table.addRow("Shamans: " + this.shamans.toString()); } + if(!this.inventors.isEmpty()){ + if(Last == 5){ + table.addSeparator(); + } + table.addRow("Inventors: " + this.inventors.toString()); + } + if(!this.hunters.isEmpty()){ table.addSeparator(); 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 e26018c..f3258a2 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()); + return s + " ".repeat(w - s.length()) + "\t"; } } \ No newline at end of file