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

Fix: potential windows solution for TUI

Browse Source
This commit is contained in:
aleandro
2026-06-10 19:08:39 +02:00
parent 0e28f8c6d8
commit 73153762c3
17 changed files with 90 additions and 116 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())+" \uD83C\uDFC5:"+String.valueOf(getPrestigeValue());
return ":" + " ID:" + String.valueOf(getEffectId())+ " \uD83C\uDF56:"+String.valueOf(getPrice())+" \uD83C\uDFC5:"+String.valueOf(getPrestigeValue());
}
}
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class Inventor extends Character {
*/
@Override
public String toString() {
return super.toString() + " I_ID:" + String.valueOf(icon);
return super.toString() + "ID:" + String.valueOf(icon);
}
/**
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() + " " + "🌟".repeat(icon);
return super.toString() + "🌟:" + icon;
}
/**
@@ -102,7 +102,7 @@ public class Shaman extends Character {
*/
@Override
public String toStringBoard() {
return super.toStringBoard() + " " + "🌟".repeat(icon);
return super.toStringBoard() + "🌟:" + icon;
}
/**
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java
+1 -1
View File
@@ -89,7 +89,7 @@ public abstract class EventCard extends TribeCard {
*/
@Override
public String toStringBoard() {
return super.toString() + " " + type.toString();
return super.toStringBoard() + " " + type.toString();
}
/**
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class Hunt extends EventCard {
*/
@Override
public String toStringBoard() {
return super.toStringBoard()+" 1F+"+prestigeMultiplier+"PP"+" X N Hunter";
return super.toStringBoard()+" 1\uD83C\uDF56+"+prestigeMultiplier+"\uD83C\uDFC5"+" X N Hunter";
}
}
src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
+1 -5
View File
@@ -201,11 +201,9 @@ public class CurrentState implements Serializable {
}
@Override
public String toString(){
var table= new AsciiTable(BorderStyle.ROUNDED,6);
var table= new AsciiTable(BorderStyle.ROUNDED,4);
List<String>header= new ArrayList<>();
header.add("Player");
header.add("NUpper");
header.add("NLower");
header.add("Round");
header.add("Era");
header.add("GameStage");
@@ -213,8 +211,6 @@ public class CurrentState implements Serializable {
table.addSeparator();
List<String>values= 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());
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java
+5 -5
View File
@@ -72,9 +72,9 @@ public class Order2 extends OrderLogicCard {
{
try {
if(playerList.get(i).played)
stringUp.add(" ");
stringUp.add("");
else
stringUp.add(i+". "+playerList.get(i).player.getUserName());
stringUp.add(playerList.get(i).player.getUserName());
}
catch (IndexOutOfBoundsException e) {
stringUp.add("");
@@ -83,9 +83,9 @@ public class Order2 extends OrderLogicCard {
table.addRow(stringUp);
List<String> stringList=new ArrayList<>();
stringList.add("+1🍗");
stringList.add("-1🍗 / -2\uD83C\uDFC5");
stringList.add("+1\uD83C\uDF56");
stringList.add("-1\uD83C\uDF56/-2\uD83C\uDFC5");
table.addRow(stringList);
return "TURN ORDER\n" + table.build() + "\n";
return table.build() + "\n";
}
}
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java
+5 -5
View File
@@ -75,9 +75,9 @@ public class Order3 extends OrderLogicCard {
{
try {
if(playerList.get(i).played)
stringUp.add(" ");
stringUp.add("");
else
stringUp.add(i+". "+playerList.get(i).player.getUserName());
stringUp.add(playerList.get(i).player.getUserName());
}
catch (IndexOutOfBoundsException e) {
stringUp.add("");
@@ -87,12 +87,12 @@ public class Order3 extends OrderLogicCard {
List<String> stringList=new ArrayList<>();
stringList.add("+2 🍗");
stringList.add("+2\uD83C\uDF56");
stringList.add("--");
stringList.add("-1 🍗 / -2 ⭐");
stringList.add("-1\uD83C\uDF56/-2\uD83C\uDFC5");
table.addRow(stringList);
return "TURN ORDER\n" + table.build() + "\n";
return table.build() + "\n";
}
}
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java
+6 -6
View File
@@ -81,9 +81,9 @@ public class Order4 extends OrderLogicCard {
{
try {
if(playerList.get(i).played)
stringUp.add(" ");
stringUp.add("");
else
stringUp.add(i+". "+playerList.get(i).player.getUserName());
stringUp.add(playerList.get(i).player.getUserName());
}
catch (IndexOutOfBoundsException e) {
stringUp.add("");
@@ -92,11 +92,11 @@ public class Order4 extends OrderLogicCard {
table.addRow(stringUp);
List<String> stringList=new ArrayList<>();
stringList.add("+2 🍗");
stringList.add("+1 🍗");
stringList.add("+2\uD83C\uDF56");
stringList.add("+1\uD83C\uDF56");
stringList.add("--");
stringList.add("-1 🍗 / -2 ⭐");
stringList.add("-1\uD83C\uDF56/-2\uD83C\uDFC5");
table.addRow(stringList);
return "TURN ORDER\n" + table.build() + "\n";
return table.build() + "\n";
}
}
src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java
+6 -6
View File
@@ -82,9 +82,9 @@ public class Order5 extends OrderLogicCard {
{
try {
if(playerList.get(i).played)
stringUp.add(" ");
stringUp.add("");
else
stringUp.add(i+". "+playerList.get(i).player.getUserName());
stringUp.add(playerList.get(i).player.getUserName());
}
catch (IndexOutOfBoundsException e) {
stringUp.add("");
@@ -93,12 +93,12 @@ public class Order5 extends OrderLogicCard {
table.addRow(stringUp);
List<String> stringList=new ArrayList<>();
stringList.add("+3 🍗");
stringList.add("+1 🍗");
stringList.add("+3\uD83C\uDF56");
stringList.add("+1\uD83C\uDF56");
stringList.add("--");
stringList.add("--");
stringList.add("-1 🍗 / -2 ⭐");
stringList.add("-1\uD83C\uDF56/-2\uD83C\uDFC5");
table.addRow(stringList);
return "TURN ORDER\n" + table.build() + "\n";
return table.build() + "\n";
}
}
src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java
+1 -1
View File
@@ -74,7 +74,7 @@ public abstract class PlayableCard implements Serializable {
*/
@Override
public String toString() {
return ":";
return "";
}
/**
src/main/java/it/polimi/ingsw/gc14/Model/Player.java
+2 -7
View File
@@ -273,13 +273,8 @@ public class Player implements Serializable {
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("🍗 " + this.getFoodValue());
table.addRow("2\uD83C\uDFC5 " + this.getPrestigeValue());
String totemStr = (this.totem != null) ? " (" + this.totem.toString() + ")" : "";
table.addHeader(this.getUserName() + totemStr + " | \uD83C\uDF56:" + this.getFoodValue() + " | \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()+" 🍗");
s.append("+"+getFood()+" \uD83C\uDF56");
return s.toString();
}