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

revert 2 dicenow

Browse Source
This commit is contained in:
Cedric Beck
2024-12-09 04:42:55 +01:00
parent f954a24b32
commit 2dbdb1e17b
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
View File

@@ -33,6 +33,7 @@ public class CardLayerHandler {
private final Set<CardControl> selectableCards = new HashSet<>(); private final Set<CardControl> selectableCards = new HashSet<>();
private BonusCard cardSelect = null; private BonusCard cardSelect = null;
private boolean show = false;
public CardLayerHandler(MdgaApp app, Texture2D backTexture) { public CardLayerHandler(MdgaApp app, Texture2D backTexture) {
this.app = app; this.app = app;
@@ -64,11 +65,14 @@ public void rollDice(int rollNum, Runnable actionAfter) {
} }
public void showDice() { public void showDice() {
if(show) return;
show = true;
cardLayer.addSpatial(diceControl.getSpatial()); cardLayer.addSpatial(diceControl.getSpatial());
diceControl.spin(); diceControl.spin();
} }
public void hideDice() { public void hideDice() {
show = false;
diceControl.hide(); diceControl.hide();
} }

2
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java
View File

@@ -23,7 +23,7 @@ public RollDiceState(ClientState parent, ClientGameLogic logic) {
@Override @Override
public void enter() { public void enter() {
//logic.addNotification(new DiceNowNotification()); logic.addNotification(new DiceNowNotification());
} }
@Override @Override

4
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -94,8 +94,8 @@ public Game() {
* This method initializes the draw pile with the predefined number of bonus cards. * This method initializes the draw pile with the predefined number of bonus cards.
*/ */
private void initializeDrawPile() { private void initializeDrawPile() {
this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS); // this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS);
// this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS); this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
// this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS); // this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS);
Collections.shuffle(this.drawPile); Collections.shuffle(this.drawPile);
} }