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

Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2

Browse Source
This commit is contained in:
Cedric Beck
2024-12-09 18:12:08 +01:00
parent ec77b9a6ef 2d01e4b31b
commit f8179f191f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java
View File

@@ -4,6 +4,7 @@
import pp.mdga.client.ClientState; import pp.mdga.client.ClientState;
import pp.mdga.client.gamestate.DetermineStartPlayerState; import pp.mdga.client.gamestate.DetermineStartPlayerState;
import pp.mdga.game.Player; import pp.mdga.game.Player;
import pp.mdga.game.card.PowerCard;
import pp.mdga.message.client.AnimationEndMessage; import pp.mdga.message.client.AnimationEndMessage;
import pp.mdga.notification.AcquireCardNotification; import pp.mdga.notification.AcquireCardNotification;
import pp.mdga.notification.ActivePlayerNotification; import pp.mdga.notification.ActivePlayerNotification;
@@ -48,10 +49,12 @@ public void enter() {
logic.getGame().getBoard().getInfield()[entry.getValue().getStartNodeIndex()].setOccupant(entry.getValue().getPieces()[0]); logic.getGame().getBoard().getInfield()[entry.getValue().getStartNodeIndex()].setOccupant(entry.getValue().getPieces()[0]);
entry.getValue().getWaitingArea()[0] = null; entry.getValue().getWaitingArea()[0] = null;
animationCounter++; animationCounter++;
if(entry.getKey() == logic.getOwnPlayerId()){ for (PowerCard card : entry.getValue().getHandCards()){
logic.addNotification(new AcquireCardNotification(entry.getValue().getHandCards().get(0).getCard())); if(entry.getKey() == logic.getOwnPlayerId()){
} else { logic.addNotification(new AcquireCardNotification(card.getCard()));
logic.addNotification(new DrawCardNotification(entry.getValue().getColor(), entry.getValue().getHandCards().get(0).getCard())); } else {
logic.addNotification(new DrawCardNotification(entry.getValue().getColor(), card.getCard()));
}
} }
} }
} }

1
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java
View File

@@ -183,6 +183,7 @@ else if (piece.getState() == PieceState.ACTIVE) {
if (targetIdx >= 40) { if (targetIdx >= 40) {
int stepsToHome = 39 - normPieceIdx; int stepsToHome = 39 - normPieceIdx;
int restMovement = steps - stepsToHome - 1; int restMovement = steps - stepsToHome - 1;
if(restMovement>=3) return false;
System.out.println("Server: ChoosePieceStateMachine: canPieceMoveInHome: stepsToHome:" + stepsToHome + "restMovement:" + restMovement + "jumpOver:" + jumpOver(restMovement, 0, true) + "canPieceMoveInHome: return:" + true); System.out.println("Server: ChoosePieceStateMachine: canPieceMoveInHome: stepsToHome:" + stepsToHome + "restMovement:" + restMovement + "jumpOver:" + jumpOver(restMovement, 0, true) + "canPieceMoveInHome: return:" + true);
return !jumpOver(restMovement, 0, true); return !jumpOver(restMovement, 0, true);
} }