diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java index f9e17b7..abdefc3 100644 --- a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java @@ -38,7 +38,6 @@ public class ClientLauncherTUI { */ public void main() throws InterruptedException { view = new TUI(null); - admissibleChar.add("0"); admissibleChar.add("1"); admissibleChar.add("2"); admissibleChar.add("3"); @@ -46,8 +45,6 @@ public class ClientLauncherTUI { admissibleChar.add("5"); admissibleChar.add("6"); admissibleChar.add("7"); - admissibleChar.add("8"); - admissibleChar.add("9"); admissibleChar.add("A"); admissibleChar.add("B"); admissibleChar.add("C"); @@ -138,7 +135,7 @@ public class ClientLauncherTUI { if(admissibleChar.contains(action)) { - if (!action.equals("7") && !action.equals("8")&& !action.equals("A") && !action.equals("B") && !action.equals("C")&&!action.equals("a") && !action.equals("b") && !action.equals("c")) { + if (!action.equals("6") && !action.equals("A") && !action.equals("B") && !action.equals("C")&&!action.equals("a") && !action.equals("b") && !action.equals("c")) { try { System.out.println("Insert the required position:"); pos = scanner.nextInt(); @@ -148,16 +145,13 @@ public class ClientLauncherTUI { } } switch (action) { - case "0" -> controller.slotChoice(username, pos); - case "1" -> controller.drawUpperTribeCard(username, pos); - case "2" -> controller.drawUpperBuildingCard(username, pos); - case "3" -> controller.drawLowerTribeCard(username, pos); - case "4" -> controller.drawLowerBuildingCard(username, pos); - case "5" -> controller.pickOptionalTribeCard(username, pos); - case "6" -> controller.pickOptionalBuildingCard(username, pos); - case "7" -> controller.noOptionalCard(username); - case "8" -> controller.skipTurn(username); - case "9" -> controller.totemChoice(username,pos); + case "1" -> controller.slotChoice(username, pos); + case "2" -> controller.drawUpperTribeCard(username, pos); + case "3" -> controller.drawUpperBuildingCard(username, pos); + case "4" -> controller.drawLowerTribeCard(username, pos); + case "5" -> controller.drawLowerBuildingCard(username, pos); + case "6" -> controller.skipTurn(username); + case "7" -> controller.totemChoice(username,pos); case "A", "a" -> view.fullRender(); case "B", "b" -> view.renderBoard(); case "C", "c" -> view.renderPlayer(); diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java index b463966..6914e40 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java @@ -194,7 +194,7 @@ public class TUI implements IView { lines.add(i+"."+model.availableTotems.get(i)); } table.addRow(lines); - System.out.println(model.currentState+"\nTOTEMS AVAILABLE:\n"+table.build()+"\nPress 9 and then write the position"); + System.out.println(model.currentState+"\nTOTEMS AVAILABLE:\n"+table.build()+"\nPress 7 and then write the position"); } /** @@ -248,15 +248,12 @@ public class TUI implements IView { private String printMenuOptions() { var table = new AsciiTable(BorderStyle.ROUNDED, 2); table.addHeader("Menu Options", "Render Options"); - table.addRow(List.of("0-SlotChoice(pos)", "A-Full Render")); - table.addRow(List.of("1-DrawUpperTribe(pos)", "B-Board Render")); - table.addRow(List.of("2-DrawUpperBuilding(pos)", "C-Players Render")); - table.addRow(List.of("3-DrawLowerTribe(pos)", "")); - table.addRow(List.of("4-DrawLowerBuilding(pos)", "")); - table.addRow(List.of("5-PickOptionalTribe(pos)", "")); - table.addRow(List.of("6-PickOptionalBuilding(pos)", "")); - table.addRow(List.of("7-NoOptional", "")); - table.addRow(List.of("8-SkipTurn", "")); + table.addRow(List.of("1-SlotChoice(pos)", "A-Full Render")); + table.addRow(List.of("2-DrawUpperTribe(pos)", "B-Board Render")); + table.addRow(List.of("3-DrawUpperBuilding(pos)", "C-Players Render")); + table.addRow(List.of("4-DrawLowerTribe(pos)", "")); + table.addRow(List.of("5-DrawLowerBuilding(pos)", "")); + table.addRow(List.of("6-SkipTurn", "")); return table.build(); }