librejack

commit b085138ba1c725244883bbc65283c39063db7117
parent d995000bb1958d6723ef0ed9ec755c39ed532018
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date:   Sun, 16 Oct 2022 21:20:49 +0200

add print statements

Diffstat:
M
src/controller/Controller.java
 | 
18
+++++++++++++++---
M
src/model/Person.java
 | 
2
++

2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/controller/Controller.java b/src/controller/Controller.java
@@ -96,6 +96,7 @@ public class Controller {
 
     }
 
+    // TODO: remove print statements
     public String checkWhoWins() {
         
         // check if dealer has blackjack
@@ -104,27 +105,30 @@ public class Controller {
 
             if (player.hasBlackjack()) {
                 ++pushes;
+                System.out.println("You both have 21 - Push");
                 return "You both have 21 - Push";
             } else {
                 balance -= bet;
                 ++losses;
                 dealer.printHand();
-                return "Dealer has BlackJack. You lose.";
+                System.out.println("Dealer has BlackJack. You lose.");
+                return "Dealer has BlackJack. You lose";
             }
         }
 
         // check if player has blackjack
         if(player.hasBlackjack()) {
-            System.out.println("You have BlackJack. You win.");
             balance += bet * 1.5;
             ++wins;
-            startRound();
+            System.out.println("You have BlackJack. You win.");
+            return "You have BlackJack. You win.";
         }
 
         // check whether player busted
         if(player.getHand().calculateValue() > 21) {
             balance -= bet;
             ++losses;
+            System.out.println("Busted");
             return "Busted";
         }
         
@@ -138,33 +142,40 @@ public class Controller {
         if(dealer.getHand().calculateValue() > 21) {
             balance += bet;
             ++wins;
+            System.out.println("Dealer busts");
             return "Dealer busts";
         }
         
         if(dealer.getHand().calculateValue() > player.getHand().calculateValue() && dealer.getHand().calculateValue() <= 21) {
             balance -= bet;
             ++losses;
+            System.out.println("you lose");
             return "You lose";
         }
 
         if(player.getHand().calculateValue() > dealer.getHand().calculateValue()) {
             balance += bet;
             ++wins;
+            System.out.println("you win");
             return "You win";
         }
         
         if(player.getHand().calculateValue() == dealer.getHand().calculateValue()) {
             ++pushes;
+            System.out.println("push");
             return "Push";
         }
         
+        System.out.println("something went wrong");
         return "Something went wrong";
     }
     /**
      *
      * @return player hand
      */
+    // TODO: remove print statements
     public String displayPlayerHand() {
+        System.out.println("Your hand:\n");
         return player.printHand();
     }
     
@@ -173,6 +184,7 @@ public class Controller {
      * @return dealer hand
      */
     public String displayDealerHand() {
+        System.out.println("Dealer's hand:\n");
         return dealer.printHand();
     }
 
diff --git a/src/model/Person.java b/src/model/Person.java
@@ -49,8 +49,10 @@ public abstract class Person {
     /**
      * Prints a formatted version of the person's hand
      */
+    // TODO: remove print statement
     public String printHand() {
 //        System.out.println(this.name + "'s hand:\n" + this.hand + "[" + this.hand.calculateValue() + "]");
+        System.out.println(this.hand + "[" + this.hand.calculateValue() + "]");
         return this.hand + "[" + this.hand.calculateValue() + "]";
     }