Small fix to TUI
This commit is contained in:
@@ -77,7 +77,7 @@ public class Gatherer extends Character {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toStringPlayer() {
|
public String toStringPlayer() {
|
||||||
return "-\uD83C\uDF56";
|
return "\uD83C\uDF56";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -128,6 +128,6 @@ public class CavePaintings extends EventCard {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toStringBoard() {
|
public String toStringBoard() {
|
||||||
return "CAVE_PAINTINGS 0-" + (nLower-1) + ":" + nPrestigeRem + " " + nLower + "+:" + nPrestigeMul;
|
return "\033[38;5;180mCAVE_PAINTINGS 0-" + (nLower-1) + ":" + nPrestigeRem + " " + nLower + "+:" + nPrestigeMul + "\033[0m";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ public class Hunt extends EventCard {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toStringBoard() {
|
public String toStringBoard() {
|
||||||
return "HUNT 1\uD83C\uDF56+" + prestigeMultiplier + "\uD83C\uDFC5×\uD83C\uDFF9";
|
return "\033[38;5;180mHUNT 1\uD83C\uDF56+" + prestigeMultiplier + "\uD83C\uDFC5×\uD83C\uDFF9" + "\033[0m";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -146,7 +146,7 @@ public class ShamanicRitual extends EventCard {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toStringBoard() {
|
public String toStringBoard() {
|
||||||
return "SHAMANIC_RITUAL \uD83C\uDF1F>:" + prestigeToAdd + " \uD83C\uDF1F<:" + prestigeToRemove;
|
return "\033[38;5;180mSHAMANIC_RITUAL \uD83C\uDF1F>:" + prestigeToAdd + " \uD83C\uDF1F<:" + prestigeToRemove + "\033[0m";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,6 +126,6 @@ public class Sustenance extends EventCard {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toStringBoard() {
|
public String toStringBoard() {
|
||||||
return "SUSTENANCE -1\uD83C\uDF56/-" + prestigeDebt + "\uD83C\uDFC5";
|
return "\033[38;5;180mSUSTENANCE -1\uD83C\uDF56/-" + prestigeDebt + "\uD83C\uDFC5\033[0m";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -311,7 +311,7 @@ public class Player implements Serializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!this.gatherers.isEmpty()){
|
if(!this.gatherers.isEmpty()){
|
||||||
table.addRow(this.gatherers.size() + " Gatherers: -\uD83E\uDD57:" + 3*this.gatherers.size());
|
table.addRow(this.gatherers.size() + " Gatherers: \uD83C\uDF56:-" + 3*this.gatherers.size());
|
||||||
if(last == 3){
|
if(last == 3){
|
||||||
table.addSeparator();
|
table.addSeparator();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ public class TUI implements IView {
|
|||||||
*/
|
*/
|
||||||
private String buildAllHandsContent() {
|
private String buildAllHandsContent() {
|
||||||
List<Player> players = new ArrayList<>(model.players.values());
|
List<Player> players = new ArrayList<>(model.players.values());
|
||||||
|
players.removeIf(p -> model.disconnectedPlayers.contains(p.getUserName()));
|
||||||
if (players.isEmpty()) return "";
|
if (players.isEmpty()) return "";
|
||||||
|
|
||||||
int n = players.size();
|
int n = players.size();
|
||||||
@@ -154,11 +155,23 @@ public class TUI implements IView {
|
|||||||
for (int i = 0; i < leftCount; i++) leftSb.append(players.get(i).toString()).append("\n");
|
for (int i = 0; i < leftCount; i++) leftSb.append(players.get(i).toString()).append("\n");
|
||||||
for (int i = leftCount; i < n; i++) rightSb.append(players.get(i).toString()).append("\n");
|
for (int i = leftCount; i < n; i++) rightSb.append(players.get(i).toString()).append("\n");
|
||||||
|
|
||||||
if (rightSb.isEmpty()) return leftSb.toString();
|
String handsBlock;
|
||||||
|
if (rightSb.isEmpty()) {
|
||||||
|
handsBlock = leftSb.toString();
|
||||||
|
} else {
|
||||||
|
handsBlock = AsciiTable.sideBySide(
|
||||||
|
List.of(leftSb.toString().split("\n", -1)),
|
||||||
|
List.of(rightSb.toString().split("\n", -1)), 3);
|
||||||
|
}
|
||||||
|
|
||||||
return AsciiTable.sideBySide(
|
if (!model.disconnectedPlayers.isEmpty()) {
|
||||||
List.of(leftSb.toString().split("\n", -1)),
|
var box = new AsciiTable(BorderStyle.ROUNDED, 1);
|
||||||
List.of(rightSb.toString().split("\n", -1)), 3);
|
box.addHeader("Disconnected");
|
||||||
|
model.disconnectedPlayers.forEach(box::addRow);
|
||||||
|
handsBlock += "\n" + box.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return handsBlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String buildTotemsContent() {
|
private String buildTotemsContent() {
|
||||||
|
|||||||
@@ -73,7 +73,6 @@ class BoardTest {
|
|||||||
Board bd5 = new Board(5);
|
Board bd5 = new Board(5);
|
||||||
for(TribeCard tribe : bd2.getUpperListTribe())
|
for(TribeCard tribe : bd2.getUpperListTribe())
|
||||||
{
|
{
|
||||||
System.out.println(tribe.getIdIMG() +" "+tribe.toStringBoard());
|
|
||||||
assertNotEquals("-1",tribe.getIdIMG());
|
assertNotEquals("-1",tribe.getIdIMG());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ class PlayerTest {
|
|||||||
"│ CHARACTERS │\n" +
|
"│ CHARACTERS │\n" +
|
||||||
"│ 7 Artists: 🎨:7 │\n" +
|
"│ 7 Artists: 🎨:7 │\n" +
|
||||||
"│ 1 Builders: 🔨:5 🏅:1 │\n" +
|
"│ 1 Builders: 🔨:5 🏅:1 │\n" +
|
||||||
"│ 1 Gatherers: -🥗:3 │\n" +
|
"│ 1 Gatherers: -\uD83C\uDF56:3 │\n" +
|
||||||
"│ 2 Shamans: 🌟:6 │\n" +
|
"│ 2 Shamans: 🌟:6 │\n" +
|
||||||
"│ 1 Inventors: 1:1 │\n" +
|
"│ 1 Inventors: 1:1 │\n" +
|
||||||
"│ 2 Hunters: 🍖1 │\n" +
|
"│ 2 Hunters: 🍖1 │\n" +
|
||||||
|
|||||||
Reference in New Issue
Block a user