diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/ConflictCommands.java b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/ConflictCommands.java index 41af3389..70b59119 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/ConflictCommands.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/ConflictCommands.java @@ -250,6 +250,7 @@ public String listConflicts(@Me IMessageIO io, @Me JSONObject command, ConflictM response.append(TimeUtil.DD_MM_YYYY.format(TimeUtil.getTimeFromTurn(conflict.getEndTurn()))); } response.append("\n"); + response.append("- " + conflict.getTotalWars() + " wars\n"); response.append("- Coalition 1: ").append(conflict.getCoalition1().stream().map(f -> PW.getName(f, true)).collect(Collectors.joining(","))).append("\n"); response.append("- Coalition 2: ").append(conflict.getCoalition2().stream().map(f -> PW.getName(f, true)).collect(Collectors.joining(","))).append("\n"); response.append("---\n"); diff --git a/src/main/java/link/locutus/discord/util/sheet/templates/TransferSheet.java b/src/main/java/link/locutus/discord/util/sheet/templates/TransferSheet.java index 49f4a4d6..62fe554f 100644 --- a/src/main/java/link/locutus/discord/util/sheet/templates/TransferSheet.java +++ b/src/main/java/link/locutus/discord/util/sheet/templates/TransferSheet.java @@ -166,7 +166,7 @@ public Set read() { } public TransferSheet write() { - List header = new ArrayList<>(Arrays.asList("nation", "alliance", "cities")); + List header = new ArrayList<>(Arrays.asList("nation", "alliance", "cities", "worth")); for (ResourceType value : ResourceType.values) { if (value != ResourceType.CREDITS) header.add(value.name()); } @@ -188,6 +188,7 @@ public TransferSheet write() { row.add(nation.getCities()); } Map transfer = entry.getValue(); + row.add(ResourceType.convertedTotal(transfer)); for (ResourceType type : ResourceType.values) { if (type != ResourceType.CREDITS) { double amt = transfer.getOrDefault(type, 0d);