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

Fix: TUI refactor non complete

Browse Source
This commit is contained in:
aleandro
2026-06-10 18:24:33 +02:00
parent d041067159
commit 0e28f8c6d8
16 changed files with 174 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java
+1 -1
View File
@@ -274,6 +274,6 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf
*/
@Override
public String toString() {
return "⎕:" + " ID:" + String.valueOf(getEffectId())+ " $:"+String.valueOf(getPrice())+" PV:"+String.valueOf(getPrestigeValue());
return ":" + " ID:" + String.valueOf(getEffectId())+ " 🍗:"+String.valueOf(getPrice())+" \uD83C\uDFC5:"+String.valueOf(getPrestigeValue());
}
}
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java
+2 -2
View File
@@ -139,7 +139,7 @@ public class Builder extends Character {
*/
@Override
public String toString() {
return super.toString() + " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue);
return super.toString() + " \uD83D\uDD28:" + String.valueOf(reductionValue) + " \uD83C\uDFC5:" + String.valueOf(prestigeValue);
}
/**
@@ -154,7 +154,7 @@ public class Builder extends Character {
@Override
public String toStringBoard()
{
return super.toStringBoard()+" "+ " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue);
return super.toStringBoard()+" \uD83D\uDD28:" + String.valueOf(reductionValue) + " \uD83C\uDFC5:" + String.valueOf(prestigeValue);
}
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java
+2 -2
View File
@@ -86,7 +86,7 @@ public class Shaman extends Character {
*/
@Override
public String toString() {
return super.toString() + " *:" + String.valueOf(icon);
return super.toString() + " " + "🌟".repeat(icon);
}
/**
@@ -102,7 +102,7 @@ public class Shaman extends Character {
*/
@Override
public String toStringBoard() {
return super.toStringBoard() + " *:" + String.valueOf(icon);
return super.toStringBoard() + " " + "🌟".repeat(icon);
}
/**
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java
+2 -2
View File
@@ -74,7 +74,7 @@ public abstract class EventCard extends TribeCard {
*/
@Override
public String toString() {
return super.toString()+"(Event)"+type.toString();
return super.toString() + " " + type.toString();
}
/**
@@ -89,7 +89,7 @@ public abstract class EventCard extends TribeCard {
*/
@Override
public String toStringBoard() {
return super.toString()+"(Event)"+type.toString();
return super.toString() + " " + type.toString();
}
/**
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class ShamanicRitual extends EventCard {
*/
@Override
public String toStringBoard() {
return super.toStringBoard()+" *>:"+prestigeToAdd+" *<:"+prestigeToRemove;
return super.toStringBoard()+" \uD83C\uDF1F>:"+prestigeToAdd+" \uD83C\uDF1F<:"+prestigeToRemove;
}
}
src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
+1 -1
View File
@@ -201,7 +201,7 @@ public class CurrentState implements Serializable {
}
@Override
public String toString(){
var table= new AsciiTable(BorderStyle.UNICODE,6);
var table= new AsciiTable(BorderStyle.ROUNDED,6);
List<String>header= new ArrayList<>();
header.add("Player");
header.add("NUpper");
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java
+3 -3
View File
@@ -66,7 +66,7 @@ public class Order2 extends OrderLogicCard {
@Override
public String toString()
{
var table = new AsciiTable(BorderStyle.UNICODE, 2);
var table = new AsciiTable(BorderStyle.ROUNDED, 2);
List<String> stringUp=new ArrayList<>();
for(int i=0;i<2;i++)
{
@@ -83,8 +83,8 @@ public class Order2 extends OrderLogicCard {
table.addRow(stringUp);
List<String> stringList=new ArrayList<>();
stringList.add("+1 Food");
stringList.add("-1 Food / -2 PP");
stringList.add("+1🍗");
stringList.add("-1🍗 / -2\uD83C\uDFC5");
table.addRow(stringList);
return "TURN ORDER\n" + table.build() + "\n";
}
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java
+3 -3
View File
@@ -68,7 +68,7 @@ public class Order3 extends OrderLogicCard {
public String toString()
{
var table = new AsciiTable(BorderStyle.UNICODE, 3);
var table = new AsciiTable(BorderStyle.ROUNDED, 3);
List<String> stringUp=new ArrayList<>();
for(int i=0;i<3;i++)
@@ -87,9 +87,9 @@ public class Order3 extends OrderLogicCard {
List<String> stringList=new ArrayList<>();
stringList.add("+2 Food");
stringList.add("+2 🍗");
stringList.add("--");
stringList.add("-1 Food / -2 PP");
stringList.add("-1 🍗 / -2 ⭐");
table.addRow(stringList);
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java
+4 -4
View File
@@ -75,7 +75,7 @@ public class Order4 extends OrderLogicCard {
public String toString()
{
var table = new AsciiTable(BorderStyle.UNICODE, 4);
var table = new AsciiTable(BorderStyle.ROUNDED, 4);
List<String> stringUp=new ArrayList<>();
for(int i=0;i<4;i++)
{
@@ -92,10 +92,10 @@ public class Order4 extends OrderLogicCard {
table.addRow(stringUp);
List<String> stringList=new ArrayList<>();
stringList.add("+2 Food");
stringList.add("+1 Food");
stringList.add("+2 🍗");
stringList.add("+1 🍗");
stringList.add("--");
stringList.add("-1 Food / -2 PP");
stringList.add("-1 🍗 / -2 ⭐");
table.addRow(stringList);
return "TURN ORDER\n" + table.build() + "\n";
}
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java
+4 -4
View File
@@ -76,7 +76,7 @@ public class Order5 extends OrderLogicCard {
public String toString()
{
var table = new AsciiTable(BorderStyle.UNICODE, 5);
var table = new AsciiTable(BorderStyle.ROUNDED, 5);
List<String> stringUp=new ArrayList<>();
for(int i=0;i<5;i++)
{
@@ -93,11 +93,11 @@ public class Order5 extends OrderLogicCard {
table.addRow(stringUp);
List<String> stringList=new ArrayList<>();
stringList.add("+3 Food");
stringList.add("+1 Food");
stringList.add("+3 🍗");
stringList.add("+1 🍗");
stringList.add("--");
stringList.add("--");
stringList.add("-1 Food / -2 PP");
stringList.add("-1 🍗 / -2 ⭐");
table.addRow(stringList);
return "TURN ORDER\n" + table.build() + "\n";
}
src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java
+2 -2
View File
@@ -74,7 +74,7 @@ public abstract class PlayableCard implements Serializable {
*/
@Override
public String toString() {
return "⎕:";
return ":";
}
/**
@@ -86,6 +86,6 @@ public abstract class PlayableCard implements Serializable {
*/
public String toStringBoard()
{
return "⎕:";
return ":";
}
}
src/main/java/it/polimi/ingsw/gc14/Model/Player.java
+3 -3
View File
@@ -271,15 +271,15 @@ public class Player implements Serializable {
public String toString() {
int Last = -1;
var table = new AsciiTable(UNICODE, 1);
var table = new AsciiTable(ROUNDED, 1);
table.addHeader(this.getUserName());
table.addRow("RESOURCES:");
if(this.totem != null) {
table.addRow("Totem: " + this.totem.toString());
}
table.addRow("Food: " + this.getFoodValue());
table.addRow("Prestige: " + this.getPrestigeValue());
table.addRow("🍗 " + this.getFoodValue());
table.addRow("2\uD83C\uDFC5 " + this.getPrestigeValue());
table.addSeparator();
if(!this.hunters.isEmpty()){
src/main/java/it/polimi/ingsw/gc14/Model/Slot.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class Slot implements Serializable {
s.append("↓");
}
if(getFood()!=0)
s.append("+"+getFood()+" Food");
s.append("+"+getFood()+" 🍗");
return s.toString();
}