librejack

commit a7d2632902d02ac2013a042a1cfef6cb19eb551a
parent 2ca294e6217be64080b6b2dbf180f9e1a4b5053f
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date:   Mon, 17 Oct 2022 15:23:01 +0200

Merge branch 'main' into GUI

Diffstat:
M
src/controller/Controller.java
 | 
6
++++--
M
src/model/Card.java
 | 
7
+------
M
src/model/Deck.java
 | 
5
+++--

3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/controller/Controller.java b/src/controller/Controller.java
@@ -71,8 +71,10 @@ public class Controller {
     public void startRound() {
 
         // if we run out of cards
-        dealer.getHand().discardHandToDeck(discarded);
-        player.getHand().discardHandToDeck(discarded);
+        if(wins > 0 || losses > 0 || pushes > 0) { // FIXME: change code :)
+            System.out.println("\nStarting next round...\nWins: " + wins + "\nLosses: " + losses + "\nPushes: " + pushes + "\nBalance: " + balance);
+            dealer.getHand().discardHandToDeck(discarded);
+            player.getHand().discardHandToDeck(discarded);
             
         // make sure deck has at least 4 cards left
         if(deck.cardsLeft() < 4) {
diff --git a/src/model/Card.java b/src/model/Card.java
@@ -81,9 +81,6 @@ public class Card {
         this.rank = card.getRank();
     }
 
-    /**
-     * Rank value getter method
-     */
     public int getValue() {
         return this.rank.rankValue;
     }
@@ -98,8 +95,6 @@ public class Card {
 
     @Override
     public String toString() {
-
-        return "[" + rank + " of " + suit + "]("
-                + this.getValue() + ")";
+        return "[" + rank + " of " + suit + "](" + this.getValue() + ")";
     }
 }
diff --git a/src/model/Deck.java b/src/model/Deck.java
@@ -44,11 +44,11 @@ public class Deck {
 
         ArrayList<Card> shufDeck = new ArrayList<Card>(); // temporary deck for storing cards in random order
 
-        Random random = new Random();
+        Random random = new Random(); // FIXME: use math method instead
         int randomCardIndex = 0;
 
         while (deck.size() > 0) {
-            // Generate random index
+            // generate random index
             randomCardIndex = random.nextInt(this.deck.size());
             shufDeck.add(this.deck.get(randomCardIndex)); // add card to random index of temporary deck
             this.deck.remove(randomCardIndex); // remove card from original deck
@@ -74,6 +74,7 @@ public class Deck {
     public Card takeCard() { // TODO: change take to draw
         Card cardToTake = new Card(deck.get(0));
         deck.remove(0);
+        
         return cardToTake;
     }