Fix: Fixed "toString" Methods For Most Classes + AsciiTable.java Attempted Fix.
This commit is contained in:
@@ -182,6 +182,6 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ public abstract class Character extends TribeCard implements Cloneable {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return type.toString() + " -- " + super.toString();
|
return super.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ public class Builder extends Character
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -47,7 +47,11 @@ public class Hunter extends Character {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return super.toString() + "Icon: " + String.valueOf(icon);
|
String toPrint = super.toString();
|
||||||
|
if(this.icon){
|
||||||
|
toPrint += " 🏹";
|
||||||
|
}
|
||||||
|
return toPrint;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class Inventor extends Character {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return super.toString() + " Symbol:" + String.valueOf(icon);
|
return super.toString() + " I_ID:" + String.valueOf(icon);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public class Shaman extends Character {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return super.toString() + "Icon: " + String.valueOf(icon);
|
return super.toString() + " ★: " + String.valueOf(icon);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public abstract class OrderLogicCard implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* The queue of players associated with this order logic card.
|
* The queue of players associated with this order logic card.
|
||||||
*/
|
*/
|
||||||
private Queue<Player> players;
|
protected Queue<Player> players;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an order logic card with the specified list of players.
|
* Creates an order logic card with the specified list of players.
|
||||||
|
|||||||
@@ -43,6 +43,6 @@ public abstract class PlayableCard implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Era:"+String.valueOf(Era);
|
return "⌛:"+String.valueOf(Era);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ public class Player implements Serializable {
|
|||||||
// region Functions
|
// region Functions
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
int Last = 5;
|
int Last = 6;
|
||||||
|
|
||||||
var table = new AsciiTable(UNICODE, 1);
|
var table = new AsciiTable(UNICODE, 1);
|
||||||
|
|
||||||
@@ -241,6 +241,9 @@ public class Player implements Serializable {
|
|||||||
table.addRow("Prestige: " + this.getPrestigeValue());
|
table.addRow("Prestige: " + this.getPrestigeValue());
|
||||||
|
|
||||||
if(!this.hunters.isEmpty()){
|
if(!this.hunters.isEmpty()){
|
||||||
|
Last = 6;
|
||||||
|
}
|
||||||
|
else if(!this.inventors.isEmpty()){
|
||||||
Last = 5;
|
Last = 5;
|
||||||
}
|
}
|
||||||
else if(!this.shamans.isEmpty()){
|
else if(!this.shamans.isEmpty()){
|
||||||
@@ -252,7 +255,7 @@ public class Player implements Serializable {
|
|||||||
else if(!this.builders.isEmpty()){
|
else if(!this.builders.isEmpty()){
|
||||||
Last = 2;
|
Last = 2;
|
||||||
}
|
}
|
||||||
else if(!this.inventors.isEmpty()){
|
else if(!this.artists.isEmpty()){
|
||||||
Last = 1;
|
Last = 1;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
@@ -291,6 +294,13 @@ public class Player implements Serializable {
|
|||||||
table.addRow("Shamans: " + this.shamans.toString());
|
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()){
|
if(!this.hunters.isEmpty()){
|
||||||
table.addSeparator();
|
table.addSeparator();
|
||||||
|
|||||||
@@ -45,6 +45,6 @@ public class AsciiTable {
|
|||||||
|
|
||||||
private String rpad(String s, int w) {
|
private String rpad(String s, int w) {
|
||||||
if (s.length() >= w) return s.substring(0, w);
|
if (s.length() >= w) return s.substring(0, w);
|
||||||
return s + " ".repeat(w - s.length());
|
return s + " ".repeat(w - s.length()) + "\t";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user