diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java index 1a97e98..6d926c4 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java @@ -79,7 +79,7 @@ public class Order2 extends OrderLogicCard { List stringList=new ArrayList<>(); stringList.add("+1 Food"); - stringList.add("-1 Food / -2 Prestige"); + stringList.add("-1 Food / -2 PP"); table.addRow(stringList); return "TURN ORDER\n" + table.build() + "\n"; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java index de7797e..fb4c71a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java @@ -81,8 +81,8 @@ public class Order3 extends OrderLogicCard { List stringList=new ArrayList<>(); stringList.add("+2 Food"); - stringList.add(" --"); - stringList.add("-1 Food / -2 Prestige"); + stringList.add("--"); + stringList.add("-1 Food / -2 PP"); table.addRow(stringList); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java index 7b22706..966f15a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java @@ -88,8 +88,8 @@ public class Order4 extends OrderLogicCard { List stringList=new ArrayList<>(); stringList.add("+2 Food"); stringList.add("+1 Food"); - stringList.add(" --"); - stringList.add("-1 Food / -2 Prestige"); + stringList.add("--"); + stringList.add("-1 Food / -2 PP"); table.addRow(stringList); return "TURN ORDER\n" + table.build() + "\n"; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java index d69e0dd..468c626 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java @@ -89,9 +89,9 @@ public class Order5 extends OrderLogicCard { List stringList=new ArrayList<>(); stringList.add("+3 Food"); stringList.add("+1 Food"); - stringList.add(" --"); - stringList.add(" --"); - stringList.add("-1 Food / -2 Prestige"); + stringList.add("--"); + stringList.add("--"); + stringList.add("-1 Food / -2 PP"); table.addRow(stringList); return "TURN ORDER\n" + table.build() + "\n"; } 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 f3258a2..33e93ad 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 @@ -43,8 +43,28 @@ public class AsciiTable { return sb.append(r).toString(); } - private String rpad(String s, int w) { + private static String rpad(String s, int w) { if (s.length() >= w) return s.substring(0, w); - return s + " ".repeat(w - s.length()) + "\t"; + return s + " ".repeat(w - s.length()); } + public static String sideBySide(List left, List right, int gap) { + int leftWidth = left.stream().mapToInt(String::length).max().orElse(0); + int maxHeight = Math.max(left.size(), right.size()); + String padding = " ".repeat(gap); + + var sb = new StringBuilder(); + for (int i = 0; i < maxHeight; i++) { + String l = i < left.size() + ? left.get(i) + : " ".repeat(leftWidth); + + // padda la riga sinistra se è più corta delle altre + l = rpad(l, leftWidth); + + String r = i < right.size() ? right.get(i) : ""; + sb.append(l).append(padding).append(r).append('\n'); + } + return sb.toString(); + } + } \ No newline at end of file