From de0f04b5b72baab01605df3dee58b1dc891d6337 Mon Sep 17 00:00:00 2001 From: Felix Koppe Date: Mon, 9 Dec 2024 16:07:26 +0100 Subject: [PATCH] Quality of live improvement --- .../src/main/java/pp/mdga/client/view/GameView.java | 8 +++++++- .../src/main/java/pp/mdga/client/view/MdgaView.java | 7 +++++-- .../turnstate/choosepiecestate/NoPieceState.java | 1 - 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java index bd77237a..163b1ab2 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java @@ -18,7 +18,7 @@ public class GameView extends MdgaView { private GuiHandler guiHandler; private ButtonLeft leaveButton; - private ButtonRight confirmButton; + public ButtonRight confirmButton; private ButtonRight noPowerButton; @@ -28,6 +28,8 @@ public class GameView extends MdgaView { private FilterPostProcessor fpp; + public boolean needConfirm = false; + private Node guiHandlerNode = new Node(); public GameView(MdgaApp app) { @@ -116,10 +118,14 @@ public Color getOwnColor() { public void needConfirm() { noPowerButton.hide(); confirmButton.show(); + + needConfirm = true; } public void noConfirm() { confirmButton.hide(); + + needConfirm = false; } public void showNoPower() { diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java index a16cc2d7..7f483c81 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java @@ -59,7 +59,6 @@ public void enter() { public void leave() { onLeave(); - settingsButton.hide(); while (settingsDepth > 0) { @@ -197,7 +196,11 @@ public void pressForward() { } if (this instanceof GameView gameView) { - app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT); + if(gameView.needConfirm) { + app.getModelSynchronize().confirm(); + } else { + app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT); + } } if (this instanceof CeremonyView ceremonyView) { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java index f43beea9..31931335 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java @@ -38,7 +38,6 @@ public void exit() { @Override public void received(SelectPieceMessage msg) { - //TODO ArrayList pieces = msg.getPieces().stream().map(piece -> logic.getGame().getPieceThroughUUID(piece.getUuid())).collect(Collectors.toCollection(ArrayList::new)); parent.getSelectPiece().setPossiblePieces(pieces); ArrayList listPiece = pieces.stream().map(Piece::getUuid).collect(Collectors.toCollection(ArrayList::new));