Fixed: Order toString
This commit is contained in:
@@ -79,7 +79,7 @@ public class Order2 extends OrderLogicCard {
|
|||||||
|
|
||||||
List<String> stringList=new ArrayList<>();
|
List<String> stringList=new ArrayList<>();
|
||||||
stringList.add("+1 Food");
|
stringList.add("+1 Food");
|
||||||
stringList.add("-1 Food / -2 Prestige");
|
stringList.add("-1 Food / -2 PP");
|
||||||
table.addRow(stringList);
|
table.addRow(stringList);
|
||||||
return "TURN ORDER\n" + table.build() + "\n";
|
return "TURN ORDER\n" + table.build() + "\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,8 +81,8 @@ public class Order3 extends OrderLogicCard {
|
|||||||
List<String> stringList=new ArrayList<>();
|
List<String> stringList=new ArrayList<>();
|
||||||
|
|
||||||
stringList.add("+2 Food");
|
stringList.add("+2 Food");
|
||||||
stringList.add(" --");
|
stringList.add("--");
|
||||||
stringList.add("-1 Food / -2 Prestige");
|
stringList.add("-1 Food / -2 PP");
|
||||||
table.addRow(stringList);
|
table.addRow(stringList);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -88,8 +88,8 @@ public class Order4 extends OrderLogicCard {
|
|||||||
List<String> stringList=new ArrayList<>();
|
List<String> stringList=new ArrayList<>();
|
||||||
stringList.add("+2 Food");
|
stringList.add("+2 Food");
|
||||||
stringList.add("+1 Food");
|
stringList.add("+1 Food");
|
||||||
stringList.add(" --");
|
stringList.add("--");
|
||||||
stringList.add("-1 Food / -2 Prestige");
|
stringList.add("-1 Food / -2 PP");
|
||||||
table.addRow(stringList);
|
table.addRow(stringList);
|
||||||
return "TURN ORDER\n" + table.build() + "\n";
|
return "TURN ORDER\n" + table.build() + "\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,9 +89,9 @@ public class Order5 extends OrderLogicCard {
|
|||||||
List<String> stringList=new ArrayList<>();
|
List<String> stringList=new ArrayList<>();
|
||||||
stringList.add("+3 Food");
|
stringList.add("+3 Food");
|
||||||
stringList.add("+1 Food");
|
stringList.add("+1 Food");
|
||||||
stringList.add(" --");
|
stringList.add("--");
|
||||||
stringList.add(" --");
|
stringList.add("--");
|
||||||
stringList.add("-1 Food / -2 Prestige");
|
stringList.add("-1 Food / -2 PP");
|
||||||
table.addRow(stringList);
|
table.addRow(stringList);
|
||||||
return "TURN ORDER\n" + table.build() + "\n";
|
return "TURN ORDER\n" + table.build() + "\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,8 +43,28 @@ public class AsciiTable {
|
|||||||
return sb.append(r).toString();
|
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);
|
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<String> left, List<String> 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();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user