peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fixed card selection, to use an already selected and discarded card

Browse Source
This commit is contained in:
Hanno Fleischer
2024-12-09 18:45:23 +01:00
parent ceb9e48f55
commit 06cb25b6a9
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java
View File

@@ -48,8 +48,6 @@ public void received(DieMessage msg) {
else { else {
logic.addNotification(new RollDiceNotification(logic.getGame().getActiveColor(), msg.getDiceEye())); logic.addNotification(new RollDiceNotification(logic.getGame().getActiveColor(), msg.getDiceEye()));
} }
// logic.addNotification(new RollDiceNotification(logic.getGame().getActiveColor(), logic.getGame().getDiceEyes()));
//stats //stats
if (msg.getDiceEye() == 6) { if (msg.getDiceEye() == 6) {
@@ -76,13 +74,6 @@ public void received(ActivePlayerMessage msg) {
} }
} }
// @Override
// public void received(DrawCardMessage msg){
// logic.addNotification(new DrawCardNotification(logic.getGame().getActiveColor(), msg.getCard().getCard()));
// logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getPlayerStatistic().increaseActivatedBonusNodes();
// logic.getGame().getGameStatistics().increaseActivatedBonusNodes();
// }
@Override @Override
public void received(MoveMessage msg) { public void received(MoveMessage msg) {
Piece piece = logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()); Piece piece = logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid());
@@ -111,6 +102,7 @@ public void received(MoveMessage msg) {
//set new node //set new node
logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece); logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece);
} }
System.out.println("send AnimationEndMessage");
logic.getGame().setTurboFlag(false); logic.getGame().setTurboFlag(false);
parent.setState(parent.getAnimation()); parent.setState(parent.getAnimation());
} }

4
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java
View File

@@ -24,12 +24,12 @@ public PlayPowerCardState(ClientState parent, ClientGameLogic logic) {
@Override @Override
public void enter() { public void enter() {
if(playCardMessage.getCard() instanceof SwapCard) { if(playCardMessage.getCard().getCard().equals(BonusCard.SWAP)) {
extraAnimationCounter++; extraAnimationCounter++;
} }
logic.addNotification(new PlayCardNotification(logic.getGame().getActiveColor() , playCardMessage.getCard().getCard())); logic.addNotification(new PlayCardNotification(logic.getGame().getActiveColor() , playCardMessage.getCard().getCard()));
logic.getGame().getActivePlayer().removeHandCard(playCardMessage.getCard());
handlePowerCard(playCardMessage); handlePowerCard(playCardMessage);
} }