From a12ebe89243ebf313f841331e88405ceb9e3366d Mon Sep 17 00:00:00 2001 From: donald f Date: Mon, 20 Nov 2017 10:50:34 -0500 Subject: [PATCH 01/34] created console --- src/main/java/io/zipcoder/casino/Console.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/main/java/io/zipcoder/casino/Console.java diff --git a/src/main/java/io/zipcoder/casino/Console.java b/src/main/java/io/zipcoder/casino/Console.java new file mode 100644 index 00000000..5b065501 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Console.java @@ -0,0 +1,46 @@ +package io.zipcoder.casino; + +import java.util.InputMismatchException; +import java.util.Scanner; + +public class Console { + public static String getUserInputString(String promptUser){ + do { + + try { + System.out.println(promptUser); + String userInput = new Scanner(System.in).nextLine(); + return userInput; + } catch (InputMismatchException ime){ + System.out.println("Invalid input, please try again."); + continue; + } + } + while (true) ; + } + + public static Double getUserInputDouble(String promptUser){ + do { + try { + return Double.parseDouble(getUserInputString(promptUser)); + } catch (NumberFormatException nfe){ + System.out.println("Invalid response please try again."); + continue; + } + } while (true); + + } + + public static Integer getUserInputInteger(String promptUser){ + do { + try { + return Integer.parseInt(getUserInputString(promptUser)); + } catch (NumberFormatException nfe){ + System.out.println("Invalid response please try again."); + continue; + } + } while (true); + + + } +} From 83debdb9d75b7ebc4466828c0a7624909f42d476 Mon Sep 17 00:00:00 2001 From: "Z. Cheema" <32852915+yzcheema11@users.noreply.github.com> Date: Mon, 20 Nov 2017 11:08:56 -0500 Subject: [PATCH 02/34] Added Casino Project --- Casino Project | 1 + 1 file changed, 1 insertion(+) create mode 100644 Casino Project diff --git a/Casino Project b/Casino Project new file mode 100644 index 00000000..4245b23e --- /dev/null +++ b/Casino Project @@ -0,0 +1 @@ +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 \ No newline at end of file From 0e29d9c2a4070062eb33fc827659d8456a9651bb Mon Sep 17 00:00:00 2001 From: donald f Date: Mon, 20 Nov 2017 18:36:10 -0500 Subject: [PATCH 03/34] made some framework changes --- src/main/java/io/zipcoder/casino/Bank.java | 4 +++ .../java/io/zipcoder/casino/BlackJack.java | 4 +++ .../io/zipcoder/casino/BlackjackPlayer.java | 16 ++++++++++ src/main/java/io/zipcoder/casino/Card.java | 4 +++ .../java/io/zipcoder/casino/CardGames.java | 6 ++++ src/main/java/io/zipcoder/casino/Craps.java | 4 +++ .../java/io/zipcoder/casino/CrapsPlayer.java | 14 +++++++++ src/main/java/io/zipcoder/casino/Deck.java | 4 +++ .../java/io/zipcoder/casino/DiceGames.java | 4 +++ src/main/java/io/zipcoder/casino/Gamble.java | 4 +++ src/main/java/io/zipcoder/casino/Game.java | 6 ++++ .../io/zipcoder/casino/GameInterface.java | 4 +++ src/main/java/io/zipcoder/casino/GoFish.java | 5 +++ .../java/io/zipcoder/casino/GoFishPlayer.java | 14 +++++++++ src/main/java/io/zipcoder/casino/Hand.java | 4 +++ src/main/java/io/zipcoder/casino/Player.java | 31 +++++++++++++++++++ 16 files changed, 128 insertions(+) create mode 100644 src/main/java/io/zipcoder/casino/Bank.java create mode 100644 src/main/java/io/zipcoder/casino/BlackJack.java create mode 100644 src/main/java/io/zipcoder/casino/BlackjackPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/Card.java create mode 100644 src/main/java/io/zipcoder/casino/CardGames.java create mode 100644 src/main/java/io/zipcoder/casino/Craps.java create mode 100644 src/main/java/io/zipcoder/casino/CrapsPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/Deck.java create mode 100644 src/main/java/io/zipcoder/casino/DiceGames.java create mode 100644 src/main/java/io/zipcoder/casino/Gamble.java create mode 100644 src/main/java/io/zipcoder/casino/Game.java create mode 100644 src/main/java/io/zipcoder/casino/GameInterface.java create mode 100644 src/main/java/io/zipcoder/casino/GoFish.java create mode 100644 src/main/java/io/zipcoder/casino/GoFishPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/Hand.java create mode 100644 src/main/java/io/zipcoder/casino/Player.java diff --git a/src/main/java/io/zipcoder/casino/Bank.java b/src/main/java/io/zipcoder/casino/Bank.java new file mode 100644 index 00000000..3ba17673 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Bank.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class Bank { +} diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java new file mode 100644 index 00000000..ef6611b7 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class BlackJack { +} diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java new file mode 100644 index 00000000..96493c4e --- /dev/null +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -0,0 +1,16 @@ +package io.zipcoder.casino; + +public class BlackjackPlayer extends Player { + + BlackjackPlayer(String name, Double money) { + super(name, money); + } + + double bet() { + return 0; + } + + void addToList(BlackjackPlayer player) { + players.add(player); + } +} diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java new file mode 100644 index 00000000..f9b9bddf --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class Card { +} diff --git a/src/main/java/io/zipcoder/casino/CardGames.java b/src/main/java/io/zipcoder/casino/CardGames.java new file mode 100644 index 00000000..423bd6d3 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/CardGames.java @@ -0,0 +1,6 @@ +package io.zipcoder.casino; + +abstract class CardGames extends Game { + + public abstract void start(); +} diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java new file mode 100644 index 00000000..918edc82 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class Craps { +} diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java new file mode 100644 index 00000000..519943dc --- /dev/null +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -0,0 +1,14 @@ +package io.zipcoder.casino; + +public class CrapsPlayer extends Player { + + void addToList(CrapsPlayer player) { + this.players.add(player); + } + + CrapsPlayer(String name, Double money) { + super(name, money); + } + + +} diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java new file mode 100644 index 00000000..34ed09ac --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class Deck { +} diff --git a/src/main/java/io/zipcoder/casino/DiceGames.java b/src/main/java/io/zipcoder/casino/DiceGames.java new file mode 100644 index 00000000..c0d29d37 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/DiceGames.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class DiceGames { +} diff --git a/src/main/java/io/zipcoder/casino/Gamble.java b/src/main/java/io/zipcoder/casino/Gamble.java new file mode 100644 index 00000000..17c87b3f --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Gamble.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class Gamble { +} diff --git a/src/main/java/io/zipcoder/casino/Game.java b/src/main/java/io/zipcoder/casino/Game.java new file mode 100644 index 00000000..9f5e0922 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Game.java @@ -0,0 +1,6 @@ +package io.zipcoder.casino; + +abstract class Game { + + abstract void start(); +} diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java new file mode 100644 index 00000000..e05280c0 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class GameInterface { +} diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java new file mode 100644 index 00000000..7dbf0003 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -0,0 +1,5 @@ +package io.zipcoder.casino; + +public class GoFish { + +} diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java new file mode 100644 index 00000000..c88adc53 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -0,0 +1,14 @@ +package io.zipcoder.casino; + +public class GoFishPlayer extends Player { + + @Override + void addToList(GoFishPlayer player) { + this.players.add(player); + } + + GoFishPlayer(String name) { + super(name); + } + +} diff --git a/src/main/java/io/zipcoder/casino/Hand.java b/src/main/java/io/zipcoder/casino/Hand.java new file mode 100644 index 00000000..628980c9 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Hand.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class Hand { +} diff --git a/src/main/java/io/zipcoder/casino/Player.java b/src/main/java/io/zipcoder/casino/Player.java new file mode 100644 index 00000000..4a08c73b --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Player.java @@ -0,0 +1,31 @@ +package io.zipcoder.casino; + +import java.util.ArrayList; + +abstract class Player> { + + private String name; + private Double money; + protected ArrayList players; + private Hand playerHand; + private double bet; + + private void bet(double bet){ + this.bet = bet; + } + + public Player findPlayer(String name){ + return null; + } + + abstract void addToList(E player); + + Player(String name, Double money){ + this.name = name; + this.money = money; + } + + Player(String name){ + this.name = name; + } +} From 46f2b29a29c6364bbeb80e431ca35b892b8190b4 Mon Sep 17 00:00:00 2001 From: "Z. Cheema" <32852915+yzcheema11@users.noreply.github.com> Date: Mon, 20 Nov 2017 19:55:22 -0500 Subject: [PATCH 04/34] Update Casino Project --- Casino Project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casino Project b/Casino Project index 4245b23e..51537e36 100644 --- a/Casino Project +++ b/Casino Project @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file From 121467e6ca0b91fb786c9f54bcc613d5568d6b1c Mon Sep 17 00:00:00 2001 From: zan Date: Tue, 21 Nov 2017 08:39:33 -0500 Subject: [PATCH 05/34] added enum --- src/main/java/io/zipcoder/casino/Suit.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/java/io/zipcoder/casino/Suit.java diff --git a/src/main/java/io/zipcoder/casino/Suit.java b/src/main/java/io/zipcoder/casino/Suit.java new file mode 100644 index 00000000..1eb26f4a --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Suit.java @@ -0,0 +1,6 @@ +package io.zipcoder.casino; + +public enum Suit { + + {CLUB, DIAMOND, HEART, SPADE} +} From 60dbc978a44e8c8d3c707206aa2fde9ee2f00f71 Mon Sep 17 00:00:00 2001 From: zan Date: Tue, 21 Nov 2017 11:56:59 -0500 Subject: [PATCH 06/34] Leon changes --- src/main/java/io/zipcoder/casino/BlackJack.java | 5 ++++- src/main/java/io/zipcoder/casino/BlackjackPlayer.java | 6 +++++- src/main/java/io/zipcoder/casino/Card.java | 6 ++++++ src/main/java/io/zipcoder/casino/Craps.java | 2 +- src/main/java/io/zipcoder/casino/CrapsPlayer.java | 9 ++++++++- src/main/java/io/zipcoder/casino/Deck.java | 4 ++++ src/main/java/io/zipcoder/casino/DiceGames.java | 4 +++- src/main/java/io/zipcoder/casino/Gamble.java | 4 +++- src/main/java/io/zipcoder/casino/Game.java | 2 +- src/main/java/io/zipcoder/casino/GameInterface.java | 2 +- src/main/java/io/zipcoder/casino/GoFish.java | 5 ++++- src/main/java/io/zipcoder/casino/GoFishPlayer.java | 10 ++-------- src/main/java/io/zipcoder/casino/Suit.java | 2 +- 13 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index ef6611b7..b3728201 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -1,4 +1,7 @@ package io.zipcoder.casino; -public class BlackJack { +public class BlackJack extends CardGames { + public void start() { + + } } diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 96493c4e..6961682a 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -1,6 +1,10 @@ package io.zipcoder.casino; -public class BlackjackPlayer extends Player { +public class BlackjackPlayer extends Player implements Gamble { + + void addToList(Comparable player) { + + } BlackjackPlayer(String name, Double money) { super(name, money); diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java index f9b9bddf..de2a8bb0 100644 --- a/src/main/java/io/zipcoder/casino/Card.java +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -1,4 +1,10 @@ package io.zipcoder.casino; public class Card { + private final int value; + private final Suit suit; + public Card(Suit suit, int value) { + this.suit = suit; + this.value = value; + } } diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index 918edc82..143a1233 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -1,4 +1,4 @@ package io.zipcoder.casino; -public class Craps { +public class Craps extends DiceGames { } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index 519943dc..fe1bd683 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -1,14 +1,21 @@ package io.zipcoder.casino; -public class CrapsPlayer extends Player { +public class CrapsPlayer extends Player implements Gamble { void addToList(CrapsPlayer player) { this.players.add(player); } + void addToList(Comparable player) { + + } + CrapsPlayer(String name, Double money) { super(name, money); } + public void bet() { + + } } diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index 34ed09ac..55a9b30f 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -1,4 +1,8 @@ package io.zipcoder.casino; +import java.util.ArrayList; + public class Deck { + + ArrayList cards = new ArrayList(); } diff --git a/src/main/java/io/zipcoder/casino/DiceGames.java b/src/main/java/io/zipcoder/casino/DiceGames.java index c0d29d37..2205d675 100644 --- a/src/main/java/io/zipcoder/casino/DiceGames.java +++ b/src/main/java/io/zipcoder/casino/DiceGames.java @@ -1,4 +1,6 @@ package io.zipcoder.casino; -public class DiceGames { +public class DiceGames extends Game { + void start() { + } } diff --git a/src/main/java/io/zipcoder/casino/Gamble.java b/src/main/java/io/zipcoder/casino/Gamble.java index 17c87b3f..10008723 100644 --- a/src/main/java/io/zipcoder/casino/Gamble.java +++ b/src/main/java/io/zipcoder/casino/Gamble.java @@ -1,4 +1,6 @@ package io.zipcoder.casino; -public class Gamble { +interface Gamble { + + public void bet(); } diff --git a/src/main/java/io/zipcoder/casino/Game.java b/src/main/java/io/zipcoder/casino/Game.java index 9f5e0922..d6b1f1a2 100644 --- a/src/main/java/io/zipcoder/casino/Game.java +++ b/src/main/java/io/zipcoder/casino/Game.java @@ -1,6 +1,6 @@ package io.zipcoder.casino; -abstract class Game { +abstract class Game implements GameInterface { abstract void start(); } diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index e05280c0..8944d9f9 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -1,4 +1,4 @@ package io.zipcoder.casino; -public class GameInterface { +public interface GameInterface { } diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java index 7dbf0003..40d9bb9d 100644 --- a/src/main/java/io/zipcoder/casino/GoFish.java +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -1,5 +1,8 @@ package io.zipcoder.casino; -public class GoFish { +public class GoFish extends CardGames { + public void start() { + + } } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index c88adc53..ddc50189 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -1,14 +1,8 @@ package io.zipcoder.casino; -public class GoFishPlayer extends Player { +public class GoFishPlayer { - @Override - void addToList(GoFishPlayer player) { - this.players.add(player); - } +* - GoFishPlayer(String name) { - super(name); - } } diff --git a/src/main/java/io/zipcoder/casino/Suit.java b/src/main/java/io/zipcoder/casino/Suit.java index 1eb26f4a..2be68cd4 100644 --- a/src/main/java/io/zipcoder/casino/Suit.java +++ b/src/main/java/io/zipcoder/casino/Suit.java @@ -2,5 +2,5 @@ public enum Suit { - {CLUB, DIAMOND, HEART, SPADE} + CLUB, DIAMOND, HEART, SPADE } From 389e734fb20a229c9bb158b24dbe1870019220c1 Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 12:04:28 -0500 Subject: [PATCH 07/34] gamlbe interface --- src/.DS_Store | Bin 0 -> 6148 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/.DS_Store | Bin 0 -> 6148 bytes src/main/java/io/.DS_Store | Bin 0 -> 6148 bytes src/main/java/io/zipcoder/.DS_Store | Bin 0 -> 6148 bytes .../java/io/zipcoder/casino/BlackjackPlayer.java | 13 +++++++++---- .../java/io/zipcoder/casino/CrapsPlayer.java | 10 +++++++++- src/main/java/io/zipcoder/casino/Gamble.java | 4 +++- .../java/io/zipcoder/casino/GoFishPlayer.java | 5 ++++- 9 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 src/.DS_Store create mode 100644 src/main/.DS_Store create mode 100644 src/main/java/.DS_Store create mode 100644 src/main/java/io/.DS_Store create mode 100644 src/main/java/io/zipcoder/.DS_Store diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..254fc3aa651e4450a614b710682d5cd8457a722c GIT binary patch literal 6148 zcmeH~J8r{33`B>H3IlFbrrah6@C_D*bAntTAH#qFe+t9>9^FGOn<%aW!59MMTXIE6 znnEiAu+43^21Wo&x)X06CT7eBobZJM&imc<=lgOwdXcv1fT#2kll|Nlq<|EV0#ZN< zNP!tCkjMCPHKS+JqeuZMFb@U%`%vi4nrxl%>0pQvfE-v3<2q&uvUq{4$=1mV&2oCM zY_%9eydLdj$?Iyeb@p~x4j-0xHlJc>*4tr)3C(IiK?+ELi2^S@AN~A)r$3tiCoM{) zfE0K#1#H-UY&U$VJX`;~p4UIK>gz@)<8p>yKLJeqD1N1faliP2tjX5N3Qa!(A%lVx H_*Vt)CSMYs literal 0 HcmV?d00001 diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..db5230729bac487d668cd322e4d37e689eaf857b GIT binary patch literal 6148 zcmeH~F>V4u3`M_T3nZE?Q%=JHxWNd)337ozPzn@@0zo}T=iB2Zo789(eM|Nmd)C_B zU+k;_*zSJb0waJG-HDBdi5c?&7aZ}x@#}p1JYBEfUZgEL;3<8?WIwkBDIf);fE17d zQeZ|3$ccLbDoBkOER*qQJ7}qo4l=`d{<^q(!L| zkOKcq0UP%3`yF2@&(>eB=k<@Q`nu7{xSZj~PXH4?ir?sA+%LW$YqE8+Leq~x$ekicf<8!3$P|z5EU4I1Y8CND)3VUo`O#h AF8}}l literal 0 HcmV?d00001 diff --git a/src/main/java/io/.DS_Store b/src/main/java/io/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..91a4b95abcf1b1002a8d343795b6400b143a3e14 GIT binary patch literal 6148 zcmeHKyG{c!5S)b+C()!#>0jUvtSEc|KY)@02?^;Ch=%H_d>5a_?4uw$=t2|CO6#%L zJGMNT<13vMLR~&xw z_tW&^n=&aN1*Cu!kOETRtO`_l9d6Egst%I^Qs5F4@b5#TJNCjkF+Lp}q6HwX7!Kn+ zdI@6l0I?U&iHy)Jsl=pOwHTIk##`m}!Z|VNuxdW6Zno-BEN;hY$B#)D4O&w%S9lLG&(z&Em16^#G@ literal 0 HcmV?d00001 diff --git a/src/main/java/io/zipcoder/.DS_Store b/src/main/java/io/zipcoder/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a0bdc27cc6531a26beaec6b02bd1670f713cadaa GIT binary patch literal 6148 zcmeHKJ8r`;3?KkP1+N|E_?29}3*CCN6>g>A>JE0C0t{8|L0i z0E-2HHE{_<1g1d+2351g(4Zq;GOs2sfk79|=0o#l%??HVcAQ^4U9<*rqykjnQh~=< z_E!I2;8*(pOA=R9fC}7|0=gPs#{o~u+S)wMYHfjU;g)lPn_=!03|@|bUXHP_a=iAW b$SXF-eob5gosPKEf&3XTU1(I`uNC+KYI7Bb literal 0 HcmV?d00001 diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 96493c4e..501dd0a3 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -1,16 +1,21 @@ package io.zipcoder.casino; -public class BlackjackPlayer extends Player { +public class BlackjackPlayer extends Player implements Comparable, Gamble { BlackjackPlayer(String name, Double money) { super(name, money); } - double bet() { - return 0; - } void addToList(BlackjackPlayer player) { players.add(player); } + + public int compareTo(BlackjackPlayer o) { + return 0; + } + + public Double bet() { + return null; + } } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index 519943dc..76cf4aaa 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -1,14 +1,22 @@ package io.zipcoder.casino; -public class CrapsPlayer extends Player { +public class CrapsPlayer extends Player implements Comparable ,Gamble { void addToList(CrapsPlayer player) { this.players.add(player); } + CrapsPlayer(String name, Double money) { super(name, money); } + public int compareTo(CrapsPlayer o) { + return 0; + } + + public Double bet() { + return null; + } } diff --git a/src/main/java/io/zipcoder/casino/Gamble.java b/src/main/java/io/zipcoder/casino/Gamble.java index 17c87b3f..191d447a 100644 --- a/src/main/java/io/zipcoder/casino/Gamble.java +++ b/src/main/java/io/zipcoder/casino/Gamble.java @@ -1,4 +1,6 @@ package io.zipcoder.casino; -public class Gamble { +interface Gamble { + + public Double bet(); } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index c88adc53..1d01788e 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -1,6 +1,6 @@ package io.zipcoder.casino; -public class GoFishPlayer extends Player { +public class GoFishPlayer extends Player implements Comparable { @Override void addToList(GoFishPlayer player) { @@ -11,4 +11,7 @@ void addToList(GoFishPlayer player) { super(name); } + public int compareTo(GoFishPlayer o) { + return 0; + } } From 77ef91b8ae31d8b342816cbb6a224fcbef26fc3b Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 13:06:44 -0500 Subject: [PATCH 08/34] change some stuff for collabo stuff --- src/main/java/io/zipcoder/casino/Console.java | 12 ++++++ .../java/io/zipcoder/casino/DiceGames.java | 37 ++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/casino/Console.java b/src/main/java/io/zipcoder/casino/Console.java index 5b065501..d87013ac 100644 --- a/src/main/java/io/zipcoder/casino/Console.java +++ b/src/main/java/io/zipcoder/casino/Console.java @@ -43,4 +43,16 @@ public static Integer getUserInputInteger(String promptUser){ } + +// public static double checkForNullPointer(Double toBeChecked){ +// do { +// try { +// return toBeChecked; +// } catch (NullPointerException npe){ +// toBeChecked = CurrencyConverter.getCurrencyRates(getUserInputInteger("Invalid response. Please try again.")); +// continue; +// } +// } +// while (true); +// } } diff --git a/src/main/java/io/zipcoder/casino/DiceGames.java b/src/main/java/io/zipcoder/casino/DiceGames.java index c0d29d37..06ba9805 100644 --- a/src/main/java/io/zipcoder/casino/DiceGames.java +++ b/src/main/java/io/zipcoder/casino/DiceGames.java @@ -1,4 +1,39 @@ package io.zipcoder.casino; public class DiceGames { -} + + public void chooseDiceGame(){ + int userInput = Console.getUserInputInteger("Which dice game 1 or 2."); + if(userInput == 1){ + startCraps; + } + } if else (userInput == 2){ + + }else{ + repeatQuestion;} + + public void startCraps(){ + do{ + + + + + + + + + + + + + + + + + + + + String userInput = Console.getUserInputString("Do wyou wnat to continue yes or no?"); + }while (userInput.equalsIgnoreCase("yes")); + } +} \ No newline at end of file From f69c43c77eba2146a28fa5ef67205479ec039357 Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 13:25:00 -0500 Subject: [PATCH 09/34] made some changes --- .../io/zipcoder/casino/BlackjackPlayer.java | 19 ++++++++++++++++--- src/main/java/io/zipcoder/casino/Deck.java | 4 ++++ .../java/io/zipcoder/casino/DiceGames.java | 4 ++-- src/main/java/io/zipcoder/casino/Hand.java | 3 +++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 501dd0a3..ee431f3d 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -7,15 +7,28 @@ public class BlackjackPlayer extends Player implements Comparab } - void addToList(BlackjackPlayer player) { + public void addToList(BlackjackPlayer player) { players.add(player); } - public int compareTo(BlackjackPlayer o) { - return 0; + public boolean hitStay(String userAnswer){ + if(userAnswer.equalsIgnoreCase("yes")){ + return true; + } + return false; } public Double bet() { return null; } + + public int compareTo(BlackjackPlayer o) { + return 0; + } + + public Hand getHand(){ + Hand hand = new Hand(); + hand.blackjackHand(); + return hand; + } } diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index 34ed09ac..4ea7c99f 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -1,4 +1,8 @@ package io.zipcoder.casino; public class Deck { + + + public static void dealOneRandomCard() { + } } diff --git a/src/main/java/io/zipcoder/casino/DiceGames.java b/src/main/java/io/zipcoder/casino/DiceGames.java index 06ba9805..54a52948 100644 --- a/src/main/java/io/zipcoder/casino/DiceGames.java +++ b/src/main/java/io/zipcoder/casino/DiceGames.java @@ -5,7 +5,7 @@ public class DiceGames { public void chooseDiceGame(){ int userInput = Console.getUserInputInteger("Which dice game 1 or 2."); if(userInput == 1){ - startCraps; + startCraps(); } } if else (userInput == 2){ @@ -34,6 +34,6 @@ public void startCraps(){ String userInput = Console.getUserInputString("Do wyou wnat to continue yes or no?"); - }while (userInput.equalsIgnoreCase("yes")); + }while (userInput.equalsIgnoreCase("no")); } } \ No newline at end of file diff --git a/src/main/java/io/zipcoder/casino/Hand.java b/src/main/java/io/zipcoder/casino/Hand.java index 628980c9..2da71a8a 100644 --- a/src/main/java/io/zipcoder/casino/Hand.java +++ b/src/main/java/io/zipcoder/casino/Hand.java @@ -1,4 +1,7 @@ package io.zipcoder.casino; public class Hand { + + public void blackjackHand() { + } } From 18d5f8ab23eda72cf4f7db25a1cc8e18dc99cad5 Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 15:35:37 -0500 Subject: [PATCH 10/34] made some more changes --- src/main/java/io/zipcoder/casino/Card.java | 6 +++ .../java/io/zipcoder/casino/CrapsPlayer.java | 4 ++ .../java/io/zipcoder/casino/DiceGames.java | 33 +------------ .../io/zipcoder/casino/GameInterface.java | 49 +++++++++++++++++++ src/main/java/io/zipcoder/casino/Player.java | 12 +++++ 5 files changed, 72 insertions(+), 32 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java index f9b9bddf..de2a8bb0 100644 --- a/src/main/java/io/zipcoder/casino/Card.java +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -1,4 +1,10 @@ package io.zipcoder.casino; public class Card { + private final int value; + private final Suit suit; + public Card(Suit suit, int value) { + this.suit = suit; + this.value = value; + } } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index 76cf4aaa..49c3faaa 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -19,4 +19,8 @@ public int compareTo(CrapsPlayer o) { public Double bet() { return null; } + + public static void firstRoll(){ + + } } diff --git a/src/main/java/io/zipcoder/casino/DiceGames.java b/src/main/java/io/zipcoder/casino/DiceGames.java index 54a52948..11c9ccf4 100644 --- a/src/main/java/io/zipcoder/casino/DiceGames.java +++ b/src/main/java/io/zipcoder/casino/DiceGames.java @@ -2,38 +2,7 @@ public class DiceGames { - public void chooseDiceGame(){ - int userInput = Console.getUserInputInteger("Which dice game 1 or 2."); - if(userInput == 1){ - startCraps(); - } - } if else (userInput == 2){ + public void chooseDiceGame() { - }else{ - repeatQuestion;} - - public void startCraps(){ - do{ - - - - - - - - - - - - - - - - - - - - String userInput = Console.getUserInputString("Do wyou wnat to continue yes or no?"); - }while (userInput.equalsIgnoreCase("no")); } } \ No newline at end of file diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index e05280c0..8a401bec 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -1,4 +1,53 @@ package io.zipcoder.casino; public class GameInterface { + + public static void playCraps(){ + String playAgain; + do { + + System.out.println("Welcome to the craps table. How many people are playing"); + CrapsPlayer first = new CrapsPlayer(Console.getUserInputString("What is the first players name?"), Console.getUserInputDouble("How miuch omoney are you bringing to the table?")); + first.firstRoll(); + playAgain = Console.getUserInputString("Do you want to continue playing?"); + first.getName(); + }while(playAgain.equals("no")); + + + + + + + + + + + } + + public static void playBlakcjack(){ + + + + + + + + + + } + + public static void playGoFish(){ + + + + + + + + + + + + + } } diff --git a/src/main/java/io/zipcoder/casino/Player.java b/src/main/java/io/zipcoder/casino/Player.java index 4a08c73b..46d5dce0 100644 --- a/src/main/java/io/zipcoder/casino/Player.java +++ b/src/main/java/io/zipcoder/casino/Player.java @@ -10,6 +10,10 @@ abstract class Player> { private Hand playerHand; private double bet; + public String getName() { + return name; + } + private void bet(double bet){ this.bet = bet; } @@ -28,4 +32,12 @@ public Player findPlayer(String name){ Player(String name){ this.name = name; } + + @Override + public String toString(){ + String returnString = ""; + for(int i = 0; i < players.size(); i++) + returnString += players.get(i); + return returnString; + } } From c9f6eb0fe0a47d793485e1c716063fd80c830f7a Mon Sep 17 00:00:00 2001 From: "Z. Cheema" <32852915+yzcheema11@users.noreply.github.com> Date: Tue, 21 Nov 2017 15:42:43 -0500 Subject: [PATCH 11/34] Added Casino Project Leon Review UML.xml --- Casino Project Leon Review UML.xml | 1 + 1 file changed, 1 insertion(+) create mode 100644 Casino Project Leon Review UML.xml diff --git a/Casino Project Leon Review UML.xml b/Casino Project Leon Review UML.xml new file mode 100644 index 00000000..7d7d09b9 --- /dev/null +++ b/Casino Project Leon Review UML.xml @@ -0,0 +1 @@ +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 \ No newline at end of file From b2a3a0023be6b9ca573f26c1bf0cf88b8b947b0a Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 15:49:49 -0500 Subject: [PATCH 12/34] Leon OMFG --- Casino Project Leon Review UML.xml | 1 + 1 file changed, 1 insertion(+) create mode 100644 Casino Project Leon Review UML.xml diff --git a/Casino Project Leon Review UML.xml b/Casino Project Leon Review UML.xml new file mode 100644 index 00000000..7d7d09b9 --- /dev/null +++ b/Casino Project Leon Review UML.xml @@ -0,0 +1 @@ +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 \ No newline at end of file From c1d65a1597df90a87046c4445fc0c2e380cfbc1c Mon Sep 17 00:00:00 2001 From: jeffrey Date: Tue, 21 Nov 2017 16:13:07 -0500 Subject: [PATCH 13/34] testing Craps update --- src/main/java/io/zipcoder/casino/Craps.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index 143a1233..1b5d4b7c 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -1,4 +1,14 @@ package io.zipcoder.casino; +import java.util.*; public class Craps extends DiceGames { + + public static int roll() { + Random diceRoll = new Random(); + int dice1 = diceRoll.nextInt(6) + 1; + int dice2 = diceRoll.nextInt(6) + 1; + System.out.println("\n dice1 = " + dice1 + " dice2 = " + dice2); + return dice1 + dice2; + } + } From 71bf853955f301d1a3c990a7c16ad03f449bbf66 Mon Sep 17 00:00:00 2001 From: jeffrey Date: Tue, 21 Nov 2017 16:17:46 -0500 Subject: [PATCH 14/34] test --- src/main/java/io/zipcoder/casino/Craps.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index 1b5d4b7c..e524a0cf 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -11,4 +11,8 @@ public static int roll() { return dice1 + dice2; } + public void testGit(){ + + } + } From a41bfbf644998403cbd4caddd04b48c24e4fb197 Mon Sep 17 00:00:00 2001 From: jeffrey Date: Tue, 21 Nov 2017 17:49:25 -0500 Subject: [PATCH 15/34] CrapsTest --- src/test/java/io/zipcoder/casino/CrapsPlayerTest.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/test/java/io/zipcoder/casino/CrapsPlayerTest.java diff --git a/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java b/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java new file mode 100644 index 00000000..078e705a --- /dev/null +++ b/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino; + +public class CrapsPlayerTest { +} From 529b6d152aa48091f0a9cc75014e189a7d1834e4 Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 17:55:29 -0500 Subject: [PATCH 16/34] made some good changes --- .../java/io/zipcoder/casino/BlackJack.java | 10 ++++++++++ .../io/zipcoder/casino/BlackjackPlayer.java | 3 +-- src/main/java/io/zipcoder/casino/Card.java | 4 ++-- .../java/io/zipcoder/casino/CardValue.java | 15 ++++++++++++++ src/main/java/io/zipcoder/casino/Craps.java | 4 ++++ .../java/io/zipcoder/casino/CrapsPlayer.java | 4 ---- src/main/java/io/zipcoder/casino/Deck.java | 20 +++++++++++++++++-- src/main/java/io/zipcoder/casino/GoFish.java | 13 ++++++++++++ .../java/io/zipcoder/casino/GoFishPlayer.java | 19 +++++++++++++++++- src/main/java/io/zipcoder/casino/Suit.java | 12 ++++++++++- .../java/io/zipcoder/casino/CasinoTest.java | 7 +++++++ 11 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 src/main/java/io/zipcoder/casino/CardValue.java diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index b3728201..a0e87c32 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -1,7 +1,17 @@ package io.zipcoder.casino; +import java.util.ArrayList; + public class BlackJack extends CardGames { + + ArrayList blackjackPlayers; + public void start() { + Deck blackJackDeck = new Deck(); + BlackjackPlayer josh = new BlackjackPlayer("Josh", 100.00); + blackjackPlayers.add(josh); + + } } diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index cf6e5dc2..705c6613 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -2,11 +2,10 @@ public class BlackjackPlayer extends Player implements Comparable, Gamble { - - BlackjackPlayer(String name, Double money) { super(name, money); } + public int score; public void addToList(BlackjackPlayer player) { diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java index de2a8bb0..f4326ce8 100644 --- a/src/main/java/io/zipcoder/casino/Card.java +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -1,9 +1,9 @@ package io.zipcoder.casino; public class Card { - private final int value; + private final CardValue value; private final Suit suit; - public Card(Suit suit, int value) { + public Card(Suit suit, CardValue value) { this.suit = suit; this.value = value; } diff --git a/src/main/java/io/zipcoder/casino/CardValue.java b/src/main/java/io/zipcoder/casino/CardValue.java new file mode 100644 index 00000000..8dd227f3 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/CardValue.java @@ -0,0 +1,15 @@ +package io.zipcoder.casino; + +enum CardValue { + Ace(11), Two(2), Three(3), Four(4), Five(4), Six(6), Seven(7), Eight(8), Nine(9), Ten(10), Jack(10), Queen(10), King(10); + + private final int CardsValue; + + CardValue(int cardNumber){ + this.CardsValue = cardNumber; + } + + public int getCardsValue(){ + return this.CardsValue; + } +} diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index 143a1233..07dc72e8 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -1,4 +1,8 @@ package io.zipcoder.casino; +import java.util.ArrayList; + public class Craps extends DiceGames { + + ArrayList crapsPlayers; } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index cbfdc885..e86ea3bc 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -2,18 +2,14 @@ public class CrapsPlayer extends Player implements Comparable ,Gamble { - void addToList(CrapsPlayer player) { this.players.add(player); } - CrapsPlayer(String name, Double money) { super(name, money); } - - public int compareTo(CrapsPlayer o) { return 0; } diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index e2571982..9771bc79 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -1,14 +1,30 @@ package io.zipcoder.casino; import java.util.ArrayList; +import java.util.Collections; public class Deck { - + +// ArrayDeque cards = new ArrayDeque<>(); ArrayList cards = new ArrayList(); + Deck() { + for (Suit suit : Suit.values()) { + for (CardValue cardValue : CardValue.values()) { + cards.add(new Card(suit, cardValue)); + } + } + } + + public Card dealOneRandomCard() { + Card topCard = cards.get(0); + cards.remove(topCard); + return topCard; + } - public static void dealOneRandomCard() { + public void shuffle() { + Collections.shuffle(cards); } } diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java index 40d9bb9d..48e8571e 100644 --- a/src/main/java/io/zipcoder/casino/GoFish.java +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -1,8 +1,21 @@ package io.zipcoder.casino; +import java.util.ArrayList; + public class GoFish extends CardGames { + ArrayList goFishPlayers; + public void start() { + + GoFishPlayer player = new GoFishPlayer("Donald"); + goFishPlayers.add(player); + Deck goFishDeck = new Deck(); + goFishDeck.shuffle(); + player.dealGoFishHAnd(goFishPlayers, goFishDeck); + + + } } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index 00263fda..db69ff10 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -1,12 +1,29 @@ package io.zipcoder.casino; -public class GoFishPlayer extends Player implements Comparable { +import java.util.ArrayList; +public class GoFishPlayer extends Player implements Comparable { + ArrayList hand; + GoFishPlayer(String name) { + super(name); + } public int compareTo(GoFishPlayer o) { return 0; } + + @Override + void addToList(GoFishPlayer player) { + + } + + public void dealGoFishHAnd(ArrayList players, Deck deck) { + for (int i = 1; i <= 5; i++) { + for (GoFishPlayer player : players) + player.hand.add(deck.dealOneRandomCard()); + } + } } diff --git a/src/main/java/io/zipcoder/casino/Suit.java b/src/main/java/io/zipcoder/casino/Suit.java index 2be68cd4..81c9bc29 100644 --- a/src/main/java/io/zipcoder/casino/Suit.java +++ b/src/main/java/io/zipcoder/casino/Suit.java @@ -2,5 +2,15 @@ public enum Suit { - CLUB, DIAMOND, HEART, SPADE + CLUB("♧"), DIAMOND("♢"), HEART("♡"), SPADE("♤"); + + private final String suitSymbols; + + Suit(String symbol){ + this.suitSymbols = symbol; + } + + public String getSuitSymbols() { + return suitSymbols; + } } diff --git a/src/test/java/io/zipcoder/casino/CasinoTest.java b/src/test/java/io/zipcoder/casino/CasinoTest.java index e9286523..aebbb610 100644 --- a/src/test/java/io/zipcoder/casino/CasinoTest.java +++ b/src/test/java/io/zipcoder/casino/CasinoTest.java @@ -1,5 +1,12 @@ package io.zipcoder.casino; +import org.junit.Test; + public class CasinoTest { + + @Test + public void constructorTest(){ + + } } From ce8b8b7db005d28c5e487e7565c25f38b1f3ae6a Mon Sep 17 00:00:00 2001 From: zan Date: Tue, 21 Nov 2017 18:20:22 -0500 Subject: [PATCH 17/34] got rid of Hand Class --- src/main/java/io/zipcoder/casino/Hand.java | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/main/java/io/zipcoder/casino/Hand.java diff --git a/src/main/java/io/zipcoder/casino/Hand.java b/src/main/java/io/zipcoder/casino/Hand.java deleted file mode 100644 index 2da71a8a..00000000 --- a/src/main/java/io/zipcoder/casino/Hand.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.zipcoder.casino; - -public class Hand { - - public void blackjackHand() { - } -} From 4c7a9f7fb345731dfad1f63ad31109f4668c3832 Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 22:34:39 -0500 Subject: [PATCH 18/34] made some changes --- pom.xml | 19 ------- .../io/zipcoder/casino/BlackjackPlayer.java | 12 +---- .../java/io/zipcoder/casino/CardGames.java | 53 ++++++++++++++++++- src/main/java/io/zipcoder/casino/Casino.java | 43 +++++++++++++++ .../java/io/zipcoder/casino/CrapsPlayer.java | 12 +---- src/main/java/io/zipcoder/casino/Gamble.java | 1 - src/main/java/io/zipcoder/casino/Game.java | 52 +++++++++++++++++- .../java/io/zipcoder/casino/GoFishPlayer.java | 16 +++--- src/main/java/io/zipcoder/casino/Player.java | 17 +----- 9 files changed, 153 insertions(+), 72 deletions(-) delete mode 100644 pom.xml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index c6ec0cc8..00000000 --- a/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - 4.0.0 - - io.zipcoder - casino - 1.0-SNAPSHOT - - - - junit - junit - 4.12 - test - - - diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 705c6613..12c53539 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -1,17 +1,12 @@ package io.zipcoder.casino; -public class BlackjackPlayer extends Player implements Comparable, Gamble { +public class BlackjackPlayer extends Player implements Gamble { BlackjackPlayer(String name, Double money) { super(name, money); } public int score; - - public void addToList(BlackjackPlayer player) { - players.add(player); - } - public boolean hitStay(String userAnswer){ if(userAnswer.equalsIgnoreCase("yes")){ return true; @@ -27,9 +22,4 @@ public int compareTo(BlackjackPlayer o) { return 0; } - public Hand getHand(){ - Hand hand = new Hand(); - hand.blackjackHand(); - return hand; } -} diff --git a/src/main/java/io/zipcoder/casino/CardGames.java b/src/main/java/io/zipcoder/casino/CardGames.java index 423bd6d3..9ec950bf 100644 --- a/src/main/java/io/zipcoder/casino/CardGames.java +++ b/src/main/java/io/zipcoder/casino/CardGames.java @@ -1,6 +1,55 @@ package io.zipcoder.casino; -abstract class CardGames extends Game { +public class CardGames extends Game{ + + private int userInputInt; + private String userInputString; + + public void chooseGameType() { + do { + + System.out.println(" \n" + + " ,--. ,------. ,--. ,--. ,-----. ,--. ,----. ,---. \n" + + " / \\ | .---',--. ,--.`--',-' '-. ' .--./ ,--,--.,--.--. ,-| | ' .-./ ,--,--.,--,--,--. ,---. / O \\ ,--.--. ,---. ,--,--. \n" + + "| () | | `--, \\ `' / ,--.'-. .-' | | ' ,-. || .--'' .-. | | | .---.' ,-. || || .-. : | .-. || .--'| .-. :' ,-. | \n" + + " \\ /.--. | `---. / /. \\ | | | | ' '--'\\\\ '-' || | \\ `-' | ' '--' |\\ '-' || | | |\\ --. | | | || | \\ --.\\ '-' | \n" + + " `--' '--' `------''--' '--'`--' `--' `-----' `--`--'`--' `---' `------' `--`--'`--`--`--' `----' `--' `--'`--' `----' `--`--' \n" + + " ,--. ,----. ,------.,--. ,--. \n" + + "/ | ' .-./ ,---. | .---'`--' ,---. | ,---. \n" + + "`| | | | .---.| .-. | | `--, ,--.( .-' | .-. | \n" + + " | |.--. ' '--' |' '-' ' | |` | |.-' `)| | | | \n" + + " `--''--' `------' `---' `--' `--'`----' `--' `--' \n" + + " ,---. ,-----. ,--. ,--. ,--. ,--. \n" + + "'.-. \\ | |) /_ | | ,--,--. ,---.| |,-. | | ,--,--. ,---.| |,-. \n" + + " .-' .' | .-. \\| |' ,-. || .--'| /,--. | |' ,-. || .--'| / \n" + + "/ '-..--. | '--' /| |\\ '-' |\\ `--.| \\ \\| '-' /\\ '-' |\\ `--.| \\ \\ \n" + + "'-----''--' `------' `--' `--`--' `---'`--'`--'`-----' `--`--' `---'`--'`--' \n" + + " "); + + System.out.println("Thank you for choosing to play a card game."); + userInputInt = Console.getUserInputInteger("What type of card game would you like to play?" + + "\nPlease enter 1 for go fish and 2 for black jack."); + + switch (userInputInt){ + case 0: + break; + case 1: + GameInterface.playGoFish(); + break; + case 2: + GameInterface.playBlakcjack(); + break; + default: + System.out.println("You entered an invalid response :-(\n"); + } + + userInputString = Console.getUserInputString("Would you like to leave the the card game area?" + + "\nPlease enter yes or no."); + }while(userInputString.equalsIgnoreCase("no")); + + Game game = new Game(); + game.chooseGameType(); + } - public abstract void start(); } + diff --git a/src/main/java/io/zipcoder/casino/Casino.java b/src/main/java/io/zipcoder/casino/Casino.java index 74dfdd8c..d780fb3a 100644 --- a/src/main/java/io/zipcoder/casino/Casino.java +++ b/src/main/java/io/zipcoder/casino/Casino.java @@ -2,4 +2,47 @@ public class Casino { + + public static void main(String[] args) { + System.out.println(" \n" + + ",-------.,--. ,-----. ,--. ,-----. ,--. \n" + + "`--. / `--' ,---. ' .--./ ,---. ,-| | ,---. ' .--./ ,--,--. ,---. `--',--,--, ,---. \n" + + " / / ,--.| .-. | | | | .-. |' .-. || .-. : | | ' ,-. |( .-' ,--.| \\| .-. | \n" + + " / `--.| || '-' ' ' '--'\\' '-' '\\ `-' |\\ --. ' '--'\\\\ '-' |.-' `)| || || |' '-' ' \n" + + "`-------'`--'| |-' `-----' `---' `---' `----' `-----' `--`--'`----' `--'`--''--' `---' \n" + + " `--' "); + + String userYesOrNo; + + do{ + System.out.println("Welcome to Zip Code Casino." + + "\nYou are going to have lots of fun while you are here."); + userYesOrNo = Console.getUserInputString("Would you like to play a casino game?" + + "\nPlease enter yes or no"); + + if(userYesOrNo.equalsIgnoreCase("yes")){ + Game game = new Game(); + game.chooseGameType(); + }else if(userYesOrNo.equalsIgnoreCase("no")){ + System.out.println("We currently only have games inside Zip Code Casino." + + "\nI'm sorry if there is nothing else to do."); + } + + userYesOrNo = Console.getUserInputString("Would you like to leave Zip Code Casino?"); + } while(!(userYesOrNo.equalsIgnoreCase("yes"))); + + System.out.println(" \n" + + " ,--------.,--. ,--. ,--. ,--. \n" + + " '--. .--'| ,---. ,--,--.,--,--, | |,-. \\ `.' /,---. ,--.,--. \n" + + " | | | .-. |' ,-. || \\| / '. /| .-. || || | \n" + + " | | | | | |\\ '-' || || || \\ \\ | | ' '-' '' '' ' \n" + + " `--' `--' `--' `--`--'`--''--'`--'`--' `--' `---' `----' \n" + + ",--. ,--. ,--. ,--.,--. ,------. \n" + + "| '--' | ,--,--.,--. ,--.,---. ,--,--. | ,'.| |`--' ,---. ,---. | .-. \\ ,--,--.,--. ,--. \n" + + "| .--. |' ,-. | \\ `' /| .-. : ' ,-. | | |' ' |,--.| .--'| .-. : | | \\ :' ,-. | \\ ' / \n" + + "| | | |\\ '-' | \\ / \\ --. \\ '-' | | | ` || |\\ `--.\\ --. | '--' /\\ '-' | \\ ' \n" + + "`--' `--' `--`--' `--' `----' `--`--' `--' `--'`--' `---' `----' `-------' `--`--'.-' / \n" + + " `---' "); + } } + diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index e86ea3bc..a101b627 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -1,25 +1,15 @@ package io.zipcoder.casino; -public class CrapsPlayer extends Player implements Comparable ,Gamble { - - void addToList(CrapsPlayer player) { - this.players.add(player); - } +public class CrapsPlayer extends Player implements Gamble { CrapsPlayer(String name, Double money) { super(name, money); } - public int compareTo(CrapsPlayer o) { - return 0; - } - public Double bet() { return null; - } public static void firstRoll(){ - } } diff --git a/src/main/java/io/zipcoder/casino/Gamble.java b/src/main/java/io/zipcoder/casino/Gamble.java index d7f325fa..cc68006a 100644 --- a/src/main/java/io/zipcoder/casino/Gamble.java +++ b/src/main/java/io/zipcoder/casino/Gamble.java @@ -2,7 +2,6 @@ interface Gamble { - public Double bet(); } diff --git a/src/main/java/io/zipcoder/casino/Game.java b/src/main/java/io/zipcoder/casino/Game.java index d6b1f1a2..cac618be 100644 --- a/src/main/java/io/zipcoder/casino/Game.java +++ b/src/main/java/io/zipcoder/casino/Game.java @@ -1,6 +1,54 @@ package io.zipcoder.casino; -abstract class Game implements GameInterface { +public class Game { - abstract void start(); + private int userInputInt; + private String userInputString; + + public void chooseGameType() { + do { + + System.out.println("\n\nThank you for choosing to play a game here at Zip Code Casino." + + "\nWe take pride in knowing that our games are everything that you are looking for.\n\n" + + " \n" + + " ,--. ,------. ,--. ,--. ,----. ,---. \n" + + " / \\ | .---',--. ,--.`--',-' '-. ' .-./ ,--,--.,--,--,--. ,---. / O \\ ,--.--. ,---. ,--,--. \n" + + "| () | | `--, \\ `' / ,--.'-. .-' | | .---.' ,-. || || .-. : | .-. || .--'| .-. :' ,-. | \n" + + " \\ /.--. | `---. / /. \\ | | | | ' '--' |\\ '-' || | | |\\ --. | | | || | \\ --.\\ '-' | \n" + + " `--' '--' `------''--' '--'`--' `--' `------' `--`--'`--`--`--' `----' `--' `--'`--' `----' `--`--' \n" + + " ,--. ,-----. ,--. ,----. \n" + + "/ | ' .--./ ,--,--.,--.--. ,-| | ' .-./ ,--,--.,--,--,--. ,---. \n" + + "`| | | | ' ,-. || .--'' .-. | | | .---.' ,-. || || .-. : \n" + + " | |.--. ' '--'\\\\ '-' || | \\ `-' | ' '--' |\\ '-' || | | |\\ --. \n" + + " `--''--' `-----' `--`--'`--' `---' `------' `--`--'`--`--`--' `----' \n" + + " ,---. ,------. ,--. ,----. \n" + + "'.-. \\ | .-. \\ `--' ,---. ,---. ' .-./ ,--,--.,--,--,--. ,---. \n" + + " .-' .' | | \\ :,--.| .--'| .-. : | | .---.' ,-. || || .-. : \n" + + "/ '-..--. | '--' /| |\\ `--.\\ --. ' '--' |\\ '-' || | | |\\ --. \n" + + "'-----''--' `-------' `--' `---' `----' `------' `--`--'`--`--`--' `----' \n" + + " "); + + userInputInt = Console.getUserInputInteger("\nWhat type of game would you like to play?" + + "\nPlease enter 1 for card game or 2 for dice game"); + + switch (userInputInt){ + case 0: + break; + case 1: + CardGames cardGames = new CardGames(); + cardGames.chooseGameType(); + break; + case 2: + DiceGames diceGames = new DiceGames(); + diceGames.chooseGameType(); + break; + default: + System.out.println("You entered an invalid choose :-(\n"); + } + + userInputString = Console.getUserInputString("Would you like to leave the game area?\n" + + "Please enter yes or no."); + + }while(userInputString.equalsIgnoreCase("no")); + } } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index db69ff10..4a704ffa 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -3,7 +3,7 @@ import java.util.ArrayList; -public class GoFishPlayer extends Player implements Comparable { +public class GoFishPlayer extends Player implements Gamble { ArrayList hand; @@ -11,19 +11,15 @@ public class GoFishPlayer extends Player implements Comparable players, Deck deck) { for (int i = 1; i <= 5; i++) { for (GoFishPlayer player : players) player.hand.add(deck.dealOneRandomCard()); } } + + @Override + public Double bet(){ + return null; + } } diff --git a/src/main/java/io/zipcoder/casino/Player.java b/src/main/java/io/zipcoder/casino/Player.java index 46d5dce0..0c340083 100644 --- a/src/main/java/io/zipcoder/casino/Player.java +++ b/src/main/java/io/zipcoder/casino/Player.java @@ -2,12 +2,10 @@ import java.util.ArrayList; -abstract class Player> { +abstract class Player { private String name; private Double money; - protected ArrayList players; - private Hand playerHand; private double bet; public String getName() { @@ -18,12 +16,6 @@ private void bet(double bet){ this.bet = bet; } - public Player findPlayer(String name){ - return null; - } - - abstract void addToList(E player); - Player(String name, Double money){ this.name = name; this.money = money; @@ -33,11 +25,4 @@ public Player findPlayer(String name){ this.name = name; } - @Override - public String toString(){ - String returnString = ""; - for(int i = 0; i < players.size(); i++) - returnString += players.get(i); - return returnString; - } } From c46c918412232d2a3ccddf2777b4e32d5c6888ba Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 21 Nov 2017 22:39:06 -0500 Subject: [PATCH 19/34] had to change my dependcies --- pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..39b8f5c2 --- /dev/null +++ b/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + io.zipcoder + casino + 1.0-SNAPSHOT + + + + junit + junit + 4.12 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + From f0d18b893786b4f0a764bcda659f5e4080a86eea Mon Sep 17 00:00:00 2001 From: jeffrey Date: Wed, 22 Nov 2017 12:35:22 -0500 Subject: [PATCH 20/34] a few updates - more to come --- src/main/java/io/zipcoder/casino/Craps.java | 12 +-- .../java/io/zipcoder/casino/CrapsPlayer.java | 73 ++++++++++++++++++- src/main/java/io/zipcoder/casino/Dice.java | 24 ++++++ .../java/io/zipcoder/casino/DiceTest.java | 12 +++ 4 files changed, 108 insertions(+), 13 deletions(-) create mode 100644 src/main/java/io/zipcoder/casino/Dice.java create mode 100644 src/test/java/io/zipcoder/casino/DiceTest.java diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index e88f5a15..7dd43660 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -3,20 +3,10 @@ import java.util.ArrayList; -public class Craps extends DiceGames { +public class Craps extends DiceGames implements Dice { ArrayList crapsPlayers; - public static int roll() { - Random diceRoll = new Random(); - int dice1 = diceRoll.nextInt(6) + 1; - int dice2 = diceRoll.nextInt(6) + 1; - System.out.println("\n dice1 = " + dice1 + " dice2 = " + dice2); - return dice1 + dice2; - } - public void testGit(){ - - } } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index a101b627..2ce87bc7 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -1,15 +1,84 @@ package io.zipcoder.casino; -public class CrapsPlayer extends Player implements Gamble { +public class CrapsPlayer extends Player implements Gamble, Dice { CrapsPlayer(String name, Double money) { super(name, money); } + private String name; + private Double money; + public Double bet() { return null; } + public Double bet(Double bet) { + money -= bet; + return bet; + } + + static int point = 0; + + public static int shooter = Dice.rollDice(2); + public static String gameMessage = " "; + public static void firstRoll(){ + + switch (shooter) { + case 7: + case 11: + gameMessage = "You win!"; + //add payout to bank + break; + case 2: + gameMessage ="You lose!"; + + //minus bet from available $$ + break; + default: + point = shooter; + gameMessage ="Your point has be set to: " + point + " Please roll again."; + break; + } + System.out.println(gameMessage); + System.out.println(shooter); + System.out.println(point); + + } + + public static void nextRoll() { + + if(shooter == point){ + gameMessage = "You win!"; + //add payout to bank + + }else { + switch (shooter) { + case 7: + case 11: + gameMessage = "You lose!"; + //minus bet from available $$ + break; + case 2: + gameMessage = "You win!"; + //add payout to bank + break; + default: + + gameMessage ="You rolled a: " +shooter +" you need to roll a " + point + " Please roll again."; + break; + } + } + System.out.println(gameMessage); + System.out.println(shooter); + System.out.println(point); + } -} + + + + public static void main(String[] args) { + + nextRoll(); + }} diff --git a/src/main/java/io/zipcoder/casino/Dice.java b/src/main/java/io/zipcoder/casino/Dice.java new file mode 100644 index 00000000..50b65f2e --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Dice.java @@ -0,0 +1,24 @@ +package io.zipcoder.casino; + +public interface Dice { + + static int rollDice(int diceNeeded){ + //Dice made to be dynamic to adapt to dice needed per game. + int diceTotal =0; + int die; + + for (int i = 0; i < diceNeeded; i++) { + die= (int)(Math.random()*6) + 1; + diceTotal += die; + + } + + return diceTotal; + } + +// public static void main(String[] args) { +// +// System.out.println(Dice.rollDice(2)); +// } + +} diff --git a/src/test/java/io/zipcoder/casino/DiceTest.java b/src/test/java/io/zipcoder/casino/DiceTest.java new file mode 100644 index 00000000..8f40baef --- /dev/null +++ b/src/test/java/io/zipcoder/casino/DiceTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class DiceTest { + @Test + public void rollDice() throws Exception { + } + +} \ No newline at end of file From 6cc7860e6903e90e5378e0432beb7c1f161e9452 Mon Sep 17 00:00:00 2001 From: aaron Date: Wed, 22 Nov 2017 14:46:14 -0500 Subject: [PATCH 21/34] Updates, not complete, will continue fixing --- .../java/io/zipcoder/casino/BlackJack.java | 50 ++++++++- .../io/zipcoder/casino/BlackjackPlayer.java | 71 +++++++++++- src/main/java/io/zipcoder/casino/Card.java | 15 ++- .../java/io/zipcoder/casino/CardValue.java | 5 +- src/main/java/io/zipcoder/casino/Deck.java | 19 +++- src/main/java/io/zipcoder/casino/Player.java | 24 ++-- src/main/java/io/zipcoder/casino/Suit.java | 2 +- .../io/zipcoder/casino/BlackJackTest.java | 58 ++++++++++ .../zipcoder/casino/BlackjackPlayerTest.java | 104 ++++++++++++++++++ .../java/io/zipcoder/casino/CardTest.java | 30 +++++ .../java/io/zipcoder/casino/DeckTest.java | 79 +++++++++++++ 11 files changed, 427 insertions(+), 30 deletions(-) create mode 100644 src/test/java/io/zipcoder/casino/BlackJackTest.java create mode 100644 src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/CardTest.java create mode 100644 src/test/java/io/zipcoder/casino/DeckTest.java diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index a0e87c32..0fac571d 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -4,14 +4,54 @@ public class BlackJack extends CardGames { - ArrayList blackjackPlayers; + private ArrayList blackjackPlayers = new ArrayList<>(); + private Player activePlayer; + //This constant can be used if a player/dealer gets blackjack + private static final int BLACKJACK = 21; + private Deck deck; - public void start() { + public BlackJack() { + start(); + } - Deck blackJackDeck = new Deck(); - BlackjackPlayer josh = new BlackjackPlayer("Josh", 100.00); + protected void start() { + BlackjackPlayer dealer = new BlackjackPlayer("dealer", 500.0); + BlackjackPlayer josh = new BlackjackPlayer("Josh", 500.0); + blackjackPlayers.add(dealer); blackjackPlayers.add(josh); + activePlayer = dealer; + deck = new Deck(); + deck.populate(); + deck.shuffle(); + giveCardToPlayer(); + } + + public void giveCardToPlayer() { + Card card = this.deck.dealOneRandomCard(); + //this.activePlayer.addCardToHand(card); + } + + public void endTurn() { + for (BlackjackPlayer blackjackPlayer : blackjackPlayers) { + if (!activePlayer.equals(blackjackPlayer)) + this.activePlayer = blackjackPlayer; + } + } + public ArrayList getPlayers() { + return blackjackPlayers; + } + + public Player getPlayerAtIndex(int index) { + return blackjackPlayers.get(index); + } + public void setActivePlayer(BlackjackPlayer blackjackPlayer) { + this.activePlayer = blackjackPlayer; } -} + + public Player getActivePlayer() { + return activePlayer; + } + +} \ No newline at end of file diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 12c53539..842e2587 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -1,14 +1,21 @@ package io.zipcoder.casino; -public class BlackjackPlayer extends Player implements Gamble { +import java.util.ArrayList; + +public class BlackjackPlayer extends Player implements Comparable, Gamble { + + private String name; + private Double money; + private ArrayList cardsInHand; BlackjackPlayer(String name, Double money) { - super(name, money); + super.name = name; + super.money = money; + this.cardsInHand = new ArrayList<>(); } - public int score; - public boolean hitStay(String userAnswer){ - if(userAnswer.equalsIgnoreCase("yes")){ + public boolean hitStay(String userAnswer) { + if (userAnswer.equalsIgnoreCase("yes")) { return true; } return false; @@ -18,8 +25,60 @@ public Double bet() { return null; } - public int compareTo(BlackjackPlayer o) { + public int compareTo(BlackjackPlayer p) { return 0; } + public String getName() { + return name; + } + + public Double checkBalance() { + return money; + } + + public Double bet(Double bet) { + money -= bet; + return bet; + } + + public void addCardToHand(Card newCard) { + cardsInHand.add(newCard); + } + + public String viewHand() { + String handString = ""; + for (Card card : cardsInHand) { + handString += card.toString(); + } + return handString; + } + + public int getHandValue() { + int total = 0; + int acesCount = 0; + + for (Card card : cardsInHand) { + if (CardValue.getValue() == 11) + acesCount++; + total += CardValue.getValue(); + } + + if (total > 21) { + while (acesCount > 0) { + total -= 10; + acesCount--; + } + } + return total; } + + public ArrayList getHandList() { + return cardsInHand; + } + + public void addWinnings(Double winnings) { + money += winnings; + } + +} \ No newline at end of file diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java index f4326ce8..bf0173b6 100644 --- a/src/main/java/io/zipcoder/casino/Card.java +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -1,10 +1,21 @@ package io.zipcoder.casino; public class Card { - private final CardValue value; - private final Suit suit; + + private CardValue value; + private Suit suit; + public Card(Suit suit, CardValue value) { this.suit = suit; this.value = value; } + + public String getSuitSymbols(){ + + return suit.getSuit(); + } + + public int getCardsValue() { + return value.getValue(); + } } diff --git a/src/main/java/io/zipcoder/casino/CardValue.java b/src/main/java/io/zipcoder/casino/CardValue.java index 8dd227f3..c8d17ebe 100644 --- a/src/main/java/io/zipcoder/casino/CardValue.java +++ b/src/main/java/io/zipcoder/casino/CardValue.java @@ -1,6 +1,7 @@ package io.zipcoder.casino; enum CardValue { + Ace(11), Two(2), Three(3), Four(4), Five(4), Six(6), Seven(7), Eight(8), Nine(9), Ten(10), Jack(10), Queen(10), King(10); private final int CardsValue; @@ -9,7 +10,7 @@ enum CardValue { this.CardsValue = cardNumber; } - public int getCardsValue(){ - return this.CardsValue; + int getValue(){ + return CardsValue; } } diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index 9771bc79..dfcc8bf3 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -7,7 +7,7 @@ public class Deck { // ArrayDeque cards = new ArrayDeque<>(); - ArrayList cards = new ArrayList(); + private ArrayList cards = new ArrayList(); Deck() { for (Suit suit : Suit.values()) { @@ -17,6 +17,11 @@ public class Deck { } } + public void populate() { + cards = new ArrayList(); + + } + public Card dealOneRandomCard() { Card topCard = cards.get(0); cards.remove(topCard); @@ -27,4 +32,16 @@ public void shuffle() { Collections.shuffle(cards); } + public ArrayList getCards() { + return cards; + } + + public int getDeckSize() { + return cards.size(); + } + + public Card getCardByIndex(int index) { + return cards.get(index); + } + } diff --git a/src/main/java/io/zipcoder/casino/Player.java b/src/main/java/io/zipcoder/casino/Player.java index 0c340083..0b77344d 100644 --- a/src/main/java/io/zipcoder/casino/Player.java +++ b/src/main/java/io/zipcoder/casino/Player.java @@ -1,20 +1,10 @@ package io.zipcoder.casino; -import java.util.ArrayList; - abstract class Player { - private String name; - private Double money; - private double bet; - - public String getName() { - return name; - } - - private void bet(double bet){ - this.bet = bet; - } + protected String name; + protected Double money; + protected double bet; Player(String name, Double money){ this.name = name; @@ -25,4 +15,12 @@ private void bet(double bet){ this.name = name; } + public String getName() { + return name; + } + + private void bet(double bet){ + this.bet = bet; + } + } diff --git a/src/main/java/io/zipcoder/casino/Suit.java b/src/main/java/io/zipcoder/casino/Suit.java index 81c9bc29..0bab671a 100644 --- a/src/main/java/io/zipcoder/casino/Suit.java +++ b/src/main/java/io/zipcoder/casino/Suit.java @@ -10,7 +10,7 @@ public enum Suit { this.suitSymbols = symbol; } - public String getSuitSymbols() { + public String getSuit() { return suitSymbols; } } diff --git a/src/test/java/io/zipcoder/casino/BlackJackTest.java b/src/test/java/io/zipcoder/casino/BlackJackTest.java new file mode 100644 index 00000000..b14721d4 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/BlackJackTest.java @@ -0,0 +1,58 @@ +package io.zipcoder.casino; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; + +public class BlackJackTest { + + BlackJack blackjack = new BlackJack(); + + @Test + public void startTest() { + + int expected = 2; + int actual = blackjack.getPlayers().size(); + Assert.assertEquals(expected, actual); + } + + @Test + public void giveCardToPlayerTest() { + + blackjack.start(); + Player dealer = blackjack.getPlayerAtIndex(0); + blackjack.giveCardToPlayer(); + ArrayList cards = dealer.getHandList(); + + int expected = 1; + + int actual = cards.size(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void setActivePlayerTest() { + + blackjack.start(); + ArrayList blackjackPlayers = blackjack.getPlayers(); + blackjack.setActivePlayer(blackjackPlayers.get(1)); + + Player expected = blackjackPlayers.get(1); + + Player actual = blackjack.getActivePlayer(); + + Assert.assertEquals(expected, actual); + } + + + @Test + public void endTurnTest() { + + blackjack.start(); + blackjack.endTurn(); + + } + +} diff --git a/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java b/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java new file mode 100644 index 00000000..ceedb01d --- /dev/null +++ b/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java @@ -0,0 +1,104 @@ +package io.zipcoder.casino; + +import org.junit.Assert; +import org.junit.Test; + +public class BlackjackPlayerTest { + + BlackjackPlayer blackjackPlayer = new BlackjackPlayer("Josh", 500.00); + + @Test + public void getNameTest() { + String expected = "Josh"; + + String actual = blackjackPlayer.getName(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void checkBalanceTest() { + Double expected = 100.0; + Double actual = blackjackPlayer.checkBalance(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void wagerTest() { + Double expected = 10.0; + + Double actual = blackjackPlayer.bet(10.0); + + Assert.assertEquals(expected, actual); + } + + @Test + public void checkBalanceAfterWagerTest() { + + Double expected = 100.0; + + blackjackPlayer.bet(100.0); + + Double actual = blackjackPlayer.checkBalance(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void addCardToHandAndViewHandTest() { + + Card card = new Card(Suit.DIAMOND, CardValue.Two); + String expected = card.toString(); + + blackjackPlayer.addCardToHand(card); + + String actual = blackjackPlayer.viewHand(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getHandValueTest() { + + Card card = new Card(Suit.SPADE, CardValue.Ace); + Card card2 = new Card(Suit.HEART, CardValue.Ten); + blackjackPlayer.addCardToHand(card); + + int expected = 1; + + int actual = blackjackPlayer.getHandValue(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getHandValueTestAces() { + + + Card card = new Card(Suit.SPADE, CardValue.Two); + + for (int i = 0; i < 5; i++) + blackjackPlayer.addCardToHand(card); + + blackjackPlayer.addCardToHand(new Card(Suit.DIAMOND, CardValue.Ace)); + blackjackPlayer.addCardToHand(new Card(Suit.DIAMOND, CardValue.Ace)); + + int expected = 15; + + int actual = blackjackPlayer.getHandValue(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getWinningsTest() { + Double expected = 100.0; + + blackjackPlayer.addWinnings(600.0); + Double actual = blackjackPlayer.checkBalance(); + + Assert.assertEquals(expected, actual); + } +} + diff --git a/src/test/java/io/zipcoder/casino/CardTest.java b/src/test/java/io/zipcoder/casino/CardTest.java new file mode 100644 index 00000000..921114d4 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/CardTest.java @@ -0,0 +1,30 @@ +package io.zipcoder.casino; + +import org.junit.Assert; +import org.junit.Test; + +public class CardTest { + + @Test + public void Card() { + + Card card = new Card(Suit.CLUB, CardValue.Ace); + int expected = 11; + + int actual = CardValue.getValue(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void CardSuit() { + + Card card = new Card(Suit.HEART, CardValue.Ace); + Suit expected = Suit.HEART; + + Suit actual = Suit.getSuit(); + + Assert.assertEquals(expected, actual); + + } +} diff --git a/src/test/java/io/zipcoder/casino/DeckTest.java b/src/test/java/io/zipcoder/casino/DeckTest.java new file mode 100644 index 00000000..7cc892e2 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/DeckTest.java @@ -0,0 +1,79 @@ +package io.zipcoder.casino; + +import org.junit.Assert; +import org.junit.Test; + +public class DeckTest { + + Deck deck = new Deck(); + + + @Test + void getCardsTest() { + + deck.populate(); + Card expected = new Card(Suit.CLUB, CardValue.Ace); + + Card actual = deck.getCardByIndex(0); + + Assert.assertEquals(expected, actual); + } + + @Test + void getDeckSizeTest() { + + deck.populate(); + Integer expected = 52; + + Integer actual = deck.getDeckSize(); + + Assert.assertEquals(expected, actual); + } + + @Test + void giveCardTest() { + + deck.populate(); + Card expected = deck.getCardByIndex(0); + + Card actual = deck.dealOneRandomCard(); + + Assert.assertEquals(expected, actual); + + + } + + @Test + void getCardTest() { + + deck.populate(); + Suit expected_suit = Suit.CLUB; + Integer expected_rank = CardValue.Ace.getValue(); + + String actual = deck.getCardByIndex(0).getSuitSymbols(); + Integer actual2 = deck.getCardByIndex(0).getCardsValue(); + + + Assert.assertEquals(expected_suit, actual); + Assert.assertEquals(expected_rank, actual2); + + } + + @Test + void populateTest() { + + deck.populate(); + Suit expected_suit = Suit.SPADE; + Integer expected_rank = CardValue.King.getValue(); + Integer expected_size = 52; + + String actual = deck.getCardByIndex(51).getSuitSymbols(); + Integer actual2 = deck.getCardByIndex(51).getCardsValue(); + Integer actual3 = deck.getDeckSize(); + + Assert.assertEquals(expected_suit, actual); + Assert.assertEquals(expected_rank, actual2); + Assert.assertEquals(expected_size, actual3); + } + +} From a99fc3c4a3460966ea7e6e8dec23c2094a992ace Mon Sep 17 00:00:00 2001 From: zan Date: Wed, 22 Nov 2017 15:34:56 -0500 Subject: [PATCH 22/34] blackjack update --- src/main/java/io/zipcoder/casino/BlackJack.java | 9 --------- src/main/java/io/zipcoder/casino/CardValue.java | 8 ++++++-- src/main/java/io/zipcoder/casino/Craps.java | 12 ------------ src/main/java/io/zipcoder/casino/CrapsPlayer.java | 2 ++ src/main/java/io/zipcoder/casino/Game.java | 1 + src/main/java/io/zipcoder/casino/GoFishPlayer.java | 1 - src/main/java/io/zipcoder/casino/Player.java | 1 + 7 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index 0fac571d..a146ee8d 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -38,14 +38,6 @@ public void endTurn() { } } - public ArrayList getPlayers() { - return blackjackPlayers; - } - - public Player getPlayerAtIndex(int index) { - return blackjackPlayers.get(index); - } - public void setActivePlayer(BlackjackPlayer blackjackPlayer) { this.activePlayer = blackjackPlayer; } @@ -53,5 +45,4 @@ public void setActivePlayer(BlackjackPlayer blackjackPlayer) { public Player getActivePlayer() { return activePlayer; } - } \ No newline at end of file diff --git a/src/main/java/io/zipcoder/casino/CardValue.java b/src/main/java/io/zipcoder/casino/CardValue.java index c8d17ebe..47fb8c35 100644 --- a/src/main/java/io/zipcoder/casino/CardValue.java +++ b/src/main/java/io/zipcoder/casino/CardValue.java @@ -4,13 +4,17 @@ enum CardValue { Ace(11), Two(2), Three(3), Four(4), Five(4), Six(6), Seven(7), Eight(8), Nine(9), Ten(10), Jack(10), Queen(10), King(10); - private final int CardsValue; + private int CardsValue; CardValue(int cardNumber){ this.CardsValue = cardNumber; } - int getValue(){ + static int getValue(){ return CardsValue; } + + public void setCardsValue(int cardsValue) { + CardsValue = cardsValue; + } } diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index e88f5a15..60e695d0 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -7,16 +7,4 @@ public class Craps extends DiceGames { ArrayList crapsPlayers; - public static int roll() { - Random diceRoll = new Random(); - int dice1 = diceRoll.nextInt(6) + 1; - int dice2 = diceRoll.nextInt(6) + 1; - System.out.println("\n dice1 = " + dice1 + " dice2 = " + dice2); - return dice1 + dice2; - } - - public void testGit(){ - - } - } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index a101b627..b31e57e4 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -2,6 +2,7 @@ public class CrapsPlayer extends Player implements Gamble { + CrapsPlayer(String name, Double money) { super(name, money); } @@ -12,4 +13,5 @@ public Double bet() { public static void firstRoll(){ } + } diff --git a/src/main/java/io/zipcoder/casino/Game.java b/src/main/java/io/zipcoder/casino/Game.java index cac618be..222c174e 100644 --- a/src/main/java/io/zipcoder/casino/Game.java +++ b/src/main/java/io/zipcoder/casino/Game.java @@ -1,5 +1,6 @@ package io.zipcoder.casino; + public class Game { private int userInputInt; diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index 4a704ffa..8411e787 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -1,6 +1,5 @@ package io.zipcoder.casino; - import java.util.ArrayList; public class GoFishPlayer extends Player implements Gamble { diff --git a/src/main/java/io/zipcoder/casino/Player.java b/src/main/java/io/zipcoder/casino/Player.java index 0b77344d..b0eb44e8 100644 --- a/src/main/java/io/zipcoder/casino/Player.java +++ b/src/main/java/io/zipcoder/casino/Player.java @@ -6,6 +6,7 @@ abstract class Player { protected Double money; protected double bet; + Player(String name, Double money){ this.name = name; this.money = money; From 46c51a051684786946d3b0f4acefcefbed95ea3a Mon Sep 17 00:00:00 2001 From: aaron Date: Wed, 22 Nov 2017 17:49:07 -0500 Subject: [PATCH 23/34] Blackjack and Tests Complete - Read additional notes with --- .../java/io/zipcoder/casino/BlackJack.java | 8 ++- .../io/zipcoder/casino/BlackjackPlayer.java | 16 +++--- src/main/java/io/zipcoder/casino/Card.java | 8 ++- .../java/io/zipcoder/casino/CardGames.java | 6 +- .../java/io/zipcoder/casino/CardValue.java | 7 ++- src/main/java/io/zipcoder/casino/Casino.java | 8 +-- src/main/java/io/zipcoder/casino/Console.java | 14 ++--- src/main/java/io/zipcoder/casino/Craps.java | 5 +- .../java/io/zipcoder/casino/CrapsPlayer.java | 14 ++++- src/main/java/io/zipcoder/casino/Deck.java | 8 +-- src/main/java/io/zipcoder/casino/Gamble.java | 4 +- src/main/java/io/zipcoder/casino/Game.java | 8 +-- .../io/zipcoder/casino/GameInterface.java | 33 ++--------- src/main/java/io/zipcoder/casino/GoFish.java | 1 - .../java/io/zipcoder/casino/GoFishPlayer.java | 14 +++-- src/main/java/io/zipcoder/casino/Player.java | 10 ++-- src/main/java/io/zipcoder/casino/Suit.java | 2 +- .../io/zipcoder/casino/BlackJackTest.java | 2 +- .../zipcoder/casino/BlackjackPlayerTest.java | 52 +++++------------ .../java/io/zipcoder/casino/CardTest.java | 10 ++-- .../java/io/zipcoder/casino/DeckTest.java | 57 +++++++------------ 21 files changed, 123 insertions(+), 164 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index 0fac571d..5f60c608 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -6,7 +6,7 @@ public class BlackJack extends CardGames { private ArrayList blackjackPlayers = new ArrayList<>(); private Player activePlayer; - //This constant can be used if a player/dealer gets blackjack + //This constant can be used in console/actual game-play if a player/dealer gets blackjack private static final int BLACKJACK = 21; private Deck deck; @@ -28,7 +28,7 @@ protected void start() { public void giveCardToPlayer() { Card card = this.deck.dealOneRandomCard(); - //this.activePlayer.addCardToHand(card); + this.activePlayer.addCardToHand(card); } public void endTurn() { @@ -38,11 +38,13 @@ public void endTurn() { } } + //Below methods used primarily in testing and will be useful in implementation of actual game-play via console + public ArrayList getPlayers() { return blackjackPlayers; } - public Player getPlayerAtIndex(int index) { + public BlackjackPlayer getPlayerAtIndex(int index) { return blackjackPlayers.get(index); } diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 842e2587..5bd4e923 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -4,14 +4,15 @@ public class BlackjackPlayer extends Player implements Comparable, Gamble { - private String name; + public String name; private Double money; private ArrayList cardsInHand; BlackjackPlayer(String name, Double money) { - super.name = name; - super.money = money; + this.name = name; + this.money = money; this.cardsInHand = new ArrayList<>(); + } public boolean hitStay(String userAnswer) { @@ -21,10 +22,7 @@ public boolean hitStay(String userAnswer) { return false; } - public Double bet() { - return null; - } - + //Stubbed this method out b/c may be needed in console/actual game-play integration... delete it if not... public int compareTo(BlackjackPlayer p) { return 0; } @@ -59,9 +57,9 @@ public int getHandValue() { int acesCount = 0; for (Card card : cardsInHand) { - if (CardValue.getValue() == 11) + if (card.getCardsValue() == 11) acesCount++; - total += CardValue.getValue(); + total += card.getCardsValue(); } if (total > 21) { diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java index bf0173b6..2348f94b 100644 --- a/src/main/java/io/zipcoder/casino/Card.java +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -10,7 +10,7 @@ public Card(Suit suit, CardValue value) { this.value = value; } - public String getSuitSymbols(){ + public String getSuitSymbols() { return suit.getSuit(); } @@ -18,4 +18,10 @@ public String getSuitSymbols(){ public int getCardsValue() { return value.getValue(); } + + //while this method was not originally supposed to be required in this class it is because of the contracts + //we have entered due to our arrangement of abstract and interfaces... had to make this empty method to use my + //addCardsToHand and cardsInHand for Blackjack + public void add(Card newCard) { + } } diff --git a/src/main/java/io/zipcoder/casino/CardGames.java b/src/main/java/io/zipcoder/casino/CardGames.java index 9ec950bf..5f8e3dbd 100644 --- a/src/main/java/io/zipcoder/casino/CardGames.java +++ b/src/main/java/io/zipcoder/casino/CardGames.java @@ -1,6 +1,6 @@ package io.zipcoder.casino; -public class CardGames extends Game{ +public class CardGames extends Game { private int userInputInt; private String userInputString; @@ -30,7 +30,7 @@ public void chooseGameType() { userInputInt = Console.getUserInputInteger("What type of card game would you like to play?" + "\nPlease enter 1 for go fish and 2 for black jack."); - switch (userInputInt){ + switch (userInputInt) { case 0: break; case 1: @@ -45,7 +45,7 @@ public void chooseGameType() { userInputString = Console.getUserInputString("Would you like to leave the the card game area?" + "\nPlease enter yes or no."); - }while(userInputString.equalsIgnoreCase("no")); + } while (userInputString.equalsIgnoreCase("no")); Game game = new Game(); game.chooseGameType(); diff --git a/src/main/java/io/zipcoder/casino/CardValue.java b/src/main/java/io/zipcoder/casino/CardValue.java index c8d17ebe..4fdbb870 100644 --- a/src/main/java/io/zipcoder/casino/CardValue.java +++ b/src/main/java/io/zipcoder/casino/CardValue.java @@ -6,11 +6,14 @@ enum CardValue { private final int CardsValue; - CardValue(int cardNumber){ + CardValue(int cardNumber) { this.CardsValue = cardNumber; } - int getValue(){ + int getValue() { return CardsValue; } + + //I had to remove some stuff from this class and put it elsewhere for proper implementation and proper Blackjack + //behavior } diff --git a/src/main/java/io/zipcoder/casino/Casino.java b/src/main/java/io/zipcoder/casino/Casino.java index d780fb3a..12cc637b 100644 --- a/src/main/java/io/zipcoder/casino/Casino.java +++ b/src/main/java/io/zipcoder/casino/Casino.java @@ -14,22 +14,22 @@ public static void main(String[] args) { String userYesOrNo; - do{ + do { System.out.println("Welcome to Zip Code Casino." + "\nYou are going to have lots of fun while you are here."); userYesOrNo = Console.getUserInputString("Would you like to play a casino game?" + "\nPlease enter yes or no"); - if(userYesOrNo.equalsIgnoreCase("yes")){ + if (userYesOrNo.equalsIgnoreCase("yes")) { Game game = new Game(); game.chooseGameType(); - }else if(userYesOrNo.equalsIgnoreCase("no")){ + } else if (userYesOrNo.equalsIgnoreCase("no")) { System.out.println("We currently only have games inside Zip Code Casino." + "\nI'm sorry if there is nothing else to do."); } userYesOrNo = Console.getUserInputString("Would you like to leave Zip Code Casino?"); - } while(!(userYesOrNo.equalsIgnoreCase("yes"))); + } while (!(userYesOrNo.equalsIgnoreCase("yes"))); System.out.println(" \n" + " ,--------.,--. ,--. ,--. ,--. \n" + diff --git a/src/main/java/io/zipcoder/casino/Console.java b/src/main/java/io/zipcoder/casino/Console.java index d87013ac..f613da0a 100644 --- a/src/main/java/io/zipcoder/casino/Console.java +++ b/src/main/java/io/zipcoder/casino/Console.java @@ -4,26 +4,26 @@ import java.util.Scanner; public class Console { - public static String getUserInputString(String promptUser){ + public static String getUserInputString(String promptUser) { do { try { System.out.println(promptUser); String userInput = new Scanner(System.in).nextLine(); return userInput; - } catch (InputMismatchException ime){ + } catch (InputMismatchException ime) { System.out.println("Invalid input, please try again."); continue; } } - while (true) ; + while (true); } - public static Double getUserInputDouble(String promptUser){ + public static Double getUserInputDouble(String promptUser) { do { try { return Double.parseDouble(getUserInputString(promptUser)); - } catch (NumberFormatException nfe){ + } catch (NumberFormatException nfe) { System.out.println("Invalid response please try again."); continue; } @@ -31,11 +31,11 @@ public static Double getUserInputDouble(String promptUser){ } - public static Integer getUserInputInteger(String promptUser){ + public static Integer getUserInputInteger(String promptUser) { do { try { return Integer.parseInt(getUserInputString(promptUser)); - } catch (NumberFormatException nfe){ + } catch (NumberFormatException nfe) { System.out.println("Invalid response please try again."); continue; } diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index e88f5a15..e92679ec 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -1,4 +1,5 @@ package io.zipcoder.casino; + import java.util.*; import java.util.ArrayList; @@ -15,8 +16,8 @@ public static int roll() { return dice1 + dice2; } - public void testGit(){ - + public void testGit() { + } } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index a101b627..9c6a7607 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -2,14 +2,24 @@ public class CrapsPlayer extends Player implements Gamble { + private Card cardsInHand; + CrapsPlayer(String name, Double money) { super(name, money); } - public Double bet() { + public Double bet(Double bet) { return null; } - public static void firstRoll(){ + public static void firstRoll() { + } + + //We won't be using this method of course, since Craps is a dice game, but I HAD to put this Override method here + //to fulfill a contract we entered with our arrangement of abstracts and interfaces... it's just one of those + //things we didn't anticipate when we were making the UML and now we are stuck with... + @Override + public void addCardToHand(Card newCard) { + cardsInHand.add(newCard); } } diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index dfcc8bf3..e693ee8d 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -9,7 +9,9 @@ public class Deck { private ArrayList cards = new ArrayList(); - Deck() { + public void populate() { + cards = new ArrayList(); + for (Suit suit : Suit.values()) { for (CardValue cardValue : CardValue.values()) { cards.add(new Card(suit, cardValue)); @@ -17,10 +19,6 @@ public class Deck { } } - public void populate() { - cards = new ArrayList(); - - } public Card dealOneRandomCard() { Card topCard = cards.get(0); diff --git a/src/main/java/io/zipcoder/casino/Gamble.java b/src/main/java/io/zipcoder/casino/Gamble.java index cc68006a..9d486d32 100644 --- a/src/main/java/io/zipcoder/casino/Gamble.java +++ b/src/main/java/io/zipcoder/casino/Gamble.java @@ -2,6 +2,8 @@ interface Gamble { - public Double bet(); + + //needed to add parameters to this method since my bet method in Blackjack uses it and needed these parameters + public Double bet(Double bet); } diff --git a/src/main/java/io/zipcoder/casino/Game.java b/src/main/java/io/zipcoder/casino/Game.java index cac618be..81e2459c 100644 --- a/src/main/java/io/zipcoder/casino/Game.java +++ b/src/main/java/io/zipcoder/casino/Game.java @@ -31,7 +31,7 @@ public void chooseGameType() { userInputInt = Console.getUserInputInteger("\nWhat type of game would you like to play?" + "\nPlease enter 1 for card game or 2 for dice game"); - switch (userInputInt){ + switch (userInputInt) { case 0: break; case 1: @@ -42,13 +42,13 @@ public void chooseGameType() { DiceGames diceGames = new DiceGames(); diceGames.chooseGameType(); break; - default: - System.out.println("You entered an invalid choose :-(\n"); + default: + System.out.println("You entered an invalid choose :-(\n"); } userInputString = Console.getUserInputString("Would you like to leave the game area?\n" + "Please enter yes or no."); - }while(userInputString.equalsIgnoreCase("no")); + } while (userInputString.equalsIgnoreCase("no")); } } diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index 8a401bec..ed5dad72 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -2,7 +2,7 @@ public class GameInterface { - public static void playCraps(){ + public static void playCraps() { String playAgain; do { @@ -11,42 +11,17 @@ public static void playCraps(){ first.firstRoll(); playAgain = Console.getUserInputString("Do you want to continue playing?"); first.getName(); - }while(playAgain.equals("no")); - - - - - - - - + } while (playAgain.equals("no")); } - public static void playBlakcjack(){ - - - - - - - + public static void playBlakcjack() { } - public static void playGoFish(){ - - - - - - - - - - + public static void playGoFish() { } diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java index 48e8571e..274b3ab4 100644 --- a/src/main/java/io/zipcoder/casino/GoFish.java +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -16,6 +16,5 @@ public void start() { player.dealGoFishHAnd(goFishPlayers, goFishDeck); - } } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index 4a704ffa..8eeefe21 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -5,21 +5,25 @@ public class GoFishPlayer extends Player implements Gamble { - ArrayList hand; + private ArrayList cardsInHand; - GoFishPlayer(String name) { - super(name); + GoFishPlayer (String name) { + this.name = name; } public void dealGoFishHAnd(ArrayList players, Deck deck) { for (int i = 1; i <= 5; i++) { for (GoFishPlayer player : players) - player.hand.add(deck.dealOneRandomCard()); + player.cardsInHand.add(deck.dealOneRandomCard()); } } @Override - public Double bet(){ + public Double bet(Double bet) { return null; } + + public void addCardToHand(Card newCard) { + cardsInHand.add(newCard); + } } diff --git a/src/main/java/io/zipcoder/casino/Player.java b/src/main/java/io/zipcoder/casino/Player.java index 0b77344d..45460eab 100644 --- a/src/main/java/io/zipcoder/casino/Player.java +++ b/src/main/java/io/zipcoder/casino/Player.java @@ -6,21 +6,21 @@ abstract class Player { protected Double money; protected double bet; - Player(String name, Double money){ + Player(String name, Double money) { this.name = name; this.money = money; } - Player(String name){ - this.name = name; + Player() { } public String getName() { return name; } - private void bet(double bet){ - this.bet = bet; + private void bet(double bet) { + this.bet = bet; } + public abstract void addCardToHand(Card card); } diff --git a/src/main/java/io/zipcoder/casino/Suit.java b/src/main/java/io/zipcoder/casino/Suit.java index 0bab671a..6e6f55b8 100644 --- a/src/main/java/io/zipcoder/casino/Suit.java +++ b/src/main/java/io/zipcoder/casino/Suit.java @@ -6,7 +6,7 @@ public enum Suit { private final String suitSymbols; - Suit(String symbol){ + Suit(String symbol) { this.suitSymbols = symbol; } diff --git a/src/test/java/io/zipcoder/casino/BlackJackTest.java b/src/test/java/io/zipcoder/casino/BlackJackTest.java index b14721d4..3aefccad 100644 --- a/src/test/java/io/zipcoder/casino/BlackJackTest.java +++ b/src/test/java/io/zipcoder/casino/BlackJackTest.java @@ -21,7 +21,7 @@ public void startTest() { public void giveCardToPlayerTest() { blackjack.start(); - Player dealer = blackjack.getPlayerAtIndex(0); + BlackjackPlayer dealer = blackjack.getPlayerAtIndex(0); blackjack.giveCardToPlayer(); ArrayList cards = dealer.getHandList(); diff --git a/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java b/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java index ceedb01d..cbc7bf64 100644 --- a/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java +++ b/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java @@ -7,25 +7,16 @@ public class BlackjackPlayerTest { BlackjackPlayer blackjackPlayer = new BlackjackPlayer("Josh", 500.00); - @Test - public void getNameTest() { - String expected = "Josh"; - - String actual = blackjackPlayer.getName(); - - Assert.assertEquals(expected, actual); - } - @Test public void checkBalanceTest() { - Double expected = 100.0; + Double expected = 500.0; Double actual = blackjackPlayer.checkBalance(); Assert.assertEquals(expected, actual); } @Test - public void wagerTest() { + public void betTest() { Double expected = 10.0; Double actual = blackjackPlayer.bet(10.0); @@ -33,18 +24,6 @@ public void wagerTest() { Assert.assertEquals(expected, actual); } - @Test - public void checkBalanceAfterWagerTest() { - - Double expected = 100.0; - - blackjackPlayer.bet(100.0); - - Double actual = blackjackPlayer.checkBalance(); - - Assert.assertEquals(expected, actual); - } - @Test public void addCardToHandAndViewHandTest() { @@ -59,41 +38,36 @@ public void addCardToHandAndViewHandTest() { } @Test - public void getHandValueTest() { + public void checkBalanceAfterBetTest() { - Card card = new Card(Suit.SPADE, CardValue.Ace); - Card card2 = new Card(Suit.HEART, CardValue.Ten); - blackjackPlayer.addCardToHand(card); + Double expected = 400.0; - int expected = 1; + blackjackPlayer.bet(100.0); - int actual = blackjackPlayer.getHandValue(); + Double actual = blackjackPlayer.checkBalance(); Assert.assertEquals(expected, actual); } @Test - public void getHandValueTestAces() { - - - Card card = new Card(Suit.SPADE, CardValue.Two); + public void getHandValueTest() { - for (int i = 0; i < 5; i++) - blackjackPlayer.addCardToHand(card); - blackjackPlayer.addCardToHand(new Card(Suit.DIAMOND, CardValue.Ace)); - blackjackPlayer.addCardToHand(new Card(Suit.DIAMOND, CardValue.Ace)); + Card card = new Card(Suit.HEART, CardValue.Ten); + blackjackPlayer.addCardToHand(card); - int expected = 15; + int expected = 10; int actual = blackjackPlayer.getHandValue(); + Assert.assertEquals(expected, actual); + } @Test public void getWinningsTest() { - Double expected = 100.0; + Double expected = 1100.0; blackjackPlayer.addWinnings(600.0); Double actual = blackjackPlayer.checkBalance(); diff --git a/src/test/java/io/zipcoder/casino/CardTest.java b/src/test/java/io/zipcoder/casino/CardTest.java index 921114d4..8851dd64 100644 --- a/src/test/java/io/zipcoder/casino/CardTest.java +++ b/src/test/java/io/zipcoder/casino/CardTest.java @@ -6,23 +6,23 @@ public class CardTest { @Test - public void Card() { + public void getCardsValueTest() { Card card = new Card(Suit.CLUB, CardValue.Ace); int expected = 11; - int actual = CardValue.getValue(); + int actual = card.getCardsValue(); Assert.assertEquals(expected, actual); } @Test - public void CardSuit() { + public void getSuitSymbolTest() { Card card = new Card(Suit.HEART, CardValue.Ace); - Suit expected = Suit.HEART; + String expected = "♡"; - Suit actual = Suit.getSuit(); + String actual = card.getSuitSymbols(); Assert.assertEquals(expected, actual); diff --git a/src/test/java/io/zipcoder/casino/DeckTest.java b/src/test/java/io/zipcoder/casino/DeckTest.java index 7cc892e2..1af11db7 100644 --- a/src/test/java/io/zipcoder/casino/DeckTest.java +++ b/src/test/java/io/zipcoder/casino/DeckTest.java @@ -7,73 +7,60 @@ public class DeckTest { Deck deck = new Deck(); - @Test - void getCardsTest() { + public void populateTest() { deck.populate(); - Card expected = new Card(Suit.CLUB, CardValue.Ace); + String expected = "♤"; + Integer expected2 = CardValue.King.getValue(); + Integer expected3 = 52; - Card actual = deck.getCardByIndex(0); + String actual = deck.getCardByIndex(51).getSuitSymbols(); + Integer actual2 = deck.getCardByIndex(51).getCardsValue(); + Integer actual3 = deck.getDeckSize(); Assert.assertEquals(expected, actual); + Assert.assertEquals(expected2, actual2); + Assert.assertEquals(expected3, actual3); } @Test - void getDeckSizeTest() { + public void dealOneRandomCardTest() { deck.populate(); - Integer expected = 52; + Card expected = deck.getCardByIndex(0); - Integer actual = deck.getDeckSize(); + Card actual = deck.dealOneRandomCard(); Assert.assertEquals(expected, actual); + + } @Test - void giveCardTest() { + public void getDeckSizeTest() { deck.populate(); - Card expected = deck.getCardByIndex(0); + Integer expected = 52; - Card actual = deck.dealOneRandomCard(); + Integer actual = deck.getDeckSize(); Assert.assertEquals(expected, actual); - - } @Test - void getCardTest() { + public void getCardTest() { deck.populate(); - Suit expected_suit = Suit.CLUB; - Integer expected_rank = CardValue.Ace.getValue(); + String expected = "♧"; + Integer expected2 = CardValue.Ace.getValue(); String actual = deck.getCardByIndex(0).getSuitSymbols(); Integer actual2 = deck.getCardByIndex(0).getCardsValue(); - Assert.assertEquals(expected_suit, actual); - Assert.assertEquals(expected_rank, actual2); - - } - - @Test - void populateTest() { - - deck.populate(); - Suit expected_suit = Suit.SPADE; - Integer expected_rank = CardValue.King.getValue(); - Integer expected_size = 52; - - String actual = deck.getCardByIndex(51).getSuitSymbols(); - Integer actual2 = deck.getCardByIndex(51).getCardsValue(); - Integer actual3 = deck.getDeckSize(); + Assert.assertEquals(expected, actual); + Assert.assertEquals(expected2, actual2); - Assert.assertEquals(expected_suit, actual); - Assert.assertEquals(expected_rank, actual2); - Assert.assertEquals(expected_size, actual3); } - } From c29d5cfaa32b99cae7d22a035b1333ad80e9cdf3 Mon Sep 17 00:00:00 2001 From: aaron Date: Wed, 22 Nov 2017 18:18:32 -0500 Subject: [PATCH 24/34] test --- src/main/java/io/zipcoder/casino/BlackJack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index 5f60c608..4a928b9f 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -38,7 +38,7 @@ public void endTurn() { } } - //Below methods used primarily in testing and will be useful in implementation of actual game-play via console + //Below methods used primarily in testing and will be useful in implementation of actual gameplay via console public ArrayList getPlayers() { return blackjackPlayers; From 52c66cbe3ca6e0b3f924bb31cd7b71119aefc004 Mon Sep 17 00:00:00 2001 From: zan Date: Wed, 22 Nov 2017 21:43:48 -0500 Subject: [PATCH 25/34] still working on go fish --- .../java/io/zipcoder/casino/CardGames.java | 2 +- .../java/io/zipcoder/casino/CardValue.java | 1 + .../java/io/zipcoder/casino/CrapsPlayer.java | 18 ++++-------- .../io/zipcoder/casino/GameInterface.java | 2 +- src/main/java/io/zipcoder/casino/GoFish.java | 28 +++++++++++++++---- .../java/io/zipcoder/casino/GoFishPlayer.java | 26 ++++++++++++----- 6 files changed, 50 insertions(+), 27 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/CardGames.java b/src/main/java/io/zipcoder/casino/CardGames.java index 5f8e3dbd..7fdd6d7d 100644 --- a/src/main/java/io/zipcoder/casino/CardGames.java +++ b/src/main/java/io/zipcoder/casino/CardGames.java @@ -37,7 +37,7 @@ public void chooseGameType() { GameInterface.playGoFish(); break; case 2: - GameInterface.playBlakcjack(); + GameInterface.playBlackjack(); break; default: System.out.println("You entered an invalid response :-(\n"); diff --git a/src/main/java/io/zipcoder/casino/CardValue.java b/src/main/java/io/zipcoder/casino/CardValue.java index 5c5f6854..ea6c6918 100644 --- a/src/main/java/io/zipcoder/casino/CardValue.java +++ b/src/main/java/io/zipcoder/casino/CardValue.java @@ -14,6 +14,7 @@ enum CardValue { int getValue() { return CardsValue; } +} //I had to remove some stuff from this class and put it elsewhere for proper implementation and proper Blackjack //behavior diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index 53e60eff..1a456869 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -2,7 +2,8 @@ public class CrapsPlayer extends Player implements Gamble, Dice { - + private String name; + private Double money; private Card cardsInHand; CrapsPlayer(String name, Double money) { @@ -10,12 +11,6 @@ public class CrapsPlayer extends Player implements Gamble, Dice { } - public Double bet(Double bet) { - return null; - } - - public static void firstRoll() { - } //We won't be using this method of course, since Craps is a dice game, but I HAD to put this Override method here //to fulfill a contract we entered with our arrangement of abstracts and interfaces... it's just one of those @@ -23,13 +18,12 @@ public static void firstRoll() { @Override public void addCardToHand(Card newCard) { cardsInHand.add(newCard); + } - private String name; - private Double money; - public Double bet() { - return null; - } +// public Double bet() { +// return null; +// } public Double bet(Double bet) { money -= bet; diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index ed5dad72..c97b0f87 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -16,7 +16,7 @@ public static void playCraps() { } - public static void playBlakcjack() { + public static void playBlackjack() { } diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java index 274b3ab4..8d2bb68d 100644 --- a/src/main/java/io/zipcoder/casino/GoFish.java +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -4,17 +4,33 @@ public class GoFish extends CardGames { - ArrayList goFishPlayers; + private ArrayList goFishPlayers = new ArrayList<>(); + private Deck goFishDeck; + private Player activePlayer1; + private Player activePlayer2; - public void start() { + public GoFish() { + start(); + } + + protected void start() { - GoFishPlayer player = new GoFishPlayer("Donald"); - goFishPlayers.add(player); + GoFishPlayer goFishPlayer1 = new GoFishPlayer("AA-Wrong"); + GoFishPlayer goFishPlayer2 = new GoFishPlayer("Cifu"); + goFishPlayers.add(goFishPlayer1); + goFishPlayers.add(goFishPlayer2); + activePlayer1 = goFishPlayer1; + activePlayer2 = goFishPlayer2; Deck goFishDeck = new Deck(); + goFishDeck.populate(); goFishDeck.shuffle(); - player.dealGoFishHAnd(goFishPlayers, goFishDeck); - + //giveCardToPlayer(); + goFishPlayer1.dealGoFishHand(goFishPlayers, goFishDeck); + } + public void giveCardToPlayer() { + Card card = this.goFishDeck.dealOneRandomCard(); + this.activePlayer1.addCardToHand(card); } } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index eee729a6..c29c5927 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -2,27 +2,39 @@ import java.util.ArrayList; -public class GoFishPlayer extends Player implements Gamble { +public class GoFishPlayer extends Player implements Comparable { + public String name; private ArrayList cardsInHand; GoFishPlayer (String name) { this.name = name; + this.cardsInHand = new ArrayList<>(); } - public void dealGoFishHAnd(ArrayList players, Deck deck) { + public void dealGoFishHand(ArrayList players, Deck deck) { for (int i = 1; i <= 5; i++) { for (GoFishPlayer player : players) player.cardsInHand.add(deck.dealOneRandomCard()); } } - @Override - public Double bet(Double bet) { - return null; - } - public void addCardToHand(Card newCard) { cardsInHand.add(newCard); } + + public ArrayList getHandList() { + return cardsInHand; + } + + + +// public Double bet(Double bet) { +// return null; +// } + //Stubbed this method out b/c may be needed in console/actual game-play integration... delete it if not... + @Override + public int compareTo(GoFishPlayer o) { + return 0; + } } From a49a0bfd8146934bba801456620302bb3c06544f Mon Sep 17 00:00:00 2001 From: zan Date: Wed, 22 Nov 2017 21:54:01 -0500 Subject: [PATCH 26/34] updating go fish --- src/main/java/io/zipcoder/casino/GoFish.java | 1 + src/main/java/io/zipcoder/casino/GoFishPlayer.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java index 8d2bb68d..2e161d28 100644 --- a/src/main/java/io/zipcoder/casino/GoFish.java +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -32,5 +32,6 @@ protected void start() { public void giveCardToPlayer() { Card card = this.goFishDeck.dealOneRandomCard(); this.activePlayer1.addCardToHand(card); + this.activePlayer2.addCardToHand(card); } } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index c29c5927..eca63b7d 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -27,9 +27,18 @@ public ArrayList getHandList() { return cardsInHand; } + public String viewHand() { + String handString = ""; + for (Card card : cardsInHand) { + handString += card.toString(); + } + return handString; + } + + -// public Double bet(Double bet) { + // public Double bet(Double bet) { // return null; // } //Stubbed this method out b/c may be needed in console/actual game-play integration... delete it if not... From 0baa6ae343f9dd7f90e904b046fa068ba7eb09c3 Mon Sep 17 00:00:00 2001 From: zan Date: Thu, 23 Nov 2017 14:57:09 -0500 Subject: [PATCH 27/34] working on go fish logic --- src/main/java/io/zipcoder/casino/GoFish.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java index 2e161d28..9df3d241 100644 --- a/src/main/java/io/zipcoder/casino/GoFish.java +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -34,4 +34,17 @@ public void giveCardToPlayer() { this.activePlayer1.addCardToHand(card); this.activePlayer2.addCardToHand(card); } + + public ArrayList getPlayers() { + return goFishPlayers; + } + + public GoFishPlayer getPlayerAtIndex(int index) { + return goFishPlayers.get(index); + } + + + public Player getActivePlayer() { + return activePlayer1; + } } From fcd9a195b7d2a4ca5f9f3b317fd8228d634191dd Mon Sep 17 00:00:00 2001 From: aaron Date: Thu, 23 Nov 2017 23:40:09 -0500 Subject: [PATCH 28/34] Plugged Blackjack into GameInterface --- .../java/io/zipcoder/casino/BlackJack.java | 30 +++++++++---------- .../io/zipcoder/casino/BlackjackPlayer.java | 6 ++-- .../io/zipcoder/casino/GameInterface.java | 18 ++++++++++- .../io/zipcoder/casino/BlackJackTest.java | 4 +-- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index 88e8b3dd..b691a1dc 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -4,21 +4,20 @@ public class BlackJack extends CardGames { - private ArrayList blackjackPlayers = new ArrayList<>(); - private Player activePlayer; + private static ArrayList blackjackPlayers = new ArrayList<>(); + private static Player activePlayer; //This constant can be used in console/actual game-play if a player/dealer gets blackjack private static final int BLACKJACK = 21; - private Deck deck; + private static Deck deck; public BlackJack() { start(); } - protected void start() { + protected static void start() { + BlackjackPlayer dealer = new BlackjackPlayer("dealer", 500.0); - BlackjackPlayer josh = new BlackjackPlayer("Josh", 500.0); blackjackPlayers.add(dealer); - blackjackPlayers.add(josh); activePlayer = dealer; deck = new Deck(); deck.populate(); @@ -26,22 +25,21 @@ protected void start() { giveCardToPlayer(); } - public void giveCardToPlayer() { - Card card = this.deck.dealOneRandomCard(); - this.activePlayer.addCardToHand(card); + public static void giveCardToPlayer() { + Card card = deck.dealOneRandomCard(); + activePlayer.addCardToHand(card); } public void endTurn() { for (BlackjackPlayer blackjackPlayer : blackjackPlayers) { if (!activePlayer.equals(blackjackPlayer)) - this.activePlayer = blackjackPlayer; + activePlayer = blackjackPlayer; } } + //Below methods used primarily in testing and will be useful in implementation of actual game-play via console - //Below methods used primarily in testing and will be useful in implementation of actual gameplay via console - - public ArrayList getPlayers() { + public static ArrayList getPlayers() { return blackjackPlayers; } @@ -49,12 +47,12 @@ public BlackjackPlayer getPlayerAtIndex(int index) { return blackjackPlayers.get(index); } - public void setActivePlayer(BlackjackPlayer blackjackPlayer) { - this.activePlayer = blackjackPlayer; + activePlayer = blackjackPlayer; } public Player getActivePlayer() { return activePlayer; } -} \ No newline at end of file + +} diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 5bd4e923..4ee582fe 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -6,7 +6,7 @@ public class BlackjackPlayer extends Player implements Comparab public String name; private Double money; - private ArrayList cardsInHand; + private static ArrayList cardsInHand; BlackjackPlayer(String name, Double money) { this.name = name; @@ -44,7 +44,7 @@ public void addCardToHand(Card newCard) { cardsInHand.add(newCard); } - public String viewHand() { + public static String viewHand() { String handString = ""; for (Card card : cardsInHand) { handString += card.toString(); @@ -79,4 +79,4 @@ public void addWinnings(Double winnings) { money += winnings; } -} \ No newline at end of file +} diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index c97b0f87..6e2f1fa5 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -3,11 +3,12 @@ public class GameInterface { public static void playCraps() { + String playAgain; do { System.out.println("Welcome to the craps table. How many people are playing"); - CrapsPlayer first = new CrapsPlayer(Console.getUserInputString("What is the first players name?"), Console.getUserInputDouble("How miuch omoney are you bringing to the table?")); + CrapsPlayer first = new CrapsPlayer(Console.getUserInputString("What is the first players name?"), Console.getUserInputDouble("How much money are you bringing to the table?")); first.firstRoll(); playAgain = Console.getUserInputString("Do you want to continue playing?"); first.getName(); @@ -18,11 +19,26 @@ public static void playCraps() { public static void playBlackjack() { + String playAgain; + do { + + System.out.println("Welcome to the Blackjack table"); + BlackjackPlayer blackjackPlayer = new BlackjackPlayer(Console.getUserInputString("What is your name?"), + Console.getUserInputDouble("How much money are you bringing to the table?")); + BlackJack.start(); + playAgain = Console.getUserInputString("Do you want to play another game of Blackjack?"); + //the below line to retrieve the same player name from previous game if player wants to continue may fail... + //so may need to rewrite, won't know until we test the game-play from console itself + blackjackPlayer.getName(); + } while (playAgain.equals("no")); + } + public static void playGoFish() { } } + diff --git a/src/test/java/io/zipcoder/casino/BlackJackTest.java b/src/test/java/io/zipcoder/casino/BlackJackTest.java index 3aefccad..2058632b 100644 --- a/src/test/java/io/zipcoder/casino/BlackJackTest.java +++ b/src/test/java/io/zipcoder/casino/BlackJackTest.java @@ -11,8 +11,8 @@ public class BlackJackTest { @Test public void startTest() { - - int expected = 2; + //Have to expect 1 player (dealer) because other player is created at runtime via user-inputted name/money + int expected = 1; int actual = blackjack.getPlayers().size(); Assert.assertEquals(expected, actual); } From 0936f00eff898824d95ae7bf81494a460b2688cd Mon Sep 17 00:00:00 2001 From: jeffrey Date: Sun, 26 Nov 2017 09:02:00 -0500 Subject: [PATCH 29/34] some stuff --- src/main/java/io/zipcoder/casino/Craps.java | 4 ++ .../java/io/zipcoder/casino/CrapsPlayer.java | 28 +++++---- .../io/zipcoder/casino/CrapsPlayerTest.java | 57 +++++++++++++++++++ .../java/io/zipcoder/casino/DiceTest.java | 10 +++- 4 files changed, 87 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index 7dd43660..bea9c5c4 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -5,8 +5,12 @@ public class Craps extends DiceGames implements Dice { + + ArrayList crapsPlayers; + + } diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index 2ce87bc7..63cf37d2 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -18,12 +18,16 @@ public Double bet(Double bet) { return bet; } + public void addWinnings(Double winnings) { + money += winnings; + } + static int point = 0; public static int shooter = Dice.rollDice(2); public static String gameMessage = " "; - public static void firstRoll(){ + public static String firstRoll(){ switch (shooter) { case 7: @@ -41,9 +45,10 @@ public static void firstRoll(){ gameMessage ="Your point has be set to: " + point + " Please roll again."; break; } - System.out.println(gameMessage); - System.out.println(shooter); - System.out.println(point); +// System.out.println(gameMessage); +// System.out.println(shooter); +// System.out.println(point); + return gameMessage; } @@ -70,15 +75,16 @@ public static void nextRoll() { break; } } - System.out.println(gameMessage); - System.out.println(shooter); - System.out.println(point); +// System.out.println(gameMessage); +// System.out.println(shooter); +// System.out.println(point); } - public static void main(String[] args) { - - nextRoll(); - }} +// public static void main(String[] args) { +// +// nextRoll(); +// } +} diff --git a/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java b/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java index 078e705a..3908fa8b 100644 --- a/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java +++ b/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java @@ -1,4 +1,61 @@ package io.zipcoder.casino; +import org.junit.Test; +import org.junit.Assert; +import org.junit.*; + public class CrapsPlayerTest { + + CrapsPlayer cPlayer = new CrapsPlayer("Jeff", 100.00); + @Test + public void bet() throws Exception { + } + + @Test + public void bet1() throws Exception { + } + + @Test + public void addWinnings() throws Exception { + } + + @Test + public void firstRollForSeven() { + + CrapsPlayer.shooter = 7; + + String expected = "You win!"; + + String actual = CrapsPlayer.firstRoll(); + + Assert.assertEquals(expected,actual); + } + + @Test + public void firstRollForEleven() { + + CrapsPlayer.shooter = 11; + + String expected = "You win!"; + + String actual = CrapsPlayer.firstRoll(); + + Assert.assertEquals(expected,actual); + } + + @Test + public void firstRollForTwo() { + + CrapsPlayer.shooter = 2; + + String expected = "You lose!"; + + String actual = CrapsPlayer.firstRoll(); + + Assert.assertEquals(expected,actual); + } + + @Test + public void nextRoll() { + } } diff --git a/src/test/java/io/zipcoder/casino/DiceTest.java b/src/test/java/io/zipcoder/casino/DiceTest.java index 8f40baef..e2bb1676 100644 --- a/src/test/java/io/zipcoder/casino/DiceTest.java +++ b/src/test/java/io/zipcoder/casino/DiceTest.java @@ -1,12 +1,20 @@ package io.zipcoder.casino; import org.junit.Test; +import org.junit.Assert; import static org.junit.Assert.*; public class DiceTest { @Test - public void rollDice() throws Exception { + + public void rollDiceTest() { + + Integer actual = Dice.rollDice(2); + // System.out.println(actual); + + Assert.assertTrue(actual <13 && actual > 0); } + } \ No newline at end of file From e981f25d7c1860a4cc13f1d4708deea050fcea9f Mon Sep 17 00:00:00 2001 From: jeffrey Date: Sun, 26 Nov 2017 19:56:37 -0500 Subject: [PATCH 30/34] more stuff --- User Stories | 62 ++++++++++ src/main/java/io/zipcoder/casino/Craps.java | 98 +++++++++++++-- .../java/io/zipcoder/casino/CrapsPlayer.java | 88 +++++--------- src/main/java/io/zipcoder/casino/Game.java | 4 +- .../io/zipcoder/casino/GameInterface.java | 43 ++++++- .../io/zipcoder/casino/CrapsPlayerTest.java | 61 ---------- .../java/io/zipcoder/casino/CrapsTest.java | 114 ++++++++++++++++++ 7 files changed, 329 insertions(+), 141 deletions(-) create mode 100644 User Stories delete mode 100644 src/test/java/io/zipcoder/casino/CrapsPlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/CrapsTest.java diff --git a/User Stories b/User Stories new file mode 100644 index 00000000..440e7345 --- /dev/null +++ b/User Stories @@ -0,0 +1,62 @@ +Casino User Stories + + +As a player… + +Go Fish + +I want to receive 5 cards so I can play a hand. +I want to recognize matches so that I can put down my pairs +I want to ask other players for cards so I can match with my cards to make pairs +I want to check my hand for cards that others ask for to give them the matching requested card +I want to give matching cards to the player that requested the card +I want to pull a card from the deck to replenish my hand when I failed in my request +I want to pair and discard all my matches to win the game + +Black Jack + +I want to place a bet to mark myself as a player +I want to receive 2 cards in order to play the game +I want to add the numeric values of my cards to determine my points +I want to take a hit to get my value closer to 21 without going over +I want to stay if my cards are close to 21 so that I don’t go over +I want to immediately show my hand if I have an Ace and a 10,Q,J or K + + +Craps +I want to place a bet +I want to roll a “Snake Eyes”, 7 or 11 to win outright +I want to roll the dice to set my point +I want to roll the dice try to match the set point +I don’t want to roll a “Snake Eyes”, 7 or 11 after the point is set + + +As the computer... I want to + +Ask the user if they want to play a game +Ask the user what type of game they want to play (card, dice) +Ask the user what type of card game they want to play (black jack, go fish) +Get the number of players playing. +Get the player names. + +Go fish +Deal five cards to each player + +Black jack +Ask players to place bets +Deal to cards to each player. +Ask first player if they want to hit or stay. +Give card to player that wants to hit. +Move to next player if previous player wants to stay. +Count each player total. +Pay users that beat dealer hand but are under 21. +Collect bets from players that go over 21. +Collect bets from players that lose to the dealer. + + + + + + + + diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index b8a72b06..6bab61e0 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -1,29 +1,105 @@ package io.zipcoder.casino; -import java.util.*; - import java.util.ArrayList; public class Craps extends DiceGames implements Dice { + ArrayList crapsPlayers = new ArrayList<>(); + + public int getDiceRollTotal() { + return diceRollTotal; + } + + int diceRollTotal; + + public void createOnePlayer(String name, Double money) { + CrapsPlayer newCrapsPlayer = new CrapsPlayer(name, money); + crapsPlayers.add(newCrapsPlayer); + } + + public void addWinnings() { + for (CrapsPlayer player : crapsPlayers) { //for every player in ouyr craps player arraylist... do stuff + player.setMoney(player.getPlayerBet() * 2); + } + } + + public void loseBet() { + for (CrapsPlayer player : crapsPlayers) { //for every player in ouyr craps player arraylist... do stuff + player.setPlayerBet(0.00); + } + } + + public void setDiceRollTotal(){ + diceRollTotal = Dice.rollDice(2); + } - ArrayList crapsPlayers; + public static String gameMessage = " "; + public static int gameStatus = 0; - public static int roll() { - Random diceRoll = new Random(); - int dice1 = diceRoll.nextInt(6) + 1; - int dice2 = diceRoll.nextInt(6) + 1; - System.out.println("\n dice1 = " + dice1 + " dice2 = " + dice2); - return dice1 + dice2; + public void playersFirstRoll(CrapsPlayer player){ + setDiceRollTotal(); + player.setPlayerPoint(getDiceRollTotal()); } - public void testGit() { + + public String firstRoll(CrapsPlayer player) { + + switch (diceRollTotal) { + case 7: + case 11: + gameMessage = "You rolled a: " + diceRollTotal + "! You win!"; + gameStatus = 1; + addWinnings(); + break; + case 2: + case 3: + case 12: + gameMessage = "You rolled a: " + diceRollTotal + "! You lose!"; + gameStatus =2; + + loseBet(); + break; + default: + player.setPlayerPoint(diceRollTotal); + gameMessage = "Your point has be set to: " + diceRollTotal + ". Please roll again."; + gameStatus =3; + break; + } + return gameMessage; } + public String nextRoll(CrapsPlayer player) { + + if (diceRollTotal == player.getPlayerPoint()) { + gameMessage = "You win!"; + addWinnings(); + + } else { + switch (diceRollTotal) { + case 7: + case 11: + gameMessage = "You lose!"; + loseBet(); + gameStatus =2; + break; + case 2: + gameMessage = "You win!"; + addWinnings(); + gameStatus =1; + break; + default: + gameMessage = "You rolled a: " + diceRollTotal + " you need to roll a " + player.getPlayerPoint() + " Please roll again."; + nextRoll(player); + gameStatus =3; + break; + } + + } + return gameMessage; -} + }} \ No newline at end of file diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index c5c08a57..ed8f1ef9 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -3,15 +3,34 @@ public class CrapsPlayer extends Player implements Gamble, Dice { private String name; + + public Double getMoney() { + return money; + } + + public void setMoney(Double money) { + this.money = money; + } + private Double money; private Card cardsInHand; + private int playerPoint; + + public Double getPlayerBet() { + return playerBet; + } + + public void setPlayerBet(Double playerBet) { + this.playerBet = playerBet; + } + + private Double playerBet; CrapsPlayer(String name, Double money) { super(name, money); } - //We won't be using this method of course, since Craps is a dice game, but I HAD to put this Override method here //to fulfill a contract we entered with our arrangement of abstracts and interfaces... it's just one of those //things we didn't anticipate when we were making the UML and now we are stuck with... @@ -26,71 +45,18 @@ public void addCardToHand(Card newCard) { // } public Double bet(Double bet) { - money -= bet; + money = money - bet; + this.playerBet = bet; return bet; } - public void addWinnings(Double winnings) { - money += winnings; - } - - static int point = 0; - - public static int shooter = Dice.rollDice(2); - public static String gameMessage = " "; - - - public static String firstRoll(){ - - switch (shooter) { - case 7: - case 11: - gameMessage = "You win!"; - //add payout to bank - break; - case 2: - gameMessage ="You lose!"; - - //minus bet from available $$ - break; - default: - point = shooter; - gameMessage ="Your point has be set to: " + point + " Please roll again."; - break; - } -// System.out.println(gameMessage); -// System.out.println(shooter); -// System.out.println(point); - return gameMessage; + public int getPlayerPoint() { + return playerPoint; } - public static void nextRoll() { - - if (shooter == point) { - gameMessage = "You win!"; - //add payout to bank - - } else { - switch (shooter) { - case 7: - case 11: - gameMessage = "You lose!"; - //minus bet from available $$ - break; - case 2: - gameMessage = "You win!"; - //add payout to bank - break; - default: - - gameMessage = "You rolled a: " + shooter + " you need to roll a " + point + " Please roll again."; - break; - } - } -// System.out.println(gameMessage); -// System.out.println(shooter); -// System.out.println(point); - + public void setPlayerPoint(int playerPoint) { + this.playerPoint = playerPoint; } +} diff --git a/src/main/java/io/zipcoder/casino/Game.java b/src/main/java/io/zipcoder/casino/Game.java index f06f5677..34677c6f 100644 --- a/src/main/java/io/zipcoder/casino/Game.java +++ b/src/main/java/io/zipcoder/casino/Game.java @@ -40,8 +40,8 @@ public void chooseGameType() { cardGames.chooseGameType(); break; case 2: - DiceGames diceGames = new DiceGames(); - diceGames.chooseGameType(); + GameInterface gameInterface = new GameInterface(); + gameInterface.playCraps(); break; default: System.out.println("You entered an invalid choose :-(\n"); diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index 6e2f1fa5..b5c7505b 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -2,16 +2,47 @@ public class GameInterface { - public static void playCraps() { + public void playCraps() { String playAgain; - do { - System.out.println("Welcome to the craps table. How many people are playing"); - CrapsPlayer first = new CrapsPlayer(Console.getUserInputString("What is the first players name?"), Console.getUserInputDouble("How much money are you bringing to the table?")); - first.firstRoll(); + do {Craps craps = new Craps(); + + int numberOfPlayer = Console.getUserInputInteger("Welcome to the craps table. How many people are playing?"); + //creates players + for(int i = 1; i <= numberOfPlayer; i++){ + craps.createOnePlayer(Console.getUserInputString("Player name:"), Console.getUserInputDouble("How much money would you like to bring to the table?")); + } + + //get players bets + for(int b = 0; b <= numberOfPlayer; b++){ + System.out.println(craps.crapsPlayers.get(b).getName()); + Double playerBet = craps.crapsPlayers.get(b).bet(Console.getUserInputDouble(" please place bet")); + System.out.println(craps.crapsPlayers.get(b).getName()+" you bet " + playerBet); + } + + +// if(craps.firstRollChecker()) +// +// +// System.out.println(craps.firstRoll(craps.crapsPlayers.get(0))); +// +// +// System.out.println(craps.nextRoll(craps.crapsPlayers.get(0))); +// +// +// do{ +// int firstRol = craps.firstRoll(craps.crapsPlayers.get(0)); +// }while(firstRol != 1 || 2); + + + + + + + playAgain = Console.getUserInputString("Do you want to continue playing?"); - first.getName(); + //first.getName(); } while (playAgain.equals("no")); diff --git a/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java b/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java deleted file mode 100644 index 3908fa8b..00000000 --- a/src/test/java/io/zipcoder/casino/CrapsPlayerTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package io.zipcoder.casino; - -import org.junit.Test; -import org.junit.Assert; -import org.junit.*; - -public class CrapsPlayerTest { - - CrapsPlayer cPlayer = new CrapsPlayer("Jeff", 100.00); - @Test - public void bet() throws Exception { - } - - @Test - public void bet1() throws Exception { - } - - @Test - public void addWinnings() throws Exception { - } - - @Test - public void firstRollForSeven() { - - CrapsPlayer.shooter = 7; - - String expected = "You win!"; - - String actual = CrapsPlayer.firstRoll(); - - Assert.assertEquals(expected,actual); - } - - @Test - public void firstRollForEleven() { - - CrapsPlayer.shooter = 11; - - String expected = "You win!"; - - String actual = CrapsPlayer.firstRoll(); - - Assert.assertEquals(expected,actual); - } - - @Test - public void firstRollForTwo() { - - CrapsPlayer.shooter = 2; - - String expected = "You lose!"; - - String actual = CrapsPlayer.firstRoll(); - - Assert.assertEquals(expected,actual); - } - - @Test - public void nextRoll() { - } -} diff --git a/src/test/java/io/zipcoder/casino/CrapsTest.java b/src/test/java/io/zipcoder/casino/CrapsTest.java new file mode 100644 index 00000000..d826c81f --- /dev/null +++ b/src/test/java/io/zipcoder/casino/CrapsTest.java @@ -0,0 +1,114 @@ +package io.zipcoder.casino; + +import org.junit.Test; +import org.junit.Assert; +import org.junit.*; + +public class CrapsTest { + + CrapsPlayer jeff = new CrapsPlayer("jeff", 50.00); + Craps cPlayer = new Craps(); + @Test + public void bet() throws Exception { + } + + @Test + public void bet1() throws Exception { + } + + @Test + public void addWinnings() throws Exception { + } + + @Test + public void firstRollForSeven() { + + cPlayer.diceRollTotal = 7; + + String expected = "You rolled a: 7! You win!"; + + String actual = cPlayer.firstRoll(jeff); + + Assert.assertEquals(expected,actual); + } + + @Test + public void firstRollForEleven() { + + cPlayer.diceRollTotal = 11; + + String expected = "You rolled a: 11! You win!"; + + String actual = cPlayer.firstRoll(jeff); + + Assert.assertEquals(expected,actual); + } + + @Test + public void firstRollForTwo() { + + cPlayer.diceRollTotal = 2; + + String expected = "You rolled a: 2! You lose!"; + + String actual = cPlayer.firstRoll(jeff); + + Assert.assertEquals(expected,actual); + } + + @Test + public void firstRollForOther() { + + cPlayer.diceRollTotal = 5; + String expected = "Your point has be set to: 5. Please roll again."; + + String actual = cPlayer.firstRoll(jeff); + + Assert.assertEquals(expected,actual); + } + + @Test + public void setPlayerPointTest() { + + cPlayer.diceRollTotal = 5; + cPlayer.firstRoll(jeff); + int expected = 5; + + int actual = jeff.getPlayerPoint(); + + Assert.assertEquals(expected,actual); + } + + + + @Test + public void nextRoll() { + //The roll is based on a random number so testing is iffy. + cPlayer.diceRollTotal = 5; + jeff.setPlayerPoint(5); + cPlayer.nextRoll(jeff); + jeff.getPlayerPoint(); + String expected = "You rolled..."; + + String actual = Craps.gameMessage; + + Assert.assertEquals(expected,actual); + + } + +// @Test +// public void betTest() { +// Double expected = 10.0; +// Double actual = blackjackPlayer.bet(10.0); +// Assert.assertEquals(expected, actual); +// } +// +// @Test +// public void getWinningsTest() { +// Double expected = 1100.0; +// cPlayer.addWinnings(); +// Double actual = blackjackPlayer.checkBalance(); +// +// Assert.assertEquals(expected, actual); +// } +} From e505d4722fa0b0532d6fe90ba4d7b6845f5ad0bd Mon Sep 17 00:00:00 2001 From: zan Date: Sun, 26 Nov 2017 19:56:38 -0500 Subject: [PATCH 31/34] not done but added some tests to go fish --- .../java/io/zipcoder/casino/CrapsPlayer.java | 34 +++++++------- src/main/java/io/zipcoder/casino/Gamble.java | 3 +- .../io/zipcoder/casino/GameInterface.java | 34 +++++++++++++- src/main/java/io/zipcoder/casino/GoFish.java | 46 ++++++++----------- .../java/io/zipcoder/casino/GoFishPlayer.java | 16 +++++-- .../io/zipcoder/casino/GoFishPlayerTest.java | 28 +++++++++++ .../java/io/zipcoder/casino/GoFishTest.java | 10 ++++ 7 files changed, 121 insertions(+), 50 deletions(-) create mode 100644 src/test/java/io/zipcoder/casino/GoFishPlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/GoFishTest.java diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index c5c08a57..2ad845c1 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -11,7 +11,6 @@ public class CrapsPlayer extends Player implements Gamble, Dice { } - //We won't be using this method of course, since Craps is a dice game, but I HAD to put this Override method here //to fulfill a contract we entered with our arrangement of abstracts and interfaces... it's just one of those //things we didn't anticipate when we were making the UML and now we are stuck with... @@ -40,24 +39,24 @@ public void addWinnings(Double winnings) { public static String gameMessage = " "; - public static String firstRoll(){ + public static String firstRoll() { - switch (shooter) { - case 7: - case 11: - gameMessage = "You win!"; - //add payout to bank - break; - case 2: - gameMessage ="You lose!"; + switch (shooter) { + case 7: + case 11: + gameMessage = "You win!"; + //add payout to bank + break; + case 2: + gameMessage = "You lose!"; - //minus bet from available $$ - break; - default: - point = shooter; - gameMessage ="Your point has be set to: " + point + " Please roll again."; - break; - } + //minus bet from available $$ + break; + default: + point = shooter; + gameMessage = "Your point has be set to: " + point + " Please roll again."; + break; + } // System.out.println(gameMessage); // System.out.println(shooter); // System.out.println(point); @@ -93,4 +92,5 @@ public static void nextRoll() { // System.out.println(point); } +} diff --git a/src/main/java/io/zipcoder/casino/Gamble.java b/src/main/java/io/zipcoder/casino/Gamble.java index 9d486d32..6f08d260 100644 --- a/src/main/java/io/zipcoder/casino/Gamble.java +++ b/src/main/java/io/zipcoder/casino/Gamble.java @@ -2,8 +2,7 @@ interface Gamble { - - //needed to add parameters to this method since my bet method in Blackjack uses it and needed these parameters + public Double bet(Double bet); } diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index 6e2f1fa5..ea8640ef 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -2,6 +2,7 @@ public class GameInterface { + public static void playCraps() { String playAgain; @@ -31,14 +32,43 @@ public static void playBlackjack() { //so may need to rewrite, won't know until we test the game-play from console itself blackjackPlayer.getName(); } while (playAgain.equals("no")); - + CardGames cardGames = new CardGames(); + cardGames.chooseGameType(); } public static void playGoFish() { + GoFish goFish = new GoFish(); + Deck goFishDeck = new Deck(); + goFishDeck.populate(); + goFishDeck.shuffle(); + String playAgain = null; + + do{ + System.out.println("Welcome to the Go Fish table!!!"); + + for(int i =0; i <= 1; i++) { + goFish.createOnePlayer(Console.getUserInputString("What is your name?")); + } + + goFish.goFishPlayers.get(0).dealGoFishHand(goFish.goFishPlayers,goFishDeck); + + goFish.showEverybodysHand(); + + goFish.askOtherPlayerForCard(); + int cardToAskFor = Console.getUserInputInteger("What card do you want to ask for? \nPlease input the index of the card 1 through " + goFish.goFishPlayers.get(0).getHandList().size() + "!"); + + goFish.askFirstPlayerForCard(); + + } while (playAgain.equals("no")); + CardGames cardGames = new CardGames(); + cardGames.chooseGameType(); + + } + } -} + diff --git a/src/main/java/io/zipcoder/casino/GoFish.java b/src/main/java/io/zipcoder/casino/GoFish.java index 9df3d241..c029bbda 100644 --- a/src/main/java/io/zipcoder/casino/GoFish.java +++ b/src/main/java/io/zipcoder/casino/GoFish.java @@ -1,40 +1,38 @@ package io.zipcoder.casino; import java.util.ArrayList; +import java.util.Scanner; public class GoFish extends CardGames { - private ArrayList goFishPlayers = new ArrayList<>(); + public ArrayList goFishPlayers = new ArrayList<>(); private Deck goFishDeck; - private Player activePlayer1; - private Player activePlayer2; + public void createOnePlayer(String name){ + GoFishPlayer goFishPlayer = new GoFishPlayer(name); + goFishPlayers.add(goFishPlayer); + } - public GoFish() { - start(); + public void showEverybodysHand(){ + for(GoFishPlayer player: goFishPlayers){ + System.out.println(player.getName() + " this is your hand.\n"); + System.out.println(player.viewHand()); + System.out.println(""); + } } - protected void start() { + public void askOtherPlayerForCard(){ + System.out.println(goFishPlayers.get(1).getName()+"\n"); + System.out.println(goFishPlayers.get(1).viewHand()+"\n"); + } - GoFishPlayer goFishPlayer1 = new GoFishPlayer("AA-Wrong"); - GoFishPlayer goFishPlayer2 = new GoFishPlayer("Cifu"); - goFishPlayers.add(goFishPlayer1); - goFishPlayers.add(goFishPlayer2); - activePlayer1 = goFishPlayer1; - activePlayer2 = goFishPlayer2; - Deck goFishDeck = new Deck(); - goFishDeck.populate(); - goFishDeck.shuffle(); - //giveCardToPlayer(); + public void askFirstPlayerForCard(){ + System.out.println(goFishPlayers.get(0).getName()+"\n"); + System.out.println(goFishPlayers.get(0).viewHand()+"\n"); - goFishPlayer1.dealGoFishHand(goFishPlayers, goFishDeck); - } - public void giveCardToPlayer() { - Card card = this.goFishDeck.dealOneRandomCard(); - this.activePlayer1.addCardToHand(card); - this.activePlayer2.addCardToHand(card); } + public ArrayList getPlayers() { return goFishPlayers; } @@ -43,8 +41,4 @@ public GoFishPlayer getPlayerAtIndex(int index) { return goFishPlayers.get(index); } - - public Player getActivePlayer() { - return activePlayer1; - } } diff --git a/src/main/java/io/zipcoder/casino/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/GoFishPlayer.java index eca63b7d..c73a4c63 100644 --- a/src/main/java/io/zipcoder/casino/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/GoFishPlayer.java @@ -4,14 +4,20 @@ public class GoFishPlayer extends Player implements Comparable { + @Override + public String getName() { + return name; + } + public String name; - private ArrayList cardsInHand; + private ArrayList cardsInHand; GoFishPlayer (String name) { this.name = name; this.cardsInHand = new ArrayList<>(); } + public void dealGoFishHand(ArrayList players, Deck deck) { for (int i = 1; i <= 5; i++) { for (GoFishPlayer player : players) @@ -30,12 +36,14 @@ public ArrayList getHandList() { public String viewHand() { String handString = ""; for (Card card : cardsInHand) { - handString += card.toString(); + handString += card.getCardsValue(); } return handString; } - + public void goFish(Card card){ + addCardToHand(card); + } // public Double bet(Double bet) { @@ -47,3 +55,5 @@ public int compareTo(GoFishPlayer o) { return 0; } } + + diff --git a/src/test/java/io/zipcoder/casino/GoFishPlayerTest.java b/src/test/java/io/zipcoder/casino/GoFishPlayerTest.java new file mode 100644 index 00000000..4deea044 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/GoFishPlayerTest.java @@ -0,0 +1,28 @@ +package io.zipcoder.casino; + +import org.junit.*; + + +public class GoFishPlayerTest { + + GoFishPlayer goFishPlayer = new GoFishPlayer("josh"); + + + @Test + public void addCardToHandAndViewHandTest() { + + Card card = new Card(Suit.CLUB, CardValue.Two); + int expected = 2; + + goFishPlayer.addCardToHand(card); + + int actual = card.getCardsValue(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void dealGoFishHandTest(){ + + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/GoFishTest.java b/src/test/java/io/zipcoder/casino/GoFishTest.java new file mode 100644 index 00000000..6957fd55 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/GoFishTest.java @@ -0,0 +1,10 @@ +package io.zipcoder.casino; + +import org.junit.*; + +public class GoFishTest { + + //@Test + + +} \ No newline at end of file From 69ea995230698a236bce3873de746523ec21435e Mon Sep 17 00:00:00 2001 From: aaron Date: Sun, 26 Nov 2017 23:22:04 -0500 Subject: [PATCH 32/34] More updates to Blackjack --- .../java/io/zipcoder/casino/BlackJack.java | 21 ++++++----- .../io/zipcoder/casino/BlackjackPlayer.java | 29 ++++++++------- src/main/java/io/zipcoder/casino/Gamble.java | 3 +- .../io/zipcoder/casino/GameInterface.java | 35 ++++++++++++++++++- .../io/zipcoder/casino/BlackJackTest.java | 2 +- .../zipcoder/casino/BlackjackPlayerTest.java | 4 +-- 6 files changed, 69 insertions(+), 25 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index b691a1dc..c9535102 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -4,7 +4,7 @@ public class BlackJack extends CardGames { - private static ArrayList blackjackPlayers = new ArrayList<>(); + static ArrayList blackjackPlayers = new ArrayList<>(); private static Player activePlayer; //This constant can be used in console/actual game-play if a player/dealer gets blackjack private static final int BLACKJACK = 21; @@ -14,7 +14,12 @@ public BlackJack() { start(); } - protected static void start() { + public static void createOnePlayer(String name, Double money){ + BlackjackPlayer blackjackPlayer = new BlackjackPlayer(name, money); + blackjackPlayers.add(blackjackPlayer); + } + + static void start() { BlackjackPlayer dealer = new BlackjackPlayer("dealer", 500.0); blackjackPlayers.add(dealer); @@ -25,12 +30,12 @@ protected static void start() { giveCardToPlayer(); } - public static void giveCardToPlayer() { + static void giveCardToPlayer() { Card card = deck.dealOneRandomCard(); activePlayer.addCardToHand(card); } - public void endTurn() { + static void endTurn() { for (BlackjackPlayer blackjackPlayer : blackjackPlayers) { if (!activePlayer.equals(blackjackPlayer)) activePlayer = blackjackPlayer; @@ -39,19 +44,19 @@ public void endTurn() { //Below methods used primarily in testing and will be useful in implementation of actual game-play via console - public static ArrayList getPlayers() { + static ArrayList getPlayers() { return blackjackPlayers; } - public BlackjackPlayer getPlayerAtIndex(int index) { + BlackjackPlayer getPlayerAtIndex(int index) { return blackjackPlayers.get(index); } - public void setActivePlayer(BlackjackPlayer blackjackPlayer) { + void setActivePlayer(BlackjackPlayer blackjackPlayer) { activePlayer = blackjackPlayer; } - public Player getActivePlayer() { + Player getActivePlayer() { return activePlayer; } diff --git a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java index 4ee582fe..4c63b805 100644 --- a/src/main/java/io/zipcoder/casino/BlackjackPlayer.java +++ b/src/main/java/io/zipcoder/casino/BlackjackPlayer.java @@ -4,26 +4,30 @@ public class BlackjackPlayer extends Player implements Comparable, Gamble { - public String name; + private String name; private Double money; private static ArrayList cardsInHand; BlackjackPlayer(String name, Double money) { this.name = name; this.money = money; - this.cardsInHand = new ArrayList<>(); + cardsInHand = new ArrayList<>(); } - public boolean hitStay(String userAnswer) { + static void hitStay(String userAnswer) { if (userAnswer.equalsIgnoreCase("yes")) { - return true; + BlackJack.endTurn(); + } else if (userAnswer.equalsIgnoreCase("no")) { + BlackJack.giveCardToPlayer(); + } else { + System.out.println("This table is for serious players only, take your money and get out of here!"); } - return false; } //Stubbed this method out b/c may be needed in console/actual game-play integration... delete it if not... public int compareTo(BlackjackPlayer p) { + return 0; } @@ -31,7 +35,7 @@ public String getName() { return name; } - public Double checkBalance() { + Double checkBalance() { return money; } @@ -44,15 +48,16 @@ public void addCardToHand(Card newCard) { cardsInHand.add(newCard); } - public static String viewHand() { - String handString = ""; + + static int viewHand(BlackjackPlayer blackjackPlayer) { + Integer handString = null; for (Card card : cardsInHand) { - handString += card.toString(); + handString = card.getCardsValue(); } return handString; } - public int getHandValue() { + int getHandValue() { int total = 0; int acesCount = 0; @@ -71,11 +76,11 @@ public int getHandValue() { return total; } - public ArrayList getHandList() { + ArrayList getHandList() { return cardsInHand; } - public void addWinnings(Double winnings) { + void addWinnings(Double winnings) { money += winnings; } diff --git a/src/main/java/io/zipcoder/casino/Gamble.java b/src/main/java/io/zipcoder/casino/Gamble.java index 9d486d32..0d158dcd 100644 --- a/src/main/java/io/zipcoder/casino/Gamble.java +++ b/src/main/java/io/zipcoder/casino/Gamble.java @@ -4,6 +4,7 @@ interface Gamble { //needed to add parameters to this method since my bet method in Blackjack uses it and needed these parameters - public Double bet(Double bet); + Double bet(Double bet); + } diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index 6e2f1fa5..40ac7b13 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -19,13 +19,46 @@ public static void playCraps() { public static void playBlackjack() { - String playAgain; + String playAgain = ""; + do { System.out.println("Welcome to the Blackjack table"); + +// int numberOfPlayers = Console.getUserInputInteger("How many players are there?"); +// for(int i = 0; i < numberOfPlayers; i++){ +// BlackJack.createOnePlayer(Console.getUserInputString("What is your name?"), Console.getUserInputDouble("How much money do you have?")); +// } + BlackjackPlayer blackjackPlayer = new BlackjackPlayer(Console.getUserInputString("What is your name?"), Console.getUserInputDouble("How much money are you bringing to the table?")); + BlackJack.blackjackPlayers.add(blackjackPlayer); + blackjackPlayer.bet(Console.getUserInputDouble("How much do you want to bet on this game?")); BlackJack.start(); + System.out.println("The dealer's card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); + BlackJack.endTurn(); + String playersTurn = "yes"; + + while (playersTurn.equals("yes")) { + BlackJack.giveCardToPlayer(); + BlackJack.giveCardToPlayer(); + System.out.println("Your card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); + String hitOrStay = Console.getUserInputString("Do you want to stay? Yes or no..."); + + if (hitOrStay.equalsIgnoreCase("yes")) + BlackjackPlayer.hitStay("yes"); + while (hitOrStay.equalsIgnoreCase("no")) { + BlackjackPlayer.hitStay("no"); + System.out.println("Your card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); + String hitOrStayAgain = Console.getUserInputString("Do you want to stay? Yes or no..."); + if (hitOrStayAgain.equalsIgnoreCase("yes")) + playersTurn = "no"; + break; + + } + + } + playAgain = Console.getUserInputString("Do you want to play another game of Blackjack?"); //the below line to retrieve the same player name from previous game if player wants to continue may fail... //so may need to rewrite, won't know until we test the game-play from console itself diff --git a/src/test/java/io/zipcoder/casino/BlackJackTest.java b/src/test/java/io/zipcoder/casino/BlackJackTest.java index 2058632b..01846c3a 100644 --- a/src/test/java/io/zipcoder/casino/BlackJackTest.java +++ b/src/test/java/io/zipcoder/casino/BlackJackTest.java @@ -25,7 +25,7 @@ public void giveCardToPlayerTest() { blackjack.giveCardToPlayer(); ArrayList cards = dealer.getHandList(); - int expected = 1; + int expected = 2; int actual = cards.size(); diff --git a/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java b/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java index cbc7bf64..1915a047 100644 --- a/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java +++ b/src/test/java/io/zipcoder/casino/BlackjackPlayerTest.java @@ -28,11 +28,11 @@ public void betTest() { public void addCardToHandAndViewHandTest() { Card card = new Card(Suit.DIAMOND, CardValue.Two); - String expected = card.toString(); + int expected = card.getCardsValue(); blackjackPlayer.addCardToHand(card); - String actual = blackjackPlayer.viewHand(); + int actual = blackjackPlayer.viewHand(blackjackPlayer); Assert.assertEquals(expected, actual); } From cdc078d89404f0a972ad0a5ae43275126b855097 Mon Sep 17 00:00:00 2001 From: aaron Date: Mon, 27 Nov 2017 01:25:21 -0500 Subject: [PATCH 33/34] Blackjack updates - nearly complete - looping turns and prompts fully functional but logic to determine a winning or losing condition is not working so game never ends --- .../java/io/zipcoder/casino/BlackJack.java | 2 +- .../io/zipcoder/casino/GameInterface.java | 114 +++++++++++++----- 2 files changed, 83 insertions(+), 33 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/BlackJack.java b/src/main/java/io/zipcoder/casino/BlackJack.java index c9535102..03a5c9b2 100644 --- a/src/main/java/io/zipcoder/casino/BlackJack.java +++ b/src/main/java/io/zipcoder/casino/BlackJack.java @@ -14,7 +14,7 @@ public BlackJack() { start(); } - public static void createOnePlayer(String name, Double money){ + public static void createOnePlayer(String name, Double money) { BlackjackPlayer blackjackPlayer = new BlackjackPlayer(name, money); blackjackPlayers.add(blackjackPlayer); } diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index e48f843c..040efe07 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -8,19 +8,20 @@ public void playCraps() { String playAgain; - do {Craps craps = new Craps(); + do { + Craps craps = new Craps(); int numberOfPlayer = Console.getUserInputInteger("Welcome to the craps table. How many people are playing?"); //creates players - for(int i = 1; i <= numberOfPlayer; i++){ + for (int i = 1; i <= numberOfPlayer; i++) { craps.createOnePlayer(Console.getUserInputString("Player name:"), Console.getUserInputDouble("How much money would you like to bring to the table?")); } - //get players bets - for(int b = 0; b <= numberOfPlayer; b++){ + //get players bets + for (int b = 0; b <= numberOfPlayer; b++) { System.out.println(craps.crapsPlayers.get(b).getName()); Double playerBet = craps.crapsPlayers.get(b).bet(Console.getUserInputDouble(" please place bet")); - System.out.println(craps.crapsPlayers.get(b).getName()+" you bet " + playerBet); + System.out.println(craps.crapsPlayers.get(b).getName() + " you bet " + playerBet); } @@ -38,11 +39,6 @@ public void playCraps() { // }while(firstRol != 1 || 2); - - - - - playAgain = Console.getUserInputString("Do you want to continue playing?"); //first.getName(); } while (playAgain.equals("no")); @@ -71,31 +67,85 @@ public static void playBlackjack() { System.out.println("The dealer's card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); BlackJack.endTurn(); String playersTurn = "yes"; - - while (playersTurn.equals("yes")) { - BlackJack.giveCardToPlayer(); - BlackJack.giveCardToPlayer(); - System.out.println("Your card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); - String hitOrStay = Console.getUserInputString("Do you want to stay? Yes or no..."); - - if (hitOrStay.equalsIgnoreCase("yes")) - BlackjackPlayer.hitStay("yes"); - while (hitOrStay.equalsIgnoreCase("no")) { - BlackjackPlayer.hitStay("no"); - System.out.println("Your card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); - String hitOrStayAgain = Console.getUserInputString("Do you want to stay? Yes or no..."); - if (hitOrStayAgain.equalsIgnoreCase("yes")) - playersTurn = "no"; - break; - + String dealersTurn = "no"; + + while (playersTurn.equals("yes") && dealersTurn.equals("no")) { + + while (playersTurn.equals("yes")) { + BlackJack.giveCardToPlayer(); + BlackJack.giveCardToPlayer(); + System.out.println("Your hand's total is: " + BlackjackPlayer.viewHand(blackjackPlayer)); + String hitOrStay = Console.getUserInputString("Do you want to stay? Yes or no..."); + + if (hitOrStay.equalsIgnoreCase("yes")) { + BlackjackPlayer.hitStay("yes"); + BlackJack.endTurn(); + dealersTurn = "yes"; + playersTurn = "no"; + break; + } + while (hitOrStay.equalsIgnoreCase("no")) { + BlackjackPlayer.hitStay("no"); + System.out.println("Your card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); +// if (blackjackPlayer.getHandValue() == 21) { +// System.out.println("You win!"); +// playAgain = Console.getUserInputString("Do you want to play another game of Blackjack?"); +// } +// if (blackjackPlayer.getHandValue() > 21) { +// System.out.println("You busted"); +// playAgain = Console.getUserInputString("Do you want to play another game of Blackjack?"); +// } + String hitOrStayAgain = Console.getUserInputString("Do you want to stay? Yes or no..."); + if (hitOrStayAgain.equalsIgnoreCase("yes")) { + BlackJack.endTurn(); + playersTurn = "no"; + dealersTurn = "yes"; + break; + } + } } + while (dealersTurn.equals("yes") && playersTurn.equals("no")) { + + while (dealersTurn.equals("yes")) { + BlackJack.giveCardToPlayer(); + System.out.println("The dealer's card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); + String hitOrStay = Console.getUserInputString("Does the dealer want to stay? Yes or no..."); +// if (blackjackPlayer.getHandValue() == 21) { +// System.out.println("The dealer won!"); +// playAgain = Console.getUserInputString("Do you want to play another game of Blackjack?"); +// } +// if (blackjackPlayer.getHandValue() > 21) { +// System.out.println("The dealer busted"); +// + if (hitOrStay.equalsIgnoreCase("yes")) { + BlackjackPlayer.hitStay("yes"); + BlackJack.endTurn(); + dealersTurn = "no"; + playersTurn = "yes"; + break; + } + while (hitOrStay.equalsIgnoreCase("no")) { + BlackjackPlayer.hitStay("no"); + System.out.println("The dealer's card was: " + BlackjackPlayer.viewHand(blackjackPlayer)); + + String hitOrStayAgain = Console.getUserInputString("Does the dealer want to stay? Yes or no..."); + if (hitOrStayAgain.equalsIgnoreCase("yes")) { + BlackJack.endTurn(); + dealersTurn = "no"; + playersTurn = "yes"; + break; + } + } + } + } } playAgain = Console.getUserInputString("Do you want to play another game of Blackjack?"); //the below line to retrieve the same player name from previous game if player wants to continue may fail... //so may need to rewrite, won't know until we test the game-play from console itself blackjackPlayer.getName(); + } while (playAgain.equals("no")); CardGames cardGames = new CardGames(); cardGames.chooseGameType(); @@ -110,14 +160,14 @@ public static void playGoFish() { goFishDeck.shuffle(); String playAgain = null; - do{ + do { System.out.println("Welcome to the Go Fish table!!!"); - for(int i =0; i <= 1; i++) { + for (int i = 0; i <= 1; i++) { goFish.createOnePlayer(Console.getUserInputString("What is your name?")); } - goFish.goFishPlayers.get(0).dealGoFishHand(goFish.goFishPlayers,goFishDeck); + goFish.goFishPlayers.get(0).dealGoFishHand(goFish.goFishPlayers, goFishDeck); goFish.showEverybodysHand(); @@ -132,8 +182,8 @@ public static void playGoFish() { CardGames cardGames = new CardGames(); cardGames.chooseGameType(); - } - } +} + From d63d508c30e9be2a0fe845d31794061ce56a325a Mon Sep 17 00:00:00 2001 From: jeffrey Date: Mon, 27 Nov 2017 17:29:55 -0500 Subject: [PATCH 34/34] still not working but getting better --- src/main/java/io/zipcoder/casino/Craps.java | 46 ++++++++---- .../java/io/zipcoder/casino/CrapsPlayer.java | 72 +++++++++++++++---- .../io/zipcoder/casino/GameInterface.java | 27 ++++--- src/main/java/io/zipcoder/casino/Player.java | 2 +- .../java/io/zipcoder/casino/CrapsTest.java | 36 +++------- 5 files changed, 118 insertions(+), 65 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Craps.java b/src/main/java/io/zipcoder/casino/Craps.java index 6bab61e0..c3c4d064 100644 --- a/src/main/java/io/zipcoder/casino/Craps.java +++ b/src/main/java/io/zipcoder/casino/Craps.java @@ -4,8 +4,9 @@ public class Craps extends DiceGames implements Dice { - - ArrayList crapsPlayers = new ArrayList<>(); +CrapsPlayer player; +double pot; + ArrayList crapsPlayers = new ArrayList<>(); public int getDiceRollTotal() { return diceRollTotal; @@ -13,20 +14,42 @@ public int getDiceRollTotal() { int diceRollTotal; - public void createOnePlayer(String name, Double money) { - CrapsPlayer newCrapsPlayer = new CrapsPlayer(name, money); + public void createOnePlayer(String name) { + CrapsPlayer newCrapsPlayer = new CrapsPlayer(name); crapsPlayers.add(newCrapsPlayer); } - public void addWinnings() { - for (CrapsPlayer player : crapsPlayers) { //for every player in ouyr craps player arraylist... do stuff - player.setMoney(player.getPlayerBet() * 2); +// public void createOnePlayer(String name){ +// CrapsPlayer newCrapsPlayer = new CrapsPlayer(name); +// } + + public void crapPlayerMoney(){ + //add chips to player player.addChips() + CrapsPlayer crapsPlayerBet = new CrapsPlayer() ; + } + + public void playersFirstRoll(){ + + setDiceRollTotal(); + player.setPlayerPoint(getDiceRollTotal()); + } + + //playerBet(Double bet){ + // pot =return double player.bet(bet) + // } + + public Double addWinnings() { + Double moMoney = 25.00; + for (CrapsPlayer player : createOnePlayer()) { + moMoney = player.getCrapPlayerBet() * 2; } + + return moMoney; } public void loseBet() { - for (CrapsPlayer player : crapsPlayers) { //for every player in ouyr craps player arraylist... do stuff - player.setPlayerBet(0.00); + for (CrapsPlayer player : createOnePlayer()) { //for every player in ouyr craps player arraylist... do stuff + player.setCrapPlayerBet(0.00); } } @@ -38,10 +61,7 @@ public void setDiceRollTotal(){ public static String gameMessage = " "; public static int gameStatus = 0; - public void playersFirstRoll(CrapsPlayer player){ - setDiceRollTotal(); - player.setPlayerPoint(getDiceRollTotal()); - } + public String firstRoll(CrapsPlayer player) { diff --git a/src/main/java/io/zipcoder/casino/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/CrapsPlayer.java index eb2dc531..9d8fb582 100644 --- a/src/main/java/io/zipcoder/casino/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/CrapsPlayer.java @@ -3,6 +3,45 @@ public class CrapsPlayer extends Player implements Gamble, Dice { private String name; + private Double crapPlayerMoney, playerMoney, crapPlayerBet, playerBet; + + + public CrapsPlayer(String name) { + } + + public static void crapPlayerMoney(Double playerMoney){ + + } + + public void crapPlayerBet(){ + System.out.println(Console.getUserInputDouble("How much would you like to bet?")); + } + + + + public void setCrapPlayerMoney(Double playerMoney){ + this.crapPlayerMoney = playerMoney; + } + + public Double getCrapPlayerMoney(){ + return playerMoney; + } + + public void setCrapPlayerBet(Double playerBet){ + this.crapPlayerBet = playerBet; + } + + public Double getCrapPlayerBet(){ + return playerBet; + } + + public Double crapPlayerMoneyAvailable(){ + Double moneyAvailable = 0.0; + Double getCrapPlayerMoney /*Total money available*/ = getCrapPlayerMoney(); + Double getCrapPlayerBet = getCrapPlayerBet(); + moneyAvailable = getCrapPlayerMoney - getCrapPlayerBet; + return moneyAvailable; + } public Double getMoney() { return money; @@ -16,15 +55,15 @@ public void setMoney(Double money) { private Card cardsInHand; private int playerPoint; - public Double getPlayerBet() { - return playerBet; - } - - public void setPlayerBet(Double playerBet) { - this.playerBet = playerBet; - } - - private Double playerBet; +// public Double getPlayerBet() { +// return playerBet; +// } +// +// public void setPlayerBet(Double playerBet) { +// this.bet = playerBet; +// } +// +// private Double playerBet; CrapsPlayer(String name, Double money) { super(name, money); @@ -39,16 +78,19 @@ public void addCardToHand(Card newCard) { cardsInHand.add(newCard); } + public void getBet(Double bet){ + this.bet = bet; + } -// public Double bet() { -// return null; -// } - public Double bet(Double bet) { + public Double bet(Double money) { money = money - bet; - this.playerBet = bet; - return bet; + return money; } +// public Double bet(Double money){ +// playerBet = money; +// return playerBet; +// } public int getPlayerPoint() { return playerPoint; diff --git a/src/main/java/io/zipcoder/casino/GameInterface.java b/src/main/java/io/zipcoder/casino/GameInterface.java index 712526e7..c4cfe3a9 100644 --- a/src/main/java/io/zipcoder/casino/GameInterface.java +++ b/src/main/java/io/zipcoder/casino/GameInterface.java @@ -9,22 +9,29 @@ public void playCraps() { String playAgain; do {Craps craps = new Craps(); + // CrapsPlayer player = new CrapsPlayer(); + System.out.println("Welcome to the craps table."); - int numberOfPlayer = Console.getUserInputInteger("Welcome to the craps table. How many people are playing?"); + // int numberOfPlayer = Console.getUserInputInteger("Welcome to the craps table. How many people are playing?"); //creates players - for(int i = 1; i <= numberOfPlayer; i++){ - craps.createOnePlayer(Console.getUserInputString("Player name:"), Console.getUserInputDouble("How much money would you like to bring to the table?")); - } + // for(int i = 1; i <= numberOfPlayer; i++){ + craps.createOnePlayer(Console.getUserInputString("Player name:")); + //} //get players bets - for(int b = 0; b <= numberOfPlayer; b++){ - System.out.println(craps.crapsPlayers.get(b).getName()); - Double playerBet = craps.crapsPlayers.get(b).bet(Console.getUserInputDouble(" please place bet")); - System.out.println(craps.crapsPlayers.get(b).getName()+" you bet " + playerBet); - } +// for(int b = 0; b <= numberOfPlayer; b++){ +// System.out.println(craps.crapsPlayers.get(b).getName()); +// Double playerBet = craps.crapsPlayers.get(b).bet(Console.getUserInputDouble(" please place bet")); +// System.out.println(craps.crapsPlayers.get(b).getName()+" you bet " + playerBet); +// } + + + CrapsPlayer.crapPlayerMoney(Console.getUserInputDouble("How many chips would you like to purchase?")); +// craps.takePlayerBet(Consol.Input) +// craps.playersFirstRoll(Console.) -// if(craps.firstRollChecker()) +// if() // // // System.out.println(craps.firstRoll(craps.crapsPlayers.get(0))); diff --git a/src/main/java/io/zipcoder/casino/Player.java b/src/main/java/io/zipcoder/casino/Player.java index d006e734..18b9c170 100644 --- a/src/main/java/io/zipcoder/casino/Player.java +++ b/src/main/java/io/zipcoder/casino/Player.java @@ -19,7 +19,7 @@ public String getName() { return name; } - private void bet(double bet) { + void bet(double bet) { this.bet = bet; } diff --git a/src/test/java/io/zipcoder/casino/CrapsTest.java b/src/test/java/io/zipcoder/casino/CrapsTest.java index d826c81f..a7a4aba4 100644 --- a/src/test/java/io/zipcoder/casino/CrapsTest.java +++ b/src/test/java/io/zipcoder/casino/CrapsTest.java @@ -8,17 +8,6 @@ public class CrapsTest { CrapsPlayer jeff = new CrapsPlayer("jeff", 50.00); Craps cPlayer = new Craps(); - @Test - public void bet() throws Exception { - } - - @Test - public void bet1() throws Exception { - } - - @Test - public void addWinnings() throws Exception { - } @Test public void firstRollForSeven() { @@ -96,19 +85,14 @@ public void nextRoll() { } -// @Test -// public void betTest() { -// Double expected = 10.0; -// Double actual = blackjackPlayer.bet(10.0); -// Assert.assertEquals(expected, actual); -// } -// -// @Test -// public void getWinningsTest() { -// Double expected = 1100.0; -// cPlayer.addWinnings(); -// Double actual = blackjackPlayer.checkBalance(); -// -// Assert.assertEquals(expected, actual); -// } + + + @Test + public void addWinningsTest() { + jeff.bet(25.00); + Double expected = 50.0; + Double actual = cPlayer.addWinnings(); + + Assert.assertEquals(expected, actual); + } }