From 0ce8184069b3c36651ce6dd915a2eb9d9013ce9e Mon Sep 17 00:00:00 2001 From: Daniel Grigencha Date: Thu, 5 Dec 2024 23:27:06 +0100 Subject: [PATCH] Updated 'Game' class. Updated the 'Game' class by adding the 'draw' method to it. In Addition, the 'initializeDrawPile' method was updated by shuffling the 'drawPile' attribute after filling it. --- .../model/src/main/java/pp/mdga/game/Game.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java index 5d7ac7d0..e66d877c 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java @@ -90,6 +90,20 @@ private void initializeDrawPile() { addBonusCards(BonusCard.TURBO, AMOUNT_OF_TURBO_CARDS); addBonusCards(BonusCard.SWAP, AMOUNT_OF_SWAP_CARDS); addBonusCards(BonusCard.SHIELD, AMOUNT_OF_SHIELD_CARDS); + Collections.shuffle(this.drawPile); + } + + /** + * This method will be used to remove the first card of the drawPile attribute of Game class. + * + * @return first card as a BonusCard enumeration. + */ + public BonusCard draw() { + if (!this.drawPile.isEmpty()) { + return this.drawPile.remove(0); + } + + return null; } /**