From f362677cbe534fca5a058230cca5c7be920373a4 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Mon, 10 Jun 2019 21:09:51 -0400 Subject: [PATCH 01/71] rough stubbed out --- src/main/java/io/zipcoder/casino/Account.java | 14 ++++++++++++ src/main/java/io/zipcoder/casino/Card.java | 8 +++++++ src/main/java/io/zipcoder/casino/Deck.java | 7 ++++++ src/main/java/io/zipcoder/casino/Dice.java | 7 ++++++ .../io/zipcoder/casino/Games/Blackjack.java | 17 ++++++++++++++ .../io/zipcoder/casino/Games/CardGames.java | 17 ++++++++++++++ .../java/io/zipcoder/casino/Games/Craps.java | 14 ++++++++++++ .../java/io/zipcoder/casino/Games/Games.java | 7 ++++++ .../java/io/zipcoder/casino/Games/Poker.java | 16 ++++++++++++++ .../io/zipcoder/casino/Games/Roulette.java | 11 ++++++++++ .../java/io/zipcoder/casino/Games/Slots.java | 14 ++++++++++++ .../java/io/zipcoder/casino/GetPayout.java | 15 +++++++++++++ .../casino/Players/BlackJackPlayer.java | 4 ++++ .../zipcoder/casino/Players/CrapsPlayer.java | 13 +++++++++++ .../io/zipcoder/casino/Players/Gambler.java | 12 ++++++++++ .../zipcoder/casino/Players/PokerPlayer.java | 19 ++++++++++++++++ .../casino/Players/RoulettePlayer.java | 4 ++++ .../zipcoder/casino/Players/SlotsPlayer.java | 4 ++++ .../java/io/zipcoder/casino/AccountTest.java | 16 ++++++++++++++ .../java/io/zipcoder/casino/DiceTest.java | 12 ++++++++++ .../zipcoder/casino/Games/BlackjackTest.java | 20 +++++++++++++++++ .../zipcoder/casino/Games/CardGamesTest.java | 12 ++++++++++ .../io/zipcoder/casino/Games/CrapsTest.java | 12 ++++++++++ .../io/zipcoder/casino/Games/PokerTest.java | 20 +++++++++++++++++ .../zipcoder/casino/Games/RouletteTest.java | 12 ++++++++++ .../io/zipcoder/casino/Games/SlotsTest.java | 12 ++++++++++ .../io/zipcoder/casino/GetPayoutTest.java | 12 ++++++++++ .../casino/Players/BlackJackPlayerTest.java | 12 ++++++++++ .../casino/Players/CrapsPlayerTest.java | 16 ++++++++++++++ .../zipcoder/casino/Players/GamblerTest.java | 12 ++++++++++ .../casino/Players/PokerPlayerTest.java | 22 +++++++++++++++++++ .../casino/Players/RoulettePlayerTest.java | 12 ++++++++++ .../casino/Players/SlotsPlayerTest.java | 12 ++++++++++ 33 files changed, 417 insertions(+) create mode 100644 src/main/java/io/zipcoder/casino/Account.java create mode 100644 src/main/java/io/zipcoder/casino/Card.java create mode 100644 src/main/java/io/zipcoder/casino/Deck.java create mode 100644 src/main/java/io/zipcoder/casino/Dice.java create mode 100644 src/main/java/io/zipcoder/casino/Games/Blackjack.java create mode 100644 src/main/java/io/zipcoder/casino/Games/CardGames.java create mode 100644 src/main/java/io/zipcoder/casino/Games/Craps.java create mode 100644 src/main/java/io/zipcoder/casino/Games/Games.java create mode 100644 src/main/java/io/zipcoder/casino/Games/Poker.java create mode 100644 src/main/java/io/zipcoder/casino/Games/Roulette.java create mode 100644 src/main/java/io/zipcoder/casino/Games/Slots.java create mode 100644 src/main/java/io/zipcoder/casino/GetPayout.java create mode 100644 src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/Players/Gambler.java create mode 100644 src/main/java/io/zipcoder/casino/Players/PokerPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java create mode 100644 src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java create mode 100644 src/test/java/io/zipcoder/casino/AccountTest.java create mode 100644 src/test/java/io/zipcoder/casino/DiceTest.java create mode 100644 src/test/java/io/zipcoder/casino/Games/BlackjackTest.java create mode 100644 src/test/java/io/zipcoder/casino/Games/CardGamesTest.java create mode 100644 src/test/java/io/zipcoder/casino/Games/CrapsTest.java create mode 100644 src/test/java/io/zipcoder/casino/Games/PokerTest.java create mode 100644 src/test/java/io/zipcoder/casino/Games/RouletteTest.java create mode 100644 src/test/java/io/zipcoder/casino/Games/SlotsTest.java create mode 100644 src/test/java/io/zipcoder/casino/GetPayoutTest.java create mode 100644 src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/Players/GamblerTest.java create mode 100644 src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java diff --git a/src/main/java/io/zipcoder/casino/Account.java b/src/main/java/io/zipcoder/casino/Account.java new file mode 100644 index 000000000..c5294066e --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Account.java @@ -0,0 +1,14 @@ +package io.zipcoder.casino; + +public class Account { + Integer balance; + + public Integer getBalance() { + return balance; + } + + public void setBalance(Integer balance) { + this.balance += balance; + } + +} 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 000000000..0c5e3e3a7 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -0,0 +1,8 @@ +package io.zipcoder.casino; + +public class Card { + String suit; + String description; + Integer numVal; + +} 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 000000000..60a3c480f --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -0,0 +1,7 @@ +package io.zipcoder.casino; + +import java.util.ArrayList; + +public class Deck { + ArrayList Card = new ArrayList(); +} 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 000000000..cdbca329c --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Dice.java @@ -0,0 +1,7 @@ +package io.zipcoder.casino; + +public class Dice { + public Integer rollDice() { + return null; + } +} diff --git a/src/main/java/io/zipcoder/casino/Games/Blackjack.java b/src/main/java/io/zipcoder/casino/Games/Blackjack.java new file mode 100644 index 000000000..fe5a6f20d --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Games/Blackjack.java @@ -0,0 +1,17 @@ +package io.zipcoder.casino.Games; + +public class Blackjack extends CardGames { + Integer player1Score; + Integer player2Score; + + public Blackjack() { + } + + public void deal() { + + } + + public void getResult() { + + } +} diff --git a/src/main/java/io/zipcoder/casino/Games/CardGames.java b/src/main/java/io/zipcoder/casino/Games/CardGames.java new file mode 100644 index 000000000..b7a1e29e5 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Games/CardGames.java @@ -0,0 +1,17 @@ +package io.zipcoder.casino.Games; + +import io.zipcoder.casino.Card; +import io.zipcoder.casino.Deck; + +public class CardGames { + Deck deck; + + public CardGames() { + deck = new Deck(); + } + + public Card dealCard () { + return null; + } + +} diff --git a/src/main/java/io/zipcoder/casino/Games/Craps.java b/src/main/java/io/zipcoder/casino/Games/Craps.java new file mode 100644 index 000000000..6de598dd1 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Games/Craps.java @@ -0,0 +1,14 @@ +package io.zipcoder.casino.Games; + +public class Craps { + Boolean isOn; + Integer onNumber; + + public Craps(Boolean isOn) { + this.isOn = isOn; + } + + public void getResults () { + + } +} diff --git a/src/main/java/io/zipcoder/casino/Games/Games.java b/src/main/java/io/zipcoder/casino/Games/Games.java new file mode 100644 index 000000000..aba027c44 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Games/Games.java @@ -0,0 +1,7 @@ +package io.zipcoder.casino.Games; + + +public class Games { + + //create Player +} diff --git a/src/main/java/io/zipcoder/casino/Games/Poker.java b/src/main/java/io/zipcoder/casino/Games/Poker.java new file mode 100644 index 000000000..152a6273b --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Games/Poker.java @@ -0,0 +1,16 @@ +package io.zipcoder.casino.Games; + +public class Poker extends CardGames { + + public Poker() { + + } + + public void deal() { + + } + + public void gerResults() { + + } +} diff --git a/src/main/java/io/zipcoder/casino/Games/Roulette.java b/src/main/java/io/zipcoder/casino/Games/Roulette.java new file mode 100644 index 000000000..f332a3505 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Games/Roulette.java @@ -0,0 +1,11 @@ +package io.zipcoder.casino.Games; + +public class Roulette extends Games { + + public Roulette() { + } + + public void gerResults() { + + } +} diff --git a/src/main/java/io/zipcoder/casino/Games/Slots.java b/src/main/java/io/zipcoder/casino/Games/Slots.java new file mode 100644 index 000000000..9793af3f9 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Games/Slots.java @@ -0,0 +1,14 @@ +package io.zipcoder.casino.Games; + +public class Slots extends Games { + Integer numOfLines; + + public Slots(Integer num) { + this.numOfLines = num; + } + + + public void gerResults() { + + } +} diff --git a/src/main/java/io/zipcoder/casino/GetPayout.java b/src/main/java/io/zipcoder/casino/GetPayout.java new file mode 100644 index 000000000..fe74b007a --- /dev/null +++ b/src/main/java/io/zipcoder/casino/GetPayout.java @@ -0,0 +1,15 @@ +package io.zipcoder.casino; + +public class GetPayout { + Integer odds; + Integer playerBet; + + public GetPayout(Integer odds, Integer playerBet) { + this.odds = odds; + this.playerBet = playerBet; + } + + public void updateAccout() { + + } +} diff --git a/src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java new file mode 100644 index 000000000..6a594af63 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino.Players; + +public class BlackJackPlayer extends Gambler { +} diff --git a/src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java new file mode 100644 index 000000000..e14770539 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java @@ -0,0 +1,13 @@ +package io.zipcoder.casino.Players; + +import io.zipcoder.casino.Dice; + +public class CrapsPlayer extends Gambler { + + public Integer roll() { + Dice dice = new Dice(); + + return dice.rollDice(); + } + +} diff --git a/src/main/java/io/zipcoder/casino/Players/Gambler.java b/src/main/java/io/zipcoder/casino/Players/Gambler.java new file mode 100644 index 000000000..92f1e77f8 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Players/Gambler.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Players; + +import io.zipcoder.casino.Account; + +abstract class Gambler { + + public void updateAccout(Integer c) { + Account account = new Account(); + account.setBalance(c); + + } +} diff --git a/src/main/java/io/zipcoder/casino/Players/PokerPlayer.java b/src/main/java/io/zipcoder/casino/Players/PokerPlayer.java new file mode 100644 index 000000000..9cd0077e6 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Players/PokerPlayer.java @@ -0,0 +1,19 @@ +package io.zipcoder.casino.Players; + +import io.zipcoder.casino.Card; + +import java.security.PublicKey; +import java.util.ArrayList; + +public class PokerPlayer extends Gambler { + ArrayList hand = new ArrayList(); + + public void fold() { + + } + + public void check() { + + } +} + diff --git a/src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java new file mode 100644 index 000000000..a212421b1 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino.Players; + +public class RoulettePlayer extends Gambler { +} diff --git a/src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java b/src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java new file mode 100644 index 000000000..a7bf268da --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino.Players; + +public class SlotsPlayer extends Gambler { +} diff --git a/src/test/java/io/zipcoder/casino/AccountTest.java b/src/test/java/io/zipcoder/casino/AccountTest.java new file mode 100644 index 000000000..757bd8780 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/AccountTest.java @@ -0,0 +1,16 @@ +package io.zipcoder.casino; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class AccountTest { + + @Test + public void getBalance() { + } + + @Test + public void setBalance() { + } +} \ No newline at end of file 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 000000000..4dbb0c1fe --- /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() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/BlackjackTest.java b/src/test/java/io/zipcoder/casino/Games/BlackjackTest.java new file mode 100644 index 000000000..ebb237ff7 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Games/BlackjackTest.java @@ -0,0 +1,20 @@ +package io.zipcoder.casino.Games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class BlackjackTest { + + @Test + public void dealCard() { + } + + @Test + public void deal() { + } + + @Test + public void getResult() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/CardGamesTest.java b/src/test/java/io/zipcoder/casino/Games/CardGamesTest.java new file mode 100644 index 000000000..a8997ef46 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Games/CardGamesTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CardGamesTest { + + @Test + public void dealCard() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/CrapsTest.java b/src/test/java/io/zipcoder/casino/Games/CrapsTest.java new file mode 100644 index 000000000..bce1899bd --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Games/CrapsTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CrapsTest { + + @Test + public void getResults() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/PokerTest.java b/src/test/java/io/zipcoder/casino/Games/PokerTest.java new file mode 100644 index 000000000..2a140f9b0 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Games/PokerTest.java @@ -0,0 +1,20 @@ +package io.zipcoder.casino.Games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class PokerTest { + + @Test + public void dealCard() { + } + + @Test + public void deal() { + } + + @Test + public void gerResults() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/RouletteTest.java b/src/test/java/io/zipcoder/casino/Games/RouletteTest.java new file mode 100644 index 000000000..9323a7870 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Games/RouletteTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class RouletteTest { + + @Test + public void gerResults() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/SlotsTest.java b/src/test/java/io/zipcoder/casino/Games/SlotsTest.java new file mode 100644 index 000000000..158b94591 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Games/SlotsTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class SlotsTest { + + @Test + public void gerResults() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/GetPayoutTest.java b/src/test/java/io/zipcoder/casino/GetPayoutTest.java new file mode 100644 index 000000000..5a1e4e204 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/GetPayoutTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class GetPayoutTest { + + @Test + public void updateAccout() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java new file mode 100644 index 000000000..dcf0ce4fe --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Players; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class BlackJackPlayerTest { + + @Test + public void updateAccout() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java new file mode 100644 index 000000000..d6198731c --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java @@ -0,0 +1,16 @@ +package io.zipcoder.casino.Players; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CrapsPlayerTest { + + @Test + public void updateAccout() { + } + + @Test + public void roll() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/GamblerTest.java b/src/test/java/io/zipcoder/casino/Players/GamblerTest.java new file mode 100644 index 000000000..335cb46da --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Players/GamblerTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Players; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class GamblerTest { + + @Test + public void updateAccout() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java new file mode 100644 index 000000000..2869a74c8 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java @@ -0,0 +1,22 @@ +package io.zipcoder.casino.Players; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class PokerPlayerTest { + + @Test + public void updateAccout() { + } + + @Test + public void fold() { + } + + @Test + public void check() { + } + + +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java b/src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java new file mode 100644 index 000000000..e7bbfe686 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Players; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class RoulettePlayerTest { + + @Test + public void updateAccout() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java new file mode 100644 index 000000000..d40debea8 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java @@ -0,0 +1,12 @@ +package io.zipcoder.casino.Players; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class SlotsPlayerTest { + + @Test + public void updateAccout() { + } +} \ No newline at end of file From 06d62a88771d57686868da9e95efe757d42218b1 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Mon, 10 Jun 2019 21:12:47 -0400 Subject: [PATCH 02/71] rough stubbed out --- src/main/java/io/zipcoder/casino/Account.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/zipcoder/casino/Account.java b/src/main/java/io/zipcoder/casino/Account.java index c5294066e..f6300a730 100644 --- a/src/main/java/io/zipcoder/casino/Account.java +++ b/src/main/java/io/zipcoder/casino/Account.java @@ -12,3 +12,4 @@ public void setBalance(Integer balance) { } } +// \ No newline at end of file From 4b8f8d2fe393d16231e8bd100953fd2886075ad7 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Tue, 11 Jun 2019 18:58:01 -0400 Subject: [PATCH 03/71] stubbed first --- src/main/java/io/zipcoder/casino/Account.java | 15 ---- src/main/java/io/zipcoder/casino/Card.java | 9 ++- src/main/java/io/zipcoder/casino/Casino.java | 2 + src/main/java/io/zipcoder/casino/Deck.java | 9 ++- .../io/zipcoder/casino/Games/Blackjack.java | 17 ----- .../java/io/zipcoder/casino/Games/Craps.java | 14 ---- .../java/io/zipcoder/casino/Games/Games.java | 7 -- .../java/io/zipcoder/casino/Games/Poker.java | 16 ---- .../io/zipcoder/casino/Games/Roulette.java | 11 --- .../java/io/zipcoder/casino/Games/Slots.java | 14 ---- .../java/io/zipcoder/casino/GetPayout.java | 15 ---- src/main/java/io/zipcoder/casino/Handler.java | 35 +++++++++ .../casino/Players/BlackJackPlayer.java | 4 - .../zipcoder/casino/Players/CrapsPlayer.java | 13 ---- .../io/zipcoder/casino/Players/Gambler.java | 12 --- .../zipcoder/casino/Players/PokerPlayer.java | 19 ----- .../casino/Players/RoulettePlayer.java | 4 - .../zipcoder/casino/Players/SlotsPlayer.java | 4 - .../io/zipcoder/casino/games/Blackjack.java | 51 +++++++++++++ .../casino/{Games => games}/CardGames.java | 2 +- .../java/io/zipcoder/casino/games/Craps.java | 76 +++++++++++++++++++ .../casino/games/GamblerGameInterface.java | 8 ++ .../java/io/zipcoder/casino/games/Games.java | 16 ++++ .../java/io/zipcoder/casino/games/GoFish.java | 33 ++++++++ .../io/zipcoder/casino/games/Roulette.java | 16 ++++ .../java/io/zipcoder/casino/games/Slots.java | 18 +++++ .../casino/player/BlackJackPlayer.java | 20 +++++ .../casino/player/BlackJackPlayerNPC.java | 4 + .../zipcoder/casino/player/CrapsPlayer.java | 24 ++++++ .../casino/player/GamblerInterface.java | 13 ++++ .../zipcoder/casino/player/GoFishPlayer.java | 10 +++ .../casino/player/GoFishPlayerNPC.java | 5 ++ .../zipcoder/casino/player/NPCInterface.java | 9 +++ .../io/zipcoder/casino/player/Player.java | 23 ++++++ .../casino/player/RoulettePlayer.java | 17 +++++ .../zipcoder/casino/player/SlotsPlayer.java | 16 ++++ .../java/io/zipcoder/casino/AccountTest.java | 16 ---- .../java/io/zipcoder/casino/CasinoTest.java | 5 -- .../java/io/zipcoder/casino/DiceTest.java | 12 --- .../zipcoder/casino/Games/BlackjackTest.java | 20 ----- .../zipcoder/casino/Games/CardGamesTest.java | 12 --- .../io/zipcoder/casino/Games/CrapsTest.java | 12 --- .../io/zipcoder/casino/Games/PokerTest.java | 20 ----- .../zipcoder/casino/Games/RouletteTest.java | 12 --- .../io/zipcoder/casino/Games/SlotsTest.java | 12 --- .../io/zipcoder/casino/GetPayoutTest.java | 12 --- .../casino/Players/BlackJackPlayerTest.java | 12 --- .../casino/Players/CrapsPlayerTest.java | 16 ---- .../zipcoder/casino/Players/GamblerTest.java | 12 --- .../casino/Players/PokerPlayerTest.java | 22 ------ .../casino/Players/RoulettePlayerTest.java | 12 --- .../casino/Players/SlotsPlayerTest.java | 12 --- 52 files changed, 411 insertions(+), 389 deletions(-) delete mode 100644 src/main/java/io/zipcoder/casino/Account.java delete mode 100644 src/main/java/io/zipcoder/casino/Games/Blackjack.java delete mode 100644 src/main/java/io/zipcoder/casino/Games/Craps.java delete mode 100644 src/main/java/io/zipcoder/casino/Games/Games.java delete mode 100644 src/main/java/io/zipcoder/casino/Games/Poker.java delete mode 100644 src/main/java/io/zipcoder/casino/Games/Roulette.java delete mode 100644 src/main/java/io/zipcoder/casino/Games/Slots.java delete mode 100644 src/main/java/io/zipcoder/casino/GetPayout.java create mode 100644 src/main/java/io/zipcoder/casino/Handler.java delete mode 100644 src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java delete mode 100644 src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java delete mode 100644 src/main/java/io/zipcoder/casino/Players/Gambler.java delete mode 100644 src/main/java/io/zipcoder/casino/Players/PokerPlayer.java delete mode 100644 src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java delete mode 100644 src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/games/Blackjack.java rename src/main/java/io/zipcoder/casino/{Games => games}/CardGames.java (86%) create mode 100644 src/main/java/io/zipcoder/casino/games/Craps.java create mode 100644 src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java create mode 100644 src/main/java/io/zipcoder/casino/games/Games.java create mode 100644 src/main/java/io/zipcoder/casino/games/GoFish.java create mode 100644 src/main/java/io/zipcoder/casino/games/Roulette.java create mode 100644 src/main/java/io/zipcoder/casino/games/Slots.java create mode 100644 src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java create mode 100644 src/main/java/io/zipcoder/casino/player/CrapsPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/player/GamblerInterface.java create mode 100644 src/main/java/io/zipcoder/casino/player/GoFishPlayer.java create mode 100644 src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java create mode 100644 src/main/java/io/zipcoder/casino/player/NPCInterface.java create mode 100644 src/main/java/io/zipcoder/casino/player/Player.java create mode 100644 src/main/java/io/zipcoder/casino/player/RoulettePlayer.java create mode 100644 src/main/java/io/zipcoder/casino/player/SlotsPlayer.java delete mode 100644 src/test/java/io/zipcoder/casino/AccountTest.java delete mode 100644 src/test/java/io/zipcoder/casino/CasinoTest.java delete mode 100644 src/test/java/io/zipcoder/casino/DiceTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Games/BlackjackTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Games/CardGamesTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Games/CrapsTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Games/PokerTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Games/RouletteTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Games/SlotsTest.java delete mode 100644 src/test/java/io/zipcoder/casino/GetPayoutTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Players/GamblerTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java delete mode 100644 src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java diff --git a/src/main/java/io/zipcoder/casino/Account.java b/src/main/java/io/zipcoder/casino/Account.java deleted file mode 100644 index f6300a730..000000000 --- a/src/main/java/io/zipcoder/casino/Account.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.zipcoder.casino; - -public class Account { - Integer balance; - - public Integer getBalance() { - return balance; - } - - public void setBalance(Integer balance) { - this.balance += balance; - } - -} -// \ 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 0c5e3e3a7..8d256d548 100644 --- a/src/main/java/io/zipcoder/casino/Card.java +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -1,8 +1,11 @@ package io.zipcoder.casino; public class Card { - String suit; - String description; - Integer numVal; + Integer cardVal; + public enum cardValue { + } + + public enum cardSuit { + } } diff --git a/src/main/java/io/zipcoder/casino/Casino.java b/src/main/java/io/zipcoder/casino/Casino.java index 16ca0dd74..93dbdced3 100644 --- a/src/main/java/io/zipcoder/casino/Casino.java +++ b/src/main/java/io/zipcoder/casino/Casino.java @@ -4,5 +4,7 @@ public class Casino { public static void main(String[] args) { // write your tests before you start fucking with this + Handler handler = new Handler(); + handler.run(); } } diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index 60a3c480f..b5b8d1edd 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -1,7 +1,14 @@ package io.zipcoder.casino; import java.util.ArrayList; +import java.util.Stack; public class Deck { - ArrayList Card = new ArrayList(); + Stack Card = new Stack(); + + public void shuffle () {}; + + public ArrayList deal (Integer numOfCards) { + return null; + } } diff --git a/src/main/java/io/zipcoder/casino/Games/Blackjack.java b/src/main/java/io/zipcoder/casino/Games/Blackjack.java deleted file mode 100644 index fe5a6f20d..000000000 --- a/src/main/java/io/zipcoder/casino/Games/Blackjack.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.zipcoder.casino.Games; - -public class Blackjack extends CardGames { - Integer player1Score; - Integer player2Score; - - public Blackjack() { - } - - public void deal() { - - } - - public void getResult() { - - } -} diff --git a/src/main/java/io/zipcoder/casino/Games/Craps.java b/src/main/java/io/zipcoder/casino/Games/Craps.java deleted file mode 100644 index 6de598dd1..000000000 --- a/src/main/java/io/zipcoder/casino/Games/Craps.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.zipcoder.casino.Games; - -public class Craps { - Boolean isOn; - Integer onNumber; - - public Craps(Boolean isOn) { - this.isOn = isOn; - } - - public void getResults () { - - } -} diff --git a/src/main/java/io/zipcoder/casino/Games/Games.java b/src/main/java/io/zipcoder/casino/Games/Games.java deleted file mode 100644 index aba027c44..000000000 --- a/src/main/java/io/zipcoder/casino/Games/Games.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.zipcoder.casino.Games; - - -public class Games { - - //create Player -} diff --git a/src/main/java/io/zipcoder/casino/Games/Poker.java b/src/main/java/io/zipcoder/casino/Games/Poker.java deleted file mode 100644 index 152a6273b..000000000 --- a/src/main/java/io/zipcoder/casino/Games/Poker.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.zipcoder.casino.Games; - -public class Poker extends CardGames { - - public Poker() { - - } - - public void deal() { - - } - - public void gerResults() { - - } -} diff --git a/src/main/java/io/zipcoder/casino/Games/Roulette.java b/src/main/java/io/zipcoder/casino/Games/Roulette.java deleted file mode 100644 index f332a3505..000000000 --- a/src/main/java/io/zipcoder/casino/Games/Roulette.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.zipcoder.casino.Games; - -public class Roulette extends Games { - - public Roulette() { - } - - public void gerResults() { - - } -} diff --git a/src/main/java/io/zipcoder/casino/Games/Slots.java b/src/main/java/io/zipcoder/casino/Games/Slots.java deleted file mode 100644 index 9793af3f9..000000000 --- a/src/main/java/io/zipcoder/casino/Games/Slots.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.zipcoder.casino.Games; - -public class Slots extends Games { - Integer numOfLines; - - public Slots(Integer num) { - this.numOfLines = num; - } - - - public void gerResults() { - - } -} diff --git a/src/main/java/io/zipcoder/casino/GetPayout.java b/src/main/java/io/zipcoder/casino/GetPayout.java deleted file mode 100644 index fe74b007a..000000000 --- a/src/main/java/io/zipcoder/casino/GetPayout.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.zipcoder.casino; - -public class GetPayout { - Integer odds; - Integer playerBet; - - public GetPayout(Integer odds, Integer playerBet) { - this.odds = odds; - this.playerBet = playerBet; - } - - public void updateAccout() { - - } -} diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java new file mode 100644 index 000000000..f967396d2 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -0,0 +1,35 @@ +package io.zipcoder.casino; + +import io.zipcoder.casino.games.*; +import io.zipcoder.casino.player.Player; +import io.zipcoder.casino.utilities.Console; + +public class Handler { +void run() { + String input = ""; + Integer intergerInput = 0; + + //Console console = new Console(); + Player player = new Player(); + + switch (intergerInput) { + case 0 : + Blackjack blackjack = new Blackjack(); + break; + case 1 : + GoFish goFish = new GoFish(); + break; + case 2: + Roulette roulette = new Roulette(); + break; + case 3: + Craps craps = new Craps(false); + break; + case 4: + Slots slots = new Slots(); + break; + default: + System.out.println("you blew it"); + } +} +} diff --git a/src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java deleted file mode 100644 index 6a594af63..000000000 --- a/src/main/java/io/zipcoder/casino/Players/BlackJackPlayer.java +++ /dev/null @@ -1,4 +0,0 @@ -package io.zipcoder.casino.Players; - -public class BlackJackPlayer extends Gambler { -} diff --git a/src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java deleted file mode 100644 index e14770539..000000000 --- a/src/main/java/io/zipcoder/casino/Players/CrapsPlayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.zipcoder.casino.Players; - -import io.zipcoder.casino.Dice; - -public class CrapsPlayer extends Gambler { - - public Integer roll() { - Dice dice = new Dice(); - - return dice.rollDice(); - } - -} diff --git a/src/main/java/io/zipcoder/casino/Players/Gambler.java b/src/main/java/io/zipcoder/casino/Players/Gambler.java deleted file mode 100644 index 92f1e77f8..000000000 --- a/src/main/java/io/zipcoder/casino/Players/Gambler.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Players; - -import io.zipcoder.casino.Account; - -abstract class Gambler { - - public void updateAccout(Integer c) { - Account account = new Account(); - account.setBalance(c); - - } -} diff --git a/src/main/java/io/zipcoder/casino/Players/PokerPlayer.java b/src/main/java/io/zipcoder/casino/Players/PokerPlayer.java deleted file mode 100644 index 9cd0077e6..000000000 --- a/src/main/java/io/zipcoder/casino/Players/PokerPlayer.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.zipcoder.casino.Players; - -import io.zipcoder.casino.Card; - -import java.security.PublicKey; -import java.util.ArrayList; - -public class PokerPlayer extends Gambler { - ArrayList hand = new ArrayList(); - - public void fold() { - - } - - public void check() { - - } -} - diff --git a/src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java deleted file mode 100644 index a212421b1..000000000 --- a/src/main/java/io/zipcoder/casino/Players/RoulettePlayer.java +++ /dev/null @@ -1,4 +0,0 @@ -package io.zipcoder.casino.Players; - -public class RoulettePlayer extends Gambler { -} diff --git a/src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java b/src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java deleted file mode 100644 index a7bf268da..000000000 --- a/src/main/java/io/zipcoder/casino/Players/SlotsPlayer.java +++ /dev/null @@ -1,4 +0,0 @@ -package io.zipcoder.casino.Players; - -public class SlotsPlayer extends Gambler { -} diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java new file mode 100644 index 000000000..4e9f86b36 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -0,0 +1,51 @@ +package io.zipcoder.casino.games; + +import io.zipcoder.casino.Card; +import io.zipcoder.casino.Deck; +import io.zipcoder.casino.player.BlackJackPlayer; +import io.zipcoder.casino.player.BlackJackPlayerNPC; + +public class Blackjack extends CardGames implements GamblerGameInterface { + BlackJackPlayer player1 = new BlackJackPlayer(); + BlackJackPlayerNPC player2 = new BlackJackPlayerNPC(); + Deck deck = new Deck(); + private Integer player1Score; + private Integer player2Score; + + + public Integer calcPayment(Integer bet, Integer odds) { + return null; + } + + public void updateAccount(Integer num) { + + } + + public void stay() {}; + + public void spilt() {}; + + public void doubleDown(){}; + + public Card hit() { + return null; + } + + public Integer getPlayer1Score() { + return player1Score; + } + + public void setPlayer1Score(Integer player1Score) { + this.player1Score = player1Score; + } + + public Integer getPlayer2Score() { + return player2Score; + } + + public void setPlayer2Score(Integer player2Score) { + this.player2Score = player2Score; + } + + +} diff --git a/src/main/java/io/zipcoder/casino/Games/CardGames.java b/src/main/java/io/zipcoder/casino/games/CardGames.java similarity index 86% rename from src/main/java/io/zipcoder/casino/Games/CardGames.java rename to src/main/java/io/zipcoder/casino/games/CardGames.java index b7a1e29e5..8e92f35ae 100644 --- a/src/main/java/io/zipcoder/casino/Games/CardGames.java +++ b/src/main/java/io/zipcoder/casino/games/CardGames.java @@ -1,4 +1,4 @@ -package io.zipcoder.casino.Games; +package io.zipcoder.casino.games; import io.zipcoder.casino.Card; import io.zipcoder.casino.Deck; diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java new file mode 100644 index 000000000..a92f159dd --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -0,0 +1,76 @@ +package io.zipcoder.casino.games; + +public class Craps extends Games implements GamblerGameInterface { + private Boolean isOn; + private Integer onNumber; + private Integer firstLineBet; + private Integer secondLineBet; + private Integer otherBet; + + public Craps(Boolean isOn) { + this.isOn = isOn; + } + + + public Integer calcPayment(Integer bet, Integer odds) { + return null; + } + + public void updateAccount(Integer num) { + + } + + @Override + boolean getResults() { + return false; + } + + @Override + public void display(String output) { + super.display(output); + } + + public Boolean getOn() { + return isOn; + } + + public void setOn(Boolean on) { + isOn = on; + } + + public Integer getOnNumber() { + return onNumber; + } + + public void setOnNumber(Integer onNumber) { + this.onNumber = onNumber; + } + + public Integer getFirstLineBet() { + return firstLineBet; + } + + public void setFirstLineBet(Integer firstLineBet) { + this.firstLineBet = firstLineBet; + } + + public Integer getSecondLineBet() { + return secondLineBet; + } + + public void setSecondLineBet(Integer secondLineBet) { + this.secondLineBet = secondLineBet; + } + + public Integer getOtherBet() { + return otherBet; + } + + public void setOtherBet(Integer otherBet) { + this.otherBet = otherBet; + } + + + + +} diff --git a/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java new file mode 100644 index 000000000..328c47ed0 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java @@ -0,0 +1,8 @@ +package io.zipcoder.casino.games; + +interface GamblerGameInterface { + Integer calcPayment(Integer bet, Integer odds); + + + void updateAccount(Integer num); +} diff --git a/src/main/java/io/zipcoder/casino/games/Games.java b/src/main/java/io/zipcoder/casino/games/Games.java new file mode 100644 index 000000000..b5dddd40f --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/Games.java @@ -0,0 +1,16 @@ +package io.zipcoder.casino.games; + + +import java.security.PublicKey; + +abstract class Games { + Integer odds; + + abstract boolean getResults(); + + public void display(String output) { + System.out.println(output); + } + + +} diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java new file mode 100644 index 000000000..8ebc904d5 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -0,0 +1,33 @@ +package io.zipcoder.casino.games; + +import io.zipcoder.casino.Card; +import io.zipcoder.casino.Deck; +import io.zipcoder.casino.player.GoFishPlayer; +import io.zipcoder.casino.player.GoFishPlayerNPC; + +public class GoFish extends Games { + GoFishPlayer player1 = new GoFishPlayer(); + GoFishPlayerNPC player2 = new GoFishPlayerNPC(); + Deck deck = new Deck(); + private Integer player1Score; + private Integer player2Score; + + + @Override + boolean getResults() { + return false; + } + + @Override + public void display(String output) { + super.display(output); + } + + public Card check (Integer query) { + return null; + }; + + public Card goFish () { + return null; + }; +} diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java new file mode 100644 index 000000000..ed70392d9 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -0,0 +1,16 @@ +package io.zipcoder.casino.games; + +public class Roulette extends Games { + String betType; // red/back - odd / even / number + + + @Override + boolean getResults() { + return false; + } + + @Override + public void display(String output) { + super.display(output); + } +} diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java new file mode 100644 index 000000000..06508aaf1 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -0,0 +1,18 @@ +package io.zipcoder.casino.games; + +public class Slots extends Games { + Integer numOfLines; + + public Slots(){} + + + @Override + boolean getResults() { + return false; + } + + @Override + public void display(String output) { + super.display(output); + } +} diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java new file mode 100644 index 000000000..258980c24 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -0,0 +1,20 @@ +package io.zipcoder.casino.player; + +import io.zipcoder.casino.Card; + + +import java.util.ArrayList; + +public class BlackJackPlayer extends Player implements GamblerInterface { + ArrayList hand; + + + public void bet(Integer bet) { + } + + public void betType (String betType) { + } + + public void cashout() { + } +} diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java new file mode 100644 index 000000000..2054495c3 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java @@ -0,0 +1,4 @@ +package io.zipcoder.casino.player; + +public class BlackJackPlayerNPC { +} diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java new file mode 100644 index 000000000..72d913c09 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -0,0 +1,24 @@ +package io.zipcoder.casino.player; + +import io.zipcoder.casino.Dice; + + +public class CrapsPlayer extends Player implements GamblerInterface { + + public Integer roll() { + Dice dice = new Dice(); + + return dice.rollDice(); + } + + public void bet(Integer bet) { + } + + public void betType(String betType) { + + } + + public void cashout() { + + } +} diff --git a/src/main/java/io/zipcoder/casino/player/GamblerInterface.java b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java new file mode 100644 index 000000000..8535a491b --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java @@ -0,0 +1,13 @@ +package io.zipcoder.casino.player; + +public interface GamblerInterface { + void bet(Integer bet); + + void betType (String betType); + + void cashout(); + + + + +} diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java new file mode 100644 index 000000000..3c3b340ef --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -0,0 +1,10 @@ +package io.zipcoder.casino.player; + +import io.zipcoder.casino.Card; + +import java.util.ArrayList; + +public class GoFishPlayer { + ArrayList hand; + +} diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java new file mode 100644 index 000000000..f137c7566 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java @@ -0,0 +1,5 @@ +package io.zipcoder.casino.player; + +public class GoFishPlayerNPC { + +} diff --git a/src/main/java/io/zipcoder/casino/player/NPCInterface.java b/src/main/java/io/zipcoder/casino/player/NPCInterface.java new file mode 100644 index 000000000..30421fb32 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/NPCInterface.java @@ -0,0 +1,9 @@ +package io.zipcoder.casino.player; + +interface NPCInterface { + void bet(Integer bet); + + void betType (String betType); + + void logicNPC(); +} diff --git a/src/main/java/io/zipcoder/casino/player/Player.java b/src/main/java/io/zipcoder/casino/player/Player.java new file mode 100644 index 000000000..b4f2df8f3 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/Player.java @@ -0,0 +1,23 @@ +package io.zipcoder.casino.player; + +public class Player { +private String name; +Integer account; + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getAccount() { + return account; + } + + public void setAccount(Integer account) { + this.account = account; + } +} diff --git a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java new file mode 100644 index 000000000..d30ff04ee --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java @@ -0,0 +1,17 @@ +package io.zipcoder.casino.player; + +public class RoulettePlayer extends Player implements GamblerInterface { + + + public void bet(Integer bet) { + + } + + public void betType (String betType) { + + }; + + public void cashout() { + + } +} diff --git a/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java new file mode 100644 index 000000000..f5e990a43 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java @@ -0,0 +1,16 @@ +package io.zipcoder.casino.player; + +public class SlotsPlayer extends Player implements GamblerInterface { + + public void bet(Integer bet) { + + } + + public void betType (String betType) { + + }; + + public void cashout() { + + } +} diff --git a/src/test/java/io/zipcoder/casino/AccountTest.java b/src/test/java/io/zipcoder/casino/AccountTest.java deleted file mode 100644 index 757bd8780..000000000 --- a/src/test/java/io/zipcoder/casino/AccountTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.zipcoder.casino; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class AccountTest { - - @Test - public void getBalance() { - } - - @Test - public void setBalance() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/CasinoTest.java b/src/test/java/io/zipcoder/casino/CasinoTest.java deleted file mode 100644 index e92865236..000000000 --- a/src/test/java/io/zipcoder/casino/CasinoTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.zipcoder.casino; - - -public class CasinoTest { -} diff --git a/src/test/java/io/zipcoder/casino/DiceTest.java b/src/test/java/io/zipcoder/casino/DiceTest.java deleted file mode 100644 index 4dbb0c1fe..000000000 --- a/src/test/java/io/zipcoder/casino/DiceTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class DiceTest { - - @Test - public void rollDice() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/BlackjackTest.java b/src/test/java/io/zipcoder/casino/Games/BlackjackTest.java deleted file mode 100644 index ebb237ff7..000000000 --- a/src/test/java/io/zipcoder/casino/Games/BlackjackTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.zipcoder.casino.Games; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class BlackjackTest { - - @Test - public void dealCard() { - } - - @Test - public void deal() { - } - - @Test - public void getResult() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/CardGamesTest.java b/src/test/java/io/zipcoder/casino/Games/CardGamesTest.java deleted file mode 100644 index a8997ef46..000000000 --- a/src/test/java/io/zipcoder/casino/Games/CardGamesTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Games; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class CardGamesTest { - - @Test - public void dealCard() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/CrapsTest.java b/src/test/java/io/zipcoder/casino/Games/CrapsTest.java deleted file mode 100644 index bce1899bd..000000000 --- a/src/test/java/io/zipcoder/casino/Games/CrapsTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Games; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class CrapsTest { - - @Test - public void getResults() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/PokerTest.java b/src/test/java/io/zipcoder/casino/Games/PokerTest.java deleted file mode 100644 index 2a140f9b0..000000000 --- a/src/test/java/io/zipcoder/casino/Games/PokerTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.zipcoder.casino.Games; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class PokerTest { - - @Test - public void dealCard() { - } - - @Test - public void deal() { - } - - @Test - public void gerResults() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/RouletteTest.java b/src/test/java/io/zipcoder/casino/Games/RouletteTest.java deleted file mode 100644 index 9323a7870..000000000 --- a/src/test/java/io/zipcoder/casino/Games/RouletteTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Games; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class RouletteTest { - - @Test - public void gerResults() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Games/SlotsTest.java b/src/test/java/io/zipcoder/casino/Games/SlotsTest.java deleted file mode 100644 index 158b94591..000000000 --- a/src/test/java/io/zipcoder/casino/Games/SlotsTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Games; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class SlotsTest { - - @Test - public void gerResults() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/GetPayoutTest.java b/src/test/java/io/zipcoder/casino/GetPayoutTest.java deleted file mode 100644 index 5a1e4e204..000000000 --- a/src/test/java/io/zipcoder/casino/GetPayoutTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class GetPayoutTest { - - @Test - public void updateAccout() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java deleted file mode 100644 index dcf0ce4fe..000000000 --- a/src/test/java/io/zipcoder/casino/Players/BlackJackPlayerTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Players; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class BlackJackPlayerTest { - - @Test - public void updateAccout() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java deleted file mode 100644 index d6198731c..000000000 --- a/src/test/java/io/zipcoder/casino/Players/CrapsPlayerTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.zipcoder.casino.Players; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class CrapsPlayerTest { - - @Test - public void updateAccout() { - } - - @Test - public void roll() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/GamblerTest.java b/src/test/java/io/zipcoder/casino/Players/GamblerTest.java deleted file mode 100644 index 335cb46da..000000000 --- a/src/test/java/io/zipcoder/casino/Players/GamblerTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Players; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class GamblerTest { - - @Test - public void updateAccout() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java deleted file mode 100644 index 2869a74c8..000000000 --- a/src/test/java/io/zipcoder/casino/Players/PokerPlayerTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.zipcoder.casino.Players; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class PokerPlayerTest { - - @Test - public void updateAccout() { - } - - @Test - public void fold() { - } - - @Test - public void check() { - } - - -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java b/src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java deleted file mode 100644 index e7bbfe686..000000000 --- a/src/test/java/io/zipcoder/casino/Players/RoulettePlayerTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Players; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class RoulettePlayerTest { - - @Test - public void updateAccout() { - } -} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java b/src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java deleted file mode 100644 index d40debea8..000000000 --- a/src/test/java/io/zipcoder/casino/Players/SlotsPlayerTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino.Players; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class SlotsPlayerTest { - - @Test - public void updateAccout() { - } -} \ No newline at end of file From 0d2617a966dbd87863b894b19bcc10eab9670b5c Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Tue, 11 Jun 2019 20:13:30 -0400 Subject: [PATCH 04/71] stubbed second --- src/main/java/io/zipcoder/casino/Handler.java | 3 +-- .../java/io/zipcoder/casino/games/Blackjack.java | 16 +++++++++++++--- .../java/io/zipcoder/casino/games/CardGames.java | 13 +++++++++++-- .../java/io/zipcoder/casino/games/Craps.java | 10 ++++------ .../java/io/zipcoder/casino/games/GoFish.java | 6 ++++++ .../java/io/zipcoder/casino/games/Slots.java | 1 - .../zipcoder/casino/player/BlackJackPlayer.java | 7 ++++++- .../casino/player/BlackJackPlayerNPC.java | 13 ++++++++++++- .../io/zipcoder/casino/player/GoFishPlayer.java | 6 +++++- .../zipcoder/casino/player/GoFishPlayerNPC.java | 16 +++++++++++++++- 10 files changed, 73 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index f967396d2..2960b4835 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -1,5 +1,4 @@ package io.zipcoder.casino; - import io.zipcoder.casino.games.*; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; @@ -23,7 +22,7 @@ void run() { Roulette roulette = new Roulette(); break; case 3: - Craps craps = new Craps(false); + Craps craps = new Craps(); break; case 4: Slots slots = new Slots(); diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index 4e9f86b36..9f92b44ac 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -4,22 +4,32 @@ import io.zipcoder.casino.Deck; import io.zipcoder.casino.player.BlackJackPlayer; import io.zipcoder.casino.player.BlackJackPlayerNPC; +import io.zipcoder.casino.utilities.Console; public class Blackjack extends CardGames implements GamblerGameInterface { + BlackJackPlayer player1 = new BlackJackPlayer(); BlackJackPlayerNPC player2 = new BlackJackPlayerNPC(); - Deck deck = new Deck(); + private Integer player1Score; private Integer player2Score; + public Blackjack() { + super(); + this.odds = 2; + this.player1Score = 0; + this.player2Score = 0; + } + + public Integer calcPayment(Integer bet, Integer odds) { return null; } - public void updateAccount(Integer num) { + public void updateAccount(Integer num) {} + - } public void stay() {}; diff --git a/src/main/java/io/zipcoder/casino/games/CardGames.java b/src/main/java/io/zipcoder/casino/games/CardGames.java index 8e92f35ae..b73f5f434 100644 --- a/src/main/java/io/zipcoder/casino/games/CardGames.java +++ b/src/main/java/io/zipcoder/casino/games/CardGames.java @@ -3,15 +3,24 @@ import io.zipcoder.casino.Card; import io.zipcoder.casino.Deck; -public class CardGames { +abstract class CardGames extends Games { Deck deck; public CardGames() { - deck = new Deck(); + this.deck = new Deck(); } public Card dealCard () { return null; } + @Override + boolean getResults() { + return false; + } + + @Override + public void display(String output) { + super.display(output); + } } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index a92f159dd..6473c9c7b 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -1,17 +1,15 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.player.CrapsPlayer; + public class Craps extends Games implements GamblerGameInterface { - private Boolean isOn; + private CrapsPlayer crapsPlayer = new CrapsPlayer(); + private Boolean isOn = false; private Integer onNumber; private Integer firstLineBet; private Integer secondLineBet; private Integer otherBet; - public Craps(Boolean isOn) { - this.isOn = isOn; - } - - public Integer calcPayment(Integer bet, Integer odds) { return null; } diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 8ebc904d5..dd7994d13 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -12,6 +12,12 @@ public class GoFish extends Games { private Integer player1Score; private Integer player2Score; + public GoFish() { + super(); + this.player1Score = 0; + this.player2Score = 0; + } + @Override boolean getResults() { diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 06508aaf1..34cc82b7b 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -5,7 +5,6 @@ public class Slots extends Games { public Slots(){} - @Override boolean getResults() { return false; diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java index 258980c24..93fff3f29 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -1,14 +1,19 @@ package io.zipcoder.casino.player; import io.zipcoder.casino.Card; +import io.zipcoder.casino.Deck; import java.util.ArrayList; public class BlackJackPlayer extends Player implements GamblerInterface { - ArrayList hand; + ArrayList hand; + public BlackJackPlayer(){ + super(); + this.hand = new ArrayList(); + } public void bet(Integer bet) { } diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java index 2054495c3..807a326d0 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java @@ -1,4 +1,15 @@ package io.zipcoder.casino.player; -public class BlackJackPlayerNPC { +public class BlackJackPlayerNPC implements NPCInterface { + public void bet(Integer bet) { + + } + + public void betType(String betType) { + + } + + public void logicNPC() { + + } } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 3c3b340ef..311d370cb 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -4,7 +4,11 @@ import java.util.ArrayList; -public class GoFishPlayer { +public class GoFishPlayer extends Player { ArrayList hand; + public GoFishPlayer() { + hand = new ArrayList(); + + } } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java index f137c7566..6a5556106 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java @@ -1,5 +1,19 @@ package io.zipcoder.casino.player; -public class GoFishPlayerNPC { +public class GoFishPlayerNPC implements NPCInterface { + + String betType; // red/back - odd / even / number + + public void bet(Integer bet) { + + } + + public void betType(String betType) { + + } + + public void logicNPC() { + + } } From fce86184e704d5cc58404726531c8d3ffecb80af Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Wed, 12 Jun 2019 09:47:53 -0400 Subject: [PATCH 05/71] v3 uml --- src/main/java/io/zipcoder/casino/Card.java | 1 + src/main/java/io/zipcoder/casino/Deck.java | 11 ++++++++--- .../java/io/zipcoder/casino/games/Roulette.java | 13 ++++++++++++- src/main/java/io/zipcoder/casino/games/Slots.java | 13 ++++++++++++- .../io/zipcoder/casino/player/BlackJackPlayer.java | 2 ++ .../zipcoder/casino/player/BlackJackPlayerNPC.java | 11 ++++++++++- .../io/zipcoder/casino/player/GoFishPlayer.java | 3 +++ .../io/zipcoder/casino/player/GoFishPlayerNPC.java | 11 ++++++++++- 8 files changed, 58 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java index 8d256d548..34daf6108 100644 --- a/src/main/java/io/zipcoder/casino/Card.java +++ b/src/main/java/io/zipcoder/casino/Card.java @@ -4,6 +4,7 @@ public class Card { Integer cardVal; public enum cardValue { + } public enum cardSuit { diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index b5b8d1edd..03b79319e 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -1,14 +1,19 @@ package io.zipcoder.casino; +import io.zipcoder.casino.player.Player; + import java.util.ArrayList; +import java.util.Collections; import java.util.Stack; public class Deck { - Stack Card = new Stack(); + Stack card = new Stack(); - public void shuffle () {}; + public void shuffle () { + Collections.shuffle(card); + }; - public ArrayList deal (Integer numOfCards) { + public ArrayList deal (Integer numOfCards, Player player) { return null; } } diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index ed70392d9..6ac9a1139 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -1,7 +1,10 @@ package io.zipcoder.casino.games; -public class Roulette extends Games { +import io.zipcoder.casino.player.RoulettePlayer; + +public class Roulette extends Games implements GamblerGameInterface { String betType; // red/back - odd / even / number + RoulettePlayer roulettePlayer = new RoulettePlayer(); @Override @@ -13,4 +16,12 @@ boolean getResults() { public void display(String output) { super.display(output); } + + public Integer calcPayment(Integer bet, Integer odds) { + return null; + } + + public void updateAccount(Integer num) { + + } } diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 34cc82b7b..7ddd1d2d0 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -1,7 +1,10 @@ package io.zipcoder.casino.games; -public class Slots extends Games { +import io.zipcoder.casino.player.SlotsPlayer; + +public class Slots extends Games implements GamblerGameInterface { Integer numOfLines; + SlotsPlayer slotsPlayer = new SlotsPlayer(); public Slots(){} @@ -14,4 +17,12 @@ boolean getResults() { public void display(String output) { super.display(output); } + + public Integer calcPayment(Integer bet, Integer odds) { + return null; + } + + public void updateAccount(Integer num) { + + } } diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java index 93fff3f29..003f8b2eb 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -22,4 +22,6 @@ public void betType (String betType) { public void cashout() { } + + public void endturn() {}; } diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java index 807a326d0..077133ae0 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java @@ -1,6 +1,12 @@ package io.zipcoder.casino.player; -public class BlackJackPlayerNPC implements NPCInterface { +import io.zipcoder.casino.Card; + +import java.util.ArrayList; + +public class BlackJackPlayerNPC extends Player implements NPCInterface { + ArrayList hand; + public void bet(Integer bet) { } @@ -12,4 +18,7 @@ public void betType(String betType) { public void logicNPC() { } + + public void endturn() {}; + } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 311d370cb..d65c5d584 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -11,4 +11,7 @@ public GoFishPlayer() { hand = new ArrayList(); } + + public void endturn() {}; + } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java index 6a5556106..63f86ca7c 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java @@ -1,6 +1,12 @@ package io.zipcoder.casino.player; -public class GoFishPlayerNPC implements NPCInterface { +import io.zipcoder.casino.Card; + +import java.util.ArrayList; + +public class GoFishPlayerNPC extends Player implements NPCInterface { + ArrayList hand; + String betType; // red/back - odd / even / number @@ -16,4 +22,7 @@ public void betType(String betType) { public void logicNPC() { } + + public void endturn() {}; + } From 7c6f65a84f842e74441a8b9a70b1772322b726a0 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Wed, 12 Jun 2019 13:09:44 -0400 Subject: [PATCH 06/71] v4 uml --- src/main/java/io/zipcoder/casino/Deck.java | 10 +++- src/main/java/io/zipcoder/casino/Handler.java | 24 ++++++++-- .../io/zipcoder/casino/games/Blackjack.java | 23 +++++++++ .../java/io/zipcoder/casino/games/Craps.java | 10 ++++ .../java/io/zipcoder/casino/games/Games.java | 5 ++ .../java/io/zipcoder/casino/games/GoFish.java | 22 +++++++++ .../io/zipcoder/casino/games/Roulette.java | 20 ++++++++ .../java/io/zipcoder/casino/games/Slots.java | 20 ++++++++ .../casino/player/BlackJackPlayer.java | 9 ++-- .../casino/player/BlackJackPlayerNPC.java | 3 +- .../casino/player/CardGamePlayer.java | 47 +++++++++++++++++++ .../casino/player/GamblerInterface.java | 2 +- .../zipcoder/casino/player/GoFishPlayer.java | 28 ++++++++--- .../casino/player/GoFishPlayerNPC.java | 4 +- .../io/zipcoder/casino/player/Player.java | 12 +++-- .../casino/player/RoulettePlayer.java | 4 ++ .../zipcoder/casino/player/SlotsPlayer.java | 14 ++++++ 17 files changed, 233 insertions(+), 24 deletions(-) create mode 100644 src/main/java/io/zipcoder/casino/player/CardGamePlayer.java diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index 03b79319e..d40cd711a 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -1,5 +1,6 @@ package io.zipcoder.casino; +import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.Player; import java.util.ArrayList; @@ -13,7 +14,14 @@ public void shuffle () { Collections.shuffle(card); }; - public ArrayList deal (Integer numOfCards, Player player) { + public ArrayList deal (Integer numOfCards, CardGamePlayer player) { return null; } + + public Card dealSingleCard(CardGamePlayer player) { + + return null; + } + + } diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 2960b4835..4ed8156f9 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -4,12 +4,14 @@ import io.zipcoder.casino.utilities.Console; public class Handler { + Player player; + Integer intergerInput; + void run() { - String input = ""; - Integer intergerInput = 0; + createPlayer(); + pickGame(); + - //Console console = new Console(); - Player player = new Player(); switch (intergerInput) { case 0 : @@ -30,5 +32,19 @@ void run() { default: System.out.println("you blew it"); } + } + + public void pickGame() { + Integer i; + //console get game + this.intergerInput = 0; + } + + public void createPlayer () { + //console input + String name = ""; + Double account = 0.0; + player = new Player(name, account); + } } diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index 9f92b44ac..2deaf30ca 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -14,11 +14,17 @@ public class Blackjack extends CardGames implements GamblerGameInterface { private Integer player1Score; private Integer player2Score; + + + private Double currentBet; + public Blackjack() { super(); this.odds = 2; this.player1Score = 0; this.player2Score = 0; + + } @@ -57,5 +63,22 @@ public void setPlayer2Score(Integer player2Score) { this.player2Score = player2Score; } + public Double getCurrentBet() { + return currentBet; + } + + public void setCurrentBet(Double currentBet) { + this.currentBet = currentBet; + } + + @Override + void nextTurn() { + + } + + @Override + void endGame() { + + } } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 6473c9c7b..a53dd8726 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -18,6 +18,16 @@ public void updateAccount(Integer num) { } + @Override + void nextTurn() { + + } + + @Override + void endGame() { + + } + @Override boolean getResults() { return false; diff --git a/src/main/java/io/zipcoder/casino/games/Games.java b/src/main/java/io/zipcoder/casino/games/Games.java index b5dddd40f..a2ad95bc9 100644 --- a/src/main/java/io/zipcoder/casino/games/Games.java +++ b/src/main/java/io/zipcoder/casino/games/Games.java @@ -6,6 +6,11 @@ abstract class Games { Integer odds; + + abstract void nextTurn(); + + abstract void endGame(); + abstract boolean getResults(); public void display(String output) { diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index dd7994d13..b7771c555 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -5,12 +5,15 @@ import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.GoFishPlayerNPC; +import java.security.PrivateKey; + public class GoFish extends Games { GoFishPlayer player1 = new GoFishPlayer(); GoFishPlayerNPC player2 = new GoFishPlayerNPC(); Deck deck = new Deck(); private Integer player1Score; private Integer player2Score; + private Double currentBet; public GoFish() { super(); @@ -19,6 +22,16 @@ public GoFish() { } + @Override + void nextTurn() { + + } + + @Override + void endGame() { + + } + @Override boolean getResults() { return false; @@ -36,4 +49,13 @@ public Card check (Integer query) { public Card goFish () { return null; }; + + public Double getCurrentBet() { + return currentBet; + } + + public void setCurrentBet(Double currentBet) { + this.currentBet = currentBet; + } + } diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index 6ac9a1139..4c5ceb0a7 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -5,8 +5,20 @@ public class Roulette extends Games implements GamblerGameInterface { String betType; // red/back - odd / even / number RoulettePlayer roulettePlayer = new RoulettePlayer(); + private Double currentBet; + + @Override + void nextTurn() { + + } + + @Override + void endGame() { + + } + @Override boolean getResults() { return false; @@ -24,4 +36,12 @@ public Integer calcPayment(Integer bet, Integer odds) { public void updateAccount(Integer num) { } + + public Double getCurrentBet() { + return currentBet; + } + + public void setCurrentBet(Double currentBet) { + this.currentBet = currentBet; + } } diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 7ddd1d2d0..505ec6f8e 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -5,9 +5,21 @@ public class Slots extends Games implements GamblerGameInterface { Integer numOfLines; SlotsPlayer slotsPlayer = new SlotsPlayer(); + private Double currentBet; + public Slots(){} + @Override + void nextTurn() { + + } + + @Override + void endGame() { + + } + @Override boolean getResults() { return false; @@ -25,4 +37,12 @@ public Integer calcPayment(Integer bet, Integer odds) { public void updateAccount(Integer num) { } + + public Double getCurrentBet() { + return currentBet; + } + + public void setCurrentBet(Double currentBet) { + this.currentBet = currentBet; + } } diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java index 003f8b2eb..77e45a701 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -6,12 +6,11 @@ import java.util.ArrayList; -public class BlackJackPlayer extends Player implements GamblerInterface { - ArrayList hand; +public class BlackJackPlayer extends CardGamePlayer implements GamblerInterface { + public BlackJackPlayer(){ super(); - this.hand = new ArrayList(); } public void bet(Integer bet) { @@ -23,5 +22,9 @@ public void betType (String betType) { public void cashout() { } + public void displayAccoutBal() { + + } + public void endturn() {}; } diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java index 077133ae0..b0ccbd511 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java @@ -4,8 +4,7 @@ import java.util.ArrayList; -public class BlackJackPlayerNPC extends Player implements NPCInterface { - ArrayList hand; +public class BlackJackPlayerNPC extends CardGamePlayer implements NPCInterface { public void bet(Integer bet) { diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java new file mode 100644 index 000000000..336f56d15 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -0,0 +1,47 @@ +package io.zipcoder.casino.player; + +import javax.smartcardio.Card; +import java.util.ArrayList; + +public class CardGamePlayer extends Player { + private ArrayList hand; + + public ArrayList getHand() { + return hand; + } + + public void setHand(ArrayList hand) { + this.hand = hand; + } + + public void endturn() {}; + + public CardGamePlayer(){}; + + public CardGamePlayer(String name, Double account) { + super(name, account); + } + + @Override + public String getName() { + return super.getName(); + } + + @Override + public void setName(String name) { + super.setName(name); + } + + + @Override + public Double getAccount() { + return super.getAccount(); + } + + @Override + public void setAccount(Double account) { + super.setAccount(account); + } + + +} diff --git a/src/main/java/io/zipcoder/casino/player/GamblerInterface.java b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java index 8535a491b..390893ee0 100644 --- a/src/main/java/io/zipcoder/casino/player/GamblerInterface.java +++ b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java @@ -7,7 +7,7 @@ public interface GamblerInterface { void cashout(); - + void displayAccoutBal(); } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index d65c5d584..345148272 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -1,17 +1,31 @@ package io.zipcoder.casino.player; -import io.zipcoder.casino.Card; - +import javax.smartcardio.Card; import java.util.ArrayList; -public class GoFishPlayer extends Player { - ArrayList hand; +public class GoFishPlayer extends CardGamePlayer { + - public GoFishPlayer() { - hand = new ArrayList(); + public void endturn() {}; + @Override + public ArrayList getHand() { + return super.getHand(); } - public void endturn() {}; + @Override + public void setHand(ArrayList hand) { + super.setHand(hand); + } + + @Override + public Double getAccount() { + return super.getAccount(); + } + + @Override + public void setAccount(Double account) { + super.setAccount(account); + } } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java index 63f86ca7c..2177a3dbe 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java @@ -4,9 +4,7 @@ import java.util.ArrayList; -public class GoFishPlayerNPC extends Player implements NPCInterface { - ArrayList hand; - +public class GoFishPlayerNPC extends CardGamePlayer implements NPCInterface { String betType; // red/back - odd / even / number diff --git a/src/main/java/io/zipcoder/casino/player/Player.java b/src/main/java/io/zipcoder/casino/player/Player.java index b4f2df8f3..7e7b2dcc1 100644 --- a/src/main/java/io/zipcoder/casino/player/Player.java +++ b/src/main/java/io/zipcoder/casino/player/Player.java @@ -2,8 +2,14 @@ public class Player { private String name; -Integer account; +Double account; + public Player(){}; + + public Player(String name, Double account) { + this.account = account; + this.name = name; + } public String getName() { return name; @@ -13,11 +19,11 @@ public void setName(String name) { this.name = name; } - public Integer getAccount() { + public Double getAccount() { return account; } - public void setAccount(Integer account) { + public void setAccount(Double account) { this.account = account; } } diff --git a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java index d30ff04ee..81bfc240b 100644 --- a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java @@ -14,4 +14,8 @@ public void betType (String betType) { public void cashout() { } + + public void displayAccoutBal() { + + } } diff --git a/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java index f5e990a43..624208abf 100644 --- a/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java @@ -13,4 +13,18 @@ public void betType (String betType) { public void cashout() { } + + @Override + public Double getAccount() { + return super.getAccount(); + } + + @Override + public void setAccount(Double account) { + super.setAccount(account); + } + + public void displayAccoutBal() { + + } } From 706e71851141723daf84bd01c5a3512b0fed94b8 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Wed, 12 Jun 2019 14:06:05 -0400 Subject: [PATCH 07/71] // --- src/main/java/io/zipcoder/casino/games/CardGames.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/zipcoder/casino/games/CardGames.java b/src/main/java/io/zipcoder/casino/games/CardGames.java index b73f5f434..7bbb6fe72 100644 --- a/src/main/java/io/zipcoder/casino/games/CardGames.java +++ b/src/main/java/io/zipcoder/casino/games/CardGames.java @@ -24,3 +24,4 @@ public void display(String output) { super.display(output); } } +////// From dc1306a17ee9db77a7f0af421a2ac27f18019243 Mon Sep 17 00:00:00 2001 From: Darya Date: Wed, 12 Jun 2019 14:06:51 -0400 Subject: [PATCH 08/71] original --- src/main/java/io/zipcoder/casino/player/CardGamePlayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index 336f56d15..c084dc0be 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -2,6 +2,7 @@ import javax.smartcardio.Card; import java.util.ArrayList; +/// public class CardGamePlayer extends Player { private ArrayList hand; From 6017f32802f9466a7f52daf86b5633e82ae2a595 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Wed, 12 Jun 2019 14:16:52 -0400 Subject: [PATCH 09/71] v5uml approved before testl --- src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java index 77e45a701..5af94237b 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -3,7 +3,7 @@ import io.zipcoder.casino.Card; import io.zipcoder.casino.Deck; - +// import java.util.ArrayList; public class BlackJackPlayer extends CardGamePlayer implements GamblerInterface { From 0a63b609455629a4360844d1f80679492b45c390 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Wed, 12 Jun 2019 14:32:03 -0400 Subject: [PATCH 10/71] mess --- .DS_Store | Bin 0 -> 6148 bytes 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 -> 8196 bytes src/main/java/io/zipcoder/casino/.DS_Store | Bin 0 -> 6148 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .DS_Store 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 create mode 100644 src/main/java/io/zipcoder/casino/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..289baba9871bbde8efb65c814b8fc0034f219d38 GIT binary patch literal 6148 zcmeHK%}&BV5Z(pU1!Lr3BFDXW;{YgdGHEIvyqVPKK@GG*qzSf!78^xOUqj!>C-8Ng z+1(n696T8#Gs*5Zvoo{X`I7DrV~pF=ex0#0V@yCpww>$XAzsQ8!!3#{Ubk$YqfWt%NN$xH-spO(pKr(8HR}yyYV!#-N_|dr*1s- zjD8k|qfg!S&iz5sE$W3%2yNAcw)BO2G^UHyLCEErwcm>6jckfJsQ5f99 zNEV$%5fTH$05L!etP}(07!aE)RW%h$3=ji9VF33B2@TOQm}*p82XuISMt=bj1$2B% zAWDOl!Biu7K)6l?)T!J&F}O~LacSZ#gQ-TH&bV3`<}oX0j~A|1hjFRG8Mic2PYe(P ziwxwoS;q7K7=D?hkNm|HvWNj<;GZ$T3mvCpLs8~z{Z<~HwGvtn8VbgxsDOaJa0vhd h_mPTnYQIDs;w*!yMw|u5RXQMD1Qa3E5d*)#zz0H4Pu>6k literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..e4eb065f6961f0de2c95c0422b92943e71799160 GIT binary patch literal 6148 zcmeHK!A=4(5N!dqV2m70payocL^gq40*f0(%>IV{kze5N zIMWs)K@(5L$V@VQ)9Fl`zTI?M#u&FJewDEzV@!Y|X7bQ{Avlh@A{paB1Z3$N+x392+o~1uXph{k&m67{`^$JI`cu8=G4~6hvXCaO?D<#EIQ_GPd2( zHTKTkxaS%BB8vJ8+x0GkZqhF9okU^m24Q!kk^{dBAvae+=tqeiO+tUH=5h3Z5P6Yr z7faJ=tzIw7TBA8D%W1P&Da)h7#%z`s`v=wIv(Dh*ar!iSe$lLQ_yLvd8l1x`7>fNI*J#hQRbqe`_!$FuK1fhR%V4Te9Uai%^%2K& zh$vv=TLMuUv<#*iVFZNhR6w1|%@c#`bnr_PXBkX2>U74{$}o>vnVT01SF3|xs&K|F zjnonY#K1BGS=}vS{XhNw{lA<@GxuUOX5>W|G-&IzQX)*JiiF7~`#xS7ofo7!#m~nLG^N2*y#DBx5{TK#p^`lX&0; zkqg&vOWEZ3j|||u%dtD=urYH!zdv^n_;FIHyz@*px3<0^L_rj`3fFc&n%IexjN+Cv zyu_kLCV#IA9~TG6^%kKR`b|8AVgl| zJH^s;TC3N~veszM%5vIlR?6~VzcHKT#qM79@T7bH@Hl;%J-=vHIedUhwhhkV6^z9K zz4#_@;Sn*oaE|R^7)0SM_~w&foP-!428e;xWx(uqVsmwuNGl@-h=E@+fct|4MYIg2 z8r9YTgK7Z)bKq72Hue%&BMn*xQ;iS-;kp!1mvYl$a9s|5Y4R+CsYYGSxM@DPxidE% z3RicB`K3x{+|o!RF+dD_WdM6WkRqP{$3OS~Dv1VSfEZX!26(P*w_C6_bG9z663nIsDa%qkxg)G*u{+^W?w_!$S3f1 zoN0@ZNaD>HnMvAjrZdy-e988QF~&QSpw3vCF(#lPa#WTG4li}(Y%n6nIsB3GL4Wh_ zMxpinb--`Wv5+Z0jqkpGf1K26?>v_;tgUYdQ4*!C(zQEOshfDoB<^_QOSDeCWawM{ zOsUbQ?)m58AnlcRj#QL*VKf-)68XY04}@T`^4`p{4?E<*(b^o2_R7`TsA fwA1({>JaBx%nafzIIhzH=^~&Bp^g~%1qMCPQBwGZHLZ2(Yo_t2jOYl8eWyw4|I|SankCU;y7wy%EeinM0(iJgCy#kaeNz) zvLFjrrSf=O+ug0G+FpH9QR8~OT2VXOdy`2)ZftJtA6?%)jK+_Xr)SHqz#q}bn!_o) zpfR)1d%u@-baIQaY27rRkr`kHn1MNFz-@VQWscX#OJfF@f!{Ge`-4Iy^c-du&DMbp zT^}i)CnQ0e-V%h$q31BOh!GTFOA&3Ua8C?j%h9h~p64*LXv;yEnQ&)WltW~Jjs3eq^ nS^OwL!yLt!OGj}T)d>0(8Hk?4%p!VF_#$9v;D#CaQwH7vE}v6m 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..8d27bf37b73311b3fd9d84311047b9b3eeb5a29f GIT binary patch literal 8196 zcmeHMTTC5A82*25on4?ToVI}Vlw&DMTWBfeQfkrD1Ee4*jU29}J?uHV!p3Enp51ex zr5LnPUrejMwQ4lR7gH0Tc=4s`gO}9AHX&a6U`%}T$@pfBmw$E^B2Y|xQJd~0GvDmY z|L@Fv^PQRedjJ4q8SM~21pqM09F;;U?vQvt&l^&X-;zg&!6B z3;RJy&|Ch#t^)ML)zq;ZFS#ZcZ5WaZ#Xf2Ndpr{>bP@DCmt&ei6?c zFe)%80|o*HHZs6}J_V2h6&x_u#qXadXH3I!8yddGoZP(pf-Q{6OfHsB4@}v!1Fq_3 zoS2$E#h*^9?o`sR$8FnOt*gl)L!V73+d6E^RSio|d(MWYlgaq7VQKbk%+6SvSgiesF(7^U+5-mW#KRD5Yf~d5mbWT;nN2PY=!-nmaYBIw{@K z3~O>YYdA*I)Z>;qt(RgQla`Bjlvh;V7Yc1=I+95mXETO-PN`;WS=m}rELVjdkd!4h zuF-TJw>3VJ=JkZCLN$z?;_V%2ol4Ox*M{~ZWLFmD`xoD-CA_o1(EyZfDX+%ATI4MLMD_8j3OHGj@g#+^0Hj|BP2xph?}99Fn^#N(bCddwkli^skD!m^S}(v>{p z0|(`>l20lXy@#7*S;-?Ai{2w`)LTG;Wy_W26+7ge;YTH=fafXIgk?IW{;~MphHLNv zd;&K}bYH=D@B{n=zmVYau>{LWZuestci}_07x!Zw)?*7EA>lnt((A$#*n^Le{Ngx- zBRGm0<|Togzxl>YS(0m1#xX%Fsy&cZ#M{sbvc B+gJbq literal 0 HcmV?d00001 diff --git a/src/main/java/io/zipcoder/casino/.DS_Store b/src/main/java/io/zipcoder/casino/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..779a17dff7507442199ae5f5d829e2f959f74a77 GIT binary patch literal 6148 zcmeHKIZgvX5Ud6Z*&=aBIA7ogE6coq4{+FlrIm~@4xDYoyZkh&40^1V0#;YE%vKhU=CnPcf`97WAlCYkzG{8(c+9XURS&4{%O1IN7?5C&b`75dOYHQ zFZ>zyc*BO9o4_@8KRo{YrHV=cDIf);fE4)03b1CoO|KI*N&zV#1wIw Date: Wed, 12 Jun 2019 14:32:15 -0400 Subject: [PATCH 11/71] v5uml approved before testl --- .../io/zipcoder/casino/player/CrapsPlayer.java | 4 ++++ src/test/io/zipcoder/casino/HandlerTest.java | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 src/test/io/zipcoder/casino/HandlerTest.java diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index 72d913c09..97121c60f 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -21,4 +21,8 @@ public void betType(String betType) { public void cashout() { } + + public void displayAccoutBal() { + + } } diff --git a/src/test/io/zipcoder/casino/HandlerTest.java b/src/test/io/zipcoder/casino/HandlerTest.java new file mode 100644 index 000000000..c621fcc76 --- /dev/null +++ b/src/test/io/zipcoder/casino/HandlerTest.java @@ -0,0 +1,15 @@ +package io.zipcoder.casino; + +import org.junit.Test; + + +public class HandlerTest { + + @Test + public void pickGame() { + } + + @Test + public void createPlayer() { + } +} \ No newline at end of file From 3871966bc5580d7ab9f642da5a0ad389da486c3e Mon Sep 17 00:00:00 2001 From: alilinykh Date: Wed, 12 Jun 2019 14:38:51 -0400 Subject: [PATCH 12/71] //in handler --- src/main/java/io/zipcoder/casino/Handler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 4ed8156f9..74e4c75f8 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -2,7 +2,7 @@ import io.zipcoder.casino.games.*; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; - +// public class Handler { Player player; Integer intergerInput; From 3098022bb95b2f2a6b5b701e8c3eac8beaff3de4 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Wed, 12 Jun 2019 15:59:56 -0400 Subject: [PATCH 13/71] test for person and handler --- src/main/java/io/zipcoder/casino/Handler.java | 35 +++++---- .../casino/games/GamblerGameInterface.java | 1 + .../io/zipcoder/casino/player/Player.java | 2 +- .../io/zipcoder/casino/utilities/Console.java | 2 + src/test/io/zipcoder/casino/HandlerTest.java | 16 +++- .../io/zipcoder/casino/games/CrapsTest.java | 77 +++++++++++++++++++ .../io/zipcoder/casino/player/PlayerTest.java | 40 ++++++++++ 7 files changed, 156 insertions(+), 17 deletions(-) create mode 100644 src/test/io/zipcoder/casino/games/CrapsTest.java create mode 100644 src/test/io/zipcoder/casino/player/PlayerTest.java diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 4ed8156f9..fde6adeba 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -4,12 +4,18 @@ import io.zipcoder.casino.utilities.Console; public class Handler { - Player player; - Integer intergerInput; + private Console console = new Console(System.in, System.out); + private Player player; + private Integer intergerInput; + private String name = ""; + private Double accout = 0.0; + void run() { - createPlayer(); - pickGame(); + getNameInput(); + getAccountBalanceInput(); + createPlayer(name, accout); + @@ -35,16 +41,19 @@ void run() { } - public void pickGame() { - Integer i; - //console get game - this.intergerInput = 0; + public Player createPlayer (String name, Double account) { + return player = new Player(name, account); + } + + public void getNameInput() { + this.name = console.getStringInput("Enter Name"); + } + + public void getAccountBalanceInput() { + this.accout = console.getDoubleInput("How much do you want to depoist in your account?"); } - public void createPlayer () { - //console input - String name = ""; - Double account = 0.0; - player = new Player(name, account); + public void getGameInput() { + this.intergerInput = console.getIntegerInput("What game would you like to play?"); } } diff --git a/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java index 328c47ed0..1bf974147 100644 --- a/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java +++ b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java @@ -1,6 +1,7 @@ package io.zipcoder.casino.games; interface GamblerGameInterface { + Integer calcPayment(Integer bet, Integer odds); diff --git a/src/main/java/io/zipcoder/casino/player/Player.java b/src/main/java/io/zipcoder/casino/player/Player.java index 7e7b2dcc1..8ef3c88f7 100644 --- a/src/main/java/io/zipcoder/casino/player/Player.java +++ b/src/main/java/io/zipcoder/casino/player/Player.java @@ -2,7 +2,7 @@ public class Player { private String name; -Double account; +private Double account; public Player(){}; diff --git a/src/main/java/io/zipcoder/casino/utilities/Console.java b/src/main/java/io/zipcoder/casino/utilities/Console.java index ab896c956..40cfbaf20 100644 --- a/src/main/java/io/zipcoder/casino/utilities/Console.java +++ b/src/main/java/io/zipcoder/casino/utilities/Console.java @@ -42,6 +42,8 @@ public Double getDoubleInput(String prompt, Object... args) { } } + + public Long getLongInput(String prompt, Object... args) { String stringInput = getStringInput(prompt, args); try { diff --git a/src/test/io/zipcoder/casino/HandlerTest.java b/src/test/io/zipcoder/casino/HandlerTest.java index c621fcc76..22592437f 100644 --- a/src/test/io/zipcoder/casino/HandlerTest.java +++ b/src/test/io/zipcoder/casino/HandlerTest.java @@ -1,15 +1,25 @@ package io.zipcoder.casino; +import io.zipcoder.casino.player.Player; +import org.junit.Assert; import org.junit.Test; public class HandlerTest { - @Test - public void pickGame() { - } + @Test public void createPlayer() { + Handler handler = new Handler(); + Player player; + String name = "bob"; + Double account = 100.0; + + player = handler.createPlayer(name, account); + + Assert.assertEquals("bob", player.getName()); + } + } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java new file mode 100644 index 000000000..c0f0fd145 --- /dev/null +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -0,0 +1,77 @@ +package io.zipcoder.casino.games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CrapsTest { + + + @Test + public void calcPayment() { + Craps craps = new Craps(); + + craps.odds = 2; + craps. + } + + @Test + public void updateAccount() { + } + + @Test + public void nextTurn() { + } + + @Test + public void endGame() { + } + + @Test + public void getResults() { + } + + @Test + public void display1() { + } + + @Test + public void getOn() { + } + + @Test + public void setOn() { + } + + @Test + public void getOnNumber() { + } + + @Test + public void setOnNumber() { + } + + @Test + public void getFirstLineBet() { + } + + @Test + public void setFirstLineBet() { + } + + @Test + public void getSecondLineBet() { + } + + @Test + public void setSecondLineBet() { + } + + @Test + public void getOtherBet() { + } + + @Test + public void setOtherBet() { + } +} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/player/PlayerTest.java b/src/test/io/zipcoder/casino/player/PlayerTest.java new file mode 100644 index 000000000..5b5c69d0c --- /dev/null +++ b/src/test/io/zipcoder/casino/player/PlayerTest.java @@ -0,0 +1,40 @@ +package io.zipcoder.casino.player; + +import io.zipcoder.casino.Handler; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class PlayerTest { + + @Test + public void getName() { + Player player = new Player("bob" , 100.0); + Assert.assertEquals("bob", player.getName()); + } + + @Test + public void setName() { + Player player = new Player(); + player.setName("bob"); + Assert.assertEquals("bob", player.getName()); + } + + @Test + public void getAccount() { + Player player = new Player("bob", 10000.0); + Double expected = 10000.0; + Double actual = player.getAccount(); + Assert.assertEquals(expected, actual); + } + + @Test + public void setAccount() { + Player player = new Player(); + player.setAccount(100.0); + Double expected = 100.0; + Double actual = player.getAccount(); + Assert.assertEquals(expected, actual); + } +} \ No newline at end of file From 5656f1169b9d855f641525a8ed839800edefa02f Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Wed, 12 Jun 2019 16:18:45 -0400 Subject: [PATCH 14/71] had to put in some overrides fuctions in games --- .../io/zipcoder/casino/games/Blackjack.java | 21 ++++++++--------- .../java/io/zipcoder/casino/games/Craps.java | 23 +++++++++++-------- .../casino/games/GamblerGameInterface.java | 4 ++-- .../java/io/zipcoder/casino/games/Games.java | 12 +++++++++- .../io/zipcoder/casino/games/Roulette.java | 8 +++++++ .../java/io/zipcoder/casino/games/Slots.java | 8 +++++++ .../io/zipcoder/casino/games/CrapsTest.java | 10 ++++++-- 7 files changed, 60 insertions(+), 26 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index 2deaf30ca..c18582d02 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -13,14 +13,11 @@ public class Blackjack extends CardGames implements GamblerGameInterface { private Integer player1Score; private Integer player2Score; - - - private Double currentBet; public Blackjack() { super(); - this.odds = 2; + this.odds = 2.0; this.player1Score = 0; this.player2Score = 0; @@ -63,14 +60,6 @@ public void setPlayer2Score(Integer player2Score) { this.player2Score = player2Score; } - public Double getCurrentBet() { - return currentBet; - } - - public void setCurrentBet(Double currentBet) { - this.currentBet = currentBet; - } - @Override void nextTurn() { @@ -81,4 +70,12 @@ void nextTurn() { void endGame() { } + + public Double calcPayment(Double bet, Double odds) { + return null; + } + + public void updateAccount(Double num) { + + } } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index a53dd8726..cfacfaa7f 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -6,9 +6,9 @@ public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer = new CrapsPlayer(); private Boolean isOn = false; private Integer onNumber; - private Integer firstLineBet; - private Integer secondLineBet; - private Integer otherBet; + private Double firstLineBet; + private Double secondLineBet; + private Double otherBet; public Integer calcPayment(Integer bet, Integer odds) { return null; @@ -54,31 +54,36 @@ public void setOnNumber(Integer onNumber) { this.onNumber = onNumber; } - public Integer getFirstLineBet() { + public Double getFirstLineBet() { return firstLineBet; } - public void setFirstLineBet(Integer firstLineBet) { + public void setFirstLineBet(Double firstLineBet) { this.firstLineBet = firstLineBet; } - public Integer getSecondLineBet() { + public Double getSecondLineBet() { return secondLineBet; } - public void setSecondLineBet(Integer secondLineBet) { + public void setSecondLineBet(Double secondLineBet) { this.secondLineBet = secondLineBet; } - public Integer getOtherBet() { + public Double getOtherBet() { return otherBet; } - public void setOtherBet(Integer otherBet) { + public void setOtherBet(Double otherBet) { this.otherBet = otherBet; } + public Double calcPayment(Double bet, Double odds) { + return null; + } + public void updateAccount(Double num) { + } } diff --git a/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java index 1bf974147..da6928ee1 100644 --- a/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java +++ b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java @@ -2,8 +2,8 @@ interface GamblerGameInterface { - Integer calcPayment(Integer bet, Integer odds); + Double calcPayment(Double bet, Double odds); - void updateAccount(Integer num); + void updateAccount(Double num); } diff --git a/src/main/java/io/zipcoder/casino/games/Games.java b/src/main/java/io/zipcoder/casino/games/Games.java index a2ad95bc9..a55231b13 100644 --- a/src/main/java/io/zipcoder/casino/games/Games.java +++ b/src/main/java/io/zipcoder/casino/games/Games.java @@ -4,7 +4,8 @@ import java.security.PublicKey; abstract class Games { - Integer odds; + + Double odds; abstract void nextTurn(); @@ -17,5 +18,14 @@ public void display(String output) { System.out.println(output); } + public Double getOdds() { + return odds; + } + + public void setOdds(Double odds) { + this.odds = odds; + } + + } diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index 4c5ceb0a7..f49e6b80c 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -44,4 +44,12 @@ public Double getCurrentBet() { public void setCurrentBet(Double currentBet) { this.currentBet = currentBet; } + + public Double calcPayment(Double bet, Double odds) { + return null; + } + + public void updateAccount(Double num) { + + } } diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 505ec6f8e..1eed0f181 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -45,4 +45,12 @@ public Double getCurrentBet() { public void setCurrentBet(Double currentBet) { this.currentBet = currentBet; } + + public Double calcPayment(Double bet, Double odds) { + return null; + } + + public void updateAccount(Double num) { + + } } diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index c0f0fd145..3ea3490fc 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -1,5 +1,6 @@ package io.zipcoder.casino.games; +import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.*; @@ -11,8 +12,13 @@ public class CrapsTest { public void calcPayment() { Craps craps = new Craps(); - craps.odds = 2; - craps. + craps.setOdds(2.0); + craps.setFirstLineBet(10.0); + + Double expected = 20.0; + Double actual = craps.calcPayment(craps.odds, craps.getFirstLineBet()); + + Assert.assertEquals(expected, actual); } @Test From 279cc0c5e73e970309cd0c3511f913fcedff0d97 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Wed, 12 Jun 2019 20:25:09 -0400 Subject: [PATCH 15/71] Decktests are done (6) --- src/main/java/io/zipcoder/casino/Deck.java | 14 ++-- src/test/io/zipcoder/casino/DeckTest.java | 82 +++++++++++++++++++ .../io/zipcoder/casino/games/GoFishTest.java | 40 +++++++++ 3 files changed, 129 insertions(+), 7 deletions(-) create mode 100644 src/test/io/zipcoder/casino/DeckTest.java create mode 100644 src/test/io/zipcoder/casino/games/GoFishTest.java diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/Deck.java index d40cd711a..5ac42d651 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/Deck.java @@ -1,27 +1,27 @@ package io.zipcoder.casino; import io.zipcoder.casino.player.CardGamePlayer; -import io.zipcoder.casino.player.Player; import java.util.ArrayList; import java.util.Collections; import java.util.Stack; public class Deck { - Stack card = new Stack(); + public Stack getDeck() { + return deck; + } + + Stack deck = new Stack(); public void shuffle () { - Collections.shuffle(card); + Collections.shuffle(deck); }; public ArrayList deal (Integer numOfCards, CardGamePlayer player) { return null; } - public Card dealSingleCard(CardGamePlayer player) { - - return null; - } + public void dealSingleCard(CardGamePlayer player) { } } diff --git a/src/test/io/zipcoder/casino/DeckTest.java b/src/test/io/zipcoder/casino/DeckTest.java new file mode 100644 index 000000000..2ab11c436 --- /dev/null +++ b/src/test/io/zipcoder/casino/DeckTest.java @@ -0,0 +1,82 @@ +package io.zipcoder.casino; + +import io.zipcoder.casino.player.CardGamePlayer; +import io.zipcoder.casino.player.GoFishPlayer; +import io.zipcoder.casino.player.Player; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Stack; + +import static org.junit.Assert.*; + +public class DeckTest { + + @Test + public void shuffle() { + Deck testDeck = new Deck(); + Card beforeShuffle = testDeck.deck.peek(); + testDeck.shuffle(); + Card afterShuffle = testDeck.deck.peek(); + Assert.assertFalse(beforeShuffle.equals(afterShuffle)); + } + @Test + public void shuffleNotWorking() { + Deck testDeck = new Deck(); + Card beforeShuffle = testDeck.deck.peek(); + testDeck.shuffle(); + Card afterShuffle = testDeck.deck.peek(); + Assert.assertFalse(!beforeShuffle.equals(afterShuffle)); + } + + @Test + public void deal5() { + CardGamePlayer testPlayer = new GoFishPlayer(); + Integer numCards = 5; + Deck deck = new Deck(); + ArrayList testStartingHand = deck.deal(numCards,testPlayer); + Integer expected = 5; + Integer actual = testStartingHand.size(); + Assert.assertEquals(expected,actual); + } + + @Test + public void deal2() { + CardGamePlayer testPlayer = new GoFishPlayer(); + Integer numCards = 2; + Deck deck = new Deck(); + ArrayList testStartingHand = deck.deal(numCards,testPlayer); + Integer expected = 2; + Integer actual = testStartingHand.size(); + Assert.assertEquals(expected,actual); + } + + @Test //DO + public void dealNegative() { + CardGamePlayer testPlayer = new GoFishPlayer(); + Integer numCards = -2; + Deck deck = new Deck(); + ArrayList testStartingHand = deck.deal(numCards,testPlayer); + Integer expected = 2; + Integer actual = testStartingHand.size(); + Assert.assertEquals(expected,actual); + } + + @Test + public void dealSingleCard1() { + CardGamePlayer testPlayer = new GoFishPlayer(); + Deck deck = new Deck(); + deck.dealSingleCard(testPlayer); + Assert.assertFalse(testPlayer.getHand().isEmpty()); + } + @Test + public void dealSingleCard2() { + CardGamePlayer testPlayer = new GoFishPlayer(); + Deck deck = new Deck(); + deck.dealSingleCard(testPlayer); + Integer expected = 1; + Integer actual = testPlayer.getHand().size(); + Assert.assertEquals(expected,actual); + } +} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java new file mode 100644 index 000000000..ff524096a --- /dev/null +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -0,0 +1,40 @@ +package io.zipcoder.casino.games; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class GoFishTest { + + @Test + public void nextTurn() { + } + + @Test + public void endGame() { + } + + @Test + public void getResults() { + } + + @Test + public void display() { + } + + @Test + public void check() { + } + + @Test + public void goFish() { + } + + @Test + public void getCurrentBet() { + } + + @Test + public void setCurrentBet() { + } +} \ No newline at end of file From 9ef409dd760c1af4ff4cf1931d57d58a20e7ab2d Mon Sep 17 00:00:00 2001 From: alilinykh Date: Wed, 12 Jun 2019 21:40:30 -0400 Subject: [PATCH 16/71] Decktests are done (6) --- src/main/java/io/zipcoder/casino/games/Games.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/zipcoder/casino/games/Games.java b/src/main/java/io/zipcoder/casino/games/Games.java index a55231b13..2f5909618 100644 --- a/src/main/java/io/zipcoder/casino/games/Games.java +++ b/src/main/java/io/zipcoder/casino/games/Games.java @@ -7,7 +7,6 @@ abstract class Games { Double odds; - abstract void nextTurn(); abstract void endGame(); From 75ca920dfd415dd5b72157be38d3a1577dc95db4 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Wed, 12 Jun 2019 21:46:47 -0400 Subject: [PATCH 17/71] tests for craps stuff --- src/main/java/io/zipcoder/casino/Handler.java | 13 +- .../java/io/zipcoder/casino/games/Craps.java | 36 +++- .../java/io/zipcoder/casino/games/Games.java | 3 +- .../casino/player/BlackJackPlayer.java | 2 +- .../casino/player/BlackJackPlayerNPC.java | 2 +- .../casino/player/CardGamePlayer.java | 6 +- .../zipcoder/casino/player/CrapsPlayer.java | 4 +- .../casino/player/GamblerInterface.java | 2 +- .../zipcoder/casino/player/GoFishPlayer.java | 5 - .../casino/player/GoFishPlayerNPC.java | 2 +- .../zipcoder/casino/player/NPCInterface.java | 2 +- .../io/zipcoder/casino/player/Player.java | 14 +- .../casino/player/RoulettePlayer.java | 2 +- .../zipcoder/casino/player/SlotsPlayer.java | 8 +- src/test/io/zipcoder/casino/DiceTest.java | 17 ++ .../zipcoder/casino/games/CardGamesTest.java | 44 +++++ .../io/zipcoder/casino/games/CrapsTest.java | 154 +++++++++++++++++- .../casino/player/CrapsPlayerTest.java | 112 +++++++++++++ 18 files changed, 383 insertions(+), 45 deletions(-) create mode 100644 src/test/io/zipcoder/casino/DiceTest.java create mode 100644 src/test/io/zipcoder/casino/games/CardGamesTest.java create mode 100644 src/test/io/zipcoder/casino/player/CrapsPlayerTest.java diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index fde6adeba..658c84cad 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -5,17 +5,18 @@ public class Handler { private Console console = new Console(System.in, System.out); - private Player player; + public Player player; private Integer intergerInput; private String name = ""; - private Double accout = 0.0; + private Double account = 0.0; void run() { getNameInput(); getAccountBalanceInput(); - createPlayer(name, accout); - + createPlayer(name, account); + System.out.println("0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots "); + getGameInput(); @@ -30,7 +31,7 @@ void run() { Roulette roulette = new Roulette(); break; case 3: - Craps craps = new Craps(); + Craps craps = new Craps(player); break; case 4: Slots slots = new Slots(); @@ -50,7 +51,7 @@ public void getNameInput() { } public void getAccountBalanceInput() { - this.accout = console.getDoubleInput("How much do you want to depoist in your account?"); + this.account = console.getDoubleInput("How much do you want to depoist in your account?"); } public void getGameInput() { diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index cfacfaa7f..8b7dc1845 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -1,31 +1,43 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.Casino; +import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; +import io.zipcoder.casino.player.Player; public class Craps extends Games implements GamblerGameInterface { + + private CrapsPlayer crapsPlayer = new CrapsPlayer(); + private Player player; private Boolean isOn = false; private Integer onNumber; private Double firstLineBet; private Double secondLineBet; private Double otherBet; - public Integer calcPayment(Integer bet, Integer odds) { - return null; + public Craps() { + }; + + public Craps(Player player) { + this.player = player; } - public void updateAccount(Integer num) { - } - @Override - void nextTurn() { + + public Integer calcPayment(Integer bet, Integer odds) { + return null; + } + + public void updateAccount(Double num) { + this.crapsPlayer.setAccount(num); } + @Override void endGame() { - } @Override @@ -78,12 +90,18 @@ public void setOtherBet(Double otherBet) { this.otherBet = otherBet; } + public CrapsPlayer getCrapsPlayer() { + return crapsPlayer; + } public Double calcPayment(Double bet, Double odds) { return null; } - public void updateAccount(Double num) { - + @Override + void nextTurn() { } + + + } diff --git a/src/main/java/io/zipcoder/casino/games/Games.java b/src/main/java/io/zipcoder/casino/games/Games.java index a55231b13..1ed9f0709 100644 --- a/src/main/java/io/zipcoder/casino/games/Games.java +++ b/src/main/java/io/zipcoder/casino/games/Games.java @@ -7,14 +7,13 @@ abstract class Games { Double odds; - abstract void nextTurn(); abstract void endGame(); abstract boolean getResults(); - public void display(String output) { + void display(String output) { System.out.println(output); } diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java index 5af94237b..d6a91c5bd 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -13,7 +13,7 @@ public BlackJackPlayer(){ super(); } - public void bet(Integer bet) { + public void bet(Double bet) { } public void betType (String betType) { diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java index b0ccbd511..0daf2bfac 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java @@ -6,7 +6,7 @@ public class BlackJackPlayerNPC extends CardGamePlayer implements NPCInterface { - public void bet(Integer bet) { + public void bet(Double bet) { } diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index 336f56d15..055277f6f 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -4,7 +4,7 @@ import java.util.ArrayList; public class CardGamePlayer extends Player { - private ArrayList hand; + public ArrayList hand; public ArrayList getHand() { return hand; @@ -38,10 +38,6 @@ public Double getAccount() { return super.getAccount(); } - @Override - public void setAccount(Double account) { - super.setAccount(account); - } } diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index 97121c60f..1c955941d 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -5,13 +5,15 @@ public class CrapsPlayer extends Player implements GamblerInterface { + + public Integer roll() { Dice dice = new Dice(); return dice.rollDice(); } - public void bet(Integer bet) { + public void bet(Double bet) { } public void betType(String betType) { diff --git a/src/main/java/io/zipcoder/casino/player/GamblerInterface.java b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java index 390893ee0..13e8aa989 100644 --- a/src/main/java/io/zipcoder/casino/player/GamblerInterface.java +++ b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java @@ -1,7 +1,7 @@ package io.zipcoder.casino.player; public interface GamblerInterface { - void bet(Integer bet); + void bet(Double bet); void betType (String betType); diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 345148272..2e8a40863 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -23,9 +23,4 @@ public Double getAccount() { return super.getAccount(); } - @Override - public void setAccount(Double account) { - super.setAccount(account); - } - } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java index 2177a3dbe..5c7c25f16 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java @@ -9,7 +9,7 @@ public class GoFishPlayerNPC extends CardGamePlayer implements NPCInterface { String betType; // red/back - odd / even / number - public void bet(Integer bet) { + public void bet(Double bet) { } diff --git a/src/main/java/io/zipcoder/casino/player/NPCInterface.java b/src/main/java/io/zipcoder/casino/player/NPCInterface.java index 30421fb32..a6b64ebdc 100644 --- a/src/main/java/io/zipcoder/casino/player/NPCInterface.java +++ b/src/main/java/io/zipcoder/casino/player/NPCInterface.java @@ -1,7 +1,7 @@ package io.zipcoder.casino.player; interface NPCInterface { - void bet(Integer bet); + void bet(Double bet); void betType (String betType); diff --git a/src/main/java/io/zipcoder/casino/player/Player.java b/src/main/java/io/zipcoder/casino/player/Player.java index 8ef3c88f7..b27525497 100644 --- a/src/main/java/io/zipcoder/casino/player/Player.java +++ b/src/main/java/io/zipcoder/casino/player/Player.java @@ -3,6 +3,16 @@ public class Player { private String name; private Double account; +private Boolean isPlaying = false; + + public Boolean getPlaying() { + return isPlaying; + } + + public void setPlaying(Boolean playing) { + isPlaying = playing; + } + public Player(){}; @@ -23,7 +33,7 @@ public Double getAccount() { return account; } - public void setAccount(Double account) { - this.account = account; + public void setAccount(Double sum) { + this.account = sum; } } diff --git a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java index 81bfc240b..fd49045da 100644 --- a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java @@ -3,7 +3,7 @@ public class RoulettePlayer extends Player implements GamblerInterface { - public void bet(Integer bet) { + public void bet(Double bet) { } diff --git a/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java index 624208abf..14e3540d9 100644 --- a/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java @@ -2,7 +2,9 @@ public class SlotsPlayer extends Player implements GamblerInterface { - public void bet(Integer bet) { + + + public void bet(Double bet) { } @@ -19,10 +21,6 @@ public Double getAccount() { return super.getAccount(); } - @Override - public void setAccount(Double account) { - super.setAccount(account); - } public void displayAccoutBal() { diff --git a/src/test/io/zipcoder/casino/DiceTest.java b/src/test/io/zipcoder/casino/DiceTest.java new file mode 100644 index 000000000..57ddc338c --- /dev/null +++ b/src/test/io/zipcoder/casino/DiceTest.java @@ -0,0 +1,17 @@ +package io.zipcoder.casino; + +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class DiceTest { + + @Test + public void rollDice() { + Dice dice = new Dice(); + Integer result = dice.rollDice(); + + Assert.assertTrue(result <= 12 && result >=2); + } +} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/CardGamesTest.java b/src/test/io/zipcoder/casino/games/CardGamesTest.java new file mode 100644 index 000000000..bc474db07 --- /dev/null +++ b/src/test/io/zipcoder/casino/games/CardGamesTest.java @@ -0,0 +1,44 @@ +package io.zipcoder.casino.games; + +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CardGamesTest { + + @Test + public void getOdds() { + Blackjack blackjack = new Blackjack(); + blackjack.setOdds(2.0); + + Double expected = 2.0; + Double actual = blackjack.odds; + + Assert.assertEquals(expected, actual); + } + + @Test + public void setOdds() { + Blackjack blackjack = new Blackjack(); + blackjack.setOdds(2.0); + + Double expected = 2.0; + Double actual = blackjack.odds; + + Assert.assertEquals(expected, actual); + } + + @Test + public void dealCard() { + Blackjack blackjack = new Blackjack(); + blackjack.setOdds(2.0); + + Integer beforeDeal = blackjack.player1.hand.size(); + blackjack.deck.deal(2, blackjack.player1); + Integer afterDeal = blackjack.player1.hand.size(); + + + Assert.assertFalse(beforeDeal.equals(afterDeal)); + } +} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 3ea3490fc..0f743f503 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -1,5 +1,8 @@ package io.zipcoder.casino.games; +import com.sun.org.apache.xpath.internal.operations.Bool; +import io.zipcoder.casino.Handler; +import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; @@ -23,61 +26,204 @@ public void calcPayment() { @Test public void updateAccount() { + Craps craps = new Craps(); + + craps.getCrapsPlayer().setAccount(10.0); + Double expected = 10.0; + Double actual = craps.getCrapsPlayer().getAccount(); + + Assert.assertEquals(expected, actual); } @Test - public void nextTurn() { + public void updateAccountNeg() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.getCrapsPlayer().setAccount(-10.0); + Double expected = 90.0; + Double actual = craps.getCrapsPlayer().getAccount(); + + Assert.assertEquals(expected, actual); } + @Test public void endGame() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + craps.setOn(true); + craps.setOnNumber(8); + + craps.getCrapsPlayer().roll().equals(7); + + + Boolean expected = false; + Boolean actual = player.getPlaying(); + + Assert.assertEquals(expected, actual); } + @Test public void getResults() { - } + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); - @Test - public void display1() { + craps.setOn(true); + craps.setOnNumber(8); + + + craps.getCrapsPlayer().roll().equals(7.0); + + + Double expected = 7.0; + Boolean actual = craps.getResults(); + + Assert.assertEquals(expected, actual); } + @Test public void getOn() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setOn(true); + + Boolean expected = true; + Boolean actual = craps.getOn(); + + Assert.assertEquals(expected, actual); } @Test public void setOn() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setOn(false); + + Boolean expected = false; + Boolean actual = craps.getOn(); + + Assert.assertEquals(expected, actual); } @Test public void getOnNumber() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setOnNumber(10); + + Integer expected = 10; + Integer actual = craps.getOnNumber(); + + Assert.assertEquals(expected, actual); } @Test public void setOnNumber() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setOn(true); + + Boolean expected = true; + Boolean actual = craps.getOn(); + + Assert.assertEquals(expected, actual); } @Test public void getFirstLineBet() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setFirstLineBet(10.0); + + Double expected = 10.0; + Double actual = craps.getFirstLineBet(); + + Assert.assertEquals(expected, actual); } @Test public void setFirstLineBet() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setFirstLineBet(10.0); + + Double expected = 10.0; + Double actual = craps.getFirstLineBet(); + + Assert.assertEquals(expected, actual); } @Test public void getSecondLineBet() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setSecondLineBet(10.0); + + Double expected = 10.0; + Double actual = craps.getSecondLineBet(); + + Assert.assertEquals(expected, actual); } @Test public void setSecondLineBet() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setSecondLineBet(10.0); + + Double expected = 10.0; + Double actual = craps.getSecondLineBet(); + + Assert.assertEquals(expected, actual); } @Test public void getOtherBet() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setOtherBet(10.0); + + Double expected = 10.0; + Double actual = craps.getOtherBet(); + + Assert.assertEquals(expected, actual); } @Test public void setOtherBet() { + Handler handler = new Handler(); + handler.createPlayer("bob" , 100.0); + Craps craps = new Craps(); + + craps.setOtherBet(10.0); + + Double expected = 10.0; + Double actual = craps.getOtherBet(); + + Assert.assertEquals(expected, actual); } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java new file mode 100644 index 000000000..bbc37c13a --- /dev/null +++ b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java @@ -0,0 +1,112 @@ +package io.zipcoder.casino.player; + +import io.zipcoder.casino.Handler; +import io.zipcoder.casino.games.Craps; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CrapsPlayerTest { + + @Test + public void getName() { + Handler handler = new Handler(); + CrapsPlayer crapsPlayer = new CrapsPlayer(); + crapsPlayer.setName("bob"); + + String actual = crapsPlayer.getName(); + String expected = "bob"; + + Assert.assertEquals(expected, actual); + } + + @Test + public void setName() { + Handler handler = new Handler(); + CrapsPlayer crapsPlayer = new CrapsPlayer(); + crapsPlayer.setName("bob"); + + String actual = crapsPlayer.getName(); + String expected = "bob"; + + Assert.assertEquals(expected, actual); + } + + @Test + public void getAccount() { + Handler handler = new Handler(); + CrapsPlayer crapsPlayer = new CrapsPlayer(); + crapsPlayer.getAccount(); + + Double actual = 0.0; + Double expected = crapsPlayer.getAccount(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void setAccount() { + Handler handler = new Handler(); + CrapsPlayer crapsPlayer = new CrapsPlayer(); + crapsPlayer.getAccount(); + + Double actual = 0.0; + Double expected = crapsPlayer.getAccount(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void betFirstLine() { + Handler handler = new Handler(); + + Craps craps = new Craps(); + craps.getCrapsPlayer().bet(10.0); + + Double actual = 10.0; + Double expected = craps.getFirstLineBet(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void betSecondLine() { + Handler handler = new Handler(); + + Craps craps = new Craps(); + craps.getCrapsPlayer().bet(10.0); + + Double actual = 10.0; + Double expected = craps.getSecondLineBet(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void betOther() { + Handler handler = new Handler(); + + Craps craps = new Craps(); + craps.getCrapsPlayer().bet(10.0); + + Double actual = 10.0; + Double expected = craps.getOtherBet(); + + Assert.assertEquals(expected, actual); + } + + + @Test + public void cashout() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob", 10000.0); + Craps craps = new Craps(); + craps.getCrapsPlayer().bet(10.0); + craps.getCrapsPlayer().cashout(); + + Boolean actual = player.getPlaying(); + + Assert.assertEquals(false, actual); + } +} \ No newline at end of file From 6a4db6e0f3983ed55ea992988a575f1dc8e9f3d2 Mon Sep 17 00:00:00 2001 From: Darya Date: Wed, 12 Jun 2019 14:06:51 -0400 Subject: [PATCH 18/71] original --- src/main/java/io/zipcoder/casino/player/CardGamePlayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index 055277f6f..9da31baef 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -2,6 +2,7 @@ import javax.smartcardio.Card; import java.util.ArrayList; +/// public class CardGamePlayer extends Player { public ArrayList hand; From f2a39f04da4885d2676616310e1e9381da75a2ed Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Wed, 12 Jun 2019 21:35:09 -0400 Subject: [PATCH 19/71] Kavya : fixed the maven test package structure --- src/test/{ => java}/io/zipcoder/casino/HandlerTest.java | 0 src/test/{ => java}/io/zipcoder/casino/games/CrapsTest.java | 0 src/test/{ => java}/io/zipcoder/casino/player/PlayerTest.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/test/{ => java}/io/zipcoder/casino/HandlerTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/games/CrapsTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/player/PlayerTest.java (100%) diff --git a/src/test/io/zipcoder/casino/HandlerTest.java b/src/test/java/io/zipcoder/casino/HandlerTest.java similarity index 100% rename from src/test/io/zipcoder/casino/HandlerTest.java rename to src/test/java/io/zipcoder/casino/HandlerTest.java diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/java/io/zipcoder/casino/games/CrapsTest.java similarity index 100% rename from src/test/io/zipcoder/casino/games/CrapsTest.java rename to src/test/java/io/zipcoder/casino/games/CrapsTest.java diff --git a/src/test/io/zipcoder/casino/player/PlayerTest.java b/src/test/java/io/zipcoder/casino/player/PlayerTest.java similarity index 100% rename from src/test/io/zipcoder/casino/player/PlayerTest.java rename to src/test/java/io/zipcoder/casino/player/PlayerTest.java From 355cb1e2782651d54318dd75d2302f0c5216fc5b Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Wed, 12 Jun 2019 23:54:54 -0400 Subject: [PATCH 20/71] intial testcases --- .../io/zipcoder/casino/games/Roulette.java | 9 ++- .../casino/player/RoulettePlayer.java | 2 +- .../zipcoder/casino/RoulettePlayerTest.java | 20 +++++++ .../zipcoder/casino/games/RouletteTest.java | 60 +++++++++++++++++++ 4 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 src/test/java/io/zipcoder/casino/RoulettePlayerTest.java create mode 100644 src/test/java/io/zipcoder/casino/games/RouletteTest.java diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index f49e6b80c..6670e2cab 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -16,28 +16,32 @@ void nextTurn() { @Override void endGame() { - + // end game and go back to main menu } @Override boolean getResults() { + // determine win or loose return false; } @Override public void display(String output) { + super.display(output); } public Integer calcPayment(Integer bet, Integer odds) { + //calculate payment amount to be payed based on the position return null; } public void updateAccount(Integer num) { - + //add or remove money from the balance } public Double getCurrentBet() { + return currentBet; } @@ -46,6 +50,7 @@ public void setCurrentBet(Double currentBet) { } public Double calcPayment(Double bet, Double odds) { + return null; } diff --git a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java index fd49045da..53038c45d 100644 --- a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java @@ -9,7 +9,7 @@ public void bet(Double bet) { public void betType (String betType) { - }; + } public void cashout() { diff --git a/src/test/java/io/zipcoder/casino/RoulettePlayerTest.java b/src/test/java/io/zipcoder/casino/RoulettePlayerTest.java new file mode 100644 index 000000000..d19a6e8b9 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/RoulettePlayerTest.java @@ -0,0 +1,20 @@ +package io.zipcoder.casino; + +import io.zipcoder.casino.player.RoulettePlayer; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class RoulettePlayerTest { + private RoulettePlayer roulettePlayer; + @Before + public void setup() { + this.roulettePlayer = new RoulettePlayer(); + } + + @Test + public void cashoutTest() { + + + } +} diff --git a/src/test/java/io/zipcoder/casino/games/RouletteTest.java b/src/test/java/io/zipcoder/casino/games/RouletteTest.java new file mode 100644 index 000000000..901a12091 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/games/RouletteTest.java @@ -0,0 +1,60 @@ +package io.zipcoder.casino.games; + +import io.zipcoder.casino.player.Player; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class RouletteTest { + private Roulette roulette; + + + @Before //it will get invoked before each test method + public void setup() { + this.roulette = new Roulette(); + } + + + + @Test + public void endGameTest() { + + } + + @Test + public void getResultsTest() { + + } + @Test + public void displayTest() { + + } + @Test + public void calcPaymentTest() { + + Integer actual = this.roulette.calcPayment(1, 35); + Assert.assertEquals(36,actual.intValue()); + } + + @Test + public void updateAccountTest() { + this.roulette.updateAccount(10); + Double actual = this.roulette.roulettePlayer.getAccount(); + Assert.assertEquals(10,actual.doubleValue(),0.0); + + + + } + + + @Test + public void calcPaymentDoubleTest(){ + Double actual = this.roulette.calcPayment(2.5,2d); + Assert.assertEquals(7.5,actual.doubleValue(),0.0); + + } + @Test + public void updateAccountDoubleTest(){ + + } +} From 3efd8b1534bbdbc7735fac823e1504009f793dfe Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Thu, 13 Jun 2019 00:02:51 -0400 Subject: [PATCH 21/71] Kavya: Deleted directory --- src/test/io/zipcoder/casino/DeckTest.java | 82 ------------- src/test/io/zipcoder/casino/DiceTest.java | 17 --- .../zipcoder/casino/games/CardGamesTest.java | 44 ------- .../io/zipcoder/casino/games/GoFishTest.java | 40 ------- .../casino/player/CrapsPlayerTest.java | 112 ------------------ 5 files changed, 295 deletions(-) delete mode 100644 src/test/io/zipcoder/casino/DeckTest.java delete mode 100644 src/test/io/zipcoder/casino/DiceTest.java delete mode 100644 src/test/io/zipcoder/casino/games/CardGamesTest.java delete mode 100644 src/test/io/zipcoder/casino/games/GoFishTest.java delete mode 100644 src/test/io/zipcoder/casino/player/CrapsPlayerTest.java diff --git a/src/test/io/zipcoder/casino/DeckTest.java b/src/test/io/zipcoder/casino/DeckTest.java deleted file mode 100644 index 2ab11c436..000000000 --- a/src/test/io/zipcoder/casino/DeckTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package io.zipcoder.casino; - -import io.zipcoder.casino.player.CardGamePlayer; -import io.zipcoder.casino.player.GoFishPlayer; -import io.zipcoder.casino.player.Player; -import org.junit.Assert; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.Stack; - -import static org.junit.Assert.*; - -public class DeckTest { - - @Test - public void shuffle() { - Deck testDeck = new Deck(); - Card beforeShuffle = testDeck.deck.peek(); - testDeck.shuffle(); - Card afterShuffle = testDeck.deck.peek(); - Assert.assertFalse(beforeShuffle.equals(afterShuffle)); - } - @Test - public void shuffleNotWorking() { - Deck testDeck = new Deck(); - Card beforeShuffle = testDeck.deck.peek(); - testDeck.shuffle(); - Card afterShuffle = testDeck.deck.peek(); - Assert.assertFalse(!beforeShuffle.equals(afterShuffle)); - } - - @Test - public void deal5() { - CardGamePlayer testPlayer = new GoFishPlayer(); - Integer numCards = 5; - Deck deck = new Deck(); - ArrayList testStartingHand = deck.deal(numCards,testPlayer); - Integer expected = 5; - Integer actual = testStartingHand.size(); - Assert.assertEquals(expected,actual); - } - - @Test - public void deal2() { - CardGamePlayer testPlayer = new GoFishPlayer(); - Integer numCards = 2; - Deck deck = new Deck(); - ArrayList testStartingHand = deck.deal(numCards,testPlayer); - Integer expected = 2; - Integer actual = testStartingHand.size(); - Assert.assertEquals(expected,actual); - } - - @Test //DO - public void dealNegative() { - CardGamePlayer testPlayer = new GoFishPlayer(); - Integer numCards = -2; - Deck deck = new Deck(); - ArrayList testStartingHand = deck.deal(numCards,testPlayer); - Integer expected = 2; - Integer actual = testStartingHand.size(); - Assert.assertEquals(expected,actual); - } - - @Test - public void dealSingleCard1() { - CardGamePlayer testPlayer = new GoFishPlayer(); - Deck deck = new Deck(); - deck.dealSingleCard(testPlayer); - Assert.assertFalse(testPlayer.getHand().isEmpty()); - } - @Test - public void dealSingleCard2() { - CardGamePlayer testPlayer = new GoFishPlayer(); - Deck deck = new Deck(); - deck.dealSingleCard(testPlayer); - Integer expected = 1; - Integer actual = testPlayer.getHand().size(); - Assert.assertEquals(expected,actual); - } -} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/DiceTest.java b/src/test/io/zipcoder/casino/DiceTest.java deleted file mode 100644 index 57ddc338c..000000000 --- a/src/test/io/zipcoder/casino/DiceTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.zipcoder.casino; - -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; - -public class DiceTest { - - @Test - public void rollDice() { - Dice dice = new Dice(); - Integer result = dice.rollDice(); - - Assert.assertTrue(result <= 12 && result >=2); - } -} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/CardGamesTest.java b/src/test/io/zipcoder/casino/games/CardGamesTest.java deleted file mode 100644 index bc474db07..000000000 --- a/src/test/io/zipcoder/casino/games/CardGamesTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.zipcoder.casino.games; - -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; - -public class CardGamesTest { - - @Test - public void getOdds() { - Blackjack blackjack = new Blackjack(); - blackjack.setOdds(2.0); - - Double expected = 2.0; - Double actual = blackjack.odds; - - Assert.assertEquals(expected, actual); - } - - @Test - public void setOdds() { - Blackjack blackjack = new Blackjack(); - blackjack.setOdds(2.0); - - Double expected = 2.0; - Double actual = blackjack.odds; - - Assert.assertEquals(expected, actual); - } - - @Test - public void dealCard() { - Blackjack blackjack = new Blackjack(); - blackjack.setOdds(2.0); - - Integer beforeDeal = blackjack.player1.hand.size(); - blackjack.deck.deal(2, blackjack.player1); - Integer afterDeal = blackjack.player1.hand.size(); - - - Assert.assertFalse(beforeDeal.equals(afterDeal)); - } -} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java deleted file mode 100644 index ff524096a..000000000 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.zipcoder.casino.games; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class GoFishTest { - - @Test - public void nextTurn() { - } - - @Test - public void endGame() { - } - - @Test - public void getResults() { - } - - @Test - public void display() { - } - - @Test - public void check() { - } - - @Test - public void goFish() { - } - - @Test - public void getCurrentBet() { - } - - @Test - public void setCurrentBet() { - } -} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java deleted file mode 100644 index bbc37c13a..000000000 --- a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java +++ /dev/null @@ -1,112 +0,0 @@ -package io.zipcoder.casino.player; - -import io.zipcoder.casino.Handler; -import io.zipcoder.casino.games.Craps; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; - -public class CrapsPlayerTest { - - @Test - public void getName() { - Handler handler = new Handler(); - CrapsPlayer crapsPlayer = new CrapsPlayer(); - crapsPlayer.setName("bob"); - - String actual = crapsPlayer.getName(); - String expected = "bob"; - - Assert.assertEquals(expected, actual); - } - - @Test - public void setName() { - Handler handler = new Handler(); - CrapsPlayer crapsPlayer = new CrapsPlayer(); - crapsPlayer.setName("bob"); - - String actual = crapsPlayer.getName(); - String expected = "bob"; - - Assert.assertEquals(expected, actual); - } - - @Test - public void getAccount() { - Handler handler = new Handler(); - CrapsPlayer crapsPlayer = new CrapsPlayer(); - crapsPlayer.getAccount(); - - Double actual = 0.0; - Double expected = crapsPlayer.getAccount(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setAccount() { - Handler handler = new Handler(); - CrapsPlayer crapsPlayer = new CrapsPlayer(); - crapsPlayer.getAccount(); - - Double actual = 0.0; - Double expected = crapsPlayer.getAccount(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void betFirstLine() { - Handler handler = new Handler(); - - Craps craps = new Craps(); - craps.getCrapsPlayer().bet(10.0); - - Double actual = 10.0; - Double expected = craps.getFirstLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void betSecondLine() { - Handler handler = new Handler(); - - Craps craps = new Craps(); - craps.getCrapsPlayer().bet(10.0); - - Double actual = 10.0; - Double expected = craps.getSecondLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void betOther() { - Handler handler = new Handler(); - - Craps craps = new Craps(); - craps.getCrapsPlayer().bet(10.0); - - Double actual = 10.0; - Double expected = craps.getOtherBet(); - - Assert.assertEquals(expected, actual); - } - - - @Test - public void cashout() { - Handler handler = new Handler(); - Player player = handler.createPlayer("bob", 10000.0); - Craps craps = new Craps(); - craps.getCrapsPlayer().bet(10.0); - craps.getCrapsPlayer().cashout(); - - Boolean actual = player.getPlaying(); - - Assert.assertEquals(false, actual); - } -} \ No newline at end of file From 87aa3abea2827e9ddfa7d3bd9eb124363d37b69a Mon Sep 17 00:00:00 2001 From: alilinykh Date: Thu, 13 Jun 2019 14:16:20 -0400 Subject: [PATCH 22/71] 215 thursday gofish test started --- src/main/java/io/zipcoder/casino/Handler.java | 4 ++- .../java/io/zipcoder/casino/games/GoFish.java | 31 +++++++++++-------- .../zipcoder/casino/player/GoFishPlayer.java | 6 ++++ src/test/io/zipcoder/casino/DeckTest.java | 4 +-- .../io/zipcoder/casino/games/GoFishTest.java | 24 ++++++++++++++ 5 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 658c84cad..4d7e50749 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -1,5 +1,6 @@ package io.zipcoder.casino; import io.zipcoder.casino.games.*; +import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; @@ -25,7 +26,8 @@ void run() { Blackjack blackjack = new Blackjack(); break; case 1 : - GoFish goFish = new GoFish(); + GoFishPlayer goFishPlayer = new GoFishPlayer(player); + GoFish goFish = new GoFish(goFishPlayer); break; case 2: Roulette roulette = new Roulette(); diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index b7771c555..4b3c43024 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -2,23 +2,23 @@ import io.zipcoder.casino.Card; import io.zipcoder.casino.Deck; +import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.GoFishPlayerNPC; +import io.zipcoder.casino.player.Player; import java.security.PrivateKey; +import java.util.ArrayList; public class GoFish extends Games { - GoFishPlayer player1 = new GoFishPlayer(); - GoFishPlayerNPC player2 = new GoFishPlayerNPC(); + + private CardGamePlayer goFishPlayer; Deck deck = new Deck(); - private Integer player1Score; - private Integer player2Score; - private Double currentBet; - public GoFish() { + public GoFish() {} + public GoFish(GoFishPlayer player) { super(); - this.player1Score = 0; - this.player2Score = 0; + this.goFishPlayer = player; } @@ -50,12 +50,17 @@ public Card goFish () { return null; }; - public Double getCurrentBet() { - return currentBet; - } - public void setCurrentBet(Double currentBet) { - this.currentBet = currentBet; + //====================alex + public Integer inputNumPlayers() { + String info = "Please Enter Number of players"; + return null; } + public ArrayList createOtherPlayers (Integer numPlayers) { + //foreach of inputnUmplayers - create player + return null; + } + + } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 2e8a40863..fcf05df4b 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -4,7 +4,13 @@ import java.util.ArrayList; public class GoFishPlayer extends CardGamePlayer { + Player player; + public GoFishPlayer() {} + + public GoFishPlayer(Player player) { + this.player = player; + } public void endturn() {}; diff --git a/src/test/io/zipcoder/casino/DeckTest.java b/src/test/io/zipcoder/casino/DeckTest.java index 2ab11c436..91b32b0b0 100644 --- a/src/test/io/zipcoder/casino/DeckTest.java +++ b/src/test/io/zipcoder/casino/DeckTest.java @@ -58,9 +58,7 @@ public void dealNegative() { Integer numCards = -2; Deck deck = new Deck(); ArrayList testStartingHand = deck.deal(numCards,testPlayer); - Integer expected = 2; - Integer actual = testStartingHand.size(); - Assert.assertEquals(expected,actual); + Assert.assertNull(testStartingHand); } @Test diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index ff524096a..3d9460794 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -1,13 +1,22 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.Deck; +import io.zipcoder.casino.player.CardGamePlayer; +import io.zipcoder.casino.player.GoFishPlayer; +import io.zipcoder.casino.player.Player; +import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; + import static org.junit.Assert.*; public class GoFishTest { @Test public void nextTurn() { + + } @Test @@ -37,4 +46,19 @@ public void getCurrentBet() { @Test public void setCurrentBet() { } + + @Test + public void inputNumPlayers() { + + } + + @Test + public void createOtherPlayersTest() { + GoFish goFish = new GoFish(); + Integer expected = 2; + Integer actual = goFish.createOtherPlayers(expected).size(); + Assert.assertEquals(expected,actual); + + + } } \ No newline at end of file From a0f3f83722dc2eafbe4801dbbdc0ef8f738110dc Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Thu, 13 Jun 2019 15:11:29 -0400 Subject: [PATCH 23/71] some craps logic implemented new tests needed --- src/main/java/io/zipcoder/casino/Handler.java | 5 +- .../io/zipcoder/casino/games/Blackjack.java | 7 +- .../java/io/zipcoder/casino/games/Craps.java | 94 ++++++++++++--- .../casino/games/GamblerGameInterface.java | 4 +- .../io/zipcoder/casino/games/Roulette.java | 7 +- .../java/io/zipcoder/casino/games/Slots.java | 8 ++ .../zipcoder/casino/player/CrapsPlayer.java | 8 ++ .../casino/player/GamblerInterface.java | 2 + .../zipcoder/casino/player/GoFishPlayer.java | 5 +- .../io/zipcoder/casino/games/CrapsTest.java | 112 +++++------------- 10 files changed, 146 insertions(+), 106 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 658c84cad..f6abf801d 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -1,5 +1,6 @@ package io.zipcoder.casino; import io.zipcoder.casino.games.*; +import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; @@ -31,7 +32,8 @@ void run() { Roulette roulette = new Roulette(); break; case 3: - Craps craps = new Craps(player); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); break; case 4: Slots slots = new Slots(); @@ -39,7 +41,6 @@ void run() { default: System.out.println("you blew it"); } - } public Player createPlayer (String name, Double account) { diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index c18582d02..731c6298d 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -75,7 +75,12 @@ public Double calcPayment(Double bet, Double odds) { return null; } - public void updateAccount(Double num) { + public void withdraw(Double num) { } + + public void deposit(Double num) { + + } + } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 8b7dc1845..c98da5666 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -4,35 +4,92 @@ import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; +import io.zipcoder.casino.utilities.Console; -public class Craps extends Games implements GamblerGameInterface { - +import java.security.PrivateKey; - private CrapsPlayer crapsPlayer = new CrapsPlayer(); - private Player player; - private Boolean isOn = false; +public class Craps extends Games implements GamblerGameInterface { + private CrapsPlayer crapsPlayer; private Integer onNumber; private Double firstLineBet; private Double secondLineBet; private Double otherBet; + private Double firstLineOdds = 2.0; + private Double secondLineOdds = 2.0; + private Integer stage; + Console console = new Console(System.in, System.out); public Craps() { }; - public Craps(Player player) { - this.player = player; + public Craps(CrapsPlayer player) { + this.crapsPlayer = player; + this.stage = 0; } + public void runGame() { + display("Welcome to the table " + crapsPlayer.player.getName() + "! \n"); + while(crapsPlayer.player.getPlaying() == true) { + switch (stage) { + case 0: + stage0Play(); + break; + case 1: + stage1Play(); + break; + case 2: + stage2Play(); + break; + case 3: + stage3Play(); + break; + } + } + } + + public void stage0Play(){ + String input = console.getStringInput("A game has just ended would you like to play or exit? "); + + if(input.toLowerCase().equals("play")) { + this.stage = 1; + } else if (input.toLowerCase().equals("exit")){ + crapsPlayer.player.setPlaying(false); + } else { + display("Excuse me I didnt understand"); + } + } + + public void stage1Play(){ + firstLineBet = console.getDoubleInput("Let's get started! \n Place Your bet!"); + withdraw(firstLineBet); //need to handle seeting account + Integer roll = crapsPlayer.roll(); + + if(roll.equals(2) || roll.equals(3) || roll.equals(12)) { + display(" you rolled a " + roll + "\n" + "Sorry you crapped out!"); + this.stage = 0; + } else if (roll.equals(7) || roll.equals(11)) { + display(" you rolled a " + roll + "\n" + "you won!" + calcPayment(firstLineOdds, firstLineBet)); + deposit(firstLineBet); + } else{ + display(" you rolled a " + roll + ".\n" + roll + " is now the on number!"); + setOnNumber(roll); + this.stage = 2; + } + + } + + public void stage2Play(){ + + } + public void stage3Play(){ - public Integer calcPayment(Integer bet, Integer odds) { - return null; } - public void updateAccount(Double num) { - this.crapsPlayer.setAccount(num); + public Integer calcPayment(Integer bet, Integer odds) { + return null; } @@ -47,17 +104,20 @@ boolean getResults() { @Override public void display(String output) { - super.display(output); + System.out.println(output); } - public Boolean getOn() { - return isOn; + public void withdraw(Double num) { + Double temp = crapsPlayer.player.getAccount(); + crapsPlayer.player.setAccount(temp - num); } - public void setOn(Boolean on) { - isOn = on; + public void deposit(Double num) { + Double temp = crapsPlayer.player.getAccount(); + crapsPlayer.player.setAccount(temp + num); } + public Integer getOnNumber() { return onNumber; } @@ -95,7 +155,7 @@ public CrapsPlayer getCrapsPlayer() { } public Double calcPayment(Double bet, Double odds) { - return null; + return bet *odds; } @Override diff --git a/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java index da6928ee1..9c1057e7c 100644 --- a/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java +++ b/src/main/java/io/zipcoder/casino/games/GamblerGameInterface.java @@ -4,6 +4,8 @@ interface GamblerGameInterface { Double calcPayment(Double bet, Double odds); + void withdraw(Double num); + + void deposit(Double num); - void updateAccount(Double num); } diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index f49e6b80c..904ec999a 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -49,7 +49,12 @@ public Double calcPayment(Double bet, Double odds) { return null; } - public void updateAccount(Double num) { + public void withdraw(Double num) { } + + public void deposit(Double num) { + + } + } diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 1eed0f181..f79ef8aa9 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -50,6 +50,14 @@ public Double calcPayment(Double bet, Double odds) { return null; } + public void withdraw(Double num) { + + } + + public void deposit(Double num) { + + } + public void updateAccount(Double num) { } diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index 1c955941d..b5c9449b4 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -5,8 +5,16 @@ public class CrapsPlayer extends Player implements GamblerInterface { + public Player player; + + public CrapsPlayer(){}; + + public CrapsPlayer(Player player){ + this.player = player; + } + public Integer roll() { Dice dice = new Dice(); diff --git a/src/main/java/io/zipcoder/casino/player/GamblerInterface.java b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java index 13e8aa989..7cad98620 100644 --- a/src/main/java/io/zipcoder/casino/player/GamblerInterface.java +++ b/src/main/java/io/zipcoder/casino/player/GamblerInterface.java @@ -10,4 +10,6 @@ public interface GamblerInterface { void displayAccoutBal(); + + } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 2e8a40863..9854dfb11 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -1,13 +1,12 @@ package io.zipcoder.casino.player; +import io.zipcoder.casino.games.GoFish; + import javax.smartcardio.Card; import java.util.ArrayList; public class GoFishPlayer extends CardGamePlayer { - - public void endturn() {}; - @Override public ArrayList getHand() { return super.getHand(); diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 0f743f503..e7d0e86cf 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -35,86 +35,8 @@ public void updateAccount() { Assert.assertEquals(expected, actual); } - @Test - public void updateAccountNeg() { - Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); - Craps craps = new Craps(); - - craps.getCrapsPlayer().setAccount(-10.0); - Double expected = 90.0; - Double actual = craps.getCrapsPlayer().getAccount(); - - Assert.assertEquals(expected, actual); - } - - - @Test - public void endGame() { - Handler handler = new Handler(); - Player player = handler.createPlayer("bob" , 100.0); - Craps craps = new Craps(); - craps.setOn(true); - craps.setOnNumber(8); - - craps.getCrapsPlayer().roll().equals(7); - - - Boolean expected = false; - Boolean actual = player.getPlaying(); - - Assert.assertEquals(expected, actual); - } - - - @Test - public void getResults() { - Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); - Craps craps = new Craps(); - - craps.setOn(true); - craps.setOnNumber(8); - - - craps.getCrapsPlayer().roll().equals(7.0); - - - Double expected = 7.0; - Boolean actual = craps.getResults(); - - Assert.assertEquals(expected, actual); - } - @Test - public void getOn() { - Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); - Craps craps = new Craps(); - - craps.setOn(true); - - Boolean expected = true; - Boolean actual = craps.getOn(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setOn() { - Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); - Craps craps = new Craps(); - - craps.setOn(false); - - Boolean expected = false; - Boolean actual = craps.getOn(); - - Assert.assertEquals(expected, actual); - } - @Test public void getOnNumber() { Handler handler = new Handler(); @@ -135,10 +57,10 @@ public void setOnNumber() { handler.createPlayer("bob" , 100.0); Craps craps = new Craps(); - craps.setOn(true); + craps.setOnNumber(8); - Boolean expected = true; - Boolean actual = craps.getOn(); + Integer expected = 8; + Integer actual = craps.getOnNumber(); Assert.assertEquals(expected, actual); } @@ -226,4 +148,32 @@ public void setOtherBet() { Assert.assertEquals(expected, actual); } + + @Test + public void stage0Play() { + } + + @Test + public void stage1PlayLost() { + Craps craps = new Craps(); + Integer roll = 2; + + + } + + @Test + public void stage2Play() { + } + + @Test + public void stage3Play() { + } + + @Test + public void withdraw() { + } + + @Test + public void deposit() { + } } \ No newline at end of file From ab16b3f2bf13cc96bef2112ce9e042d587855d94 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Thu, 13 Jun 2019 15:35:58 -0400 Subject: [PATCH 24/71] working on card and deck --- src/main/java/io/zipcoder/casino/Card.java | 12 --------- .../io/zipcoder/casino/gameTools/Card.java | 27 +++++++++++++++++++ .../zipcoder/casino/gameTools/CardValue.java | 27 +++++++++++++++++++ .../zipcoder/casino/{ => gameTools}/Deck.java | 17 +++++++++++- .../zipcoder/casino/{ => gameTools}/Dice.java | 2 +- .../io/zipcoder/casino/gameTools/Suit.java | 8 ++++++ .../io/zipcoder/casino/games/Blackjack.java | 4 +-- .../io/zipcoder/casino/games/CardGames.java | 4 +-- .../java/io/zipcoder/casino/games/GoFish.java | 6 ++--- .../casino/player/BlackJackPlayer.java | 5 +--- .../casino/player/BlackJackPlayerNPC.java | 4 --- .../zipcoder/casino/player/CrapsPlayer.java | 2 +- .../casino/player/GoFishPlayerNPC.java | 4 --- .../casino/{ => gameTools}/DeckTest.java | 8 +++--- .../casino/{ => gameTools}/DiceTest.java | 5 ++-- .../io/zipcoder/casino/games/GoFishTest.java | 8 ------ 16 files changed, 91 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/io/zipcoder/casino/Card.java create mode 100644 src/main/java/io/zipcoder/casino/gameTools/Card.java create mode 100644 src/main/java/io/zipcoder/casino/gameTools/CardValue.java rename src/main/java/io/zipcoder/casino/{ => gameTools}/Deck.java (84%) rename src/main/java/io/zipcoder/casino/{ => gameTools}/Dice.java (68%) create mode 100644 src/main/java/io/zipcoder/casino/gameTools/Suit.java rename src/test/io/zipcoder/casino/{ => gameTools}/DeckTest.java (94%) rename src/test/io/zipcoder/casino/{ => gameTools}/DiceTest.java (75%) diff --git a/src/main/java/io/zipcoder/casino/Card.java b/src/main/java/io/zipcoder/casino/Card.java deleted file mode 100644 index 34daf6108..000000000 --- a/src/main/java/io/zipcoder/casino/Card.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.zipcoder.casino; - -public class Card { - Integer cardVal; - - public enum cardValue { - - } - - public enum cardSuit { - } -} diff --git a/src/main/java/io/zipcoder/casino/gameTools/Card.java b/src/main/java/io/zipcoder/casino/gameTools/Card.java new file mode 100644 index 000000000..7ef58c839 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/gameTools/Card.java @@ -0,0 +1,27 @@ +package io.zipcoder.casino.gameTools; + +public class Card { + private CardValue cardValue; + private Suit suit; + + public Card (CardValue cv, Suit s) { + this.cardValue = cv; + this.suit = s; + } + + public CardValue getCardValue() { + return cardValue; + } + + public void setCardValue(CardValue cardValue) { + this.cardValue = cardValue; + } + + public Suit getSuit() { + return suit; + } + + public void setSuit(Suit suit) { + this.suit = suit; + } +} diff --git a/src/main/java/io/zipcoder/casino/gameTools/CardValue.java b/src/main/java/io/zipcoder/casino/gameTools/CardValue.java new file mode 100644 index 000000000..56c8186df --- /dev/null +++ b/src/main/java/io/zipcoder/casino/gameTools/CardValue.java @@ -0,0 +1,27 @@ +package io.zipcoder.casino.gameTools; + +public enum CardValue { + Two(2), + Three(3), + Four(4), + Five(5), + Six(6), + Seven(7), + Eight(8), + Nine(9), + Ten(10), + Jack(11), + Queen(12), + King(13), + Ace(14); + + private Integer cardValue; + + CardValue(Integer cardValue) { + this.cardValue = cardValue; + } + public Integer getCardValue() { + return cardValue; + } + +} diff --git a/src/main/java/io/zipcoder/casino/Deck.java b/src/main/java/io/zipcoder/casino/gameTools/Deck.java similarity index 84% rename from src/main/java/io/zipcoder/casino/Deck.java rename to src/main/java/io/zipcoder/casino/gameTools/Deck.java index 5ac42d651..8e4ea5178 100644 --- a/src/main/java/io/zipcoder/casino/Deck.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Deck.java @@ -1,5 +1,6 @@ -package io.zipcoder.casino; +package io.zipcoder.casino.gameTools; +import io.zipcoder.casino.gameTools.Card; import io.zipcoder.casino.player.CardGamePlayer; import java.util.ArrayList; @@ -11,6 +12,20 @@ public Stack getDeck() { return deck; } + + + + + + + + + + + + + + Stack deck = new Stack(); public void shuffle () { diff --git a/src/main/java/io/zipcoder/casino/Dice.java b/src/main/java/io/zipcoder/casino/gameTools/Dice.java similarity index 68% rename from src/main/java/io/zipcoder/casino/Dice.java rename to src/main/java/io/zipcoder/casino/gameTools/Dice.java index cdbca329c..fdfc3a7f1 100644 --- a/src/main/java/io/zipcoder/casino/Dice.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Dice.java @@ -1,4 +1,4 @@ -package io.zipcoder.casino; +package io.zipcoder.casino.gameTools; public class Dice { public Integer rollDice() { diff --git a/src/main/java/io/zipcoder/casino/gameTools/Suit.java b/src/main/java/io/zipcoder/casino/gameTools/Suit.java new file mode 100644 index 000000000..258d5869e --- /dev/null +++ b/src/main/java/io/zipcoder/casino/gameTools/Suit.java @@ -0,0 +1,8 @@ +package io.zipcoder.casino.gameTools; + +public enum Suit { + Hearts, + Spades, + Diamonds, + Clubs; +} diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index c18582d02..523263938 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -1,10 +1,8 @@ package io.zipcoder.casino.games; -import io.zipcoder.casino.Card; -import io.zipcoder.casino.Deck; +import io.zipcoder.casino.gameTools.Card; import io.zipcoder.casino.player.BlackJackPlayer; import io.zipcoder.casino.player.BlackJackPlayerNPC; -import io.zipcoder.casino.utilities.Console; public class Blackjack extends CardGames implements GamblerGameInterface { diff --git a/src/main/java/io/zipcoder/casino/games/CardGames.java b/src/main/java/io/zipcoder/casino/games/CardGames.java index 7bbb6fe72..23bc6f8f2 100644 --- a/src/main/java/io/zipcoder/casino/games/CardGames.java +++ b/src/main/java/io/zipcoder/casino/games/CardGames.java @@ -1,7 +1,7 @@ package io.zipcoder.casino.games; -import io.zipcoder.casino.Card; -import io.zipcoder.casino.Deck; +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.Deck; abstract class CardGames extends Games { Deck deck; diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 4b3c43024..38a558be0 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -1,13 +1,11 @@ package io.zipcoder.casino.games; -import io.zipcoder.casino.Card; -import io.zipcoder.casino.Deck; +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.Deck; import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; -import io.zipcoder.casino.player.GoFishPlayerNPC; import io.zipcoder.casino.player.Player; -import java.security.PrivateKey; import java.util.ArrayList; public class GoFish extends Games { diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java index d6a91c5bd..ad1a6adb9 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -1,10 +1,7 @@ package io.zipcoder.casino.player; -import io.zipcoder.casino.Card; -import io.zipcoder.casino.Deck; - // -import java.util.ArrayList; + public class BlackJackPlayer extends CardGamePlayer implements GamblerInterface { diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java index 0daf2bfac..5494022ef 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayerNPC.java @@ -1,9 +1,5 @@ package io.zipcoder.casino.player; -import io.zipcoder.casino.Card; - -import java.util.ArrayList; - public class BlackJackPlayerNPC extends CardGamePlayer implements NPCInterface { public void bet(Double bet) { diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index 1c955941d..62a0536b4 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -1,6 +1,6 @@ package io.zipcoder.casino.player; -import io.zipcoder.casino.Dice; +import io.zipcoder.casino.gameTools.Dice; public class CrapsPlayer extends Player implements GamblerInterface { diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java index 5c7c25f16..3654b3424 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayerNPC.java @@ -1,9 +1,5 @@ package io.zipcoder.casino.player; -import io.zipcoder.casino.Card; - -import java.util.ArrayList; - public class GoFishPlayerNPC extends CardGamePlayer implements NPCInterface { diff --git a/src/test/io/zipcoder/casino/DeckTest.java b/src/test/io/zipcoder/casino/gameTools/DeckTest.java similarity index 94% rename from src/test/io/zipcoder/casino/DeckTest.java rename to src/test/io/zipcoder/casino/gameTools/DeckTest.java index 91b32b0b0..66ab3b08c 100644 --- a/src/test/io/zipcoder/casino/DeckTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DeckTest.java @@ -1,15 +1,13 @@ -package io.zipcoder.casino; +package io.zipcoder.casino.gameTools; +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.Deck; import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; -import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; -import java.util.Stack; - -import static org.junit.Assert.*; public class DeckTest { diff --git a/src/test/io/zipcoder/casino/DiceTest.java b/src/test/io/zipcoder/casino/gameTools/DiceTest.java similarity index 75% rename from src/test/io/zipcoder/casino/DiceTest.java rename to src/test/io/zipcoder/casino/gameTools/DiceTest.java index 57ddc338c..ba1a97150 100644 --- a/src/test/io/zipcoder/casino/DiceTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DiceTest.java @@ -1,10 +1,9 @@ -package io.zipcoder.casino; +package io.zipcoder.casino.gameTools; +import io.zipcoder.casino.gameTools.Dice; import org.junit.Assert; import org.junit.Test; -import static org.junit.Assert.*; - public class DiceTest { @Test diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index 3d9460794..db2467dcb 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -1,16 +1,8 @@ package io.zipcoder.casino.games; -import io.zipcoder.casino.Deck; -import io.zipcoder.casino.player.CardGamePlayer; -import io.zipcoder.casino.player.GoFishPlayer; -import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; - -import static org.junit.Assert.*; - public class GoFishTest { @Test From a812dcb4ee1c587e24bdc2ee0b11318463436b24 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Thu, 13 Jun 2019 15:48:46 -0400 Subject: [PATCH 25/71] working on card and deck --- .../io/zipcoder/casino/gameTools/Card.java | 2 +- .../io/zipcoder/casino/gameTools/Deck.java | 31 +++++++++---------- .../zipcoder/casino/gameTools/DeckTest.java | 10 +++--- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/gameTools/Card.java b/src/main/java/io/zipcoder/casino/gameTools/Card.java index 7ef58c839..aa4f19f68 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Card.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Card.java @@ -8,7 +8,7 @@ public Card (CardValue cv, Suit s) { this.cardValue = cv; this.suit = s; } - + public CardValue getCardValue() { return cardValue; } diff --git a/src/main/java/io/zipcoder/casino/gameTools/Deck.java b/src/main/java/io/zipcoder/casino/gameTools/Deck.java index 8e4ea5178..1a5a25cb9 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Deck.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Deck.java @@ -1,6 +1,5 @@ package io.zipcoder.casino.gameTools; -import io.zipcoder.casino.gameTools.Card; import io.zipcoder.casino.player.CardGamePlayer; import java.util.ArrayList; @@ -8,28 +7,26 @@ import java.util.Stack; public class Deck { - public Stack getDeck() { - return deck; + Stack cardStack; + public Deck() { + this.cardStack = new Stack(); + for (CardValue card : CardValue.values() + ) { + for (Suit suit : Suit.values() + ) { + cardStack.add(new Card(card,suit)); + } + } } - - - - - - - - - - - - - Stack deck = new Stack(); + public Stack getCardStack() { + return cardStack; + } public void shuffle () { - Collections.shuffle(deck); + Collections.shuffle(cardStack); }; public ArrayList deal (Integer numOfCards, CardGamePlayer player) { diff --git a/src/test/io/zipcoder/casino/gameTools/DeckTest.java b/src/test/io/zipcoder/casino/gameTools/DeckTest.java index 66ab3b08c..f8cdf7753 100644 --- a/src/test/io/zipcoder/casino/gameTools/DeckTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DeckTest.java @@ -1,7 +1,5 @@ package io.zipcoder.casino.gameTools; -import io.zipcoder.casino.gameTools.Card; -import io.zipcoder.casino.gameTools.Deck; import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; import org.junit.Assert; @@ -14,17 +12,17 @@ public class DeckTest { @Test public void shuffle() { Deck testDeck = new Deck(); - Card beforeShuffle = testDeck.deck.peek(); + Card beforeShuffle = testDeck.cardStack.peek(); testDeck.shuffle(); - Card afterShuffle = testDeck.deck.peek(); + Card afterShuffle = testDeck.cardStack.peek(); Assert.assertFalse(beforeShuffle.equals(afterShuffle)); } @Test public void shuffleNotWorking() { Deck testDeck = new Deck(); - Card beforeShuffle = testDeck.deck.peek(); + Card beforeShuffle = testDeck.cardStack.peek(); testDeck.shuffle(); - Card afterShuffle = testDeck.deck.peek(); + Card afterShuffle = testDeck.cardStack.peek(); Assert.assertFalse(!beforeShuffle.equals(afterShuffle)); } From 9e6b7450a25e9983ab06aaa69b8a0aa2fe4c726a Mon Sep 17 00:00:00 2001 From: Darya Date: Thu, 13 Jun 2019 16:26:31 -0400 Subject: [PATCH 26/71] Logic doesn't work --- .../java/io/zipcoder/casino/games/Slots.java | 87 ++++++++++++++++++- .../zipcoder/casino/player/CrapsPlayer.java | 4 + 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 505ec6f8e..b801f8e0e 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -1,18 +1,92 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.player.Player; import io.zipcoder.casino.player.SlotsPlayer; +import java.lang.reflect.Array; + public class Slots extends Games implements GamblerGameInterface { Integer numOfLines; SlotsPlayer slotsPlayer = new SlotsPlayer(); private Double currentBet; + public Player player; + + public Slots(){ + } + + public Slots(Player player){ + this.player= player; + } + + public static void main(String[] args) { + Integer random =0; + String[] characters = new String[]{" cherry ", " orange ", " bell ", " bars ", " apple ", " seven "}; + String[][] toSave = new String[3][3]; +// for (int i = 0; i Date: Thu, 13 Jun 2019 16:32:40 -0400 Subject: [PATCH 27/71] ibg# Please enter the commit message for your changes. Lines starting --- .../io/zipcoder/casino/games/Blackjack.java | 16 ++++ .../zipcoder/casino/games/BlackjackTest.java | 89 +++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 src/test/java/io/zipcoder/casino/games/BlackjackTest.java diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index c18582d02..88b17d618 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -20,6 +20,7 @@ public Blackjack() { this.odds = 2.0; this.player1Score = 0; this.player2Score = 0; + this.currentBet = 0.0; } @@ -60,6 +61,15 @@ public void setPlayer2Score(Integer player2Score) { this.player2Score = player2Score; } + public void setCurrentBet(Double currentBet1) { + + this.currentBet = currentBet; + } + + public double getCurrentBet(){ + return currentBet; + } + @Override void nextTurn() { @@ -78,4 +88,10 @@ public Double calcPayment(Double bet, Double odds) { public void updateAccount(Double num) { } + + public BlackJackPlayer getBlackJackPlayer() { + + return player1; + } + } diff --git a/src/test/java/io/zipcoder/casino/games/BlackjackTest.java b/src/test/java/io/zipcoder/casino/games/BlackjackTest.java new file mode 100644 index 000000000..38fbc6040 --- /dev/null +++ b/src/test/java/io/zipcoder/casino/games/BlackjackTest.java @@ -0,0 +1,89 @@ +package io.zipcoder.casino.games; + + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import io.zipcoder.casino.Handler; +import io.zipcoder.casino.player.Player; + +public class BlackjackTest { + + @Test + public void stayTest(){ + + } + + @Test + public void splitTest(){ + + } + + @Test + public void doubleDownTest(){ + + } + + @Test + public void getPlayer1ScoreTest(){ + + } + + @Test + public void setPlayer1ScoreTest(){ + + } + + @Test + public void getPlayer2ScoreTest(){ + + } + + @Test + public void setPlayer2ScoreTest(){ + + } + + @Test + public void nextTurnTest(){ + + } + + @Test + public void endGameTest(){ + Handler handler = new Handler(); + Player player = handler.createPlayer("Sally" , 200.0); + Blackjack blackjack = new Blackjack(); + + + Boolean expected = false; + Boolean actual = player.getPlaying(); + + Assert.assertEquals(expected, actual); + + } + + @Test + public void calcBJPaymentTest(){ + Blackjack blackjack = new Blackjack(); + + blackjack.setOdds(3.0); + blackjack.setCurrentBet(10.0); + + Double expected = 30.0; + Double actual = blackjack.calcPayment(blackjack.odds, blackjack.getCurrentBet()); + + Assert.assertEquals(expected, actual); + } + + @Test + public void updateAccount(){ + Blackjack blackjack = new Blackjack(); + + blackjack.getBlackJackPlayer().setAccount(30.0); + Double expected = 30.0; + Double actual = blackjack.getBlackJackPlayer().getAccount(); + + Assert.assertEquals(expected, actual); + } +} From 5326289f4b49d4550707cdf1b95ff15d7b5e1991 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Thu, 13 Jun 2019 16:51:55 -0400 Subject: [PATCH 28/71] deck is working --- src/main/java/io/zipcoder/casino/gameTools/Deck.java | 10 ++++++++-- src/test/io/zipcoder/casino/gameTools/DeckTest.java | 2 +- src/test/io/zipcoder/casino/games/BlackjackTest.java | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/gameTools/Deck.java b/src/main/java/io/zipcoder/casino/gameTools/Deck.java index 1a5a25cb9..6dddc2abb 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Deck.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Deck.java @@ -4,19 +4,25 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Iterator; import java.util.Stack; public class Deck { Stack cardStack; public Deck() { this.cardStack = new Stack(); - for (CardValue card : CardValue.values() + for (CardValue c : CardValue.values() ) { for (Suit suit : Suit.values() ) { - cardStack.add(new Card(card,suit)); + Card card = new Card(c,suit); + this.cardStack.add(card); } } + Collections.shuffle(cardStack); + + System.out.println("FML"); + } diff --git a/src/test/io/zipcoder/casino/gameTools/DeckTest.java b/src/test/io/zipcoder/casino/gameTools/DeckTest.java index f8cdf7753..d314a03d4 100644 --- a/src/test/io/zipcoder/casino/gameTools/DeckTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DeckTest.java @@ -12,6 +12,7 @@ public class DeckTest { @Test public void shuffle() { Deck testDeck = new Deck(); + Card beforeShuffle = testDeck.cardStack.peek(); testDeck.shuffle(); Card afterShuffle = testDeck.cardStack.peek(); @@ -21,7 +22,6 @@ public void shuffle() { public void shuffleNotWorking() { Deck testDeck = new Deck(); Card beforeShuffle = testDeck.cardStack.peek(); - testDeck.shuffle(); Card afterShuffle = testDeck.cardStack.peek(); Assert.assertFalse(!beforeShuffle.equals(afterShuffle)); } diff --git a/src/test/io/zipcoder/casino/games/BlackjackTest.java b/src/test/io/zipcoder/casino/games/BlackjackTest.java index 38fbc6040..8c6347640 100644 --- a/src/test/io/zipcoder/casino/games/BlackjackTest.java +++ b/src/test/io/zipcoder/casino/games/BlackjackTest.java @@ -80,10 +80,10 @@ public void calcBJPaymentTest(){ public void updateAccount(){ Blackjack blackjack = new Blackjack(); - blackjack.getBlackJackPlayer().setAccount(30.0); - Double expected = 30.0; - Double actual = blackjack.getBlackJackPlayer().getAccount(); - - Assert.assertEquals(expected, actual); +// blackjack.getBlackJackPlayer().setAccount(30.0); +// Double expected = 30.0; +// Double actual = blackjack.getBlackJackPlayer().getAccount(); +// +// Assert.assertEquals(expected, actual); } } From 82f2e8a8ba04f42a0c9556ee01d5f3d343f9c8ae Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Thu, 13 Jun 2019 21:27:46 -0400 Subject: [PATCH 29/71] tests --- src/main/java/io/zipcoder/casino/games/Roulette.java | 2 ++ .../java/io/zipcoder/casino/player/RoulettePlayer.java | 4 ++++ src/test/io/zipcoder/casino/RoulettePlayerTest.java | 6 +++++- src/test/io/zipcoder/casino/games/RouletteTest.java | 10 +++++++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index eeb818764..d9df0b1bf 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -2,6 +2,8 @@ import io.zipcoder.casino.player.RoulettePlayer; +import java.util.Random; + public class Roulette extends Games implements GamblerGameInterface { String betType; // red/back - odd / even / number RoulettePlayer roulettePlayer = new RoulettePlayer(); diff --git a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java index 53038c45d..45e895f1b 100644 --- a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java @@ -1,8 +1,11 @@ package io.zipcoder.casino.player; +import java.util.Random; + public class RoulettePlayer extends Player implements GamblerInterface { + public void bet(Double bet) { } @@ -13,6 +16,7 @@ public void betType (String betType) { public void cashout() { + } public void displayAccoutBal() { diff --git a/src/test/io/zipcoder/casino/RoulettePlayerTest.java b/src/test/io/zipcoder/casino/RoulettePlayerTest.java index d19a6e8b9..756a5e50e 100644 --- a/src/test/io/zipcoder/casino/RoulettePlayerTest.java +++ b/src/test/io/zipcoder/casino/RoulettePlayerTest.java @@ -14,7 +14,11 @@ public void setup() { @Test public void cashoutTest() { + this.roulettePlayer.cashout(); + Double actual = this.roulettePlayer.getAccount(); + Assert.assertEquals(2.0,actual.doubleValue(),0.0); + } + - } } diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java index 901a12091..e73478df9 100644 --- a/src/test/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -53,8 +53,16 @@ public void calcPaymentDoubleTest(){ Assert.assertEquals(7.5,actual.doubleValue(),0.0); } + @Test public void updateAccountDoubleTest(){ - + this.roulette.updateAccount(1.5); + Double actual = this.roulette.roulettePlayer.getAccount(); + Assert.assertEquals(1.5, actual.doubleValue(),0.0); + } + + + + } From 8af27300ec7e504f8ffaeb92c980a2333204965e Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Thu, 13 Jun 2019 21:36:16 -0400 Subject: [PATCH 30/71] tests --- src/main/java/io/zipcoder/casino/games/Roulette.java | 1 + src/test/{ => java}/io/zipcoder/casino/HandlerTest.java | 0 src/test/{ => java}/io/zipcoder/casino/gameTools/DeckTest.java | 0 src/test/{ => java}/io/zipcoder/casino/gameTools/DiceTest.java | 0 src/test/{ => java}/io/zipcoder/casino/games/BlackjackTest.java | 0 src/test/{ => java}/io/zipcoder/casino/games/CrapsTest.java | 0 src/test/{ => java}/io/zipcoder/casino/games/GoFishTest.java | 0 src/test/{ => java}/io/zipcoder/casino/games/RouletteTest.java | 0 src/test/{ => java}/io/zipcoder/casino/player/PlayerTest.java | 0 .../io/zipcoder/casino/player}/RoulettePlayerTest.java | 2 +- 10 files changed, 2 insertions(+), 1 deletion(-) rename src/test/{ => java}/io/zipcoder/casino/HandlerTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/gameTools/DeckTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/gameTools/DiceTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/games/BlackjackTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/games/CrapsTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/games/GoFishTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/games/RouletteTest.java (100%) rename src/test/{ => java}/io/zipcoder/casino/player/PlayerTest.java (100%) rename src/test/{io/zipcoder/casino => java/io/zipcoder/casino/player}/RoulettePlayerTest.java (93%) diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index d9df0b1bf..27d668001 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -19,6 +19,7 @@ void nextTurn() { @Override void endGame() { // end game and go back to main menu + } @Override diff --git a/src/test/io/zipcoder/casino/HandlerTest.java b/src/test/java/io/zipcoder/casino/HandlerTest.java similarity index 100% rename from src/test/io/zipcoder/casino/HandlerTest.java rename to src/test/java/io/zipcoder/casino/HandlerTest.java diff --git a/src/test/io/zipcoder/casino/gameTools/DeckTest.java b/src/test/java/io/zipcoder/casino/gameTools/DeckTest.java similarity index 100% rename from src/test/io/zipcoder/casino/gameTools/DeckTest.java rename to src/test/java/io/zipcoder/casino/gameTools/DeckTest.java diff --git a/src/test/io/zipcoder/casino/gameTools/DiceTest.java b/src/test/java/io/zipcoder/casino/gameTools/DiceTest.java similarity index 100% rename from src/test/io/zipcoder/casino/gameTools/DiceTest.java rename to src/test/java/io/zipcoder/casino/gameTools/DiceTest.java diff --git a/src/test/io/zipcoder/casino/games/BlackjackTest.java b/src/test/java/io/zipcoder/casino/games/BlackjackTest.java similarity index 100% rename from src/test/io/zipcoder/casino/games/BlackjackTest.java rename to src/test/java/io/zipcoder/casino/games/BlackjackTest.java diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/java/io/zipcoder/casino/games/CrapsTest.java similarity index 100% rename from src/test/io/zipcoder/casino/games/CrapsTest.java rename to src/test/java/io/zipcoder/casino/games/CrapsTest.java diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/java/io/zipcoder/casino/games/GoFishTest.java similarity index 100% rename from src/test/io/zipcoder/casino/games/GoFishTest.java rename to src/test/java/io/zipcoder/casino/games/GoFishTest.java diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/java/io/zipcoder/casino/games/RouletteTest.java similarity index 100% rename from src/test/io/zipcoder/casino/games/RouletteTest.java rename to src/test/java/io/zipcoder/casino/games/RouletteTest.java diff --git a/src/test/io/zipcoder/casino/player/PlayerTest.java b/src/test/java/io/zipcoder/casino/player/PlayerTest.java similarity index 100% rename from src/test/io/zipcoder/casino/player/PlayerTest.java rename to src/test/java/io/zipcoder/casino/player/PlayerTest.java diff --git a/src/test/io/zipcoder/casino/RoulettePlayerTest.java b/src/test/java/io/zipcoder/casino/player/RoulettePlayerTest.java similarity index 93% rename from src/test/io/zipcoder/casino/RoulettePlayerTest.java rename to src/test/java/io/zipcoder/casino/player/RoulettePlayerTest.java index 756a5e50e..7cba2b03c 100644 --- a/src/test/io/zipcoder/casino/RoulettePlayerTest.java +++ b/src/test/java/io/zipcoder/casino/player/RoulettePlayerTest.java @@ -1,4 +1,4 @@ -package io.zipcoder.casino; +package io.zipcoder.casino.player; import io.zipcoder.casino.player.RoulettePlayer; import org.junit.Assert; From 65e893a547e0447f9f7e8235c9e89c5912662e06 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Thu, 13 Jun 2019 21:44:37 -0400 Subject: [PATCH 31/71] test 90% written for craps game --- .../io/zipcoder/casino/gameTools/Dice.java | 6 +- .../io/zipcoder/casino/games/Blackjack.java | 1 + .../java/io/zipcoder/casino/games/Craps.java | 107 +++++++++++------ .../casino/player/BlackJackPlayer.java | 2 + .../casino/player/CardGamePlayer.java | 4 +- .../zipcoder/casino/player/CrapsPlayer.java | 2 + .../zipcoder/casino/player/GoFishPlayer.java | 3 +- .../zipcoder/casino/gameTools/DiceTest.java | 2 + .../zipcoder/casino/games/BlackjackTest.java | 20 ++-- .../io/zipcoder/casino/games/CrapsTest.java | 109 ++++++++++++++++-- 10 files changed, 196 insertions(+), 60 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/gameTools/Dice.java b/src/main/java/io/zipcoder/casino/gameTools/Dice.java index fdfc3a7f1..5581086b5 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Dice.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Dice.java @@ -2,6 +2,10 @@ public class Dice { public Integer rollDice() { - return null; + int sum = 0; + for (int i = 0; i < 2 ; i++) { + sum += (int) (Math.random()*6+1); + }; + return sum; } } diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index b2f64c391..90caeba36 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -91,4 +91,5 @@ public void deposit(Double num) { } + public void getBlackJackPlayer(){}; } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index c98da5666..8c9d0b640 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -1,21 +1,25 @@ package io.zipcoder.casino.games; -import io.zipcoder.casino.Casino; -import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; -import java.security.PrivateKey; - public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; private Integer onNumber; private Double firstLineBet; private Double secondLineBet; private Double otherBet; + private String otherBetType; private Double firstLineOdds = 2.0; private Double secondLineOdds = 2.0; + private Double otherBetodds = 5.0; + private Integer currentRoll; + + + + + private Integer stage; Console console = new Console(System.in, System.out); @@ -24,34 +28,44 @@ public Craps() { public Craps(CrapsPlayer player) { this.crapsPlayer = player; + crapsPlayer.player.setPlaying(true); this.stage = 0; + runGame(); } + + + public void runGame() { display("Welcome to the table " + crapsPlayer.player.getName() + "! \n"); while(crapsPlayer.player.getPlaying() == true) { switch (stage) { case 0: - stage0Play(); + String input = console.getStringInput("A game has just ended would you like to play or exit? "); + stage0Play(input); break; case 1: - stage1Play(); + firstLineBet = console.getDoubleInput("Let's get started! \n Place Your bet!"); + currentRoll = crapsPlayer.roll(); + stage1Play(firstLineBet); break; case 2: - stage2Play(); - break; - case 3: - stage3Play(); + secondLineBet = console.getDoubleInput("Bet your push number bets! \n Place Your bet!"); + otherBetType = console.getStringInput("What else do you want to bet?"); + otherBet = console.getDoubleInput("how much do you want to bet on this?"); + currentRoll =crapsPlayer.roll(); + stage2Play(secondLineBet, otherBet, otherBetType); break; } } + endGame(); } - public void stage0Play(){ - String input = console.getStringInput("A game has just ended would you like to play or exit? "); + + public void stage0Play(String input){ if(input.toLowerCase().equals("play")) { this.stage = 1; @@ -62,37 +76,37 @@ public void stage0Play(){ } } - public void stage1Play(){ - firstLineBet = console.getDoubleInput("Let's get started! \n Place Your bet!"); + public void stage1Play(Double firstLineBet){ withdraw(firstLineBet); //need to handle seeting account - Integer roll = crapsPlayer.roll(); + if(currentRoll.equals(2) || currentRoll.equals(3) || currentRoll.equals(12)) { - if(roll.equals(2) || roll.equals(3) || roll.equals(12)) { - display(" you rolled a " + roll + "\n" + "Sorry you crapped out!"); + display(" you rolled a " + currentRoll + "\n" + "Sorry you crapped out!"); this.stage = 0; - } else if (roll.equals(7) || roll.equals(11)) { - display(" you rolled a " + roll + "\n" + "you won!" + calcPayment(firstLineOdds, firstLineBet)); - deposit(firstLineBet); + } else if (currentRoll.equals(7) || currentRoll.equals(11)) { + display(" you rolled a " + currentRoll + "\n" + "you won!" + calcPayment(firstLineOdds, firstLineBet)); + deposit(calcPayment(firstLineBet, firstLineOdds)); } else{ - display(" you rolled a " + roll + ".\n" + roll + " is now the on number!"); - setOnNumber(roll); + display(" you rolled a " + currentRoll + ".\n" + currentRoll + " is now the on number!"); + setOnNumber(currentRoll); this.stage = 2; } } - public void stage2Play(){ - - } - public void stage3Play(){ - - } + public void stage2Play(Double secondLineBet, Double otherBet, String bet ){ - public Integer calcPayment(Integer bet, Integer odds) { - return null; + if(currentRoll.equals(7)) { + display(" you rolled a " + currentRoll + "\n" + "Sorry you crapped out!"); + this.stage = 0; + } else if (currentRoll.equals(onNumber)) { + display(" you rolled a " + currentRoll + "\n" + "you won!" + (calcPayment(firstLineOdds, firstLineBet) + (calcPayment(secondLineBet,secondLineOdds)))); + deposit(calcPayment(firstLineBet, firstLineOdds)); + deposit(calcPayment(otherBet, otherBetodds )); +// } else if () { if other bet +// display(""); + } } - @Override void endGame() { } @@ -117,6 +131,19 @@ public void deposit(Double num) { crapsPlayer.player.setAccount(temp + num); } + public Double calcPayment(Double bet, Double odds) { + return bet *odds; + } + + + public Boolean hasMoenytoBet(Double bet, Player player) { + if (bet > player.getAccount()){ + return false; + } else return true; + } + + + /*----Getters/Setters------*/ public Integer getOnNumber() { return onNumber; @@ -150,18 +177,24 @@ public void setOtherBet(Double otherBet) { this.otherBet = otherBet; } - public CrapsPlayer getCrapsPlayer() { - return crapsPlayer; +// public CrapsPlayer getCrapsPlayer() { +// return crapsPlayer; +// } + + public Integer getStage() { + return stage; } - public Double calcPayment(Double bet, Double odds) { - return bet *odds; + public Integer getCurrentRoll() { + return currentRoll; + } + + public void setCurrentRoll(Integer num) { + this.currentRoll = num; } @Override void nextTurn() { } - - } diff --git a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java index ad1a6adb9..4dc1e1c87 100644 --- a/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java @@ -24,4 +24,6 @@ public void displayAccoutBal() { } public void endturn() {}; + + } diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index 9da31baef..f04513f8a 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -1,6 +1,8 @@ package io.zipcoder.casino.player; -import javax.smartcardio.Card; + +import io.zipcoder.casino.gameTools.Card; + import java.util.ArrayList; /// diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index 257f84ece..7bb701bcc 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -1,6 +1,8 @@ package io.zipcoder.casino.player; import io.zipcoder.casino.gameTools.Dice; +import io.zipcoder.casino.gameTools.Card; + public class CrapsPlayer extends Player implements GamblerInterface { diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 190b81db0..4b50283a0 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -1,8 +1,9 @@ package io.zipcoder.casino.player; import io.zipcoder.casino.games.GoFish; +import io.zipcoder.casino.gameTools.Card; + -import javax.smartcardio.Card; import java.util.ArrayList; public class GoFishPlayer extends CardGamePlayer { diff --git a/src/test/io/zipcoder/casino/gameTools/DiceTest.java b/src/test/io/zipcoder/casino/gameTools/DiceTest.java index ba1a97150..3c4428fdc 100644 --- a/src/test/io/zipcoder/casino/gameTools/DiceTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DiceTest.java @@ -13,4 +13,6 @@ public void rollDice() { Assert.assertTrue(result <= 12 && result >=2); } + + } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/BlackjackTest.java b/src/test/io/zipcoder/casino/games/BlackjackTest.java index 38fbc6040..021263773 100644 --- a/src/test/io/zipcoder/casino/games/BlackjackTest.java +++ b/src/test/io/zipcoder/casino/games/BlackjackTest.java @@ -76,14 +76,14 @@ public void calcBJPaymentTest(){ Assert.assertEquals(expected, actual); } - @Test - public void updateAccount(){ - Blackjack blackjack = new Blackjack(); - - blackjack.getBlackJackPlayer().setAccount(30.0); - Double expected = 30.0; - Double actual = blackjack.getBlackJackPlayer().getAccount(); - - Assert.assertEquals(expected, actual); - } +// @Test +// public void updateAccount(){ +// Blackjack blackjack = new Blackjack(); +// +// blackjack.player1 +// Double expected = 30.0; +// Double actual = blackjack.getBlackJackPlayer(); +// +// Assert.assertEquals(expected, actual); +// } } diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index e7d0e86cf..0c29341d6 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -2,6 +2,7 @@ import com.sun.org.apache.xpath.internal.operations.Bool; import io.zipcoder.casino.Handler; +import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; @@ -26,11 +27,11 @@ public void calcPayment() { @Test public void updateAccount() { - Craps craps = new Craps(); + CrapsPlayer crapsPlayer = new CrapsPlayer(); - craps.getCrapsPlayer().setAccount(10.0); + crapsPlayer.setAccount(10.0); Double expected = 10.0; - Double actual = craps.getCrapsPlayer().getAccount(); + Double actual = crapsPlayer.getAccount(); Assert.assertEquals(expected, actual); } @@ -149,31 +150,119 @@ public void setOtherBet() { Assert.assertEquals(expected, actual); } + @Test - public void stage0Play() { + public void withdraw() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + + craps.withdraw(100.0); + Double expected = 900.0; + Double actual = crapsPlayer.getAccount(); + + Assert.assertEquals(expected,actual); } @Test - public void stage1PlayLost() { + public void deposit() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + craps.deposit(100.0); + Double expected = 1100.0; + Double actual = crapsPlayer.getAccount(); + + Assert.assertEquals(expected,actual); + } + + @Test + public void display() { + + } + + @Test + public void hasMoenytoBet() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob" , 5.0); Craps craps = new Craps(); - Integer roll = 2; + Boolean expected = false; + Boolean actual = craps.hasMoenytoBet(50.0, player ); + + Assert.assertEquals(expected, actual); } @Test - public void stage2Play() { + public void stage0PlayPlay() { + Craps craps = new Craps(); + craps.stage0Play("play"); + + Integer actual = 1; + Integer expected =craps.getStage(); + + Assert.assertEquals(expected,actual); } @Test - public void stage3Play() { + public void stage0PlayExit() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + craps.stage0Play("exit"); + + Boolean actual = false; + Boolean expected = crapsPlayer.player.getPlaying(); + + Assert.assertEquals(expected,actual); } @Test - public void withdraw() { + public void stage0PlayInvalidInput() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + craps.stage0Play("234234"); + + Integer actual = 0; + Integer expected = craps.getStage(); + + Assert.assertEquals(expected,actual); } + @Test - public void deposit() { + public void stage1Play() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + craps.setCurrentRoll(10); + craps.stage1Play(10.0); + + // Double actual = " you rolled a " + currentRoll + ".\n" + currentRoll + " is now the on number!"; + Double expected = craps.getSecondLineBet(); + + // Assert.assertEquals(expected,actual); + + } + + @Test + public void stage2Play() { + + } + + + } \ No newline at end of file From 85b48d1bec82181b29d9727b8e6015c5b43aefec Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Fri, 14 Jun 2019 08:43:26 -0400 Subject: [PATCH 32/71] moring merge added more test for stage 1 --- src/main/java/io/zipcoder/casino/Handler.java | 1 + .../java/io/zipcoder/casino/games/Craps.java | 58 ++++--- .../io/zipcoder/casino/games/CrapsTest.java | 151 +++++++++++++----- 3 files changed, 147 insertions(+), 63 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index c8546a34f..f0bafa1d6 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -36,6 +36,7 @@ void run() { case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); + craps.runGame(); break; case 4: Slots slots = new Slots(); diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 8c9d0b640..c596501e8 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -4,17 +4,21 @@ import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; +import java.util.HashMap; +import java.util.TreeMap; + public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; private Integer onNumber; private Double firstLineBet; private Double secondLineBet; - private Double otherBet; - private String otherBetType; + private Double fieldBet; + private Integer fieldBetType; private Double firstLineOdds = 2.0; private Double secondLineOdds = 2.0; - private Double otherBetodds = 5.0; + private Double fieldBetodds = 12.0; private Integer currentRoll; + //private HashMap fieldOdds = new HashMap(); @@ -30,7 +34,7 @@ public Craps(CrapsPlayer player) { this.crapsPlayer = player; crapsPlayer.player.setPlaying(true); this.stage = 0; - runGame(); + } @@ -47,16 +51,16 @@ public void runGame() { stage0Play(input); break; case 1: - firstLineBet = console.getDoubleInput("Let's get started! \n Place Your bet!"); + firstLineBet = (console.getDoubleInput("Let's get started! \n Place Your bet!")); currentRoll = crapsPlayer.roll(); stage1Play(firstLineBet); break; case 2: secondLineBet = console.getDoubleInput("Bet your push number bets! \n Place Your bet!"); - otherBetType = console.getStringInput("What else do you want to bet?"); - otherBet = console.getDoubleInput("how much do you want to bet on this?"); + fieldBetType = console.getIntegerInput("What else do you want to bet?"); + fieldBet = console.getDoubleInput("how much do you want to bet on this?"); currentRoll =crapsPlayer.roll(); - stage2Play(secondLineBet, otherBet, otherBetType); + stage2Play(secondLineBet, fieldBet, fieldBetType); break; } } @@ -77,14 +81,14 @@ public void stage0Play(String input){ } public void stage1Play(Double firstLineBet){ - withdraw(firstLineBet); //need to handle seeting account - if(currentRoll.equals(2) || currentRoll.equals(3) || currentRoll.equals(12)) { + withdraw(firstLineBet); + if(currentRoll.equals(2) || currentRoll.equals(3) || currentRoll.equals(12)) { display(" you rolled a " + currentRoll + "\n" + "Sorry you crapped out!"); this.stage = 0; } else if (currentRoll.equals(7) || currentRoll.equals(11)) { display(" you rolled a " + currentRoll + "\n" + "you won!" + calcPayment(firstLineOdds, firstLineBet)); - deposit(calcPayment(firstLineBet, firstLineOdds)); + deposit(calcPayment(firstLineBet, firstLineOdds) + firstLineBet); } else{ display(" you rolled a " + currentRoll + ".\n" + currentRoll + " is now the on number!"); setOnNumber(currentRoll); @@ -93,18 +97,20 @@ public void stage1Play(Double firstLineBet){ } - public void stage2Play(Double secondLineBet, Double otherBet, String bet ){ + public void stage2Play(Double secondLineBet, Double fieldBet, Integer bet ){ +// - if(currentRoll.equals(7)) { - display(" you rolled a " + currentRoll + "\n" + "Sorry you crapped out!"); - this.stage = 0; - } else if (currentRoll.equals(onNumber)) { - display(" you rolled a " + currentRoll + "\n" + "you won!" + (calcPayment(firstLineOdds, firstLineBet) + (calcPayment(secondLineBet,secondLineOdds)))); - deposit(calcPayment(firstLineBet, firstLineOdds)); - deposit(calcPayment(otherBet, otherBetodds )); -// } else if () { if other bet -// display(""); - } + +// if(currentRoll.equals(7)) { +// display(" you rolled a " + currentRoll + "\n" + "Sorry you crapped out!"); +// this.stage = 0; +// } else if (currentRoll.equals(onNumber)) { +// display(" you rolled a " + currentRoll + "\n" + "you won!" + (calcPayment(firstLineOdds, firstLineBet) + (calcPayment(secondLineBet,secondLineOdds)))); +// deposit(calcPayment(firstLineBet, firstLineOdds)); +// deposit(calcPayment(otherBet, otherBetodds )); +//// } else if () { if other bet +//// display(""); +// } } @Override @@ -169,12 +175,12 @@ public void setSecondLineBet(Double secondLineBet) { this.secondLineBet = secondLineBet; } - public Double getOtherBet() { - return otherBet; + public Double getFieldBet() { + return fieldBet; } - public void setOtherBet(Double otherBet) { - this.otherBet = otherBet; + public void setFieldBet(Double fieldBet) { + this.fieldBet = fieldBet; } // public CrapsPlayer getCrapsPlayer() { diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 0c29341d6..226d0bc11 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -1,14 +1,11 @@ package io.zipcoder.casino.games; -import com.sun.org.apache.xpath.internal.operations.Bool; import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; -import static org.junit.Assert.*; - public class CrapsTest { @@ -37,11 +34,10 @@ public void updateAccount() { } - @Test public void getOnNumber() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); craps.setOnNumber(10); @@ -55,7 +51,7 @@ public void getOnNumber() { @Test public void setOnNumber() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); craps.setOnNumber(8); @@ -69,7 +65,7 @@ public void setOnNumber() { @Test public void getFirstLineBet() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); craps.setFirstLineBet(10.0); @@ -83,7 +79,7 @@ public void getFirstLineBet() { @Test public void setFirstLineBet() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); craps.setFirstLineBet(10.0); @@ -97,7 +93,7 @@ public void setFirstLineBet() { @Test public void getSecondLineBet() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); craps.setSecondLineBet(10.0); @@ -111,7 +107,7 @@ public void getSecondLineBet() { @Test public void setSecondLineBet() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); craps.setSecondLineBet(10.0); @@ -125,13 +121,13 @@ public void setSecondLineBet() { @Test public void getOtherBet() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); - craps.setOtherBet(10.0); + craps.setFieldBet(10.0); Double expected = 10.0; - Double actual = craps.getOtherBet(); + Double actual = craps.getFieldBet(); Assert.assertEquals(expected, actual); } @@ -139,13 +135,13 @@ public void getOtherBet() { @Test public void setOtherBet() { Handler handler = new Handler(); - handler.createPlayer("bob" , 100.0); + handler.createPlayer("", 100.0); Craps craps = new Craps(); - craps.setOtherBet(10.0); + craps.setFieldBet(10.0); Double expected = 10.0; - Double actual = craps.getOtherBet(); + Double actual = craps.getFieldBet(); Assert.assertEquals(expected, actual); } @@ -154,30 +150,30 @@ public void setOtherBet() { @Test public void withdraw() { Handler handler = new Handler(); - Player player = handler.createPlayer("bob", 1000.0); + Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); - craps.withdraw(100.0); Double expected = 900.0; - Double actual = crapsPlayer.getAccount(); + Double actual = player.getAccount(); - Assert.assertEquals(expected,actual); + Assert.assertEquals(expected, actual); } + @Test public void deposit() { Handler handler = new Handler(); - Player player = handler.createPlayer("bob", 1000.0); + Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); craps.deposit(100.0); Double expected = 1100.0; - Double actual = crapsPlayer.getAccount(); + Double actual = player.getAccount(); - Assert.assertEquals(expected,actual); + Assert.assertEquals(expected, actual); } @Test @@ -188,11 +184,11 @@ public void display() { @Test public void hasMoenytoBet() { Handler handler = new Handler(); - Player player = handler.createPlayer("bob" , 5.0); + Player player = handler.createPlayer("", 5.0); Craps craps = new Craps(); Boolean expected = false; - Boolean actual = craps.hasMoenytoBet(50.0, player ); + Boolean actual = craps.hasMoenytoBet(50.0, player); Assert.assertEquals(expected, actual); @@ -201,18 +197,18 @@ public void hasMoenytoBet() { @Test public void stage0PlayPlay() { Craps craps = new Craps(); - craps.stage0Play("play"); + craps.stage0Play(""); Integer actual = 1; - Integer expected =craps.getStage(); + Integer expected = craps.getStage(); - Assert.assertEquals(expected,actual); + Assert.assertEquals(expected, actual); } @Test public void stage0PlayExit() { Handler handler = new Handler(); - Player player = handler.createPlayer("bob", 1000.0); + Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); @@ -221,13 +217,13 @@ public void stage0PlayExit() { Boolean actual = false; Boolean expected = crapsPlayer.player.getPlaying(); - Assert.assertEquals(expected,actual); + Assert.assertEquals(expected, actual); } @Test public void stage0PlayInvalidInput() { Handler handler = new Handler(); - Player player = handler.createPlayer("bob", 1000.0); + Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); @@ -236,33 +232,114 @@ public void stage0PlayInvalidInput() { Integer actual = 0; Integer expected = craps.getStage(); - Assert.assertEquals(expected,actual); + Assert.assertEquals(expected, actual); } @Test public void stage1Play() { Handler handler = new Handler(); - Player player = handler.createPlayer("bob", 1000.0); + Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); craps.setCurrentRoll(10); craps.stage1Play(10.0); + Integer currentRoll = craps.getCurrentRoll(); + + Integer actual = 10; + Integer expected = craps.getOnNumber(); + + Assert.assertEquals(expected, actual); + + } + + @Test + public void stage1PlayCrap() { + Handler handler = new Handler(); + Player player = handler.createPlayer("", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + craps.setCurrentRoll(2); + craps.stage1Play(10.0); + + + Integer actual = 0; + Integer expected = craps.getStage(); + + Assert.assertEquals(expected, actual); + + } + + @Test + public void stage1PlayCrapWin() { + Handler handler = new Handler(); + Player player = handler.createPlayer("", 10.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + craps.setCurrentRoll(7); + craps.stage1Play(10.0); - // Double actual = " you rolled a " + currentRoll + ".\n" + currentRoll + " is now the on number!"; - Double expected = craps.getSecondLineBet(); - // Assert.assertEquals(expected,actual); + Double actual = 30.0; + Double expected = player.getAccount(); + + Assert.assertEquals(expected, actual); } @Test - public void stage2Play() { + public void stage2PlayWinOnNumber() { + Handler handler = new Handler(); + Player player = handler.createPlayer("", 100.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + craps.setOnNumber(8); + craps.setCurrentRoll(8); + craps.stage2Play(10.0, 10.0, 5); + + + Double actual = 250.0; + Double expected = player.getAccount(); + + Assert.assertEquals(expected, actual); } + // + @Test + public void stage2PlayCrapOut() { + Handler handler = new Handler(); + Player player = handler.createPlayer("", 100.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + craps.setCurrentRoll(7); + craps.stage2Play(10.0, 10.0, 5); + Integer actual = 0; + Integer expected = craps.getStage(); + + Assert.assertEquals(expected, actual); + + } + + @Test + public void stage2PlayBadSecondLineInput() { + Handler handler = new Handler(); + Player player = handler.createPlayer("bob", 10.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + + craps.stage2Play(1.0, 10.0, 5); + + Double actual = 30.0; + Double expected = player.getAccount(); + + Assert.assertEquals(expected, actual); + + } } \ No newline at end of file From ce6466b64b036664fa4d4153013523cc2aa7f1d0 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Fri, 14 Jun 2019 09:01:06 -0400 Subject: [PATCH 33/71] moring merge added more test for stage 1 --- src/main/java/io/zipcoder/casino/Handler.java | 2 +- .../java/io/zipcoder/casino/games/Craps.java | 21 +++++++------------ .../io/zipcoder/casino/games/CrapsTest.java | 16 -------------- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index f0bafa1d6..cdaa7f364 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -13,7 +13,7 @@ public class Handler { private Double account = 0.0; -void run() { +public void run() { getNameInput(); getAccountBalanceInput(); createPlayer(name, account); diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index c596501e8..c8c02471f 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -1,5 +1,6 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; @@ -89,32 +90,24 @@ public void stage1Play(Double firstLineBet){ } else if (currentRoll.equals(7) || currentRoll.equals(11)) { display(" you rolled a " + currentRoll + "\n" + "you won!" + calcPayment(firstLineOdds, firstLineBet)); deposit(calcPayment(firstLineBet, firstLineOdds) + firstLineBet); - } else{ + } else if(currentRoll.equals(2) && currentRoll.equals(3) && !currentRoll.equals(12) && !currentRoll.equals(7) && !currentRoll.equals(11)){ display(" you rolled a " + currentRoll + ".\n" + currentRoll + " is now the on number!"); setOnNumber(currentRoll); this.stage = 2; - } + } else { + display("Excuse me I didnt understand"); + } } public void stage2Play(Double secondLineBet, Double fieldBet, Integer bet ){ -// - -// if(currentRoll.equals(7)) { -// display(" you rolled a " + currentRoll + "\n" + "Sorry you crapped out!"); -// this.stage = 0; -// } else if (currentRoll.equals(onNumber)) { -// display(" you rolled a " + currentRoll + "\n" + "you won!" + (calcPayment(firstLineOdds, firstLineBet) + (calcPayment(secondLineBet,secondLineOdds)))); -// deposit(calcPayment(firstLineBet, firstLineOdds)); -// deposit(calcPayment(otherBet, otherBetodds )); -//// } else if () { if other bet -//// display(""); -// } } @Override void endGame() { + Handler handler = new Handler(); + handler.run(); } @Override diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 226d0bc11..bdade457a 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -326,20 +326,4 @@ public void stage2PlayCrapOut() { Assert.assertEquals(expected, actual); } - - @Test - public void stage2PlayBadSecondLineInput() { - Handler handler = new Handler(); - Player player = handler.createPlayer("bob", 10.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - craps.stage2Play(1.0, 10.0, 5); - - Double actual = 30.0; - Double expected = player.getAccount(); - - Assert.assertEquals(expected, actual); - - } } \ No newline at end of file From 16070768d22e930dbf2a04bbc1cbacb4453c62ef Mon Sep 17 00:00:00 2001 From: alilinykh Date: Fri, 14 Jun 2019 09:01:17 -0400 Subject: [PATCH 34/71] friday morning commit --- src/main/java/io/zipcoder/casino/Handler.java | 1 + .../io/zipcoder/casino/gameTools/Card.java | 1 + .../io/zipcoder/casino/gameTools/Deck.java | 34 ++++++++++----- .../java/io/zipcoder/casino/games/GoFish.java | 41 +++++++++++++++---- .../casino/player/CardGamePlayer.java | 4 +- .../zipcoder/casino/player/GoFishPlayer.java | 3 +- .../zipcoder/casino/gameTools/CardTest.java | 39 ++++++++++++++++++ .../zipcoder/casino/gameTools/DeckTest.java | 20 ++++++--- .../io/zipcoder/casino/games/GoFishTest.java | 4 ++ 9 files changed, 121 insertions(+), 26 deletions(-) create mode 100644 src/test/io/zipcoder/casino/gameTools/CardTest.java diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index c8546a34f..6b2956a40 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -29,6 +29,7 @@ void run() { case 1 : GoFishPlayer goFishPlayer = new GoFishPlayer(player); GoFish goFish = new GoFish(goFishPlayer); + goFish.startTheGame(); break; case 2: Roulette roulette = new Roulette(); diff --git a/src/main/java/io/zipcoder/casino/gameTools/Card.java b/src/main/java/io/zipcoder/casino/gameTools/Card.java index aa4f19f68..054996e87 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Card.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Card.java @@ -4,6 +4,7 @@ public class Card { private CardValue cardValue; private Suit suit; + public Card (){} public Card (CardValue cv, Suit s) { this.cardValue = cv; this.suit = s; diff --git a/src/main/java/io/zipcoder/casino/gameTools/Deck.java b/src/main/java/io/zipcoder/casino/gameTools/Deck.java index 6dddc2abb..b502f2d7a 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Deck.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Deck.java @@ -8,7 +8,9 @@ import java.util.Stack; public class Deck { - Stack cardStack; + + + private Stack cardStack; public Deck() { this.cardStack = new Stack(); for (CardValue c : CardValue.values() @@ -20,26 +22,36 @@ public Deck() { } } Collections.shuffle(cardStack); - - System.out.println("FML"); - } - - public Stack getCardStack() { - return cardStack; - } - public void shuffle () { Collections.shuffle(cardStack); }; public ArrayList deal (Integer numOfCards, CardGamePlayer player) { - return null; + ArrayList result = new ArrayList(); + for (int i = 0; i < numOfCards ; i++) { + result.add(cardStack.pop()); + } + return result; + } + + public void dealSingleCard(CardGamePlayer player) { + Card card = cardStack.pop(); + ArrayList hand; + hand = player.getHand(); + hand.add(card); + player.setHand(hand); + } - public void dealSingleCard(CardGamePlayer player) { } + public void setDeck(Stack cardStack) { + this.cardStack = cardStack; + } + public Stack getDeck() { + return cardStack; + } } diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 38a558be0..0b21c75ae 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -5,21 +5,36 @@ import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.Player; +import io.zipcoder.casino.utilities.Console; import java.util.ArrayList; +import java.util.Scanner; public class GoFish extends Games { - private CardGamePlayer goFishPlayer; - Deck deck = new Deck(); + private CardGamePlayer mainPlayer; + private Deck deck = new Deck(); + private Scanner scanner = new Scanner(System.in); + private ArrayList otherPlayers; public GoFish() {} + public GoFish(GoFishPlayer player) { super(); - this.goFishPlayer = player; + this.mainPlayer = player; + } + + public void startTheGame () { + otherPlayers = createOtherPlayers(2); + deck.deal(5,mainPlayer); + for (GoFishPlayer other: otherPlayers + ) { + deck.deal(5, other); + } } + @Override void nextTurn() { @@ -44,19 +59,31 @@ public Card check (Integer query) { return null; }; - public Card goFish () { + public Card goFishAction () { return null; }; //====================alex public Integer inputNumPlayers() { + String info = "Please Enter Number of players"; - return null; + Integer result = scanner.nextInt(); + return result; } - public ArrayList createOtherPlayers (Integer numPlayers) { + public ArrayList createOtherPlayers (Integer numPlayers) { + ArrayList players = new ArrayList(); //foreach of inputnUmplayers - create player - return null; + for (int i = 1; i <= numPlayers; i++) { + GoFishPlayer goFishPlayer = new GoFishPlayer(); + goFishPlayer.setName("Player" + i); + players.add(goFishPlayer); + } + return players; + } + public void runAction (String userAction) { + //based on the action user Start the game/See Rules/ Exit the game + } diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index 9da31baef..f04513f8a 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -1,6 +1,8 @@ package io.zipcoder.casino.player; -import javax.smartcardio.Card; + +import io.zipcoder.casino.gameTools.Card; + import java.util.ArrayList; /// diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 190b81db0..426f390f0 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -1,8 +1,7 @@ package io.zipcoder.casino.player; - +import io.zipcoder.casino.gameTools.Card; import io.zipcoder.casino.games.GoFish; -import javax.smartcardio.Card; import java.util.ArrayList; public class GoFishPlayer extends CardGamePlayer { diff --git a/src/test/io/zipcoder/casino/gameTools/CardTest.java b/src/test/io/zipcoder/casino/gameTools/CardTest.java new file mode 100644 index 000000000..af7062e6f --- /dev/null +++ b/src/test/io/zipcoder/casino/gameTools/CardTest.java @@ -0,0 +1,39 @@ +package io.zipcoder.casino.gameTools; + +import com.sun.source.tree.AssertTree; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CardTest { + Deck deck = new Deck(); + + @Test + public void getCardValueAce() { + Card card = deck.getDeck().pop(); + Assert.assertEquals("Ace",CardValue.Ace.name()); + } + @Test + public void getCardValueTwo() { + Card card = deck.getDeck().pop(); + Assert.assertEquals("Two",CardValue.Two.name()); + } + + @Test + public void getSuitSpades() { + Card card = deck.getDeck().pop(); + Assert.assertEquals("Spades",Suit.Spades.name()); + } + @Test + public void getSuitHearts() { + Card card = deck.getDeck().pop(); + Assert.assertEquals("Hearts",Suit.Hearts.name()); + } + @Test + public void checkObjectTest(){ + Object card = deck.getDeck().pop(); + Assert.assertTrue(card instanceof Card); + } + +} \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/gameTools/DeckTest.java b/src/test/io/zipcoder/casino/gameTools/DeckTest.java index d314a03d4..f28e7716a 100644 --- a/src/test/io/zipcoder/casino/gameTools/DeckTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DeckTest.java @@ -2,27 +2,30 @@ import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; +import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; +import static io.zipcoder.casino.gameTools.Suit.Clubs; + public class DeckTest { @Test public void shuffle() { Deck testDeck = new Deck(); - Card beforeShuffle = testDeck.cardStack.peek(); + Card beforeShuffle = testDeck.getDeck().peek(); testDeck.shuffle(); - Card afterShuffle = testDeck.cardStack.peek(); + Card afterShuffle = testDeck.getDeck().peek(); Assert.assertFalse(beforeShuffle.equals(afterShuffle)); } @Test public void shuffleNotWorking() { Deck testDeck = new Deck(); - Card beforeShuffle = testDeck.cardStack.peek(); - Card afterShuffle = testDeck.cardStack.peek(); + Card beforeShuffle = testDeck.getDeck().peek(); + Card afterShuffle = testDeck.getDeck().peek(); Assert.assertFalse(!beforeShuffle.equals(afterShuffle)); } @@ -59,15 +62,22 @@ public void dealNegative() { @Test public void dealSingleCard1() { + CardGamePlayer testPlayer = new GoFishPlayer(); + ArrayListtestHand = new ArrayList(2); Deck deck = new Deck(); + testPlayer.setHand(testHand); deck.dealSingleCard(testPlayer); - Assert.assertFalse(testPlayer.getHand().isEmpty()); + Integer expected = 1; + Integer actual = testPlayer.getHand().size(); + Assert.assertEquals(expected,actual); } @Test public void dealSingleCard2() { CardGamePlayer testPlayer = new GoFishPlayer(); + ArrayListtestHand = new ArrayList(2); Deck deck = new Deck(); + testPlayer.setHand(testHand); deck.dealSingleCard(testPlayer); Integer expected = 1; Integer actual = testPlayer.getHand().size(); diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index db2467dcb..96186358f 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -4,6 +4,7 @@ import org.junit.Test; public class GoFishTest { + //GoFish goFish = new GoFish(); @Test public void nextTurn() { @@ -50,7 +51,10 @@ public void createOtherPlayersTest() { Integer expected = 2; Integer actual = goFish.createOtherPlayers(expected).size(); Assert.assertEquals(expected,actual); + } + @Test + public void runGoFishGameStart() { } } \ No newline at end of file From 5c73182c6e3531859cd237b203005a9c7553fe41 Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 14 Jun 2019 09:35:28 -0400 Subject: [PATCH 35/71] latest1 --- .../java/io/zipcoder/casino/games/Slots.java | 140 ++++++++++-------- 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index b0de43153..49543b930 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -12,77 +12,91 @@ public class Slots extends Games implements GamblerGameInterface { public Player player; - public Slots(){ - } + Integer random = 0; + String[] characters = new String[]{"cherry ", "orange ", "bell ", "bars ", "apple ", "seven "}; + + String[][] toSave = new String[3][3]; + + - public Slots(Player player){ - this.player= player; + public Slots() { } - public static void main(String[] args) { - Integer random =0; - String[] characters = new String[]{" cherry ", " orange ", " bell ", " bars ", " apple ", " seven "}; - String[][] toSave = new String[3][3]; -// for (int i = 0; i Date: Fri, 14 Jun 2019 09:36:31 -0400 Subject: [PATCH 36/71] run game commented out --- .../io/zipcoder/casino/games/Blackjack.java | 25 +++++++++++++++++ .../zipcoder/casino/games/BlackjackTest.java | 27 ++++++++++--------- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Blackjack.java b/src/main/java/io/zipcoder/casino/games/Blackjack.java index b2f64c391..e5f30c443 100644 --- a/src/main/java/io/zipcoder/casino/games/Blackjack.java +++ b/src/main/java/io/zipcoder/casino/games/Blackjack.java @@ -3,6 +3,7 @@ import io.zipcoder.casino.gameTools.Card; import io.zipcoder.casino.player.BlackJackPlayer; import io.zipcoder.casino.player.BlackJackPlayerNPC; +import io.zipcoder.casino.player.Player; public class Blackjack extends CardGames implements GamblerGameInterface { @@ -23,7 +24,20 @@ public Blackjack() { } + public void runGame(){ + display("Hello "); //+ BlackJackPlayer.getName() + "!"); + } + + /** public void getWinner(){ + if(player1.currentHand() > 21){ + playerLose(); + } else if (player1.currentHand() < player2.currentHand() && player2 <=21){ + playerLose(); + } else if (player1.currentHand() == 21 && player2.currentHand() == 21){ + push(); + } else if { + } */ public Integer calcPayment(Integer bet, Integer odds) { return null; @@ -31,7 +45,11 @@ public Integer calcPayment(Integer bet, Integer odds) { public void updateAccount(Integer num) {} + public void currentHand(){ + }; + + //enums for the below public void stay() {}; @@ -68,6 +86,13 @@ public double getCurrentBet(){ return currentBet; } + /** public BlackJackPlayer getBlackJackPLayer() { + + return blackJackPlayer; + } */ + + + @Override void nextTurn() { diff --git a/src/test/io/zipcoder/casino/games/BlackjackTest.java b/src/test/io/zipcoder/casino/games/BlackjackTest.java index 38fbc6040..c9486cddb 100644 --- a/src/test/io/zipcoder/casino/games/BlackjackTest.java +++ b/src/test/io/zipcoder/casino/games/BlackjackTest.java @@ -10,49 +10,49 @@ public class BlackjackTest { @Test - public void stayTest(){ + public void stayTest() { } @Test - public void splitTest(){ + public void splitTest() { } @Test - public void doubleDownTest(){ + public void doubleDownTest() { } @Test - public void getPlayer1ScoreTest(){ + public void getPlayer1ScoreTest() { } @Test - public void setPlayer1ScoreTest(){ + public void setPlayer1ScoreTest() { } @Test - public void getPlayer2ScoreTest(){ + public void getPlayer2ScoreTest() { } @Test - public void setPlayer2ScoreTest(){ + public void setPlayer2ScoreTest() { } @Test - public void nextTurnTest(){ + public void nextTurnTest() { } @Test - public void endGameTest(){ + public void endGameTest() { Handler handler = new Handler(); - Player player = handler.createPlayer("Sally" , 200.0); + Player player = handler.createPlayer("Sally", 200.0); Blackjack blackjack = new Blackjack(); @@ -64,7 +64,7 @@ public void endGameTest(){ } @Test - public void calcBJPaymentTest(){ + public void calcBJPaymentTest() { Blackjack blackjack = new Blackjack(); blackjack.setOdds(3.0); @@ -75,8 +75,9 @@ public void calcBJPaymentTest(){ Assert.assertEquals(expected, actual); } +} - @Test + /**@Test public void updateAccount(){ Blackjack blackjack = new Blackjack(); @@ -86,4 +87,4 @@ public void updateAccount(){ Assert.assertEquals(expected, actual); } -} +} */ From d57af9fa30247d3d700071fe05e2038fed97f8b9 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Fri, 14 Jun 2019 11:38:14 -0400 Subject: [PATCH 37/71] beforedata hanler addon --- src/main/java/io/zipcoder/casino/Handler.java | 2 +- src/main/java/io/zipcoder/casino/games/Craps.java | 15 ++++++++++++--- .../zipcoder/casino/games/CrapsDataHandler.java | 5 +++++ .../java/io/zipcoder/casino/games/Roulette.java | 2 +- .../java/io/zipcoder/casino/games/CrapsTest.java | 7 ++++--- .../io/zipcoder/casino/games/RouletteTest.java | 11 ++--------- 6 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index b1717beb3..5a1cde621 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -36,7 +36,7 @@ public void run() { break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); + Craps craps = new Craps(crapsPlayer, console); craps.runGame(); break; case 4: diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index c8c02471f..cafe08d7b 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -10,6 +10,7 @@ public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; + private Console console; private Integer onNumber; private Double firstLineBet; private Double secondLineBet; @@ -26,10 +27,9 @@ public class Craps extends Games implements GamblerGameInterface { private Integer stage; - Console console = new Console(System.in, System.out); - public Craps() { - }; + + public Craps() {} public Craps(CrapsPlayer player) { this.crapsPlayer = player; @@ -39,6 +39,15 @@ public Craps(CrapsPlayer player) { } + public Craps(CrapsPlayer player, Console console) { + this.crapsPlayer = player; + this.console = console; + crapsPlayer.player.setPlaying(true); + this.stage = 0; + + } + + diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java new file mode 100644 index 000000000..93d489876 --- /dev/null +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -0,0 +1,5 @@ +package io.zipcoder.casino.games; + +public class CrapsDataHandler { + +} diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index 27d668001..f45c77242 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -6,7 +6,7 @@ public class Roulette extends Games implements GamblerGameInterface { String betType; // red/back - odd / even / number - RoulettePlayer roulettePlayer = new RoulettePlayer(); + public RoulettePlayer roulettePlayer = new RoulettePlayer(); private Double currentBet; diff --git a/src/test/java/io/zipcoder/casino/games/CrapsTest.java b/src/test/java/io/zipcoder/casino/games/CrapsTest.java index bdade457a..e6ccf4b79 100644 --- a/src/test/java/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/java/io/zipcoder/casino/games/CrapsTest.java @@ -1,6 +1,7 @@ -package io.zipcoder.casino.games; +package java.io.zipcoder.casino.games; import io.zipcoder.casino.Handler; +import io.zipcoder.casino.games.Craps; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import org.junit.Assert; @@ -17,7 +18,7 @@ public void calcPayment() { craps.setFirstLineBet(10.0); Double expected = 20.0; - Double actual = craps.calcPayment(craps.odds, craps.getFirstLineBet()); + Double actual = craps.calcPayment(craps.getOdds(), craps.getFirstLineBet()); Assert.assertEquals(expected, actual); } @@ -152,7 +153,7 @@ public void withdraw() { Handler handler = new Handler(); Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); + Craps craps = new Craps(crapsPlayer ); craps.withdraw(100.0); Double expected = 900.0; diff --git a/src/test/java/io/zipcoder/casino/games/RouletteTest.java b/src/test/java/io/zipcoder/casino/games/RouletteTest.java index e73478df9..8d7ddd1d7 100644 --- a/src/test/java/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/java/io/zipcoder/casino/games/RouletteTest.java @@ -1,5 +1,6 @@ -package io.zipcoder.casino.games; +package java.io.zipcoder.casino.games; +import io.zipcoder.casino.games.Roulette; import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Before; @@ -42,8 +43,6 @@ public void updateAccountTest() { Double actual = this.roulette.roulettePlayer.getAccount(); Assert.assertEquals(10,actual.doubleValue(),0.0); - - } @@ -54,13 +53,7 @@ public void calcPaymentDoubleTest(){ } - @Test - public void updateAccountDoubleTest(){ - this.roulette.updateAccount(1.5); - Double actual = this.roulette.roulettePlayer.getAccount(); - Assert.assertEquals(1.5, actual.doubleValue(),0.0); - } From 5763a1cfaae4f3ef662eaade766b836d03c40332 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Fri, 14 Jun 2019 13:47:11 -0400 Subject: [PATCH 38/71] test for craps class writtten --- .../java/io/zipcoder/casino/games/Craps.java | 115 +++---------- .../casino/games/CrapsDataHandler.java | 126 +++++++++++++- .../zipcoder/casino/player/CrapsPlayer.java | 6 +- .../io/zipcoder/casino/HandlerTest.java | 0 .../zipcoder/casino/gameTools/DeckTest.java | 0 .../zipcoder/casino/gameTools/DiceTest.java | 0 .../zipcoder/casino/games/BlackjackTest.java | 0 .../casino/games/CrapsDataHandlerTest.java | 161 ++++++++++++++++++ .../io/zipcoder/casino/games/CrapsTest.java | 149 +++------------- .../io/zipcoder/casino/games/GoFishTest.java | 0 .../zipcoder/casino/games/RouletteTest.java | 2 +- .../io/zipcoder/casino/player/PlayerTest.java | 0 .../casino/player/RoulettePlayerTest.java | 0 .../casino/player/gameTools/CardTest.java | 10 +- 14 files changed, 343 insertions(+), 226 deletions(-) rename src/test/{java => }/io/zipcoder/casino/HandlerTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/gameTools/DeckTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/gameTools/DiceTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/games/BlackjackTest.java (100%) create mode 100644 src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java rename src/test/{java => }/io/zipcoder/casino/games/CrapsTest.java (60%) rename src/test/{java => }/io/zipcoder/casino/games/GoFishTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/games/RouletteTest.java (96%) rename src/test/{java => }/io/zipcoder/casino/player/PlayerTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/player/RoulettePlayerTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/player/gameTools/CardTest.java (70%) diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index cafe08d7b..8695db323 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -10,22 +10,7 @@ public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; - private Console console; - private Integer onNumber; - private Double firstLineBet; - private Double secondLineBet; - private Double fieldBet; - private Integer fieldBetType; - private Double firstLineOdds = 2.0; - private Double secondLineOdds = 2.0; - private Double fieldBetodds = 12.0; - private Integer currentRoll; - //private HashMap fieldOdds = new HashMap(); - - - - - + private CrapsDataHandler data = new CrapsDataHandler(); private Integer stage; @@ -38,43 +23,41 @@ public Craps(CrapsPlayer player) { } - public Craps(CrapsPlayer player, Console console) { this.crapsPlayer = player; - this.console = console; + data.setConsole(console); crapsPlayer.player.setPlaying(true); this.stage = 0; } - - - - public void runGame() { display("Welcome to the table " + crapsPlayer.player.getName() + "! \n"); while(crapsPlayer.player.getPlaying() == true) { switch (stage) { case 0: - String input = console.getStringInput("A game has just ended would you like to play or exit? "); + String input = data.getConsole().getStringInput("A game has just ended would you like to play or exit? "); stage0Play(input); break; case 1: - firstLineBet = (console.getDoubleInput("Let's get started! \n Place Your bet!")); - currentRoll = crapsPlayer.roll(); - stage1Play(firstLineBet); + data.setFirstLineBet (data.getConsole().getDoubleInput("Let's get started! \n Place Your bet!")); + if(hasMoenytoBet(data.getFirstLineBet(), crapsPlayer.player)){ + data.setCurrentRoll(crapsPlayer.roll()); + stage1Play(data.getFirstLineBet()); + } break; case 2: - secondLineBet = console.getDoubleInput("Bet your push number bets! \n Place Your bet!"); - fieldBetType = console.getIntegerInput("What else do you want to bet?"); - fieldBet = console.getDoubleInput("how much do you want to bet on this?"); - currentRoll =crapsPlayer.roll(); - stage2Play(secondLineBet, fieldBet, fieldBetType); + data.setSecondLineBet(data.getConsole().getDoubleInput("Bet your push number bets! \n Place Your bets!")); + data.setFieldBetType(data.getConsole().getIntegerInput("What else do you want to bet?")); + data.setFieldBet(data.getConsole().getDoubleInput("how much do you want to bet on this?")); + if(hasMoenytoBet(data.getSecondLineBet() + data.getFieldBet(), crapsPlayer.player)){ + data.setCurrentRoll(crapsPlayer.roll()); + stage2Play(data.getSecondLineBet(), data.getFieldBet(), data.getFieldBetType()); + } break; } } - endGame(); } @@ -93,20 +76,19 @@ public void stage0Play(String input){ public void stage1Play(Double firstLineBet){ withdraw(firstLineBet); - if(currentRoll.equals(2) || currentRoll.equals(3) || currentRoll.equals(12)) { - display(" you rolled a " + currentRoll + "\n" + "Sorry you crapped out!"); + if(data.getCurrentRoll().equals(2) || data.getCurrentRoll().equals(3) || data.getCurrentRoll().equals(12)) { + display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); this.stage = 0; - } else if (currentRoll.equals(7) || currentRoll.equals(11)) { - display(" you rolled a " + currentRoll + "\n" + "you won!" + calcPayment(firstLineOdds, firstLineBet)); - deposit(calcPayment(firstLineBet, firstLineOdds) + firstLineBet); - } else if(currentRoll.equals(2) && currentRoll.equals(3) && !currentRoll.equals(12) && !currentRoll.equals(7) && !currentRoll.equals(11)){ - display(" you rolled a " + currentRoll + ".\n" + currentRoll + " is now the on number!"); - setOnNumber(currentRoll); + } else if (data.getCurrentRoll().equals(7) || data.getCurrentRoll().equals(11)) { + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won!" + calcPayment(data.getFirstLineOdds(), firstLineBet) + "you now have " + crapsPlayer.player.getAccount()); + deposit(calcPayment(firstLineBet, data.getFirstLineOdds())); + } else if(!data.getCurrentRoll().equals(2) && !data.getCurrentRoll().equals(3) && !data.getCurrentRoll().equals(12) && !data.getCurrentRoll().equals(7) && !data.getCurrentRoll().equals(11)){ + display(" you rolled a " + data.getCurrentRoll() + ".\n" + data.getCurrentRoll() + " is now the on number!"); + data.setOnNumber(data.getCurrentRoll()); this.stage = 2; } else { display("Excuse me I didnt understand"); - } - + } } public void stage2Play(Double secondLineBet, Double fieldBet, Integer bet ){ @@ -146,59 +128,18 @@ public Double calcPayment(Double bet, Double odds) { public Boolean hasMoenytoBet(Double bet, Player player) { if (bet > player.getAccount()){ + display("Not enought Money!!! \n you only have - " + + crapsPlayer.player.getAccount()); return false; } else return true; } - - /*----Getters/Setters------*/ - - public Integer getOnNumber() { - return onNumber; - } - - public void setOnNumber(Integer onNumber) { - this.onNumber = onNumber; - } - - public Double getFirstLineBet() { - return firstLineBet; - } - - public void setFirstLineBet(Double firstLineBet) { - this.firstLineBet = firstLineBet; - } - - public Double getSecondLineBet() { - return secondLineBet; - } - - public void setSecondLineBet(Double secondLineBet) { - this.secondLineBet = secondLineBet; - } - - public Double getFieldBet() { - return fieldBet; - } - - public void setFieldBet(Double fieldBet) { - this.fieldBet = fieldBet; - } - -// public CrapsPlayer getCrapsPlayer() { -// return crapsPlayer; -// } - public Integer getStage() { return stage; } - public Integer getCurrentRoll() { - return currentRoll; - } - - public void setCurrentRoll(Integer num) { - this.currentRoll = num; + public void setStage(Integer stage) { + this.stage = stage; } @Override diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java index 93d489876..d431caec0 100644 --- a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -1,5 +1,129 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.player.CrapsPlayer; +import io.zipcoder.casino.utilities.Console; + +import java.util.HashMap; + public class CrapsDataHandler { - + private CrapsPlayer crapsPlayer; + private Console console; + private Integer onNumber; + private Double firstLineBet; + private Double secondLineBet; + private Double fieldBet; + private Integer fieldBetType; + private Double firstLineOdds = 2.0; + private Double secondLineOdds = 2.0; + private Double fieldBetodds = 12.0; + private Integer currentRoll; + private HashMap fieldOdds = new HashMap(); + + + public CrapsDataHandler(){ + fieldOdds.put(2,10); + fieldOdds.put(3,9); + fieldOdds.put(4,8); + fieldOdds.put(5,7); + fieldOdds.put(6,6); + fieldOdds.put(7,5); + fieldOdds.put(8,6); + fieldOdds.put(9,7); + fieldOdds.put(10,8); + fieldOdds.put(11,9); + fieldOdds.put(12,10); + + + } + public CrapsPlayer getCrapsPlayer() { + return crapsPlayer; + } + + public void setCrapsPlayer(CrapsPlayer crapsPlayer) { + this.crapsPlayer = crapsPlayer; + } + + public Console getConsole() { + return console; + } + + public void setConsole(Console console) { + this.console = console; + } + + public Integer getOnNumber() { + return onNumber; + } + + public void setOnNumber(Integer onNumber) { + this.onNumber = onNumber; + } + + public Double getFirstLineBet() { + return firstLineBet; + } + + public void setFirstLineBet(Double firstLineBet) { + this.firstLineBet = firstLineBet; + } + + public Double getSecondLineBet() { + return secondLineBet; + } + + public void setSecondLineBet(Double secondLineBet) { + this.secondLineBet = secondLineBet; + } + + public Double getFieldBet() { + return fieldBet; + } + + public void setFieldBet(Double fieldBet) { + this.fieldBet = fieldBet; + } + + public Integer getFieldBetType() { + return fieldBetType; + } + + public void setFieldBetType(Integer fieldBetType) { + this.fieldBetType = fieldBetType; + } + + public Double getFirstLineOdds() { + return firstLineOdds; + } + + public void setFirstLineOdds(Double firstLineOdds) { + this.firstLineOdds = firstLineOdds; + } + + public Double getSecondLineOdds() { + return secondLineOdds; + } + + public void setSecondLineOdds(Double secondLineOdds) { + this.secondLineOdds = secondLineOdds; + } + + public Double getFieldBetodds() { + return fieldBetodds; + } + + public void setFieldBetodds(Double fieldBetodds) { + this.fieldBetodds = fieldBetodds; + } + + public Integer getCurrentRoll() { + return currentRoll; + } + + public void setCurrentRoll(Integer currentRoll) { + this.currentRoll = currentRoll; + } + + + + } diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index 7bb701bcc..adf67c401 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -6,11 +6,8 @@ public class CrapsPlayer extends Player implements GamblerInterface { - public Player player; - - public CrapsPlayer(){}; public CrapsPlayer(Player player){ @@ -24,6 +21,7 @@ public Integer roll() { } public void bet(Double bet) { + } public void betType(String betType) { @@ -35,6 +33,6 @@ public void cashout() { } public void displayAccoutBal() { - + System.out.println(player.getAccount()); } } diff --git a/src/test/java/io/zipcoder/casino/HandlerTest.java b/src/test/io/zipcoder/casino/HandlerTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/HandlerTest.java rename to src/test/io/zipcoder/casino/HandlerTest.java diff --git a/src/test/java/io/zipcoder/casino/gameTools/DeckTest.java b/src/test/io/zipcoder/casino/gameTools/DeckTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/gameTools/DeckTest.java rename to src/test/io/zipcoder/casino/gameTools/DeckTest.java diff --git a/src/test/java/io/zipcoder/casino/gameTools/DiceTest.java b/src/test/io/zipcoder/casino/gameTools/DiceTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/gameTools/DiceTest.java rename to src/test/io/zipcoder/casino/gameTools/DiceTest.java diff --git a/src/test/java/io/zipcoder/casino/games/BlackjackTest.java b/src/test/io/zipcoder/casino/games/BlackjackTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/games/BlackjackTest.java rename to src/test/io/zipcoder/casino/games/BlackjackTest.java diff --git a/src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java b/src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java new file mode 100644 index 000000000..078d7b0ea --- /dev/null +++ b/src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java @@ -0,0 +1,161 @@ +package io.zipcoder.casino.games; + +import io.zipcoder.casino.Handler; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CrapsDataHandlerTest { + CrapsDataHandler data = new CrapsDataHandler(); + + @Test + public void getOnNumber() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setOnNumber(10); + + Integer expected = 10; + Integer actual = data.getOnNumber(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void setOnNumber() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setOnNumber(8); + + Integer expected = 8; + Integer actual = data.getOnNumber(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getFirstLineBet() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setFirstLineBet(10.0); + + Double expected = 10.0; + Double actual = data.getFirstLineBet(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void setFirstLineBet() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setFirstLineBet(10.0); + + Double expected = 10.0; + Double actual = data.getFirstLineBet(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getSecondLineBet() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setSecondLineBet(10.0); + + Double expected = 10.0; + Double actual = data.getSecondLineBet(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void setSecondLineBet() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setSecondLineBet(10.0); + + Double expected = 10.0; + Double actual = data.getSecondLineBet(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getOtherBet() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setFieldBet(10.0); + + Double expected = 10.0; + Double actual = data.getFieldBet(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void setOtherBet() { + Handler handler = new Handler(); + handler.createPlayer("", 100.0); + Craps craps = new Craps(); + + data.setFieldBet(10.0); + + Double expected = 10.0; + Double actual = data.getFieldBet(); + + Assert.assertEquals(expected, actual); + } + + + @Test + public void getFirstLineOdds() { + data.setFirstLineOdds(10.0); + Double actual = data.getFirstLineOdds(); + Double expected = 10.0; + + Assert.assertEquals(expected,actual); + } + + @Test + public void setFirstLineOdds() { + data.setFirstLineOdds(10.0); + Double actual = data.getFirstLineOdds(); + Double expected = 10.0; + + Assert.assertEquals(expected,actual); + } + + @Test + public void getSecondLineOdds() { + data.setSecondLineOdds(10.0); + Double actual = data.getSecondLineOdds(); + Double expected = 10.0; + + Assert.assertEquals(expected,actual); + } + + @Test + public void setSecondLineOdds() { + data.setSecondLineOdds(10.0); + Double actual = data.getSecondLineOdds(); + Double expected = 10.0; + + Assert.assertEquals(expected,actual); + } + +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java similarity index 60% rename from src/test/java/io/zipcoder/casino/games/CrapsTest.java rename to src/test/io/zipcoder/casino/games/CrapsTest.java index e6ccf4b79..26e4c3e00 100644 --- a/src/test/java/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -1,24 +1,25 @@ -package java.io.zipcoder.casino.games; +package io.zipcoder.casino.games; import io.zipcoder.casino.Handler; import io.zipcoder.casino.games.Craps; +import io.zipcoder.casino.games.CrapsDataHandler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; public class CrapsTest { - +CrapsDataHandler data = new CrapsDataHandler(); @Test public void calcPayment() { Craps craps = new Craps(); craps.setOdds(2.0); - craps.setFirstLineBet(10.0); + data.setFirstLineBet(10.0); Double expected = 20.0; - Double actual = craps.calcPayment(craps.getOdds(), craps.getFirstLineBet()); + Double actual = craps.calcPayment(craps.getOdds(), data.getFirstLineBet()); Assert.assertEquals(expected, actual); } @@ -34,120 +35,6 @@ public void updateAccount() { Assert.assertEquals(expected, actual); } - - @Test - public void getOnNumber() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setOnNumber(10); - - Integer expected = 10; - Integer actual = craps.getOnNumber(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setOnNumber() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setOnNumber(8); - - Integer expected = 8; - Integer actual = craps.getOnNumber(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void getFirstLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFirstLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFirstLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setFirstLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFirstLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFirstLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void getSecondLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setSecondLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getSecondLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setSecondLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setSecondLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getSecondLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void getOtherBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFieldBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFieldBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setOtherBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFieldBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFieldBet(); - - Assert.assertEquals(expected, actual); - } - - @Test public void withdraw() { Handler handler = new Handler(); @@ -197,8 +84,11 @@ public void hasMoenytoBet() { @Test public void stage0PlayPlay() { - Craps craps = new Craps(); - craps.stage0Play(""); + Handler handler = new Handler(); + Player player = handler.createPlayer("", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); + craps.stage0Play("play"); Integer actual = 1; Integer expected = craps.getStage(); @@ -244,12 +134,11 @@ public void stage1Play() { CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); - craps.setCurrentRoll(10); - craps.stage1Play(10.0); - Integer currentRoll = craps.getCurrentRoll(); + data.setCurrentRoll(10); + craps.stage1Play(100.0); - Integer actual = 10; - Integer expected = craps.getOnNumber(); + Integer actual = 2; + Integer expected = craps.getStage(); Assert.assertEquals(expected, actual); @@ -262,7 +151,7 @@ public void stage1PlayCrap() { CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); - craps.setCurrentRoll(2); + data.setCurrentRoll(7); craps.stage1Play(10.0); @@ -280,7 +169,7 @@ public void stage1PlayCrapWin() { CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); - craps.setCurrentRoll(7); + data.setCurrentRoll(7); craps.stage1Play(10.0); @@ -298,8 +187,8 @@ public void stage2PlayWinOnNumber() { CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); - craps.setOnNumber(8); - craps.setCurrentRoll(8); + data.setOnNumber(8); + data.setCurrentRoll(8); craps.stage2Play(10.0, 10.0, 5); @@ -318,7 +207,7 @@ public void stage2PlayCrapOut() { CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); - craps.setCurrentRoll(7); + data.setCurrentRoll(7); craps.stage2Play(10.0, 10.0, 5); Integer actual = 0; diff --git a/src/test/java/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/games/GoFishTest.java rename to src/test/io/zipcoder/casino/games/GoFishTest.java diff --git a/src/test/java/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java similarity index 96% rename from src/test/java/io/zipcoder/casino/games/RouletteTest.java rename to src/test/io/zipcoder/casino/games/RouletteTest.java index 8d7ddd1d7..399e8f4d5 100644 --- a/src/test/java/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -1,4 +1,4 @@ -package java.io.zipcoder.casino.games; +package io.zipcoder.casino.games; import io.zipcoder.casino.games.Roulette; import io.zipcoder.casino.player.Player; diff --git a/src/test/java/io/zipcoder/casino/player/PlayerTest.java b/src/test/io/zipcoder/casino/player/PlayerTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/player/PlayerTest.java rename to src/test/io/zipcoder/casino/player/PlayerTest.java diff --git a/src/test/java/io/zipcoder/casino/player/RoulettePlayerTest.java b/src/test/io/zipcoder/casino/player/RoulettePlayerTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/player/RoulettePlayerTest.java rename to src/test/io/zipcoder/casino/player/RoulettePlayerTest.java diff --git a/src/test/java/io/zipcoder/casino/player/gameTools/CardTest.java b/src/test/io/zipcoder/casino/player/gameTools/CardTest.java similarity index 70% rename from src/test/java/io/zipcoder/casino/player/gameTools/CardTest.java rename to src/test/io/zipcoder/casino/player/gameTools/CardTest.java index af7062e6f..64ef7ffd7 100644 --- a/src/test/java/io/zipcoder/casino/player/gameTools/CardTest.java +++ b/src/test/io/zipcoder/casino/player/gameTools/CardTest.java @@ -1,6 +1,10 @@ -package io.zipcoder.casino.gameTools; +package io.zipcoder.casino.player.gameTools; import com.sun.source.tree.AssertTree; +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.CardValue; +import io.zipcoder.casino.gameTools.Deck; +import io.zipcoder.casino.gameTools.Suit; import org.junit.Assert; import org.junit.Test; @@ -12,7 +16,7 @@ public class CardTest { @Test public void getCardValueAce() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Ace",CardValue.Ace.name()); + Assert.assertEquals("Ace", CardValue.Ace.name()); } @Test public void getCardValueTwo() { @@ -23,7 +27,7 @@ public void getCardValueTwo() { @Test public void getSuitSpades() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Spades",Suit.Spades.name()); + Assert.assertEquals("Spades", Suit.Spades.name()); } @Test public void getSuitHearts() { From b72634c92e4b6ecf22c78464be3f6405db3050d9 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Fri, 14 Jun 2019 14:47:53 -0400 Subject: [PATCH 39/71] fixed gofishplayer --- src/main/java/io/zipcoder/casino/Handler.java | 8 +- .../io/zipcoder/casino/gameTools/Deck.java | 4 +- .../java/io/zipcoder/casino/games/GoFish.java | 50 +++++------- .../casino/player/CardGamePlayer.java | 28 +++---- .../zipcoder/casino/player/GoFishPlayer.java | 4 +- .../io/zipcoder/casino/HandlerTest.java | 0 .../zipcoder/casino/gameTools/DeckTest.java | 26 ++++--- .../zipcoder/casino/gameTools/DiceTest.java | 0 .../zipcoder/casino/games/BlackjackTest.java | 0 .../io/zipcoder/casino/games/CrapsTest.java | 0 .../io/zipcoder/casino/games/GoFishTest.java | 78 +++++++++++++++++++ .../zipcoder/casino/games/RouletteTest.java | 2 +- .../casino/player/GoFishPlayerTest.java | 46 +++++++++++ .../io/zipcoder/casino/player/PlayerTest.java | 0 .../casino/player/RoulettePlayerTest.java | 0 .../casino/player/gameTools/CardTest.java | 10 ++- .../io/zipcoder/casino/games/GoFishTest.java | 60 -------------- 17 files changed, 194 insertions(+), 122 deletions(-) rename src/test/{java => }/io/zipcoder/casino/HandlerTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/gameTools/DeckTest.java (76%) rename src/test/{java => }/io/zipcoder/casino/gameTools/DiceTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/games/BlackjackTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/games/CrapsTest.java (100%) create mode 100644 src/test/io/zipcoder/casino/games/GoFishTest.java rename src/test/{java => }/io/zipcoder/casino/games/RouletteTest.java (96%) create mode 100644 src/test/io/zipcoder/casino/player/GoFishPlayerTest.java rename src/test/{java => }/io/zipcoder/casino/player/PlayerTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/player/RoulettePlayerTest.java (100%) rename src/test/{java => }/io/zipcoder/casino/player/gameTools/CardTest.java (70%) delete mode 100644 src/test/java/io/zipcoder/casino/games/GoFishTest.java diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index b1717beb3..080a6be63 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -1,9 +1,13 @@ package io.zipcoder.casino; import io.zipcoder.casino.games.*; +import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; + +import javax.smartcardio.Card; + // public class Handler { private Console console = new Console(System.in, System.out); @@ -28,8 +32,8 @@ public void run() { break; case 1 : GoFishPlayer goFishPlayer = new GoFishPlayer(player); - GoFish goFish = new GoFish(goFishPlayer); - goFish.startTheGame(); + GoFish goFish = new GoFish(goFishPlayer, console); + goFish.runGame(); break; case 2: Roulette roulette = new Roulette(); diff --git a/src/main/java/io/zipcoder/casino/gameTools/Deck.java b/src/main/java/io/zipcoder/casino/gameTools/Deck.java index b502f2d7a..dfcf58921 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Deck.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Deck.java @@ -29,12 +29,12 @@ public void shuffle () { Collections.shuffle(cardStack); }; - public ArrayList deal (Integer numOfCards, CardGamePlayer player) { + public void deal (Integer numOfCards, CardGamePlayer player) { ArrayList result = new ArrayList(); for (int i = 0; i < numOfCards ; i++) { result.add(cardStack.pop()); + player.setHand(result); } - return result; } public void dealSingleCard(CardGamePlayer player) { diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 0b21c75ae..4a8236b67 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -8,42 +8,44 @@ import io.zipcoder.casino.utilities.Console; import java.util.ArrayList; +import java.util.Random; import java.util.Scanner; public class GoFish extends Games { - - private CardGamePlayer mainPlayer; + Console console; + private GoFishPlayer mainPlayer; + private CardGamePlayer otherPlayer = new GoFishPlayer(); private Deck deck = new Deck(); - private Scanner scanner = new Scanner(System.in); - private ArrayList otherPlayers; + public GoFish() {} - public GoFish(GoFishPlayer player) { + public GoFish(GoFishPlayer player, Console console) { super(); this.mainPlayer = player; + this.console = console; +// otherPlayer.setName("other player"); } + public void runGame () { - public void startTheGame () { - otherPlayers = createOtherPlayers(2); - deck.deal(5,mainPlayer); - for (GoFishPlayer other: otherPlayers - ) { - deck.deal(5, other); - } - } - + console.println("Hey " + mainPlayer.getName() + "! \nWelcome to GOFISH GAME"); - @Override - void nextTurn() { + } + public void createPlayers () { +// deck.deal(5, mainPlayer); +// deck.deal(5, otherPlayer); +// ArrayList hand = mainPlayer.getHand(); +// ArrayList dealerHand = otherPlayer.getHand(); } + @Override - void endGame() { + void nextTurn() { } - } + @Override + void endGame() { } @Override boolean getResults() { @@ -64,13 +66,6 @@ public Card goFishAction () { }; - //====================alex - public Integer inputNumPlayers() { - - String info = "Please Enter Number of players"; - Integer result = scanner.nextInt(); - return result; - } public ArrayList createOtherPlayers (Integer numPlayers) { ArrayList players = new ArrayList(); //foreach of inputnUmplayers - create player @@ -81,11 +76,6 @@ public ArrayList createOtherPlayers (Integer numPlayers) { } return players; } - public void runAction (String userAction) { - //based on the action user Start the game/See Rules/ Exit the game - - } - } diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index f04513f8a..0eb84cdb9 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -4,10 +4,17 @@ import io.zipcoder.casino.gameTools.Card; import java.util.ArrayList; -/// -public class CardGamePlayer extends Player { - public ArrayList hand; + +public class CardGamePlayer { + private Player player; + private ArrayList hand; + + public CardGamePlayer (Player player) { + this.player = player; + + } + public ArrayList getHand() { return hand; @@ -21,24 +28,19 @@ public void setHand(ArrayList hand) { public CardGamePlayer(){}; - public CardGamePlayer(String name, Double account) { - super(name, account); - } - - @Override public String getName() { - return super.getName(); + return player.getName(); } - @Override + public void setName(String name) { - super.setName(name); + player.setName(name); } - @Override + public Double getAccount() { - return super.getAccount(); + return player.getAccount(); } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 821e86345..b30700946 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -7,12 +7,12 @@ import java.util.ArrayList; public class GoFishPlayer extends CardGamePlayer { - Player player; + public GoFishPlayer() {} public GoFishPlayer(Player player) { - this.player = player; + super(player); } public void endturn() {}; diff --git a/src/test/java/io/zipcoder/casino/HandlerTest.java b/src/test/io/zipcoder/casino/HandlerTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/HandlerTest.java rename to src/test/io/zipcoder/casino/HandlerTest.java diff --git a/src/test/java/io/zipcoder/casino/gameTools/DeckTest.java b/src/test/io/zipcoder/casino/gameTools/DeckTest.java similarity index 76% rename from src/test/java/io/zipcoder/casino/gameTools/DeckTest.java rename to src/test/io/zipcoder/casino/gameTools/DeckTest.java index f28e7716a..a0150df08 100644 --- a/src/test/java/io/zipcoder/casino/gameTools/DeckTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DeckTest.java @@ -7,6 +7,7 @@ import org.junit.Test; import java.util.ArrayList; +import java.util.EmptyStackException; import static io.zipcoder.casino.gameTools.Suit.Clubs; @@ -34,9 +35,9 @@ public void deal5() { CardGamePlayer testPlayer = new GoFishPlayer(); Integer numCards = 5; Deck deck = new Deck(); - ArrayList testStartingHand = deck.deal(numCards,testPlayer); + deck.deal(numCards,testPlayer); Integer expected = 5; - Integer actual = testStartingHand.size(); + Integer actual = testPlayer.getHand().size(); Assert.assertEquals(expected,actual); } @@ -45,19 +46,26 @@ public void deal2() { CardGamePlayer testPlayer = new GoFishPlayer(); Integer numCards = 2; Deck deck = new Deck(); - ArrayList testStartingHand = deck.deal(numCards,testPlayer); + deck.deal(numCards,testPlayer); Integer expected = 2; - Integer actual = testStartingHand.size(); + Integer actual = testPlayer.getHand().size(); Assert.assertEquals(expected,actual); } - @Test //DO - public void dealNegative() { + @Test(expected = EmptyStackException.class) + public void testEmptyStackException() { + CardGamePlayer testPlayer = new GoFishPlayer(); + Integer numCards = 53; + Deck deck = new Deck(); + deck.deal(numCards,testPlayer); + } + @Test(expected = NullPointerException.class) + public void testNumCardslessthan1() { CardGamePlayer testPlayer = new GoFishPlayer(); - Integer numCards = -2; + Integer numCards = -1; Deck deck = new Deck(); - ArrayList testStartingHand = deck.deal(numCards,testPlayer); - Assert.assertNull(testStartingHand); + deck.deal(numCards,testPlayer); + testPlayer.getHand().size(); } @Test diff --git a/src/test/java/io/zipcoder/casino/gameTools/DiceTest.java b/src/test/io/zipcoder/casino/gameTools/DiceTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/gameTools/DiceTest.java rename to src/test/io/zipcoder/casino/gameTools/DiceTest.java diff --git a/src/test/java/io/zipcoder/casino/games/BlackjackTest.java b/src/test/io/zipcoder/casino/games/BlackjackTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/games/BlackjackTest.java rename to src/test/io/zipcoder/casino/games/BlackjackTest.java diff --git a/src/test/java/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/games/CrapsTest.java rename to src/test/io/zipcoder/casino/games/CrapsTest.java diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java new file mode 100644 index 000000000..13bf60d92 --- /dev/null +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -0,0 +1,78 @@ +package io.zipcoder.casino.games; + +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.Deck; +import io.zipcoder.casino.games.GoFish; +import io.zipcoder.casino.player.GoFishPlayer; +import io.zipcoder.casino.player.Player; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Random; + +public class GoFishTest { + GoFish goFish = new GoFish(); + GoFishPlayer mainplayer = new GoFishPlayer(); + GoFishPlayer otherPlayer = new GoFishPlayer(); + + + @Test + public void nextTurn() { + + } + + @Test + public void endGame() { + } + + @Test + public void getResults() { + } + + @Test + public void display() { + } + + @Test + public void checkCondition() { + + } + + @Test + public void goFish() { + } + + @Test + public void getCurrentBet() { + } + + @Test + public void setCurrentBet() { + } + + @Test + public void inputNumPlayers() { + + } + + @Test + public void createPlayersTestMain() { + Deck deck = new Deck(); + deck.deal(5,mainplayer); + Integer expected = 5; + Integer actual = mainplayer.getHand().size(); + Assert.assertEquals(expected,actual); + } + + @Test + public void createPlayersTestOther() { + Deck deck = new Deck(); + otherPlayer.setHand(new ArrayList(1)); + deck.deal(10,otherPlayer); + Integer expected = 10; + Integer actual = otherPlayer.getHand().size(); + Assert.assertEquals(expected,actual); + } + +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java similarity index 96% rename from src/test/java/io/zipcoder/casino/games/RouletteTest.java rename to src/test/io/zipcoder/casino/games/RouletteTest.java index e73478df9..c45e75f71 100644 --- a/src/test/java/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -56,7 +56,7 @@ public void calcPaymentDoubleTest(){ @Test public void updateAccountDoubleTest(){ - this.roulette.updateAccount(1.5); + //this.roulette.updateAccount(1.5); Double actual = this.roulette.roulettePlayer.getAccount(); Assert.assertEquals(1.5, actual.doubleValue(),0.0); diff --git a/src/test/io/zipcoder/casino/player/GoFishPlayerTest.java b/src/test/io/zipcoder/casino/player/GoFishPlayerTest.java new file mode 100644 index 000000000..c4a5f2fc3 --- /dev/null +++ b/src/test/io/zipcoder/casino/player/GoFishPlayerTest.java @@ -0,0 +1,46 @@ +package io.zipcoder.casino.player; + +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.Deck; +import io.zipcoder.casino.player.GoFishPlayer; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; + +import static org.junit.Assert.*; + +public class GoFishPlayerTest { + GoFishPlayer goFishPlayer = new GoFishPlayer(); + ArrayList hand = new ArrayList(1); + + + @Test + public void endturn() { + } + + @Test + public void getHand() { + Deck deck = new Deck(); + deck.deal(1,goFishPlayer); + Integer expected = 1; + Integer actual = goFishPlayer.getHand().size(); + Assert.assertEquals(expected,actual); + } + @Test + public void getHand1() { + Deck deck = new Deck(); + deck.deal(52,goFishPlayer); + Integer expected = 52; + Integer actual = goFishPlayer.getHand().size(); + Assert.assertEquals(expected,actual); + } + + @Test + public void setHand() { + } + + @Test + public void getAccount() { + } +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/casino/player/PlayerTest.java b/src/test/io/zipcoder/casino/player/PlayerTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/player/PlayerTest.java rename to src/test/io/zipcoder/casino/player/PlayerTest.java diff --git a/src/test/java/io/zipcoder/casino/player/RoulettePlayerTest.java b/src/test/io/zipcoder/casino/player/RoulettePlayerTest.java similarity index 100% rename from src/test/java/io/zipcoder/casino/player/RoulettePlayerTest.java rename to src/test/io/zipcoder/casino/player/RoulettePlayerTest.java diff --git a/src/test/java/io/zipcoder/casino/player/gameTools/CardTest.java b/src/test/io/zipcoder/casino/player/gameTools/CardTest.java similarity index 70% rename from src/test/java/io/zipcoder/casino/player/gameTools/CardTest.java rename to src/test/io/zipcoder/casino/player/gameTools/CardTest.java index af7062e6f..64ef7ffd7 100644 --- a/src/test/java/io/zipcoder/casino/player/gameTools/CardTest.java +++ b/src/test/io/zipcoder/casino/player/gameTools/CardTest.java @@ -1,6 +1,10 @@ -package io.zipcoder.casino.gameTools; +package io.zipcoder.casino.player.gameTools; import com.sun.source.tree.AssertTree; +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.CardValue; +import io.zipcoder.casino.gameTools.Deck; +import io.zipcoder.casino.gameTools.Suit; import org.junit.Assert; import org.junit.Test; @@ -12,7 +16,7 @@ public class CardTest { @Test public void getCardValueAce() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Ace",CardValue.Ace.name()); + Assert.assertEquals("Ace", CardValue.Ace.name()); } @Test public void getCardValueTwo() { @@ -23,7 +27,7 @@ public void getCardValueTwo() { @Test public void getSuitSpades() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Spades",Suit.Spades.name()); + Assert.assertEquals("Spades", Suit.Spades.name()); } @Test public void getSuitHearts() { diff --git a/src/test/java/io/zipcoder/casino/games/GoFishTest.java b/src/test/java/io/zipcoder/casino/games/GoFishTest.java deleted file mode 100644 index 96186358f..000000000 --- a/src/test/java/io/zipcoder/casino/games/GoFishTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.zipcoder.casino.games; - -import org.junit.Assert; -import org.junit.Test; - -public class GoFishTest { - //GoFish goFish = new GoFish(); - - @Test - public void nextTurn() { - - - } - - @Test - public void endGame() { - } - - @Test - public void getResults() { - } - - @Test - public void display() { - } - - @Test - public void check() { - } - - @Test - public void goFish() { - } - - @Test - public void getCurrentBet() { - } - - @Test - public void setCurrentBet() { - } - - @Test - public void inputNumPlayers() { - - } - - @Test - public void createOtherPlayersTest() { - GoFish goFish = new GoFish(); - Integer expected = 2; - Integer actual = goFish.createOtherPlayers(expected).size(); - Assert.assertEquals(expected,actual); - } - - @Test - public void runGoFishGameStart() { - - } -} \ No newline at end of file From add312e1a3c94e30aac290657960f2d7f9af037b Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Fri, 14 Jun 2019 15:10:17 -0400 Subject: [PATCH 40/71] fixed player bug with craps --- src/main/java/io/zipcoder/casino/Handler.java | 2 +- .../java/io/zipcoder/casino/games/Craps.java | 11 +-- .../casino/games/CrapsDataHandler.java | 12 +-- .../io/zipcoder/casino/games/CrapsTest.java | 88 ++++--------------- .../casino/player/CrapsPlayerTest.java | 20 +++++ 5 files changed, 49 insertions(+), 84 deletions(-) create mode 100644 src/test/io/zipcoder/casino/player/CrapsPlayerTest.java diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 5a1cde621..f9b60ed51 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -36,7 +36,7 @@ public void run() { break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer, console); + Craps craps = new Craps(crapsPlayer,console); craps.runGame(); break; case 4: diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 8695db323..b28d6e9b6 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -10,7 +10,7 @@ public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; - private CrapsDataHandler data = new CrapsDataHandler(); + public CrapsDataHandler data = new CrapsDataHandler(); private Integer stage; @@ -78,14 +78,15 @@ public void stage1Play(Double firstLineBet){ if(data.getCurrentRoll().equals(2) || data.getCurrentRoll().equals(3) || data.getCurrentRoll().equals(12)) { display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); - this.stage = 0; + stage = 0; } else if (data.getCurrentRoll().equals(7) || data.getCurrentRoll().equals(11)) { - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won!" + calcPayment(data.getFirstLineOdds(), firstLineBet) + "you now have " + crapsPlayer.player.getAccount()); + System.out.println(calcPayment(firstLineBet, data.getFirstLineOdds())); deposit(calcPayment(firstLineBet, data.getFirstLineOdds())); + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won! " + calcPayment(data.getFirstLineOdds(), firstLineBet) + " you now have " + crapsPlayer.player.getAccount()); } else if(!data.getCurrentRoll().equals(2) && !data.getCurrentRoll().equals(3) && !data.getCurrentRoll().equals(12) && !data.getCurrentRoll().equals(7) && !data.getCurrentRoll().equals(11)){ display(" you rolled a " + data.getCurrentRoll() + ".\n" + data.getCurrentRoll() + " is now the on number!"); data.setOnNumber(data.getCurrentRoll()); - this.stage = 2; + stage = 2; } else { display("Excuse me I didnt understand"); } @@ -122,7 +123,7 @@ public void deposit(Double num) { } public Double calcPayment(Double bet, Double odds) { - return bet *odds; + return bet * odds; } diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java index d431caec0..335c5dfbd 100644 --- a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -1,12 +1,11 @@ package io.zipcoder.casino.games; -import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.utilities.Console; import java.util.HashMap; public class CrapsDataHandler { - private CrapsPlayer crapsPlayer; + private Console console; private Integer onNumber; private Double firstLineBet; @@ -32,16 +31,11 @@ public CrapsDataHandler(){ fieldOdds.put(10,8); fieldOdds.put(11,9); fieldOdds.put(12,10); + } + - } - public CrapsPlayer getCrapsPlayer() { - return crapsPlayer; - } - public void setCrapsPlayer(CrapsPlayer crapsPlayer) { - this.crapsPlayer = crapsPlayer; - } public Console getConsole() { return console; diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 26e4c3e00..66a7c9d9e 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -1,25 +1,27 @@ package io.zipcoder.casino.games; import io.zipcoder.casino.Handler; -import io.zipcoder.casino.games.Craps; -import io.zipcoder.casino.games.CrapsDataHandler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import org.junit.Assert; import org.junit.Test; public class CrapsTest { -CrapsDataHandler data = new CrapsDataHandler(); + + Handler handler = new Handler(); + Player player = handler.createPlayer("", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); @Test public void calcPayment() { Craps craps = new Craps(); craps.setOdds(2.0); - data.setFirstLineBet(10.0); + craps.data.setFirstLineBet(10.0); Double expected = 20.0; - Double actual = craps.calcPayment(craps.getOdds(), data.getFirstLineBet()); + Double actual = craps.calcPayment(craps.getOdds(), craps.data.getFirstLineBet()); Assert.assertEquals(expected, actual); } @@ -37,11 +39,6 @@ public void updateAccount() { @Test public void withdraw() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer ); - craps.withdraw(100.0); Double expected = 900.0; Double actual = player.getAccount(); @@ -52,11 +49,6 @@ public void withdraw() { @Test public void deposit() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - craps.deposit(100.0); Double expected = 1100.0; Double actual = player.getAccount(); @@ -71,11 +63,7 @@ public void display() { @Test public void hasMoenytoBet() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 5.0); - Craps craps = new Craps(); - - Boolean expected = false; + Boolean expected = true; Boolean actual = craps.hasMoenytoBet(50.0, player); Assert.assertEquals(expected, actual); @@ -84,10 +72,6 @@ public void hasMoenytoBet() { @Test public void stage0PlayPlay() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); craps.stage0Play("play"); Integer actual = 1; @@ -98,11 +82,6 @@ public void stage0PlayPlay() { @Test public void stage0PlayExit() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - craps.stage0Play("exit"); Boolean actual = false; @@ -113,11 +92,6 @@ public void stage0PlayExit() { @Test public void stage0PlayInvalidInput() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - craps.stage0Play("234234"); Integer actual = 0; @@ -129,13 +103,10 @@ public void stage0PlayInvalidInput() { @Test public void stage1Play() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - data.setCurrentRoll(10); - craps.stage1Play(100.0); + craps.data.setCurrentRoll(10); + craps.data.setFirstLineBet(10.0); +// + craps.stage1Play(10.0); Integer actual = 2; Integer expected = craps.getStage(); @@ -146,15 +117,9 @@ public void stage1Play() { @Test public void stage1PlayCrap() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - data.setCurrentRoll(7); + craps.data.setCurrentRoll(7); craps.stage1Play(10.0); - Integer actual = 0; Integer expected = craps.getStage(); @@ -164,16 +129,11 @@ public void stage1PlayCrap() { @Test public void stage1PlayCrapWin() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 10.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); + craps.data.setCurrentRoll(7); - data.setCurrentRoll(7); craps.stage1Play(10.0); - - Double actual = 30.0; + Double actual = 1010.0; Double expected = player.getAccount(); Assert.assertEquals(expected, actual); @@ -182,16 +142,10 @@ public void stage1PlayCrapWin() { @Test public void stage2PlayWinOnNumber() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 100.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - data.setOnNumber(8); - data.setCurrentRoll(8); + craps.data.setOnNumber(8); + craps.data.setCurrentRoll(8); craps.stage2Play(10.0, 10.0, 5); - Double actual = 250.0; Double expected = player.getAccount(); @@ -202,18 +156,14 @@ public void stage2PlayWinOnNumber() { // @Test public void stage2PlayCrapOut() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 100.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - data.setCurrentRoll(7); + craps.data.setCurrentRoll(7); craps.stage2Play(10.0, 10.0, 5); Integer actual = 0; Integer expected = craps.getStage(); Assert.assertEquals(expected, actual); + } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java new file mode 100644 index 000000000..587f9b553 --- /dev/null +++ b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java @@ -0,0 +1,20 @@ +package io.zipcoder.casino.player; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CrapsPlayerTest { + + @Test + public void roll() { + } + + @Test + public void cashout() { + } + + @Test + public void displayAccoutBal() { + } +} \ No newline at end of file From a8b431bd3619ff348d704117624cb9e1fdd15ba2 Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 14 Jun 2019 16:45:43 -0400 Subject: [PATCH 41/71] working lastOne --- src/main/java/io/zipcoder/casino/Handler.java | 5 +- .../java/io/zipcoder/casino/games/Craps.java | 2 +- .../java/io/zipcoder/casino/games/Slots.java | 158 ++++++++++++------ .../zipcoder/casino/player/SlotsPlayer.java | 11 +- .../zipcoder/casino/games/RouletteTest.java | 14 +- 5 files changed, 132 insertions(+), 58 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index b1717beb3..5870e9f42 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -3,6 +3,7 @@ import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; +import io.zipcoder.casino.player.SlotsPlayer; import io.zipcoder.casino.utilities.Console; // public class Handler { @@ -40,7 +41,9 @@ public void run() { craps.runGame(); break; case 4: - Slots slots = new Slots(); + SlotsPlayer slotsPlayer = new SlotsPlayer(player); + Slots slots = new Slots(slotsPlayer, console); +// slots.runGame(); break; default: System.out.println("you blew it"); diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index c8c02471f..d5b3da57e 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -29,7 +29,7 @@ public class Craps extends Games implements GamblerGameInterface { Console console = new Console(System.in, System.out); public Craps() { - }; + } public Craps(CrapsPlayer player) { this.crapsPlayer = player; diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 49543b930..821aad995 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -2,58 +2,109 @@ import io.zipcoder.casino.player.Player; import io.zipcoder.casino.player.SlotsPlayer; +import io.zipcoder.casino.utilities.Console; import java.lang.reflect.Array; +import java.util.Random; public class Slots extends Games implements GamblerGameInterface { Integer numOfLines; - SlotsPlayer slotsPlayer = new SlotsPlayer(); + SlotsPlayer slotsPlayer; private Double currentBet; + public Console console; + public Player player; Integer random = 0; String[] characters = new String[]{"cherry ", "orange ", "bell ", "bars ", "apple ", "seven "}; - + // String[] characters = new String[]{"cherry ", "cherry ", "cherry ", "cherry ", "cherry ", "cherry "}; String[][] toSave = new String[3][3]; - public Slots() { } - public Slots(Player player) { - this.player = player; + public Slots(SlotsPlayer player, Console console) { + this.slotsPlayer = player; + this.console = console; } -// public static void main(String[] args) { -// Slots bestSlot = new Slots(); -// -// int max = bestSlot.characters.length; -// int min = 1; -// int range = max - min + 1; -// -// -// -// // generate random numbers within 1 to 6 -// for (int i = 0; i <= 2; i++) { -// for (int j = 0; j <= 2; j++) { -// int rand = (int) (Math.random() * range); -// System.out.print(bestSlot.characters[rand]); -// bestSlot.toSave[i][j] = bestSlot.characters[rand]; -// -// } -// -// System.out.println(); -// } -// -// for (int i = 0; i = 1) { + if (toSave[1][0] == toSave[1][1] && toSave[1][1] == toSave[1][2]) { + System.out.println(); + System.out.println("you won horizontal middle"); + countPaylines++; + } + } + if (bet >= 3) { + if (toSave[0][0] == toSave[0][1] && toSave[0][1] == toSave[0][2]) { + System.out.println(); + System.out.println("you won horizontal top"); + countPaylines++; + } + if (toSave[2][0] == toSave[2][1] && toSave[2][1] == toSave[2][2]) { + System.out.println(); + System.out.println("you won horizontal bottom"); + countPaylines++; + } + } + if (bet >= 5) { + if (toSave[2][0] == toSave[1][1] && toSave[1][1] == toSave[0][2]) { + System.out.println(); + System.out.println("you won diagonally right"); + countPaylines++; + } + if (toSave[0][0] == toSave[1][1] && toSave[1][1] == toSave[2][2]) { + System.out.println(); + System.out.println("you won diagonally left "); + countPaylines++; + } + + } + +// bestSlots. + } + + // public Integer checkIfWin(String fruit) { // int countDiag1 = 0; // int countDiag2 = 0; @@ -69,36 +120,47 @@ public Slots(Player player) { // } // if (toSave[i][j] == fruit) { // countHor += 1; +// +// +// } +// +// if (countHor == 3) { +// System.out.println("You won " + fruit + "horizontally"); +//// calcPayment(); +//// System.out.print(calcPayment(currentBet, getOdds())); +// +// } else { +// countHor = 0; +// // } // +// // } +// if (countDiag1 == 3) { // -// if (countHor == 3) { -// System.out.println("You won "+ fruit); -// } else { -// countHor = 0; +// System.out.println("You won " + fruit + "diagonally "); +//// calcPayment(); +//// System.out.print(); // // } +// if (countDiag2 == 3) { // +// System.out.println("You won " + fruit + "diagonally"); +//// calcPayment(); +//// System.out.print(calcPayment()); // -// } -// if (countDiag1 == 3) { +// } // -// System.out.println("You won "+fruit); -// } -// if (countDiag2 == 3) { // -// System.out.println("You won "+fruit); -// } +// System.out.println(); +// // System.out.println("one more time?!"); // // -// System.out.println(); -// // System.out.println("one more time?!"); -// return 9; +// } +// return 9; // } - @Override void nextTurn() { } @@ -135,7 +197,7 @@ public void setCurrentBet(Double currentBet) { } public Double calcPayment(Double bet, Double odds) { - return null; + return bet * odds; } public void withdraw(Double num) { diff --git a/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java index 14e3540d9..2680498aa 100644 --- a/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/SlotsPlayer.java @@ -2,6 +2,15 @@ public class SlotsPlayer extends Player implements GamblerInterface { + public Player player; + + + public SlotsPlayer(){ + + } + public SlotsPlayer(Player player){ + this.player = player; + } public void bet(Double bet) { @@ -10,7 +19,7 @@ public void bet(Double bet) { public void betType (String betType) { - }; + } public void cashout() { diff --git a/src/test/java/io/zipcoder/casino/games/RouletteTest.java b/src/test/java/io/zipcoder/casino/games/RouletteTest.java index e73478df9..b1f6f8b93 100644 --- a/src/test/java/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/java/io/zipcoder/casino/games/RouletteTest.java @@ -54,13 +54,13 @@ public void calcPaymentDoubleTest(){ } - @Test - public void updateAccountDoubleTest(){ - this.roulette.updateAccount(1.5); - Double actual = this.roulette.roulettePlayer.getAccount(); - Assert.assertEquals(1.5, actual.doubleValue(),0.0); - - } +// @Test +// public void updateAccountDoubleTest(){ +// this.roulette.updateAccount(1.5); +// Double actual = this.roulette.roulettePlayer.getAccount(); +// Assert.assertEquals(1.5, actual.doubleValue(),0.0); +// +// } From 3b4a9f5c2b6fba5bd71e7dcd07865865e9f1f73b Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Fri, 14 Jun 2019 17:23:17 -0400 Subject: [PATCH 42/71] game working with bugs --- src/main/java/io/zipcoder/casino/Handler.java | 6 +- .../java/io/zipcoder/casino/games/Craps.java | 59 +++++++++++++++---- .../casino/games/CrapsDataHandler.java | 39 ++++++------ .../zipcoder/casino/player/CrapsPlayer.java | 3 +- .../io/zipcoder/casino/games/CrapsTest.java | 18 +++++- .../casino/player/CrapsPlayerTest.java | 4 +- 6 files changed, 91 insertions(+), 38 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index f9b60ed51..4d456d281 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -14,9 +14,13 @@ public class Handler { public void run() { + if (player ==null) { getNameInput(); getAccountBalanceInput(); - createPlayer(name, account); + createPlayer(name, account);} + + + System.out.println("0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots "); getGameInput(); diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index b28d6e9b6..dbba479a5 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -12,6 +12,9 @@ public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; public CrapsDataHandler data = new CrapsDataHandler(); private Integer stage; + private Boolean comeFirstRound = true; + private Boolean passFirstRound = true; + public Craps() {} @@ -37,20 +40,24 @@ public void runGame() { switch (stage) { case 0: - String input = data.getConsole().getStringInput("A game has just ended would you like to play or exit? "); + String input = data.getConsole().getStringInput("A game has just ended would you like to join the table? (play or exit?) "); stage0Play(input); break; case 1: - data.setFirstLineBet (data.getConsole().getDoubleInput("Let's get started! \n Place Your bet!")); + if (comeFirstRound) { + data.setFirstLineBet(data.getConsole().getDoubleInput("Let's get started! \n" + ""+"Place Your Come bets!")); + } if(hasMoenytoBet(data.getFirstLineBet(), crapsPlayer.player)){ data.setCurrentRoll(crapsPlayer.roll()); stage1Play(data.getFirstLineBet()); } break; case 2: - data.setSecondLineBet(data.getConsole().getDoubleInput("Bet your push number bets! \n Place Your bets!")); - data.setFieldBetType(data.getConsole().getIntegerInput("What else do you want to bet?")); - data.setFieldBet(data.getConsole().getDoubleInput("how much do you want to bet on this?")); + if(passFirstRound) { + data.setSecondLineBet(data.getConsole().getDoubleInput(" Make your passline bets!")); + data.setFieldBetType(data.getConsole().getIntegerInput("What prop number bet do you want to make?")); + data.setFieldBet(data.getConsole().getDoubleInput("how much do you want to bet on this?")); + } if(hasMoenytoBet(data.getSecondLineBet() + data.getFieldBet(), crapsPlayer.player)){ data.setCurrentRoll(crapsPlayer.roll()); stage2Play(data.getSecondLineBet(), data.getFieldBet(), data.getFieldBetType()); @@ -61,6 +68,7 @@ public void runGame() { endGame(); } +/*----------------STAGE 0---------------*/ public void stage0Play(String input){ @@ -69,30 +77,61 @@ public void stage0Play(String input){ } else if (input.toLowerCase().equals("exit")){ crapsPlayer.player.setPlaying(false); } else { - display("Excuse me I didnt understand"); + display("Excuse me, I didnt understand"); } } +/*----------------STAGE 1---------------*/ + + public void stage1Play(Double firstLineBet){ + if (comeFirstRound) withdraw(firstLineBet); + comeFirstRound= false; if(data.getCurrentRoll().equals(2) || data.getCurrentRoll().equals(3) || data.getCurrentRoll().equals(12)) { display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); stage = 0; + comeFirstRound = true; + passFirstRound = true; } else if (data.getCurrentRoll().equals(7) || data.getCurrentRoll().equals(11)) { - System.out.println(calcPayment(firstLineBet, data.getFirstLineOdds())); deposit(calcPayment(firstLineBet, data.getFirstLineOdds())); - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won! " + calcPayment(data.getFirstLineOdds(), firstLineBet) + " you now have " + crapsPlayer.player.getAccount()); + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + calcPayment(data.getFirstLineOdds(), firstLineBet) + "! you now have " + crapsPlayer.player.getAccount()); } else if(!data.getCurrentRoll().equals(2) && !data.getCurrentRoll().equals(3) && !data.getCurrentRoll().equals(12) && !data.getCurrentRoll().equals(7) && !data.getCurrentRoll().equals(11)){ display(" you rolled a " + data.getCurrentRoll() + ".\n" + data.getCurrentRoll() + " is now the on number!"); data.setOnNumber(data.getCurrentRoll()); stage = 2; } else { - display("Excuse me I didnt understand"); + display("Excuse me, I didnt understand"); } } - public void stage2Play(Double secondLineBet, Double fieldBet, Integer bet ){ + +/*-----------------STAGE 2----------------*/ + + + public void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBetNumber ){ + if(passFirstRound) { + withdraw(secondLineBet); + withdraw(fieldBet); + } + passFirstRound = false; + if(data.getCurrentRoll().equals(7)) { + display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); + stage = 0; + comeFirstRound = true; + passFirstRound = true; + } else if (data.getCurrentRoll().equals(fieldBetNumber)) { + Double wins = calcPayment(fieldBet, data.getfieldOdds(fieldBetNumber)); + deposit(wins); + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "! you now have " + crapsPlayer.player.getAccount()); + }else if (data.getCurrentRoll().equals(data.getOnNumber())) { + Double wins = calcPayment(data.getfieldOdds(data.getOnNumber()), secondLineBet) + calcPayment(data.getfieldOdds(data.getOnNumber()), data.getFirstLineBet()); + deposit(wins); + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "! you now have " + crapsPlayer.player.getAccount()); + } else { + display("Excuse me, I didn't understand"); + } } diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java index 335c5dfbd..309a85c38 100644 --- a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -1,11 +1,11 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; import java.util.HashMap; public class CrapsDataHandler { - private Console console; private Integer onNumber; private Double firstLineBet; @@ -14,23 +14,26 @@ public class CrapsDataHandler { private Integer fieldBetType; private Double firstLineOdds = 2.0; private Double secondLineOdds = 2.0; - private Double fieldBetodds = 12.0; private Integer currentRoll; - private HashMap fieldOdds = new HashMap(); + private HashMap fieldOdds = new HashMap(); + + public Double getfieldOdds(Integer key) { + return fieldOdds.get(key); + } public CrapsDataHandler(){ - fieldOdds.put(2,10); - fieldOdds.put(3,9); - fieldOdds.put(4,8); - fieldOdds.put(5,7); - fieldOdds.put(6,6); - fieldOdds.put(7,5); - fieldOdds.put(8,6); - fieldOdds.put(9,7); - fieldOdds.put(10,8); - fieldOdds.put(11,9); - fieldOdds.put(12,10); + fieldOdds.put(2,10.0); + fieldOdds.put(3,9.0); + fieldOdds.put(4,8.0); + fieldOdds.put(5,7.0); + fieldOdds.put(6,6.0); + fieldOdds.put(7,5.0); + fieldOdds.put(8,6.0); + fieldOdds.put(9,7.0); + fieldOdds.put(10,8.0); + fieldOdds.put(11,9.0); + fieldOdds.put(12,10.0); } @@ -101,14 +104,6 @@ public void setSecondLineOdds(Double secondLineOdds) { this.secondLineOdds = secondLineOdds; } - public Double getFieldBetodds() { - return fieldBetodds; - } - - public void setFieldBetodds(Double fieldBetodds) { - this.fieldBetodds = fieldBetodds; - } - public Integer getCurrentRoll() { return currentRoll; } diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index adf67c401..094b8b4f1 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -29,7 +29,8 @@ public void betType(String betType) { } public void cashout() { - + //leave game mid way! + player.setPlaying(false); } public void displayAccoutBal() { diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 66a7c9d9e..ba079f829 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -144,8 +144,10 @@ public void stage1PlayCrapWin() { public void stage2PlayWinOnNumber() { craps.data.setOnNumber(8); craps.data.setCurrentRoll(8); + craps.data.setFirstLineBet(10.0); craps.stage2Play(10.0, 10.0, 5); + Double actual = 250.0; Double expected = player.getAccount(); @@ -153,6 +155,20 @@ public void stage2PlayWinOnNumber() { } + @Test + public void stage2PlayWinField() { + craps.data.setOnNumber(8); + craps.data.setCurrentRoll(9); + craps.stage2Play(10.0, 10.0, 9); + + + Double actual = 1050.0; + Double expected = player.getAccount(); + + Assert.assertEquals(expected, actual); + + } + // @Test public void stage2PlayCrapOut() { @@ -163,7 +179,7 @@ public void stage2PlayCrapOut() { Integer expected = craps.getStage(); Assert.assertEquals(expected, actual); - + } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java index 587f9b553..9112fa12c 100644 --- a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java +++ b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java @@ -14,7 +14,5 @@ public void roll() { public void cashout() { } - @Test - public void displayAccoutBal() { - } + } \ No newline at end of file From d9f0638e25f7bb5931ebbf50bafb7f4e68aa4ba2 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Fri, 14 Jun 2019 17:24:23 -0400 Subject: [PATCH 43/71] friday 530pm --- .../zipcoder/casino/gameTools/CardValue.java | 28 ++++---- .../io/zipcoder/casino/gameTools/Suit.java | 8 +-- .../java/io/zipcoder/casino/games/GoFish.java | 64 ++++++++++++++++--- .../casino/player/CardGamePlayer.java | 4 +- .../zipcoder/casino/gameTools/DeckTest.java | 2 +- .../io/zipcoder/casino/games/GoFishTest.java | 19 ++++++ .../casino/player/gameTools/CardTest.java | 8 +-- 7 files changed, 99 insertions(+), 34 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/gameTools/CardValue.java b/src/main/java/io/zipcoder/casino/gameTools/CardValue.java index 56c8186df..9e402fd5d 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/CardValue.java +++ b/src/main/java/io/zipcoder/casino/gameTools/CardValue.java @@ -1,26 +1,26 @@ package io.zipcoder.casino.gameTools; public enum CardValue { - Two(2), - Three(3), - Four(4), - Five(5), - Six(6), - Seven(7), - Eight(8), - Nine(9), - Ten(10), - Jack(11), - Queen(12), - King(13), - Ace(14); + TWO(2), + THREE(3), + FOUR(4), + FIVE(5), + SIX(6), + SEVEN(7), + EIGHT(8), + NINE(9), + TEN(10), + JACK(11), + QUEEN(12), + KING(13), + ACE(14); private Integer cardValue; CardValue(Integer cardValue) { this.cardValue = cardValue; } - public Integer getCardValue() { + public Integer getCardIntegerValue() { return cardValue; } diff --git a/src/main/java/io/zipcoder/casino/gameTools/Suit.java b/src/main/java/io/zipcoder/casino/gameTools/Suit.java index 258d5869e..d9c1b52e3 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/Suit.java +++ b/src/main/java/io/zipcoder/casino/gameTools/Suit.java @@ -1,8 +1,8 @@ package io.zipcoder.casino.gameTools; public enum Suit { - Hearts, - Spades, - Diamonds, - Clubs; + HEARTS, + SPADES, + DIAMONDS, + CLUBS; } diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 4a8236b67..727574135 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -1,6 +1,7 @@ package io.zipcoder.casino.games; import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.CardValue; import io.zipcoder.casino.gameTools.Deck; import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; @@ -14,7 +15,11 @@ public class GoFish extends Games { Console console; private GoFishPlayer mainPlayer; - private CardGamePlayer otherPlayer = new GoFishPlayer(); + private GoFishPlayer otherPlayer = new GoFishPlayer(); + private boolean isPlaying = true; + + + private Deck deck = new Deck(); @@ -24,25 +29,65 @@ public GoFish(GoFishPlayer player, Console console) { super(); this.mainPlayer = player; this.console = console; -// otherPlayer.setName("other player"); + } public void runGame () { - console.println("Hey " + mainPlayer.getName() + "! \nWelcome to GOFISH GAME"); + String userInput = console.getStringInput("Do you want to play?"); + if (readyToPlay(userInput)) { + dealHands(); + console.println(seeHand()); + Double test = 200.00; + update(test); + + nextTurn(); + turnPlayer(); + } + } + public void update(Double ammount) { + Double result = mainPlayer.getAccount() + ammount; + mainPlayer.setAccount(result); + String test = ""; } - public void createPlayers () { -// deck.deal(5, mainPlayer); -// deck.deal(5, otherPlayer); -// ArrayList hand = mainPlayer.getHand(); -// ArrayList dealerHand = otherPlayer.getHand(); + public void dealHands () { + deck.deal(5, mainPlayer); + deck.deal(5, otherPlayer); } + public String seeHand () { + String hand = ""; + for (Card c: mainPlayer.getHand() + ) { + hand += c.getCardValue() + " of " + c.getSuit() + " ==== "; + } + return hand; + } + + public boolean readyToPlay(String userInput){ + if (userInput.equalsIgnoreCase("yes")) { + return true; + } + else { + return false;} + } + + public String turnPlayer() { + String userInput = console.getStringInput("What are you looking for?"); + return userInput.toUpperCase(); + } + + public void action() { + String value = turnPlayer(); + + //if (otherPlayer.getHand().contains( + } @Override - void nextTurn() { } + void nextTurn() { + } @Override void endGame() { } @@ -77,5 +122,4 @@ public ArrayList createOtherPlayers (Integer numPlayers) { return players; } - } diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index 0eb84cdb9..e6b3b7928 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -37,7 +37,9 @@ public void setName(String name) { player.setName(name); } - + public void setAccount(Double balance) { + player.setAccount(balance); + } public Double getAccount() { return player.getAccount(); diff --git a/src/test/io/zipcoder/casino/gameTools/DeckTest.java b/src/test/io/zipcoder/casino/gameTools/DeckTest.java index a0150df08..9c1c304f1 100644 --- a/src/test/io/zipcoder/casino/gameTools/DeckTest.java +++ b/src/test/io/zipcoder/casino/gameTools/DeckTest.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.EmptyStackException; -import static io.zipcoder.casino.gameTools.Suit.Clubs; +import static io.zipcoder.casino.gameTools.Suit.CLUBS; public class DeckTest { diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index 13bf60d92..46b059598 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.Random; +import java.util.Stack; public class GoFishTest { GoFish goFish = new GoFish(); @@ -75,4 +76,22 @@ public void createPlayersTestOther() { Assert.assertEquals(expected,actual); } + @Test + public void readyToPlayFalse() { + Assert.assertFalse(goFish.readyToPlay("no")); + } + @Test + public void readyToPlayTrue() { + Assert.assertTrue(goFish.readyToPlay("yes")); + } + + @Test + public void seeHandTest() { + Deck deck = new Deck(); + Stack stack = new Stack(); + stack = deck.getDeck(); + Card card = new Card(); + + + } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/player/gameTools/CardTest.java b/src/test/io/zipcoder/casino/player/gameTools/CardTest.java index 64ef7ffd7..aeca25c70 100644 --- a/src/test/io/zipcoder/casino/player/gameTools/CardTest.java +++ b/src/test/io/zipcoder/casino/player/gameTools/CardTest.java @@ -16,23 +16,23 @@ public class CardTest { @Test public void getCardValueAce() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Ace", CardValue.Ace.name()); + Assert.assertEquals("Ace", CardValue.ACE.name()); } @Test public void getCardValueTwo() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Two",CardValue.Two.name()); + Assert.assertEquals("Two",CardValue.TWO.name()); } @Test public void getSuitSpades() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Spades", Suit.Spades.name()); + Assert.assertEquals("Spades", Suit.SPADES.name()); } @Test public void getSuitHearts() { Card card = deck.getDeck().pop(); - Assert.assertEquals("Hearts",Suit.Hearts.name()); + Assert.assertEquals("Hearts",Suit.HEARTS.name()); } @Test public void checkObjectTest(){ From 92a7663eec7bbddab733a315a7b42c1318a62a08 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Fri, 14 Jun 2019 17:35:46 -0400 Subject: [PATCH 44/71] game working with bugs --- .../io/zipcoder/casino/games/CrapsTest.java | 214 +++--------------- .../zipcoder/casino/games/RouletteTest.java | 8 +- 2 files changed, 38 insertions(+), 184 deletions(-) diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index bdade457a..ba079f829 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -8,16 +8,20 @@ public class CrapsTest { + Handler handler = new Handler(); + Player player = handler.createPlayer("", 1000.0); + CrapsPlayer crapsPlayer = new CrapsPlayer(player); + Craps craps = new Craps(crapsPlayer); @Test public void calcPayment() { Craps craps = new Craps(); craps.setOdds(2.0); - craps.setFirstLineBet(10.0); + craps.data.setFirstLineBet(10.0); Double expected = 20.0; - Double actual = craps.calcPayment(craps.odds, craps.getFirstLineBet()); + Double actual = craps.calcPayment(craps.getOdds(), craps.data.getFirstLineBet()); Assert.assertEquals(expected, actual); } @@ -33,127 +37,8 @@ public void updateAccount() { Assert.assertEquals(expected, actual); } - - @Test - public void getOnNumber() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setOnNumber(10); - - Integer expected = 10; - Integer actual = craps.getOnNumber(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setOnNumber() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setOnNumber(8); - - Integer expected = 8; - Integer actual = craps.getOnNumber(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void getFirstLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFirstLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFirstLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setFirstLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFirstLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFirstLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void getSecondLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setSecondLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getSecondLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setSecondLineBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setSecondLineBet(10.0); - - Double expected = 10.0; - Double actual = craps.getSecondLineBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void getOtherBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFieldBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFieldBet(); - - Assert.assertEquals(expected, actual); - } - - @Test - public void setOtherBet() { - Handler handler = new Handler(); - handler.createPlayer("", 100.0); - Craps craps = new Craps(); - - craps.setFieldBet(10.0); - - Double expected = 10.0; - Double actual = craps.getFieldBet(); - - Assert.assertEquals(expected, actual); - } - - @Test public void withdraw() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - craps.withdraw(100.0); Double expected = 900.0; Double actual = player.getAccount(); @@ -164,11 +49,6 @@ public void withdraw() { @Test public void deposit() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - craps.deposit(100.0); Double expected = 1100.0; Double actual = player.getAccount(); @@ -183,11 +63,7 @@ public void display() { @Test public void hasMoenytoBet() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 5.0); - Craps craps = new Craps(); - - Boolean expected = false; + Boolean expected = true; Boolean actual = craps.hasMoenytoBet(50.0, player); Assert.assertEquals(expected, actual); @@ -196,8 +72,7 @@ public void hasMoenytoBet() { @Test public void stage0PlayPlay() { - Craps craps = new Craps(); - craps.stage0Play(""); + craps.stage0Play("play"); Integer actual = 1; Integer expected = craps.getStage(); @@ -207,11 +82,6 @@ public void stage0PlayPlay() { @Test public void stage0PlayExit() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - craps.stage0Play("exit"); Boolean actual = false; @@ -222,11 +92,6 @@ public void stage0PlayExit() { @Test public void stage0PlayInvalidInput() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - craps.stage0Play("234234"); Integer actual = 0; @@ -238,17 +103,13 @@ public void stage0PlayInvalidInput() { @Test public void stage1Play() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - craps.setCurrentRoll(10); + craps.data.setCurrentRoll(10); + craps.data.setFirstLineBet(10.0); +// craps.stage1Play(10.0); - Integer currentRoll = craps.getCurrentRoll(); - Integer actual = 10; - Integer expected = craps.getOnNumber(); + Integer actual = 2; + Integer expected = craps.getStage(); Assert.assertEquals(expected, actual); @@ -256,15 +117,9 @@ public void stage1Play() { @Test public void stage1PlayCrap() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 1000.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - craps.setCurrentRoll(2); + craps.data.setCurrentRoll(7); craps.stage1Play(10.0); - Integer actual = 0; Integer expected = craps.getStage(); @@ -274,16 +129,11 @@ public void stage1PlayCrap() { @Test public void stage1PlayCrapWin() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 10.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); + craps.data.setCurrentRoll(7); - craps.setCurrentRoll(7); craps.stage1Play(10.0); - - Double actual = 30.0; + Double actual = 1010.0; Double expected = player.getAccount(); Assert.assertEquals(expected, actual); @@ -292,13 +142,9 @@ public void stage1PlayCrapWin() { @Test public void stage2PlayWinOnNumber() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 100.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - craps.setOnNumber(8); - craps.setCurrentRoll(8); + craps.data.setOnNumber(8); + craps.data.setCurrentRoll(8); + craps.data.setFirstLineBet(10.0); craps.stage2Play(10.0, 10.0, 5); @@ -309,15 +155,24 @@ public void stage2PlayWinOnNumber() { } + @Test + public void stage2PlayWinField() { + craps.data.setOnNumber(8); + craps.data.setCurrentRoll(9); + craps.stage2Play(10.0, 10.0, 9); + + + Double actual = 1050.0; + Double expected = player.getAccount(); + + Assert.assertEquals(expected, actual); + + } + // @Test public void stage2PlayCrapOut() { - Handler handler = new Handler(); - Player player = handler.createPlayer("", 100.0); - CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer); - - craps.setCurrentRoll(7); + craps.data.setCurrentRoll(7); craps.stage2Play(10.0, 10.0, 5); Integer actual = 0; @@ -325,5 +180,6 @@ public void stage2PlayCrapOut() { Assert.assertEquals(expected, actual); + } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java index 469560770..4784bbf54 100644 --- a/src/test/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -54,13 +54,11 @@ public void calcPaymentDoubleTest(){ } @Test - public void updateAccountDoubleTest(){ + public void updateAccountDoubleTest() { //this.roulette.updateAccount(1.5); Double actual = this.roulette.roulettePlayer.getAccount(); - Assert.assertEquals(1.5, actual.doubleValue(),0.0); - - - + Assert.assertEquals(1.5, actual.doubleValue(), 0.0); + } } From f00de37c7567aeac5983176dcf1c62d95ac954ca Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Fri, 14 Jun 2019 11:19:12 -0400 Subject: [PATCH 45/71] modified --- src/main/java/io/zipcoder/casino/Handler.java | 6 ++- .../io/zipcoder/casino/games/Roulette.java | 37 ++++++++++++++++--- .../casino/player/RoulettePlayer.java | 10 ++++- .../zipcoder/casino/games/BlackjackTest.java | 5 ++- .../zipcoder/casino/games/RouletteTest.java | 4 +- .../casino/player/RoulettePlayerTest.java | 7 +++- 6 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 02659c247..c3dcfb7f0 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -4,6 +4,7 @@ import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; +import io.zipcoder.casino.player.RoulettePlayer; import io.zipcoder.casino.utilities.Console; import javax.smartcardio.Card; @@ -40,7 +41,9 @@ public void run() { goFish.runGame(); break; case 2: - Roulette roulette = new Roulette(); + RoulettePlayer roulettePlayer = new RoulettePlayer(name, account); + Roulette roulette = new Roulette(roulettePlayer); + roulette.play(); break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); @@ -57,6 +60,7 @@ public void run() { public Player createPlayer (String name, Double account) { return player = new Player(name, account); + } public void getNameInput() { diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index f45c77242..70121af3c 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -1,15 +1,19 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.player.Player; import io.zipcoder.casino.player.RoulettePlayer; import java.util.Random; +import java.util.Scanner; public class Roulette extends Games implements GamblerGameInterface { String betType; // red/back - odd / even / number - public RoulettePlayer roulettePlayer = new RoulettePlayer(); + private RoulettePlayer roulettePlayer; private Double currentBet; - + public Roulette(RoulettePlayer roulettePlayer) { + this.roulettePlayer = roulettePlayer; + } @Override void nextTurn() { @@ -36,11 +40,12 @@ public void display(String output) { public Integer calcPayment(Integer bet, Integer odds) { //calculate payment amount to be payed based on the position - return null; + return bet + odds * bet; } public void updateAccount(Integer num) { //add or remove money from the balance + this.roulettePlayer.setAccount((double)(num)); } public Double getCurrentBet() { @@ -53,8 +58,8 @@ public void setCurrentBet(Double currentBet) { } public Double calcPayment(Double bet, Double odds) { - - return null; + //no of odds aganist = n(1 + odds) + return bet + odds * bet; } public void withdraw(Double num) { @@ -65,4 +70,26 @@ public void deposit(Double num) { } + public void play() { + + // Get Bet Amount + Scanner sc = new Scanner(System.in); + System.out.println("Enter Bet Amount : "); + sc.nextInt(); + + // Set Current Bet on a bettable place like 0,1,2,3,... or Even/Odd or Red/Black or 1st/2nd/3rd 12, etc + + + // Calculate the odds based on the position. + + // Deduct the current bet from the account balance + + // Generate a random number where the ball is going to fall - Range should be 0 to 36 + + // Identify if the position of bet is winning position + + // Update the Account Balance + + } + } diff --git a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java index 45e895f1b..2a7dc4ead 100644 --- a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java @@ -5,6 +5,9 @@ public class RoulettePlayer extends Player implements GamblerInterface { + public RoulettePlayer(String name, Double account) { + super(name, account); + } public void bet(Double bet) { @@ -15,11 +18,16 @@ public void betType (String betType) { } public void cashout() { - + System.out.println("Your balance has been cashed" +this.getAccount()); } public void displayAccoutBal() { } + + // TODO - Create method for updating current Balance - Arg - int + // Get current balance using getAccount() + // Add the argument to currentBalance + // set the balance using setAccount } diff --git a/src/test/io/zipcoder/casino/games/BlackjackTest.java b/src/test/io/zipcoder/casino/games/BlackjackTest.java index c9486cddb..a3fc4289f 100644 --- a/src/test/io/zipcoder/casino/games/BlackjackTest.java +++ b/src/test/io/zipcoder/casino/games/BlackjackTest.java @@ -77,7 +77,9 @@ public void calcBJPaymentTest() { } } - /**@Test + + /* @Test +>>>>>>> modified:src/test/java/io/zipcoder/casino/games/BlackjackTest.java public void updateAccount(){ Blackjack blackjack = new Blackjack(); @@ -86,5 +88,6 @@ public void updateAccount(){ Double actual = blackjack.getBlackJackPlayer().getAccount(); Assert.assertEquals(expected, actual); +<<<<<<< HEAD:src/test/io/zipcoder/casino/games/BlackjackTest.java } } */ diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java index 4784bbf54..7b7e6d3ae 100644 --- a/src/test/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -2,6 +2,7 @@ import io.zipcoder.casino.games.Roulette; import io.zipcoder.casino.player.Player; +import io.zipcoder.casino.player.RoulettePlayer; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -12,7 +13,8 @@ public class RouletteTest { @Before //it will get invoked before each test method public void setup() { - this.roulette = new Roulette(); + RoulettePlayer roulettePlayer = new RoulettePlayer("Player", 20d); + this.roulette = new Roulette(roulettePlayer); } diff --git a/src/test/io/zipcoder/casino/player/RoulettePlayerTest.java b/src/test/io/zipcoder/casino/player/RoulettePlayerTest.java index 7cba2b03c..e4fcf3670 100644 --- a/src/test/io/zipcoder/casino/player/RoulettePlayerTest.java +++ b/src/test/io/zipcoder/casino/player/RoulettePlayerTest.java @@ -9,14 +9,17 @@ public class RoulettePlayerTest { private RoulettePlayer roulettePlayer; @Before public void setup() { - this.roulettePlayer = new RoulettePlayer(); + String name = ""; + Double account = 0.0; + this.roulettePlayer = new RoulettePlayer(name,account); } @Test public void cashoutTest() { this.roulettePlayer.cashout(); Double actual = this.roulettePlayer.getAccount(); - Assert.assertEquals(2.0,actual.doubleValue(),0.0); + + Assert.assertEquals(0.0,actual.doubleValue(),0.0); } From 8a115c2ebaaeffd345de09924b0d506f7cc27d2c Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Fri, 14 Jun 2019 23:21:18 -0400 Subject: [PATCH 46/71] roulettegame --- .../io/zipcoder/casino/games/Roulette.java | 76 +++++++++++++++++-- .../casino/player/RoulettePlayer.java | 1 + 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index 70121af3c..a9ad9d7e0 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -3,14 +3,19 @@ import io.zipcoder.casino.player.Player; import io.zipcoder.casino.player.RoulettePlayer; -import java.util.Random; -import java.util.Scanner; +import java.util.*; public class Roulette extends Games implements GamblerGameInterface { String betType; // red/back - odd / even / number private RoulettePlayer roulettePlayer; private Double currentBet; + String[] redArray = {"2","4","6","8","10","12","14","16","18","20","22","24","26","28","30","32","34","36"}; + String[] blackArray = {"1","3","5","7","9","11","13","15","17","19","21","23","25","27","29","31","33","35"}; + //List list = new ArrayList(); + List redList = Arrays.asList(redArray); + List blackList = Arrays.asList(blackArray); + public Roulette(RoulettePlayer roulettePlayer) { this.roulettePlayer = roulettePlayer; } @@ -59,6 +64,7 @@ public void setCurrentBet(Double currentBet) { public Double calcPayment(Double bet, Double odds) { //no of odds aganist = n(1 + odds) + return bet + odds * bet; } @@ -75,21 +81,81 @@ public void play() { // Get Bet Amount Scanner sc = new Scanner(System.in); System.out.println("Enter Bet Amount : "); - sc.nextInt(); + int enterBet = sc.nextInt(); + sc.nextLine(); // Set Current Bet on a bettable place like 0,1,2,3,... or Even/Odd or Red/Black or 1st/2nd/3rd 12, etc - + System.out.println("Bet position : "); + String betPosition = sc.nextLine(); // Calculate the odds based on the position. + if(betPosition.equalsIgnoreCase("red") || betPosition.equalsIgnoreCase("Black") || betPosition.equalsIgnoreCase("even") || betPosition.equalsIgnoreCase("odd")) { + odds = 1d; + + } + else if(betPosition.equalsIgnoreCase("1st12") || betPosition.equalsIgnoreCase("2nd12") || betPosition.equalsIgnoreCase("3rd12")) { + odds = 2d; + } + else { + odds = 35d; + } // Deduct the current bet from the account balance + this.updateBalance(enterBet * (-1d)); // Generate a random number where the ball is going to fall - Range should be 0 to 36 + int random = (int)(Math.random() * 36 + 1); + System.out.println(" Winning Number " +random); + //System.out.println("Even " +); // Identify if the position of bet is winning position - + if(isWinner(betPosition, random)) { + System.out.println("You Won....."); + double d = calcPayment((double)enterBet,odds ); + updateBalance(d); + } + else { + System.out.println("You Lose....."); + } + System.out.println("Game Over \n"); + System.out.println("Your Balance is : " +this.roulettePlayer.getAccount()); // Update the Account Balance + + } + public void updateBalance(Double amount) { + Double d = this.roulettePlayer.getAccount(); + Double add = d + amount; + this.roulettePlayer.setAccount(add); + + } + + public boolean isWinner(String betPosition,int random ) { + if(betPosition.equalsIgnoreCase("even") && random % 2 == 0) { + return true; + } + else if(betPosition.equalsIgnoreCase("odd") && random % 2 != 0) { + return true; + } + else if(betPosition.equalsIgnoreCase("red") && redList.contains(random)) { + return true; + } + else if(betPosition.equalsIgnoreCase("black") && blackList.contains(random)) { + return true; + } + else if(betPosition.equalsIgnoreCase("1st12") && random <= 12 && random >=1) { + return true; + } + else if(betPosition.equalsIgnoreCase("2nd12") && random <=24 && random >=13) { + return true; + } + else if(betPosition.equalsIgnoreCase("3rd12") && random <= 36 && random >=14) { + return true; + } + else if(betPosition.equalsIgnoreCase(Integer.toString(random))) { + return true; + } + return false; } } diff --git a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java index 2a7dc4ead..8538374d7 100644 --- a/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/RoulettePlayer.java @@ -28,6 +28,7 @@ public void displayAccoutBal() { // TODO - Create method for updating current Balance - Arg - int // Get current balance using getAccount() + // Add the argument to currentBalance // set the balance using setAccount } From 498a46f77397b007d4af390be6ccfc24bd0e5e7d Mon Sep 17 00:00:00 2001 From: alilinykh Date: Sat, 15 Jun 2019 01:51:14 -0400 Subject: [PATCH 47/71] friday night --- .../java/io/zipcoder/casino/games/GoFish.java | 101 ++++++++++++------ .../io/zipcoder/casino/games/GoFishTest.java | 4 +- 2 files changed, 69 insertions(+), 36 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 727574135..38c61dd78 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -3,19 +3,20 @@ import io.zipcoder.casino.gameTools.Card; import io.zipcoder.casino.gameTools.CardValue; import io.zipcoder.casino.gameTools.Deck; -import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; -import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; import java.util.ArrayList; -import java.util.Random; -import java.util.Scanner; +import java.util.Iterator; public class GoFish extends Games { Console console; private GoFishPlayer mainPlayer; private GoFishPlayer otherPlayer = new GoFishPlayer(); + private GoFishPlayer activePlayer; + private GoFishPlayer passivePlayer; + Boolean switchP = true; + private boolean isPlaying = true; @@ -36,29 +37,79 @@ public void runGame () { String userInput = console.getStringInput("Do you want to play?"); if (readyToPlay(userInput)) { dealHands(); - console.println(seeHand()); - Double test = 200.00; - update(test); + while (deck.getDeck().size() > 0) { + //setActivePlayer(switchP); + + + + console.println(seeHand(mainPlayer)); + + console.println(seeHand(otherPlayer) + "other"); + + + String input = searchFor(); + ArrayList temp = checkHand(input, otherPlayer); - nextTurn(); - turnPlayer(); + if (!temp.isEmpty()) { + removeFromHand(temp, otherPlayer); + addToHand(temp, mainPlayer); + } + else { + deck.dealSingleCard(mainPlayer); + } + } } } - public void update(Double ammount) { - Double result = mainPlayer.getAccount() + ammount; - mainPlayer.setAccount(result); - String test = ""; + public ArrayList checkHand (String value, GoFishPlayer player){ + + ArrayList cards = new ArrayList(0); + for (Card c : player.getHand() + ) { + if(c.getCardValue().equals(CardValue.valueOf(value))) { + cards.add(c); + } + } + return cards; + } + + public void removeFromHand (ArrayList cards, GoFishPlayer player) { + player.getHand().removeAll(cards); + } + + public void addToHand (ArrayList cards, GoFishPlayer player) { + ArrayList temp; + temp = player.getHand(); + temp.addAll(cards); + player.setHand(temp); + } + +// public void setActivePlayer (Boolean isActive) { +// if (isActive) { +// mainPlayer = activePlayer; +// otherPlayer = passivePlayer; +// } +// else { +// mainPlayer = passivePlayer; +// otherPlayer = activePlayer; +// } +// } + + public void update(Double amount) { + Double result = mainPlayer.getAccount() + amount; + mainPlayer.setAccount(result); } public void dealHands () { deck.deal(5, mainPlayer); deck.deal(5, otherPlayer); } - public String seeHand () { + + + public String seeHand (GoFishPlayer player) { String hand = ""; - for (Card c: mainPlayer.getHand() + for (Card c: player.getHand() ) { hand += c.getCardValue() + " of " + c.getSuit() + " ==== "; } @@ -74,16 +125,11 @@ public boolean readyToPlay(String userInput){ return false;} } - public String turnPlayer() { + public String searchFor() { String userInput = console.getStringInput("What are you looking for?"); return userInput.toUpperCase(); } - public void action() { - String value = turnPlayer(); - - //if (otherPlayer.getHand().contains( - } @Override void nextTurn() { @@ -108,18 +154,5 @@ public Card check (Integer query) { public Card goFishAction () { return null; - }; - - - public ArrayList createOtherPlayers (Integer numPlayers) { - ArrayList players = new ArrayList(); - //foreach of inputnUmplayers - create player - for (int i = 1; i <= numPlayers; i++) { - GoFishPlayer goFishPlayer = new GoFishPlayer(); - goFishPlayer.setName("Player" + i); - players.add(goFishPlayer); - } - return players; } - } diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index 96186358f..0af643a27 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -49,8 +49,8 @@ public void inputNumPlayers() { public void createOtherPlayersTest() { GoFish goFish = new GoFish(); Integer expected = 2; - Integer actual = goFish.createOtherPlayers(expected).size(); - Assert.assertEquals(expected,actual); + //Integer actual = goFish.createOtherPlayers(expected).size(); + //Assert.assertEquals(expected,actual); } @Test From 90aa108cce3330b09a26eec859eb764899b9e5e3 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Sat, 15 Jun 2019 01:54:32 -0400 Subject: [PATCH 48/71] Update RouletteTest.java --- src/test/io/zipcoder/casino/games/RouletteTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java index 4784bbf54..08ddfee7d 100644 --- a/src/test/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -58,6 +58,12 @@ public void updateAccountDoubleTest() { //this.roulette.updateAccount(1.5); Double actual = this.roulette.roulettePlayer.getAccount(); Assert.assertEquals(1.5, actual.doubleValue(), 0.0); +<<<<<<< Updated upstream +======= + + + } +>>>>>>> Stashed changes } From 668fd3f0d9601e24a2d66f7f8c9d11a79dab7488 Mon Sep 17 00:00:00 2001 From: Darya Date: Sat, 15 Jun 2019 09:16:37 -0400 Subject: [PATCH 49/71] run game need some changes --- src/main/java/io/zipcoder/casino/Handler.java | 2 +- .../java/io/zipcoder/casino/games/Slots.java | 133 +++++++++++------- 2 files changed, 81 insertions(+), 54 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 5870e9f42..8c7e29ce0 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -43,7 +43,7 @@ public void run() { case 4: SlotsPlayer slotsPlayer = new SlotsPlayer(player); Slots slots = new Slots(slotsPlayer, console); -// slots.runGame(); + slots.runGame(); break; default: System.out.println("you blew it"); diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 821aad995..af10bf8f3 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -12,6 +12,7 @@ public class Slots extends Games implements GamblerGameInterface { SlotsPlayer slotsPlayer; private Double currentBet; public Console console; + private Integer bet; public Player player; @@ -29,79 +30,105 @@ public Slots(SlotsPlayer player, Console console) { this.slotsPlayer = player; this.console = console; } - - public static void main(String[] args) { +// +// } public static void main(String[] args) { -// public void runGame() { -// display("Welcome to the slots " +slotsPlayer.player.getName() + "! \n"); - Slots bestSlot = new Slots(); + public void runGame() { + display("Welcome to the slots " + slotsPlayer.player.getName() + "! \n"); +// Slots = new Slots(); - int max = bestSlot.characters.length; + int max = characters.length; int min = 1; int range = max - min + 1; - + slotsPlayer.setPlaying(true); // generate random numbers within 1 to 6 - // Random rnd = new Random(); + // Random rnd = new Random(); // rnd.setSeed(2L); - for (int i = 0; i <= 2; i++) { - for (int j = 0; j <= 2; j++) { - int rand = (int) (Math.random() * range); - System.out.print(bestSlot.characters[rand]); - bestSlot.toSave[i][j] = bestSlot.characters[rand]; + do { + Integer bet = console.getIntegerInput("How much would you like to bet? 1, 3 or 5?"); +// + if (validateInputBet(bet)) { + console.println("please, choose between 1 or 3 or 5"); + continue; + } + //check user input here for bet + + // if user input == 1||3||5 + // ==> set useer input to bet; + for (int i = 0; i <= 2; i++) { + for (int j = 0; j <= 2; j++) { + int rand = (int) (Math.random() * range); + System.out.print(characters[rand]); + toSave[i][j] = characters[rand]; + } + System.out.println(); + } +// for (int i = 0; i < .characters.length; i++) { +// .checkIfWin(.characters[i]); +// } + CheckWins(bet); + System.out.println(); + String tryAgain = console.getStringInput("do you want to play again?"); + if (tryAgain.equals("no")) { + slotsPlayer.setPlaying(false); } + } while (slotsPlayer.getPlaying().equals(true)); - System.out.println(); - } -// -// for (int i = 0; i < bestSlot.characters.length; i++) { -// bestSlot.checkIfWin(bestSlot.characters[i]); -// } -// endGame(); - bestSlot.CheckWins(); + endGame(); +// CheckWins(); } - public void CheckWins() { + public Boolean validateInputBet(Integer bet) { + if (bet != 1 || bet != 3 || bet != 5) { + return false; + } + return true; + } + + public Integer CheckWins(Integer bet) { int countPaylines = 0; - int bet = 5; + if (!validateInputBet(bet)) { + console.println("please, choose between 1 or 3 or 5"); - if (bet >= 1) { - if (toSave[1][0] == toSave[1][1] && toSave[1][1] == toSave[1][2]) { - System.out.println(); - System.out.println("you won horizontal middle"); - countPaylines++; - } - } - if (bet >= 3) { - if (toSave[0][0] == toSave[0][1] && toSave[0][1] == toSave[0][2]) { - System.out.println(); - System.out.println("you won horizontal top"); - countPaylines++; - } - if (toSave[2][0] == toSave[2][1] && toSave[2][1] == toSave[2][2]) { - System.out.println(); - System.out.println("you won horizontal bottom"); - countPaylines++; + + if (bet >= 1) { + if (toSave[1][0] == toSave[1][1] && toSave[1][1] == toSave[1][2]) { + System.out.println(); + System.out.println("you won horizontal middle"); + countPaylines++; + } } - } - if (bet >= 5) { - if (toSave[2][0] == toSave[1][1] && toSave[1][1] == toSave[0][2]) { - System.out.println(); - System.out.println("you won diagonally right"); - countPaylines++; - } - if (toSave[0][0] == toSave[1][1] && toSave[1][1] == toSave[2][2]) { - System.out.println(); - System.out.println("you won diagonally left "); - countPaylines++; + if (bet >= 3) { + if (toSave[0][0] == toSave[0][1] && toSave[0][1] == toSave[0][2]) { + System.out.println(); + System.out.println("you won horizontal top"); + countPaylines++; + } + if (toSave[2][0] == toSave[2][1] && toSave[2][1] == toSave[2][2]) { + System.out.println(); + System.out.println("you won horizontal bottom"); + countPaylines++; + } } + if (bet >= 5) { + if (toSave[2][0] == toSave[1][1] && toSave[1][1] == toSave[0][2]) { + System.out.println(); + System.out.println("you won diagonally right"); + countPaylines++; + } + if (toSave[0][0] == toSave[1][1] && toSave[1][1] == toSave[2][2]) { + System.out.println(); + System.out.println("you won diagonally left "); + countPaylines++; + } + } } - -// bestSlots. + return countPaylines; } From cd0c826a541ee2d7cf38f77f0b3688ea9638babb Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Sat, 15 Jun 2019 11:40:49 -0400 Subject: [PATCH 50/71] working version need to handle some bugs --- .../java/io/zipcoder/casino/games/Craps.java | 55 ++++++++++--------- .../casino/games/CrapsDataHandler.java | 11 +++- .../io/zipcoder/casino/player/Player.java | 1 + .../io/zipcoder/casino/games/CrapsTest.java | 2 +- 4 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index dbba479a5..c3a4f5a44 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -12,8 +12,8 @@ public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; public CrapsDataHandler data = new CrapsDataHandler(); private Integer stage; - private Boolean comeFirstRound = true; - private Boolean passFirstRound = true; +// private Boolean comeFirstRound = true; +// private Boolean passFirstRound = true; @@ -44,24 +44,27 @@ public void runGame() { stage0Play(input); break; case 1: - if (comeFirstRound) { - data.setFirstLineBet(data.getConsole().getDoubleInput("Let's get started! \n" + ""+"Place Your Come bets!")); - } +// if (comeFirstRound) { + data.setFirstLineBet(data.getConsole().getDoubleInput("Let's get started! \n Losing rolls: [2] [3] [12]. \n Winning rolls: [7] [11]. \n Any other roll becomes the on number\n" + "\n"+ "Place Your bets!")); + //} if(hasMoenytoBet(data.getFirstLineBet(), crapsPlayer.player)){ data.setCurrentRoll(crapsPlayer.roll()); stage1Play(data.getFirstLineBet()); } break; case 2: - if(passFirstRound) { - data.setSecondLineBet(data.getConsole().getDoubleInput(" Make your passline bets!")); - data.setFieldBetType(data.getConsole().getIntegerInput("What prop number bet do you want to make?")); - data.setFieldBet(data.getConsole().getDoubleInput("how much do you want to bet on this?")); - } - if(hasMoenytoBet(data.getSecondLineBet() + data.getFieldBet(), crapsPlayer.player)){ - data.setCurrentRoll(crapsPlayer.roll()); - stage2Play(data.getSecondLineBet(), data.getFieldBet(), data.getFieldBetType()); - } +// if(passFirstRound) { + data.setSecondLineBet(data.getConsole().getDoubleInput("Winning rolls: [" + data.getOnNumber() + "] \n Make your passline bets!")); + data.setMakePropBet(data.getConsole().getStringInput("Would you like to make a prop bet")); + if (data.getMakePropBet().toLowerCase().equals("yes")) { + data.setFieldBetType(data.getConsole().getIntegerInput("What prop bet do you want to make?")); + data.setFieldBet(data.getConsole().getDoubleInput("how much do you want to bet on this?")); + } else {} + //} + //if (hasMoenytoBet(data.getSecondLineBet() + data.getFieldBet(), crapsPlayer.player)) { + data.setCurrentRoll(crapsPlayer.roll()); + stage2Play(data.getSecondLineBet(), data.getFieldBet(), data.getFieldBetType()); + //} break; } } @@ -85,15 +88,15 @@ public void stage0Play(String input){ public void stage1Play(Double firstLineBet){ - if (comeFirstRound) + // if (comeFirstRound) withdraw(firstLineBet); - comeFirstRound= false; + //comeFirstRound= false; if(data.getCurrentRoll().equals(2) || data.getCurrentRoll().equals(3) || data.getCurrentRoll().equals(12)) { display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); - stage = 0; - comeFirstRound = true; - passFirstRound = true; + stage = 1; + // comeFirstRound = true; + // passFirstRound = true; } else if (data.getCurrentRoll().equals(7) || data.getCurrentRoll().equals(11)) { deposit(calcPayment(firstLineBet, data.getFirstLineOdds())); display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + calcPayment(data.getFirstLineOdds(), firstLineBet) + "! you now have " + crapsPlayer.player.getAccount()); @@ -111,16 +114,17 @@ public void stage1Play(Double firstLineBet){ public void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBetNumber ){ - if(passFirstRound) { + //if(passFirstRound) { withdraw(secondLineBet); withdraw(fieldBet); - } - passFirstRound = false; + //} + //passFirstRound = false; + if(data.getCurrentRoll().equals(7)) { display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); - stage = 0; - comeFirstRound = true; - passFirstRound = true; + stage = 1; + //comeFirstRound = true; + //passFirstRound = true; } else if (data.getCurrentRoll().equals(fieldBetNumber)) { Double wins = calcPayment(fieldBet, data.getfieldOdds(fieldBetNumber)); deposit(wins); @@ -132,7 +136,6 @@ public void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBetNu } else { display("Excuse me, I didn't understand"); } - } @Override diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java index 309a85c38..d4cf334de 100644 --- a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -15,9 +15,8 @@ public class CrapsDataHandler { private Double firstLineOdds = 2.0; private Double secondLineOdds = 2.0; private Integer currentRoll; + private String makePropBet; private HashMap fieldOdds = new HashMap(); - - public Double getfieldOdds(Integer key) { return fieldOdds.get(key); } @@ -112,6 +111,14 @@ public void setCurrentRoll(Integer currentRoll) { this.currentRoll = currentRoll; } + public String getMakePropBet() { + return makePropBet; + } + + public void setMakePropBet(String makePropBet) { + this.makePropBet = makePropBet; + } + diff --git a/src/main/java/io/zipcoder/casino/player/Player.java b/src/main/java/io/zipcoder/casino/player/Player.java index b27525497..0797ed34b 100644 --- a/src/main/java/io/zipcoder/casino/player/Player.java +++ b/src/main/java/io/zipcoder/casino/player/Player.java @@ -16,6 +16,7 @@ public void setPlaying(Boolean playing) { public Player(){}; + public Player(String name, Double account) { this.account = account; this.name = name; diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index ba079f829..72353b74e 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -175,7 +175,7 @@ public void stage2PlayCrapOut() { craps.data.setCurrentRoll(7); craps.stage2Play(10.0, 10.0, 5); - Integer actual = 0; + Integer actual = 1; Integer expected = craps.getStage(); Assert.assertEquals(expected, actual); From f5154c633cccd1dc06e4d1340a050a56b2058445 Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Sat, 15 Jun 2019 14:03:42 -0400 Subject: [PATCH 51/71] before display refactor --- src/main/java/io/zipcoder/casino/Handler.java | 23 ++-- .../java/io/zipcoder/casino/games/Craps.java | 113 ++++++++++-------- .../casino/games/CrapsDataHandler.java | 19 ++- .../io/zipcoder/casino/games/Roulette.java | 2 +- .../zipcoder/casino/player/CrapsPlayer.java | 6 +- .../io/zipcoder/casino/games/CrapsTest.java | 12 +- .../zipcoder/casino/games/RouletteTest.java | 5 - 7 files changed, 102 insertions(+), 78 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index c3dcfb7f0..d3fac017b 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -1,37 +1,36 @@ package io.zipcoder.casino; import io.zipcoder.casino.games.*; -import io.zipcoder.casino.player.CardGamePlayer; import io.zipcoder.casino.player.GoFishPlayer; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.player.RoulettePlayer; import io.zipcoder.casino.utilities.Console; -import javax.smartcardio.Card; - // public class Handler { private Console console = new Console(System.in, System.out); public Player player; - private Integer intergerInput; + private Integer integerInput; private String name = ""; private Double account = 0.0; + private Boolean hasStarted = false; public void run() { - if (player ==null) { - getNameInput(); - getAccountBalanceInput(); - createPlayer(name, account);} - + if (!hasStarted) { + getNameInput(); + getAccountBalanceInput(); + createPlayer(name, account); + } + hasStarted = true; System.out.println("0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots "); getGameInput(); - switch (intergerInput) { + switch (integerInput) { case 0 : Blackjack blackjack = new Blackjack(); break; @@ -68,10 +67,10 @@ public void getNameInput() { } public void getAccountBalanceInput() { - this.account = console.getDoubleInput("How much do you want to depoist in your account?"); + this.account = console.getDoubleInput("How much do you want to deposit in your account?"); } public void getGameInput() { - this.intergerInput = console.getIntegerInput("What game would you like to play?"); + this.integerInput = console.getIntegerInput("What game would you like to play?"); } } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index c3a4f5a44..91f91b67e 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -11,9 +11,9 @@ public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; public CrapsDataHandler data = new CrapsDataHandler(); - private Integer stage; -// private Boolean comeFirstRound = true; -// private Boolean passFirstRound = true; + private Boolean comeFirstRound = true; + private Boolean passFirstRound = true; + @@ -22,7 +22,7 @@ public Craps() {} public Craps(CrapsPlayer player) { this.crapsPlayer = player; crapsPlayer.player.setPlaying(true); - this.stage = 0; + data.setStage(0); } @@ -30,7 +30,7 @@ public Craps(CrapsPlayer player, Console console) { this.crapsPlayer = player; data.setConsole(console); crapsPlayer.player.setPlaying(true); - this.stage = 0; + data.setStage(0); } @@ -38,33 +38,35 @@ public void runGame() { display("Welcome to the table " + crapsPlayer.player.getName() + "! \n"); while(crapsPlayer.player.getPlaying() == true) { - switch (stage) { + switch (data.getStage()) { case 0: String input = data.getConsole().getStringInput("A game has just ended would you like to join the table? (play or exit?) "); stage0Play(input); break; case 1: -// if (comeFirstRound) { - data.setFirstLineBet(data.getConsole().getDoubleInput("Let's get started! \n Losing rolls: [2] [3] [12]. \n Winning rolls: [7] [11]. \n Any other roll becomes the on number\n" + "\n"+ "Place Your bets!")); - //} + + if (comeFirstRound) { + data.setFirstLineBet(data.getConsole().getDoubleInput("Let's get started! \n Losing rolls: [2] [3] [12]. \n Winning rolls: [7] [11]. \n Any other roll becomes the on number\n" + "\n"+ "Place your passline bet!")); + } if(hasMoenytoBet(data.getFirstLineBet(), crapsPlayer.player)){ data.setCurrentRoll(crapsPlayer.roll()); stage1Play(data.getFirstLineBet()); } break; case 2: -// if(passFirstRound) { - data.setSecondLineBet(data.getConsole().getDoubleInput("Winning rolls: [" + data.getOnNumber() + "] \n Make your passline bets!")); + if(passFirstRound) { + data.setSecondLineBet(data.getConsole().getDoubleInput("Winning rolls: [" + data.getOnNumber() + "] \n Make your come out bet!")); data.setMakePropBet(data.getConsole().getStringInput("Would you like to make a prop bet")); if (data.getMakePropBet().toLowerCase().equals("yes")) { data.setFieldBetType(data.getConsole().getIntegerInput("What prop bet do you want to make?")); data.setFieldBet(data.getConsole().getDoubleInput("how much do you want to bet on this?")); - } else {} - //} - //if (hasMoenytoBet(data.getSecondLineBet() + data.getFieldBet(), crapsPlayer.player)) { + } else { + display("No prop bets, roll the dice! \n");} + } + if (hasMoenytoBet(data.getSecondLineBet() + data.getFieldBet(), crapsPlayer.player)) { data.setCurrentRoll(crapsPlayer.roll()); stage2Play(data.getSecondLineBet(), data.getFieldBet(), data.getFieldBetType()); - //} + } break; } } @@ -73,10 +75,11 @@ public void runGame() { /*----------------STAGE 0---------------*/ - public void stage0Play(String input){ + protected void stage0Play(String input){ if(input.toLowerCase().equals("play")) { - this.stage = 1; + data.setStage(1); + } else if (input.toLowerCase().equals("exit")){ crapsPlayer.player.setPlaying(false); } else { @@ -87,57 +90,62 @@ public void stage0Play(String input){ /*----------------STAGE 1---------------*/ - public void stage1Play(Double firstLineBet){ - // if (comeFirstRound) - withdraw(firstLineBet); - //comeFirstRound= false; - + protected void stage1Play(Double firstLineBet){ + if (comeFirstRound) { + withdraw(firstLineBet); + } + comeFirstRound= false; if(data.getCurrentRoll().equals(2) || data.getCurrentRoll().equals(3) || data.getCurrentRoll().equals(12)) { - display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); - stage = 1; - // comeFirstRound = true; - // passFirstRound = true; + display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount() + "\n "); + data.setStage(1); + comeFirstRound = true; + passFirstRound = true; } else if (data.getCurrentRoll().equals(7) || data.getCurrentRoll().equals(11)) { deposit(calcPayment(firstLineBet, data.getFirstLineOdds())); - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + calcPayment(data.getFirstLineOdds(), firstLineBet) + "! you now have " + crapsPlayer.player.getAccount()); + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + calcPayment(data.getFirstLineOdds(), firstLineBet) + "! you now have " + crapsPlayer.player.getAccount() + "\n "); } else if(!data.getCurrentRoll().equals(2) && !data.getCurrentRoll().equals(3) && !data.getCurrentRoll().equals(12) && !data.getCurrentRoll().equals(7) && !data.getCurrentRoll().equals(11)){ - display(" you rolled a " + data.getCurrentRoll() + ".\n" + data.getCurrentRoll() + " is now the on number!"); + display(" you rolled a " + data.getCurrentRoll() + ".\n" + data.getCurrentRoll() + " is now the on number! \n "); data.setOnNumber(data.getCurrentRoll()); - stage = 2; + data.setStage(2); } else { display("Excuse me, I didnt understand"); } + + keepPlayingOrQuit(); } /*-----------------STAGE 2----------------*/ - public void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBetNumber ){ - //if(passFirstRound) { + protected void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBetNumber ){ + if(passFirstRound) { withdraw(secondLineBet); withdraw(fieldBet); - //} - //passFirstRound = false; - + } + passFirstRound = false; if(data.getCurrentRoll().equals(7)) { - display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount()); - stage = 1; - //comeFirstRound = true; - //passFirstRound = true; + display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out!"); + displayCurrentState(); + data.setStage(1); + comeFirstRound = true; + passFirstRound = true; } else if (data.getCurrentRoll().equals(fieldBetNumber)) { Double wins = calcPayment(fieldBet, data.getfieldOdds(fieldBetNumber)); deposit(wins); - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "! you now have " + crapsPlayer.player.getAccount()); + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "!"); }else if (data.getCurrentRoll().equals(data.getOnNumber())) { Double wins = calcPayment(data.getfieldOdds(data.getOnNumber()), secondLineBet) + calcPayment(data.getfieldOdds(data.getOnNumber()), data.getFirstLineBet()); deposit(wins); - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "! you now have " + crapsPlayer.player.getAccount()); + display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "! you now have " + crapsPlayer.player.getAccount() + "\n"); } else { - display("Excuse me, I didn't understand"); + display( "you rolled a" + data.getCurrentRoll() +"No winners! Roll again!"); } + + keepPlayingOrQuit(); } + @Override void endGame() { Handler handler = new Handler(); @@ -150,7 +158,7 @@ boolean getResults() { } @Override - public void display(String output) { + protected void display(String output) { System.out.println(output); } @@ -169,7 +177,7 @@ public Double calcPayment(Double bet, Double odds) { } - public Boolean hasMoenytoBet(Double bet, Player player) { + protected Boolean hasMoenytoBet(Double bet, Player player) { if (bet > player.getAccount()){ display("Not enought Money!!! \n you only have - " + crapsPlayer.player.getAccount()); @@ -177,16 +185,27 @@ public Boolean hasMoenytoBet(Double bet, Player player) { } else return true; } - public Integer getStage() { - return stage; + protected void keepPlayingOrQuit() { + String quitOrContinue = data.getConsole().getStringInput("Would you like to keep playing?").toLowerCase(); + if (quitOrContinue.equals("no")) { + endGame(); + } + } - public void setStage(Integer stage) { - this.stage = stage; + protected void displayCurrentState() { + display("Current Balance: " + crapsPlayer.player.getAccount() + "\n" + + "Passline Bet: " + data.getFirstLineBet() + "\n" + + "Come Out Bet: " + data.getSecondLineBet() + "\n" + + "On Number: " + data.getOnNumber() + "\n" + + "Prop Bet Type: " + data.getFieldBetType() + "\n" + + "Prob Bet: " + data.getFieldBet() + "\n" + ); } @Override void nextTurn() { + } } diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java index d4cf334de..3b2f3720f 100644 --- a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -6,16 +6,18 @@ import java.util.HashMap; public class CrapsDataHandler { + private String quit; private Console console; private Integer onNumber; private Double firstLineBet; private Double secondLineBet; - private Double fieldBet; - private Integer fieldBetType; + private Double fieldBet = 0.0; + private Integer fieldBetType =0; private Double firstLineOdds = 2.0; private Double secondLineOdds = 2.0; private Integer currentRoll; private String makePropBet; + private Integer stage; private HashMap fieldOdds = new HashMap(); public Double getfieldOdds(Integer key) { return fieldOdds.get(key); @@ -119,7 +121,20 @@ public void setMakePropBet(String makePropBet) { this.makePropBet = makePropBet; } + public String getQuit() { + return quit; + } + public void setQuit(String quit) { + this.quit = quit; + } + public Integer getStage() { + return stage; + } + + public void setStage(Integer stage) { + this.stage = stage; + } } diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index a9ad9d7e0..3cf182e8e 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -7,7 +7,7 @@ public class Roulette extends Games implements GamblerGameInterface { String betType; // red/back - odd / even / number - private RoulettePlayer roulettePlayer; + protected RoulettePlayer roulettePlayer; private Double currentBet; String[] redArray = {"2","4","6","8","10","12","14","16","18","20","22","24","26","28","30","32","34","36"}; diff --git a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java index 094b8b4f1..44cdb0e9e 100644 --- a/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CrapsPlayer.java @@ -1,9 +1,6 @@ package io.zipcoder.casino.player; import io.zipcoder.casino.gameTools.Dice; -import io.zipcoder.casino.gameTools.Card; - - public class CrapsPlayer extends Player implements GamblerInterface { public Player player; @@ -29,8 +26,7 @@ public void betType(String betType) { } public void cashout() { - //leave game mid way! - player.setPlaying(false); + this.player.setPlaying(false); } public void displayAccoutBal() { diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 72353b74e..adddaa986 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -75,7 +75,7 @@ public void stage0PlayPlay() { craps.stage0Play("play"); Integer actual = 1; - Integer expected = craps.getStage(); + Integer expected = craps.data.getStage(); Assert.assertEquals(expected, actual); } @@ -95,7 +95,7 @@ public void stage0PlayInvalidInput() { craps.stage0Play("234234"); Integer actual = 0; - Integer expected = craps.getStage(); + Integer expected = craps.data.getStage(); Assert.assertEquals(expected, actual); } @@ -109,7 +109,7 @@ public void stage1Play() { craps.stage1Play(10.0); Integer actual = 2; - Integer expected = craps.getStage(); + Integer expected = craps.data.getStage(); Assert.assertEquals(expected, actual); @@ -121,7 +121,7 @@ public void stage1PlayCrap() { craps.stage1Play(10.0); Integer actual = 0; - Integer expected = craps.getStage(); + Integer expected = craps.data.getStage(); Assert.assertEquals(expected, actual); @@ -148,7 +148,7 @@ public void stage2PlayWinOnNumber() { craps.stage2Play(10.0, 10.0, 5); - Double actual = 250.0; + Double actual = 1100.0; Double expected = player.getAccount(); Assert.assertEquals(expected, actual); @@ -176,7 +176,7 @@ public void stage2PlayCrapOut() { craps.stage2Play(10.0, 10.0, 5); Integer actual = 1; - Integer expected = craps.getStage(); + Integer expected = craps.data.getStage(); Assert.assertEquals(expected, actual); diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java index e91d049f8..708f15a3e 100644 --- a/src/test/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -60,13 +60,8 @@ public void updateAccountDoubleTest() { //this.roulette.updateAccount(1.5); Double actual = this.roulette.roulettePlayer.getAccount(); Assert.assertEquals(1.5, actual.doubleValue(), 0.0); -<<<<<<< Updated upstream -======= - } ->>>>>>> Stashed changes - } } From e05f8a5f43c3d57c27a6c764f3f32ddf959c892f Mon Sep 17 00:00:00 2001 From: Robert Rieger Date: Sat, 15 Jun 2019 18:00:06 -0400 Subject: [PATCH 52/71] craps 90% working - neg number bug --- src/main/java/io/zipcoder/casino/Handler.java | 31 ++++- .../java/io/zipcoder/casino/games/Craps.java | 110 +++++++++++------- .../casino/games/CrapsDataHandler.java | 22 +++- .../io/zipcoder/casino/player/Player.java | 11 +- src/test/io/zipcoder/casino/HandlerTest.java | 27 +++++ .../casino/games/CrapsDataHandlerTest.java | 56 ++++++++- .../io/zipcoder/casino/games/CrapsTest.java | 91 ++++++++++++++- .../casino/player/CrapsPlayerTest.java | 15 ++- 8 files changed, 306 insertions(+), 57 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index d3fac017b..572c50972 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -6,23 +6,37 @@ import io.zipcoder.casino.player.RoulettePlayer; import io.zipcoder.casino.utilities.Console; + // public class Handler { - private Console console = new Console(System.in, System.out); + public Console console = new Console(System.in, System.out); public Player player; private Integer integerInput; private String name = ""; private Double account = 0.0; + private Boolean accoutIsSet = false; private Boolean hasStarted = false; + private Double tempDeposit; + public void run() { if (!hasStarted) { getNameInput(); - getAccountBalanceInput(); - createPlayer(name, account); + + while (!accoutIsSet){ + getAccountBalanceInput(); + + if (testAccountInput(tempDeposit)) { + account = tempDeposit; + accoutIsSet= true; + } else { + console.println("Invalid input");} + createPlayer(name, account); + } } + hasStarted = true; System.out.println("0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots "); @@ -53,13 +67,13 @@ public void run() { Slots slots = new Slots(); break; default: + System.out.println("you blew it"); } } public Player createPlayer (String name, Double account) { return player = new Player(name, account); - } public void getNameInput() { @@ -67,7 +81,14 @@ public void getNameInput() { } public void getAccountBalanceInput() { - this.account = console.getDoubleInput("How much do you want to deposit in your account?"); + this.tempDeposit = console.getDoubleInput("How much do you want to deposit in your account?"); + } + + public Boolean testAccountInput (Double tempDeposit) { + if (tempDeposit > 0 && tempDeposit < Double.MAX_VALUE) { + return true; + } else + return false; } public void getGameInput() { diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 91f91b67e..d2d87d9d5 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -1,18 +1,20 @@ package io.zipcoder.casino.games; +import com.sun.org.apache.xpath.internal.operations.Bool; +import com.sun.xml.internal.fastinfoset.util.CharArray; import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; +import java.security.ProtectionDomain; import java.util.HashMap; import java.util.TreeMap; public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; public CrapsDataHandler data = new CrapsDataHandler(); - private Boolean comeFirstRound = true; - private Boolean passFirstRound = true; + @@ -40,28 +42,28 @@ public void runGame() { switch (data.getStage()) { case 0: - String input = data.getConsole().getStringInput("A game has just ended would you like to join the table? (play or exit?) "); + String input = data.getConsole().getStringInput("A game has just ended would you like to join the table?"); stage0Play(input); break; case 1: - - if (comeFirstRound) { - data.setFirstLineBet(data.getConsole().getDoubleInput("Let's get started! \n Losing rolls: [2] [3] [12]. \n Winning rolls: [7] [11]. \n Any other roll becomes the on number\n" + "\n"+ "Place your passline bet!")); - } + if (data.getComeFirstRound()) { + data.setFirstLineBet(data.getConsole().getDoubleInput("LET'S GET STARTED ON A NEW GAME!\n \n Losing rolls: [2] [3] [12]. \n Winning rolls: [7] [11]. \n [Any other roll becomes the on number]\n" + "\n"+ "Place your passline bet!")); + } else {keepPlayingOrQuit();} if(hasMoenytoBet(data.getFirstLineBet(), crapsPlayer.player)){ data.setCurrentRoll(crapsPlayer.roll()); stage1Play(data.getFirstLineBet()); } break; case 2: - if(passFirstRound) { - data.setSecondLineBet(data.getConsole().getDoubleInput("Winning rolls: [" + data.getOnNumber() + "] \n Make your come out bet!")); + keepPlayingOrQuit(); + if(data.getPassFirstRound()) { + data.setSecondLineBet(data.getConsole().getDoubleInput("Winning roll: [" + data.getOnNumber() + "] \n Make your come out bet!")); data.setMakePropBet(data.getConsole().getStringInput("Would you like to make a prop bet")); - if (data.getMakePropBet().toLowerCase().equals("yes")) { + if (checkForPropBet(data.getMakePropBet())) { data.setFieldBetType(data.getConsole().getIntegerInput("What prop bet do you want to make?")); data.setFieldBet(data.getConsole().getDoubleInput("how much do you want to bet on this?")); } else { - display("No prop bets, roll the dice! \n");} + display("NO PROP BETS PLACED, ROLL THE DICE! \n");} } if (hasMoenytoBet(data.getSecondLineBet() + data.getFieldBet(), crapsPlayer.player)) { data.setCurrentRoll(crapsPlayer.roll()); @@ -76,11 +78,11 @@ public void runGame() { /*----------------STAGE 0---------------*/ protected void stage0Play(String input){ - - if(input.toLowerCase().equals("play")) { + Character firstLetter = input.toLowerCase().charAt(0); + if(input.toLowerCase().equals("play") || firstLetter.equals('y')) { data.setStage(1); - } else if (input.toLowerCase().equals("exit")){ + } else if (input.toLowerCase().equals("exit") || firstLetter.equals('n')){ crapsPlayer.player.setPlaying(false); } else { display("Excuse me, I didnt understand"); @@ -91,27 +93,27 @@ protected void stage0Play(String input){ protected void stage1Play(Double firstLineBet){ - if (comeFirstRound) { + if (data.getComeFirstRound()) { withdraw(firstLineBet); } - comeFirstRound= false; + data.setComeFirstRound(false); if(data.getCurrentRoll().equals(2) || data.getCurrentRoll().equals(3) || data.getCurrentRoll().equals(12)) { - display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out! \n you now have " + crapsPlayer.player.getAccount() + "\n "); + display("you rolled a " + data.getCurrentRoll() + "\n" + "SORRY YOU CRAPPED OUT!"); data.setStage(1); - comeFirstRound = true; - passFirstRound = true; + display(displayCurrentState()); + resetFirstRoundState(); } else if (data.getCurrentRoll().equals(7) || data.getCurrentRoll().equals(11)) { deposit(calcPayment(firstLineBet, data.getFirstLineOdds())); - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + calcPayment(data.getFirstLineOdds(), firstLineBet) + "! you now have " + crapsPlayer.player.getAccount() + "\n "); + display(displayCurrentState()); + display("YOU ROLLED A " + data.getCurrentRoll() + "\n" + "YOU WON " + calcPayment(data.getFirstLineOdds(), firstLineBet)); } else if(!data.getCurrentRoll().equals(2) && !data.getCurrentRoll().equals(3) && !data.getCurrentRoll().equals(12) && !data.getCurrentRoll().equals(7) && !data.getCurrentRoll().equals(11)){ - display(" you rolled a " + data.getCurrentRoll() + ".\n" + data.getCurrentRoll() + " is now the on number! \n "); + display(displayCurrentState()); + display("YOU ROLLED A " + data.getCurrentRoll() + ".\n" + data.getCurrentRoll() + " IS NOW THE ON NUMBER! \n "); data.setOnNumber(data.getCurrentRoll()); data.setStage(2); - } else { - display("Excuse me, I didnt understand"); } - keepPlayingOrQuit(); + } @@ -119,30 +121,30 @@ protected void stage1Play(Double firstLineBet){ protected void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBetNumber ){ - if(passFirstRound) { + if(data.getPassFirstRound()) { withdraw(secondLineBet); withdraw(fieldBet); } - passFirstRound = false; + data.setPassFirstRound(false); if(data.getCurrentRoll().equals(7)) { - display(" you rolled a " + data.getCurrentRoll() + "\n" + "Sorry you crapped out!"); - displayCurrentState(); + display("YOU ROLLED A " + data.getCurrentRoll() + "\n" + "SORRY YOU CRAPPED OUT!"); data.setStage(1); - comeFirstRound = true; - passFirstRound = true; + display(displayCurrentState()); + resetFirstRoundState(); } else if (data.getCurrentRoll().equals(fieldBetNumber)) { + display(displayCurrentState()); Double wins = calcPayment(fieldBet, data.getfieldOdds(fieldBetNumber)); deposit(wins); - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "!"); + display(displayWinningRoll(wins)); }else if (data.getCurrentRoll().equals(data.getOnNumber())) { + display(displayCurrentState()); Double wins = calcPayment(data.getfieldOdds(data.getOnNumber()), secondLineBet) + calcPayment(data.getfieldOdds(data.getOnNumber()), data.getFirstLineBet()); deposit(wins); - display(" you rolled a " + data.getCurrentRoll() + "\n" + "you won " + wins + "! you now have " + crapsPlayer.player.getAccount() + "\n"); + display(displayWinningRoll(wins)); } else { - display( "you rolled a" + data.getCurrentRoll() +"No winners! Roll again!"); + display(displayCurrentState()); + display( "YOU ROLLED A " + data.getCurrentRoll() +" NO WINNERS, ROLL AGAIN!"); } - - keepPlayingOrQuit(); } @@ -152,6 +154,11 @@ void endGame() { handler.run(); } + @Override + void nextTurn() { + + } + @Override boolean getResults() { return false; @@ -179,7 +186,7 @@ public Double calcPayment(Double bet, Double odds) { protected Boolean hasMoenytoBet(Double bet, Player player) { if (bet > player.getAccount()){ - display("Not enought Money!!! \n you only have - " + + display("Not enough Money!!! \n you only have - " + crapsPlayer.player.getAccount()); return false; } else return true; @@ -187,25 +194,42 @@ protected Boolean hasMoenytoBet(Double bet, Player player) { protected void keepPlayingOrQuit() { String quitOrContinue = data.getConsole().getStringInput("Would you like to keep playing?").toLowerCase(); - if (quitOrContinue.equals("no")) { + Character firstletter = quitOrContinue.toLowerCase().charAt(0); + if (firstletter.equals('n')) { endGame(); } } - protected void displayCurrentState() { - display("Current Balance: " + crapsPlayer.player.getAccount() + "\n" + + protected String displayCurrentState() { + return + "*-----------------------------------*\n" + + "Current Balance: " + crapsPlayer.player.getAccount() + "\n" + "Passline Bet: " + data.getFirstLineBet() + "\n" + "Come Out Bet: " + data.getSecondLineBet() + "\n" + "On Number: " + data.getOnNumber() + "\n" + "Prop Bet Type: " + data.getFieldBetType() + "\n" + - "Prob Bet: " + data.getFieldBet() + "\n" - ); + "Prob Bet: " + data.getFieldBet() + "\n" + "\n" + + "*-----------------------------------*\n"; + } - @Override - void nextTurn() { + protected String displayWinningRoll(Double wins){ + return "YOU ROLLED A " + data.getCurrentRoll() + "\n" + "YOU WON " + wins + "!"; + } + protected Boolean checkForPropBet (String string) { + Character firstLetter = string.toLowerCase().charAt(0); + if (firstLetter.equals('y')) { + return true; + }else return false; + } + protected void resetFirstRoundState() { + data.setComeFirstRound(true); + data.setPassFirstRound(true); } + + + } diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java index 3b2f3720f..7b98d9c30 100644 --- a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -9,8 +9,8 @@ public class CrapsDataHandler { private String quit; private Console console; private Integer onNumber; - private Double firstLineBet; - private Double secondLineBet; + private Double firstLineBet = 0.0; + private Double secondLineBet = 0.0 ; private Double fieldBet = 0.0; private Integer fieldBetType =0; private Double firstLineOdds = 2.0; @@ -18,6 +18,8 @@ public class CrapsDataHandler { private Integer currentRoll; private String makePropBet; private Integer stage; + private Boolean comeFirstRound = true; + private Boolean passFirstRound = true; private HashMap fieldOdds = new HashMap(); public Double getfieldOdds(Integer key) { return fieldOdds.get(key); @@ -137,4 +139,20 @@ public void setStage(Integer stage) { this.stage = stage; } + public Boolean getComeFirstRound() { + return comeFirstRound; + } + + public void setComeFirstRound(Boolean comeFirstRound) { + this.comeFirstRound = comeFirstRound; + } + + public Boolean getPassFirstRound() { + return passFirstRound; + } + + public void setPassFirstRound(Boolean passFirstRound) { + this.passFirstRound = passFirstRound; + } + } diff --git a/src/main/java/io/zipcoder/casino/player/Player.java b/src/main/java/io/zipcoder/casino/player/Player.java index 0797ed34b..dfa52cd42 100644 --- a/src/main/java/io/zipcoder/casino/player/Player.java +++ b/src/main/java/io/zipcoder/casino/player/Player.java @@ -1,8 +1,8 @@ package io.zipcoder.casino.player; public class Player { -private String name; -private Double account; +private String name = "Elvis"; +private Double account = 0.0; private Boolean isPlaying = false; public Boolean getPlaying() { @@ -16,6 +16,13 @@ public void setPlaying(Boolean playing) { public Player(){}; + public Player(Double account) { + this.account = account; + } + + public Player(String name) { + this.name = name; + } public Player(String name, Double account) { this.account = account; diff --git a/src/test/io/zipcoder/casino/HandlerTest.java b/src/test/io/zipcoder/casino/HandlerTest.java index 22592437f..c669a5a7f 100644 --- a/src/test/io/zipcoder/casino/HandlerTest.java +++ b/src/test/io/zipcoder/casino/HandlerTest.java @@ -22,4 +22,31 @@ public void createPlayer() { } + + @Test + public void testAccountInputneg() { + Handler handler = new Handler(); + Boolean actual = handler.testAccountInput(-2445.0); + Boolean expeceted = false; + + Assert.assertEquals(expeceted,actual); + } + + @Test + public void testAccountInputOver() { + Handler handler = new Handler(); + Boolean actual = handler.testAccountInput(Double.MAX_VALUE+10); + Boolean expeceted = false; + + Assert.assertEquals(expeceted,actual); + } + + @Test + public void testAccountInputHappy() { + Handler handler = new Handler(); + Boolean actual = handler.testAccountInput(1000.0); + Boolean expeceted = true; + + Assert.assertEquals(expeceted,actual); + } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java b/src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java index 078d7b0ea..6b00b70d9 100644 --- a/src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsDataHandlerTest.java @@ -1,6 +1,8 @@ package io.zipcoder.casino.games; +import com.sun.xml.internal.ws.api.ha.StickyFeature; import io.zipcoder.casino.Handler; +import io.zipcoder.casino.utilities.Console; import org.junit.Assert; import org.junit.Test; @@ -8,11 +10,12 @@ public class CrapsDataHandlerTest { CrapsDataHandler data = new CrapsDataHandler(); + Handler handler= new Handler(); @Test public void getOnNumber() { Handler handler = new Handler(); - handler.createPlayer("", 100.0); + Craps craps = new Craps(); data.setOnNumber(10); @@ -121,7 +124,6 @@ public void setOtherBet() { Assert.assertEquals(expected, actual); } - @Test public void getFirstLineOdds() { data.setFirstLineOdds(10.0); @@ -158,4 +160,54 @@ public void setSecondLineOdds() { Assert.assertEquals(expected,actual); } + @Test + public void getQuit() { + data.setQuit("yes"); + String actual = data.getQuit(); + String expected = "yes"; + + Assert.assertEquals(expected,actual); + + } + + @Test + public void setQuit() { + data.setQuit("yes"); + String actual = data.getQuit(); + String expected = "yes"; + + Assert.assertEquals(expected,actual); + } + + @Test + public void getMakePropBet() { + data.setMakePropBet("no"); + String actual = data.getMakePropBet(); + String expected = "no"; + + Assert.assertEquals(expected,actual); + } + + @Test + public void setMakePropBet() { + data.setMakePropBet("no"); + String actual = data.getMakePropBet(); + String expected = "no"; + + Assert.assertEquals(expected,actual); + } + + @Test + public void getConsole() { + Console actual = data.getConsole(); + Console expected = handler.console; + } + + @Test + public void setConsole() { + data.setConsole(handler.console); + Console actual = data.getConsole(); + Console expected = handler.console; + + } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index adddaa986..b88dc28df 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -1,5 +1,6 @@ package io.zipcoder.casino.games; +import com.sun.org.apache.xpath.internal.operations.Bool; import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; @@ -12,6 +13,7 @@ public class CrapsTest { Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); + CrapsDataHandler data = new CrapsDataHandler(); @Test public void calcPayment() { @@ -104,7 +106,7 @@ public void stage0PlayInvalidInput() { @Test public void stage1Play() { craps.data.setCurrentRoll(10); - craps.data.setFirstLineBet(10.0); + craps.data.setFirstLineBet(500.0); // craps.stage1Play(10.0); @@ -182,4 +184,91 @@ public void stage2PlayCrapOut() { } + + @Test + public void stage2PlaywinwithOnNumber() { + craps.data.setOnNumber(4); + craps.data.setCurrentRoll(4); + craps.data.setFirstLineBet(10.0); + craps.stage2Play(100.0, 100.0, 9); + + + Double actual = 1680.0; + Double expected = player.getAccount(); + + Assert.assertEquals(expected, actual); + + + } + + @Test + public void hasMoenytoBetFalse() { + Boolean actual = false; + Boolean expected = craps.hasMoenytoBet(100000.0, player); + + Assert.assertEquals(expected, actual); + } + + @Test + public void hasMoenytoBetTrue() { + Boolean actual = true; + Boolean expected = craps.hasMoenytoBet(10.0, player); + + Assert.assertEquals(expected, actual); + } + + @Test + public void hasMoenytoBetexcat() { + Boolean actual = true; + Boolean expected = craps.hasMoenytoBet(1000.0, player); + + Assert.assertEquals(expected, actual); + } + + @Test + public void displayCurrentState() { + String actual = + "*-----------------------------------*\nCurrent Balance: 1000.0\nPassline Bet: 0.0\nCome Out Bet: 0.0\nOn Number: null\nProp Bet Type: 0\nProb Bet: 0.0\n\n*-----------------------------------*\n"; + + String expected = craps.displayCurrentState(); + + Assert.assertEquals(expected, actual); + + + } + + @Test + public void displayWinningRoll() { + craps.data.setCurrentRoll(9); + + String actual = craps.displayWinningRoll(10.0); + String expected = "YOU ROLLED A 9 \n YOU WON 10!"; + + + } + + @Test + public void resetFirstRoundState() { + + craps.stage1Play(100.0); + + Boolean actual = false; + Boolean expeceted = craps.data.getPassFirstRound(); + + craps.resetFirstRoundState(); + + Boolean actual1 = true; + Boolean expeceted1 = craps.data.getPassFirstRound(); + + Assert.assertEquals(actual,expeceted); + Assert.assertEquals(actual1,expeceted1); + } + + @Test + public void checkForPropBet() { + } + + @Test + public void keepPlayingOrQuit() { + } } \ No newline at end of file diff --git a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java index 9112fa12c..f2dae4178 100644 --- a/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java +++ b/src/test/io/zipcoder/casino/player/CrapsPlayerTest.java @@ -6,13 +6,24 @@ public class CrapsPlayerTest { + + @Test + public void roll1() { + } + @Test - public void roll() { + public void bet() { } @Test - public void cashout() { + public void betType() { } + @Test + public void cashout1() { + } + @Test + public void displayAccoutBal() { + } } \ No newline at end of file From 7062f5afc9c18b0de52db5c72b98b65141622342 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Sat, 15 Jun 2019 18:46:00 -0400 Subject: [PATCH 53/71] saturday push and pull --- .../java/io/zipcoder/casino/games/GoFish.java | 40 +++++++++---------- .../zipcoder/casino/games/RouletteTest.java | 35 +++++++--------- 2 files changed, 34 insertions(+), 41 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 38c61dd78..34982cd60 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -13,8 +13,8 @@ public class GoFish extends Games { Console console; private GoFishPlayer mainPlayer; private GoFishPlayer otherPlayer = new GoFishPlayer(); - private GoFishPlayer activePlayer; - private GoFishPlayer passivePlayer; + private GoFishPlayer activePlayer = new GoFishPlayer(); + private GoFishPlayer passivePlayer = new GoFishPlayer(); Boolean switchP = true; private boolean isPlaying = true; @@ -33,29 +33,29 @@ public GoFish(GoFishPlayer player, Console console) { } public void runGame () { - console.println("Hey " + mainPlayer.getName() + "! \nWelcome to GOFISH GAME"); + console.println("Hey " + mainPlayer.getName() + "! \nWelcome to GO FISH GAME"); String userInput = console.getStringInput("Do you want to play?"); if (readyToPlay(userInput)) { dealHands(); while (deck.getDeck().size() > 0) { - //setActivePlayer(switchP); + setActivePlayer(switchP); - console.println(seeHand(mainPlayer)); + console.println(seeHand(activePlayer)); - console.println(seeHand(otherPlayer) + "other"); + console.println(seeHand(passivePlayer) + "other"); String input = searchFor(); - ArrayList temp = checkHand(input, otherPlayer); + ArrayList temp = checkHand(input, passivePlayer); if (!temp.isEmpty()) { - removeFromHand(temp, otherPlayer); - addToHand(temp, mainPlayer); + removeFromHand(temp, passivePlayer); + addToHand(temp, activePlayer); } else { - deck.dealSingleCard(mainPlayer); + deck.dealSingleCard(activePlayer); } } } @@ -85,16 +85,16 @@ public void addToHand (ArrayList cards, GoFishPlayer player) { player.setHand(temp); } -// public void setActivePlayer (Boolean isActive) { -// if (isActive) { -// mainPlayer = activePlayer; -// otherPlayer = passivePlayer; -// } -// else { -// mainPlayer = passivePlayer; -// otherPlayer = activePlayer; -// } -// } + public void setActivePlayer (Boolean isActive) { + if (isActive) { + this.mainPlayer = activePlayer; + this.otherPlayer = passivePlayer; + } + else { + this.mainPlayer = passivePlayer; + this.otherPlayer = activePlayer; + } + } public void update(Double amount) { Double result = mainPlayer.getAccount() + amount; diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java index e91d049f8..bccae1b6e 100644 --- a/src/test/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -39,13 +39,13 @@ public void calcPaymentTest() { Assert.assertEquals(36,actual.intValue()); } - @Test - public void updateAccountTest() { - this.roulette.updateAccount(10); - Double actual = this.roulette.roulettePlayer.getAccount(); - Assert.assertEquals(10,actual.doubleValue(),0.0); - - } +// @Test +// public void updateAccountTest() { +// this.roulette.updateAccount(10); +// Double actual = this.roulette.roulettePlayer.getAccount(); +// Assert.assertEquals(10,actual.doubleValue(),0.0); +// +// } @Test @@ -55,18 +55,11 @@ public void calcPaymentDoubleTest(){ } - @Test - public void updateAccountDoubleTest() { - //this.roulette.updateAccount(1.5); - Double actual = this.roulette.roulettePlayer.getAccount(); - Assert.assertEquals(1.5, actual.doubleValue(), 0.0); -<<<<<<< Updated upstream -======= - - - } ->>>>>>> Stashed changes - - - } +// @Test +// public void updateAccountDoubleTest() { +// //this.roulette.updateAccount(1.5); +// Double actual = this.roulette.roulettePlayer.getAccount(); +// Assert.assertEquals(1.5, actual.doubleValue(), 0.0); +// +// } } From c6484519b9911d2de13f47d34f3e18ce57ee5888 Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sat, 15 Jun 2019 19:03:44 -0400 Subject: [PATCH 54/71] craps 95% --- src/main/java/io/zipcoder/casino/Casino.java | 4 +- src/main/java/io/zipcoder/casino/Handler.java | 26 ++++-------- .../java/io/zipcoder/casino/games/Craps.java | 15 +++---- .../casino/games/CrapsDataHandler.java | 6 +-- .../io/zipcoder/casino/games/CrapsTest.java | 41 ++++++++++++++++--- 5 files changed, 56 insertions(+), 36 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Casino.java b/src/main/java/io/zipcoder/casino/Casino.java index 93dbdced3..595460fe7 100644 --- a/src/main/java/io/zipcoder/casino/Casino.java +++ b/src/main/java/io/zipcoder/casino/Casino.java @@ -4,7 +4,9 @@ public class Casino { public static void main(String[] args) { // write your tests before you start fucking with this + Handler handler = new Handler(); - handler.run(); + handler.setUpPlayer(); + handler.run(handler); } } diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 572c50972..c2ee8b951 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -15,29 +15,13 @@ public class Handler { private String name = ""; private Double account = 0.0; private Boolean accoutIsSet = false; - private Boolean hasStarted = false; private Double tempDeposit; -public void run() { - if (!hasStarted) { - getNameInput(); - - while (!accoutIsSet){ - getAccountBalanceInput(); - - if (testAccountInput(tempDeposit)) { - account = tempDeposit; - accoutIsSet= true; - } else { - console.println("Invalid input");} - createPlayer(name, account); - } - } +public void run(Handler handler) { - hasStarted = true; System.out.println("0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots "); getGameInput(); @@ -60,7 +44,7 @@ public void run() { break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer,console); + Craps craps = new Craps(crapsPlayer,console, handler); craps.runGame(); break; case 4: @@ -94,4 +78,10 @@ public Boolean testAccountInput (Double tempDeposit) { public void getGameInput() { this.integerInput = console.getIntegerInput("What game would you like to play?"); } + + public void setUpPlayer(){ + getNameInput(); + getAccountBalanceInput(); + createPlayer(name, tempDeposit); + } } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index d2d87d9d5..68fe490e6 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -1,18 +1,15 @@ package io.zipcoder.casino.games; -import com.sun.org.apache.xpath.internal.operations.Bool; -import com.sun.xml.internal.fastinfoset.util.CharArray; + import io.zipcoder.casino.Handler; import io.zipcoder.casino.player.CrapsPlayer; import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; -import java.security.ProtectionDomain; -import java.util.HashMap; -import java.util.TreeMap; public class Craps extends Games implements GamblerGameInterface { private CrapsPlayer crapsPlayer; + public Handler handler; public CrapsDataHandler data = new CrapsDataHandler(); @@ -28,9 +25,10 @@ public Craps(CrapsPlayer player) { } - public Craps(CrapsPlayer player, Console console) { + public Craps(CrapsPlayer player, Console console, Handler handler) { this.crapsPlayer = player; data.setConsole(console); + this.handler =handler; crapsPlayer.player.setPlaying(true); data.setStage(0); @@ -150,8 +148,8 @@ protected void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBe @Override void endGame() { - Handler handler = new Handler(); - handler.run(); + + handler.run(handler); } @Override @@ -211,7 +209,6 @@ protected String displayCurrentState() { "Prop Bet Type: " + data.getFieldBetType() + "\n" + "Prob Bet: " + data.getFieldBet() + "\n" + "\n" + "*-----------------------------------*\n"; - } protected String displayWinningRoll(Double wins){ diff --git a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java index 7b98d9c30..4a6b08d58 100644 --- a/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java +++ b/src/main/java/io/zipcoder/casino/games/CrapsDataHandler.java @@ -8,15 +8,15 @@ public class CrapsDataHandler { private String quit; private Console console; - private Integer onNumber; + private Integer onNumber = 0; private Double firstLineBet = 0.0; private Double secondLineBet = 0.0 ; private Double fieldBet = 0.0; private Integer fieldBetType =0; private Double firstLineOdds = 2.0; private Double secondLineOdds = 2.0; - private Integer currentRoll; - private String makePropBet; + private Integer currentRoll = 0; + private String makePropBet = ""; private Integer stage; private Boolean comeFirstRound = true; private Boolean passFirstRound = true; diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index b88dc28df..49d5f86f2 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -13,7 +13,7 @@ public class CrapsTest { Player player = handler.createPlayer("", 1000.0); CrapsPlayer crapsPlayer = new CrapsPlayer(player); Craps craps = new Craps(crapsPlayer); - CrapsDataHandler data = new CrapsDataHandler(); + @Test public void calcPayment() { @@ -252,23 +252,54 @@ public void resetFirstRoundState() { craps.stage1Play(100.0); - Boolean actual = false; - Boolean expeceted = craps.data.getPassFirstRound(); + + Boolean expeceted1 = false; + Boolean actual1 = craps.data.getComeFirstRound(); craps.resetFirstRoundState(); - Boolean actual1 = true; - Boolean expeceted1 = craps.data.getPassFirstRound(); + Boolean expeceted = true; + Boolean actual = craps.data.getComeFirstRound(); Assert.assertEquals(actual,expeceted); Assert.assertEquals(actual1,expeceted1); } + @Test public void checkForPropBet() { + + + Boolean actual1 = craps.checkForPropBet("yes");; + Boolean expeceted = true; + Assert.assertEquals(actual1,expeceted); + + } + + @Test + public void checkForPropBetUppercase() { + + + Boolean actual1 = craps.checkForPropBet("Yes");; + Boolean expeceted = true; + Assert.assertEquals(actual1,expeceted); + } + @Test + public void checkForPropBetNum() { + + + Boolean actual1 = craps.checkForPropBet("3258235");; + Boolean expeceted = false; + Assert.assertEquals(actual1,expeceted); + + } + + + @Test public void keepPlayingOrQuit() { + } } \ No newline at end of file From 60d3ee83cc07b3980feaa75f6d08c524d2796367 Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sat, 15 Jun 2019 19:26:20 -0400 Subject: [PATCH 55/71] testing --- src/main/java/io/zipcoder/casino/games/Slots.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Slots.java b/src/main/java/io/zipcoder/casino/games/Slots.java index 3285fe17b..6d069bdea 100644 --- a/src/main/java/io/zipcoder/casino/games/Slots.java +++ b/src/main/java/io/zipcoder/casino/games/Slots.java @@ -152,8 +152,8 @@ void nextTurn() { @Override void endGame() { - Handler handler = new Handler(); - handler.run(); +// Handler handler = new Handler(); +// handler.run(); } @Override From 25b19b6911690ff61292b7ce5092763eded86561 Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sat, 15 Jun 2019 19:50:36 -0400 Subject: [PATCH 56/71] exit working...Maybe? --- src/main/java/io/zipcoder/casino/Handler.java | 5 +++-- src/main/java/io/zipcoder/casino/games/Craps.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 59b57a499..9fec90b1d 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -17,12 +17,13 @@ public class Handler { private Double account = 0.0; private Boolean accoutIsSet = false; private Double tempDeposit; + public Handler handler; public void run(Handler handler) { - + this.handler = handler; System.out.println("0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots "); getGameInput(); @@ -45,7 +46,7 @@ public void run(Handler handler) { break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer,console, handler); + Craps craps = new Craps(crapsPlayer, console, handler); craps.runGame(); break; case 4: diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 68fe490e6..e50c23667 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -28,7 +28,7 @@ public Craps(CrapsPlayer player) { public Craps(CrapsPlayer player, Console console, Handler handler) { this.crapsPlayer = player; data.setConsole(console); - this.handler =handler; + this.handler = handler; crapsPlayer.player.setPlaying(true); data.setStage(0); From 6cc2b9052388b477d2be36ca337410ac9034cb15 Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sat, 15 Jun 2019 19:54:27 -0400 Subject: [PATCH 57/71] exit working...Maybe? --- src/test/io/zipcoder/casino/games/CrapsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 49d5f86f2..4eac15f30 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -38,7 +38,7 @@ public void updateAccount() { Assert.assertEquals(expected, actual); } - +// @Test public void withdraw() { craps.withdraw(100.0); From acdc14f9bdaafa0c52116ecb525b2cf7e1f89773 Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sat, 15 Jun 2019 20:50:43 -0400 Subject: [PATCH 58/71] craps/roulette/slot operational- with some input bugs --- src/main/java/io/zipcoder/casino/Casino.java | 5 +++-- src/main/java/io/zipcoder/casino/Handler.java | 13 +++++++------ src/main/java/io/zipcoder/casino/games/Craps.java | 10 +++++----- src/test/io/zipcoder/casino/games/CrapsTest.java | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Casino.java b/src/main/java/io/zipcoder/casino/Casino.java index 595460fe7..b320ef574 100644 --- a/src/main/java/io/zipcoder/casino/Casino.java +++ b/src/main/java/io/zipcoder/casino/Casino.java @@ -1,12 +1,13 @@ package io.zipcoder.casino; +import io.zipcoder.casino.player.Player; + public class Casino { public static void main(String[] args) { // write your tests before you start fucking with this - Handler handler = new Handler(); handler.setUpPlayer(); - handler.run(handler); + handler.run(); } } diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 9fec90b1d..4fb07657d 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -21,20 +21,20 @@ public class Handler { -public void run(Handler handler) { +public void run() { - this.handler = handler; - System.out.println("0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots "); +while (true) { + System.out.println("WELCOME TO THE BIG TROUBLE CASINO \n PICK FROM ONE OF OUR GAMES \n \n 0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots \n"); getGameInput(); switch (integerInput) { - case 0 : + case 0: Blackjack blackjack = new Blackjack(); break; - case 1 : + case 1: GoFishPlayer goFishPlayer = new GoFishPlayer(player); GoFish goFish = new GoFish(goFishPlayer, console); goFish.runGame(); @@ -46,7 +46,7 @@ public void run(Handler handler) { break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer, console, handler); + Craps craps = new Craps(crapsPlayer, console /*,handler*/); craps.runGame(); break; case 4: @@ -57,6 +57,7 @@ public void run(Handler handler) { default: System.out.println("you blew it"); + } } } diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index e50c23667..911a88d67 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -25,7 +25,7 @@ public Craps(CrapsPlayer player) { } - public Craps(CrapsPlayer player, Console console, Handler handler) { + public Craps(CrapsPlayer player, Console console /*, Handler handler*/) { this.crapsPlayer = player; data.setConsole(console); this.handler = handler; @@ -51,9 +51,10 @@ public void runGame() { data.setCurrentRoll(crapsPlayer.roll()); stage1Play(data.getFirstLineBet()); } + keepPlayingOrQuit(); break; case 2: - keepPlayingOrQuit(); +// keepPlayingOrQuit(); if(data.getPassFirstRound()) { data.setSecondLineBet(data.getConsole().getDoubleInput("Winning roll: [" + data.getOnNumber() + "] \n Make your come out bet!")); data.setMakePropBet(data.getConsole().getStringInput("Would you like to make a prop bet")); @@ -67,10 +68,10 @@ public void runGame() { data.setCurrentRoll(crapsPlayer.roll()); stage2Play(data.getSecondLineBet(), data.getFieldBet(), data.getFieldBetType()); } + keepPlayingOrQuit(); break; } } - endGame(); } /*----------------STAGE 0---------------*/ @@ -148,8 +149,7 @@ protected void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBe @Override void endGame() { - - handler.run(handler); + crapsPlayer.player.setPlaying(false); } @Override diff --git a/src/test/io/zipcoder/casino/games/CrapsTest.java b/src/test/io/zipcoder/casino/games/CrapsTest.java index 4eac15f30..49d5f86f2 100644 --- a/src/test/io/zipcoder/casino/games/CrapsTest.java +++ b/src/test/io/zipcoder/casino/games/CrapsTest.java @@ -38,7 +38,7 @@ public void updateAccount() { Assert.assertEquals(expected, actual); } -// + @Test public void withdraw() { craps.withdraw(100.0); From 80af3981e94472ccf29049aeeb81cec874744845 Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sat, 15 Jun 2019 20:51:30 -0400 Subject: [PATCH 59/71] craps/roulette/slot operational- with some input bugs --- src/main/java/io/zipcoder/casino/Handler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 4fb07657d..212cd0d1a 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -90,3 +90,4 @@ public void setUpPlayer(){ createPlayer(name, tempDeposit); } } +// \ No newline at end of file From 9a29193904d048e9f5ffdcb975fcbb053d170c40 Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Sat, 15 Jun 2019 23:41:25 -0400 Subject: [PATCH 60/71] roulette game --- src/main/java/io/zipcoder/casino/Handler.java | 5 +++-- src/main/java/io/zipcoder/casino/games/Roulette.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 212cd0d1a..e5937032f 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -40,9 +40,10 @@ public void run() { goFish.runGame(); break; case 2: - RoulettePlayer roulettePlayer = new RoulettePlayer(name, account); + RoulettePlayer roulettePlayer = new RoulettePlayer(player.getName(), player.getAccount()); Roulette roulette = new Roulette(roulettePlayer); - roulette.play(); + roulette.runGame(); + player.setAccount(roulettePlayer.getAccount()); break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index 3cf182e8e..35541a02f 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -76,7 +76,7 @@ public void deposit(Double num) { } - public void play() { + public void runGame() { // Get Bet Amount Scanner sc = new Scanner(System.in); From 827c69465a4794f99eea6a9c795c11262782f663 Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Sun, 16 Jun 2019 00:18:12 -0400 Subject: [PATCH 61/71] roulette test cases --- .../io/zipcoder/casino/games/Roulette.java | 4 +- .../zipcoder/casino/games/RouletteTest.java | 56 ++++++++++++++----- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/Roulette.java b/src/main/java/io/zipcoder/casino/games/Roulette.java index 35541a02f..f8e017625 100644 --- a/src/main/java/io/zipcoder/casino/games/Roulette.java +++ b/src/main/java/io/zipcoder/casino/games/Roulette.java @@ -137,10 +137,10 @@ public boolean isWinner(String betPosition,int random ) { else if(betPosition.equalsIgnoreCase("odd") && random % 2 != 0) { return true; } - else if(betPosition.equalsIgnoreCase("red") && redList.contains(random)) { + else if(betPosition.equalsIgnoreCase("red") && redList.contains(Integer.toString(random))) { return true; } - else if(betPosition.equalsIgnoreCase("black") && blackList.contains(random)) { + else if(betPosition.equalsIgnoreCase("black") && blackList.contains(Integer.toString(random))) { return true; } else if(betPosition.equalsIgnoreCase("1st12") && random <= 12 && random >=1) { diff --git a/src/test/io/zipcoder/casino/games/RouletteTest.java b/src/test/io/zipcoder/casino/games/RouletteTest.java index 7b7e6d3ae..df200ae45 100644 --- a/src/test/io/zipcoder/casino/games/RouletteTest.java +++ b/src/test/io/zipcoder/casino/games/RouletteTest.java @@ -19,19 +19,8 @@ public void setup() { - @Test - public void endGameTest() { - - } - - @Test - public void getResultsTest() { - } - @Test - public void displayTest() { - } @Test public void calcPaymentTest() { @@ -55,12 +44,49 @@ public void calcPaymentDoubleTest(){ } + @Test - public void updateAccountDoubleTest() { - //this.roulette.updateAccount(1.5); - Double actual = this.roulette.roulettePlayer.getAccount(); - Assert.assertEquals(1.5, actual.doubleValue(), 0.0); + public void isWinnerEvenTest() { + boolean actual = this.roulette.isWinner("even",2); + Assert.assertEquals(true,actual); + } + + @Test + public void isWinnerOddTest() { + boolean actual = this.roulette.isWinner("odd",3); + Assert.assertEquals(true,actual); } + @Test + public void isWinnerRedTest() { + boolean actual = this.roulette.isWinner("red",12); + Assert.assertEquals(true,actual); + + } + @Test + public void isWinnerBlackTest() { + boolean actual = this.roulette.isWinner("black",35); + Assert.assertEquals(true,actual); + + } + @Test + public void isFirstTwelveTest() { + boolean actual = this.roulette.isWinner("1st12",12); + Assert.assertEquals(true,actual); + + } + @Test + public void isSecondTwelveTest() { + boolean actual = this.roulette.isWinner("2nd12",13); + Assert.assertEquals(true,actual); + + } + @Test + public void isThirdTwelveTest() { + boolean actual = this.roulette.isWinner("3rd12",35); + Assert.assertEquals(true,actual); + + } + } From 124f999341259506d589895e14114890c3932b49 Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sun, 16 Jun 2019 08:06:42 -0400 Subject: [PATCH 62/71] refactor handler --- src/main/java/io/zipcoder/casino/Casino.java | 1 - src/main/java/io/zipcoder/casino/Handler.java | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Casino.java b/src/main/java/io/zipcoder/casino/Casino.java index b320ef574..188e53e43 100644 --- a/src/main/java/io/zipcoder/casino/Casino.java +++ b/src/main/java/io/zipcoder/casino/Casino.java @@ -7,7 +7,6 @@ public class Casino { public static void main(String[] args) { // write your tests before you start fucking with this Handler handler = new Handler(); - handler.setUpPlayer(); handler.run(); } } diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 212cd0d1a..d8682a183 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -15,14 +15,14 @@ public class Handler { private Integer integerInput; private String name = ""; private Double account = 0.0; - private Boolean accoutIsSet = false; private Double tempDeposit; - public Handler handler; public void run() { - + getNameInput(); + getAccountBalanceInput(); + createPlayer(name, tempDeposit); while (true) { System.out.println("WELCOME TO THE BIG TROUBLE CASINO \n PICK FROM ONE OF OUR GAMES \n \n 0 blackjack -- 1 go fish -- 2 roulette -- 3 craps -- 4 slots \n"); @@ -84,10 +84,5 @@ public void getGameInput() { this.integerInput = console.getIntegerInput("What game would you like to play?"); } - public void setUpPlayer(){ - getNameInput(); - getAccountBalanceInput(); - createPlayer(name, tempDeposit); - } } // \ No newline at end of file From a59f5d52c94b85f228e4337e8f7077d45d6f816f Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sun, 16 Jun 2019 08:22:22 -0400 Subject: [PATCH 63/71] deposits money from bets mid game when exiting early--craps --- src/main/java/io/zipcoder/casino/Handler.java | 2 +- src/main/java/io/zipcoder/casino/games/Craps.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index e5937032f..07d8f8943 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -47,7 +47,7 @@ public void run() { break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); - Craps craps = new Craps(crapsPlayer, console /*,handler*/); + Craps craps = new Craps(crapsPlayer, console); craps.runGame(); break; case 4: diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 911a88d67..9111d06dc 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -99,6 +99,7 @@ protected void stage1Play(Double firstLineBet){ if(data.getCurrentRoll().equals(2) || data.getCurrentRoll().equals(3) || data.getCurrentRoll().equals(12)) { display("you rolled a " + data.getCurrentRoll() + "\n" + "SORRY YOU CRAPPED OUT!"); data.setStage(1); + resetBets(); display(displayCurrentState()); resetFirstRoundState(); } else if (data.getCurrentRoll().equals(7) || data.getCurrentRoll().equals(11)) { @@ -129,6 +130,7 @@ protected void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBe display("YOU ROLLED A " + data.getCurrentRoll() + "\n" + "SORRY YOU CRAPPED OUT!"); data.setStage(1); display(displayCurrentState()); + resetBets(); resetFirstRoundState(); } else if (data.getCurrentRoll().equals(fieldBetNumber)) { display(displayCurrentState()); @@ -149,6 +151,10 @@ protected void stage2Play(Double secondLineBet, Double fieldBet, Integer fieldBe @Override void endGame() { + deposit(data.getFirstLineBet()); + deposit(data.getSecondLineBet()); + deposit(data.getFieldBet()); + crapsPlayer.player.setPlaying(false); } @@ -226,6 +232,11 @@ protected void resetFirstRoundState() { data.setPassFirstRound(true); } + protected void resetBets() { + data.setFirstLineBet(0.0); + data.setSecondLineBet(0.0); + data.setFieldBet(0.0); + } From 52f549d699000e0b08127d96c6078416a629211d Mon Sep 17 00:00:00 2001 From: Kavya Muppalla Date: Sun, 16 Jun 2019 11:10:26 -0400 Subject: [PATCH 64/71] added while loop --- src/main/java/io/zipcoder/casino/Handler.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/Handler.java b/src/main/java/io/zipcoder/casino/Handler.java index 319137e5b..7ca6d10a2 100644 --- a/src/main/java/io/zipcoder/casino/Handler.java +++ b/src/main/java/io/zipcoder/casino/Handler.java @@ -7,6 +7,8 @@ import io.zipcoder.casino.player.SlotsPlayer; import io.zipcoder.casino.utilities.Console; +import java.util.Scanner; + // public class Handler { @@ -42,8 +44,18 @@ public void run() { case 2: RoulettePlayer roulettePlayer = new RoulettePlayer(player.getName(), player.getAccount()); Roulette roulette = new Roulette(roulettePlayer); - roulette.runGame(); - player.setAccount(roulettePlayer.getAccount()); + Scanner scanner = new Scanner(System.in); + boolean isNextRound = false; + do { + roulette.runGame(); + player.setAccount(roulettePlayer.getAccount()); + String continuePlaying = console.getStringInput("Do you want to continue playing (Y/N)?"); + if (continuePlaying != null && continuePlaying.equalsIgnoreCase("Y")) { + isNextRound = true; + } else { + isNextRound = false; + } + } while (isNextRound); break; case 3: CrapsPlayer crapsPlayer = new CrapsPlayer(player); From 1ecdf9880870db57044bbf19b94ff91f4050079d Mon Sep 17 00:00:00 2001 From: rfrieger Date: Sun, 16 Jun 2019 11:27:55 -0400 Subject: [PATCH 65/71] Update Craps.java --- src/main/java/io/zipcoder/casino/games/Craps.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/io/zipcoder/casino/games/Craps.java b/src/main/java/io/zipcoder/casino/games/Craps.java index 9111d06dc..7deee8154 100644 --- a/src/main/java/io/zipcoder/casino/games/Craps.java +++ b/src/main/java/io/zipcoder/casino/games/Craps.java @@ -155,6 +155,7 @@ void endGame() { deposit(data.getSecondLineBet()); deposit(data.getFieldBet()); + crapsPlayer.player.setPlaying(false); } @@ -236,6 +237,7 @@ protected void resetBets() { data.setFirstLineBet(0.0); data.setSecondLineBet(0.0); data.setFieldBet(0.0); + data.setFieldBetType(0); } From 0aa8f91349397d89a424be012af058b3790ba9df Mon Sep 17 00:00:00 2001 From: alilinykh Date: Sun, 16 Jun 2019 13:54:39 -0400 Subject: [PATCH 66/71] 2pm sunday --- .../java/io/zipcoder/casino/games/GoFish.java | 139 +++++++++++++----- 1 file changed, 101 insertions(+), 38 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 34982cd60..6431c84cb 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -4,18 +4,17 @@ import io.zipcoder.casino.gameTools.CardValue; import io.zipcoder.casino.gameTools.Deck; import io.zipcoder.casino.player.GoFishPlayer; +import io.zipcoder.casino.player.Player; import io.zipcoder.casino.utilities.Console; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Random; public class GoFish extends Games { Console console; - private GoFishPlayer mainPlayer; - private GoFishPlayer otherPlayer = new GoFishPlayer(); - private GoFishPlayer activePlayer = new GoFishPlayer(); - private GoFishPlayer passivePlayer = new GoFishPlayer(); - Boolean switchP = true; + private GoFishPlayer goFishPlayer; + private GoFishPlayer computer = new GoFishPlayer(); + private GoFishPlayer currentPlayer = new GoFishPlayer(); private boolean isPlaying = true; @@ -28,39 +27,114 @@ public GoFish() {} public GoFish(GoFishPlayer player, Console console) { super(); - this.mainPlayer = player; + this.goFishPlayer = player; this.console = console; } public void runGame () { - console.println("Hey " + mainPlayer.getName() + "! \nWelcome to GO FISH GAME"); - String userInput = console.getStringInput("Do you want to play?"); - if (readyToPlay(userInput)) { + console.println("Hey " + goFishPlayer.getName() + "! \nWelcome to GO FISH GAME"); + //String userInput = console.getStringInput("Do you want to play?"); + //if (readyToPlay(userInput)) { dealHands(); + currentPlayer = goFishPlayer; + while (deck.getDeck().size() > 0) { - setActivePlayer(switchP); + if (currentPlayer == goFishPlayer) { + playerTurn(); + } + else { + compTurn(); + } - console.println(seeHand(activePlayer)); - console.println(seeHand(passivePlayer) + "other"); + //} + } - String input = searchFor(); - ArrayList temp = checkHand(input, passivePlayer); + } - if (!temp.isEmpty()) { - removeFromHand(temp, passivePlayer); - addToHand(temp, activePlayer); - } - else { - deck.dealSingleCard(activePlayer); - } + public void setCurrentPlayer(GoFishPlayer player) { + + } + + public void playerTurn() { + console.println(seeHand(goFishPlayer)); + + console.println(seeHand(computer) + "comphand!"); + + + String input = searchFor(); + ArrayList temp = checkHand(input, computer); + while (!temp.isEmpty()) { + + removeFromHand(temp, computer); + addToHand(temp, goFishPlayer); + console.println("You got card/s from computer"); + console.getStringInput(""); + console.println("your hand: \n" + seeHand(goFishPlayer)); + + input = searchFor(); + temp = checkHand(input, computer); + + } + deck.dealSingleCard(goFishPlayer); + currentPlayer = computer; + } + + public void compTurn() { + Integer compValueInt = compPickValue(); + String compValueString = getCardValue(compValueInt); + console.println("Computer picking " + compValueString); + ArrayList temp = checkHand(compValueString, goFishPlayer); + + while (!temp.isEmpty()) { + + removeFromHand(temp, goFishPlayer); + addToHand(temp, computer); + console.println("Comp got card/s from you"); + console.getStringInput(""); + console.println("your hand" + seeHand(goFishPlayer)); + + compValueInt = compPickValue(); + compValueString = getCardValue(compValueInt); + temp = checkHand(compValueString, goFishPlayer); + + } + deck.dealSingleCard(computer); + currentPlayer = goFishPlayer; + } + + + + public Integer compPickValue () { + Random random = new Random(); + Integer value = random.nextInt(13); + return value; + } + + public String getCardValue (Integer input) { + String result = ""; + CardValue[] cardValues = CardValue.values(); + for (CardValue c: cardValues + ) { + if (c.ordinal() == input) { + result = c.name(); + break; } } + return result; } + public void checkForFour () {} + + + + + + + public ArrayList checkHand (String value, GoFishPlayer player){ ArrayList cards = new ArrayList(0); @@ -85,25 +159,14 @@ public void addToHand (ArrayList cards, GoFishPlayer player) { player.setHand(temp); } - public void setActivePlayer (Boolean isActive) { - if (isActive) { - this.mainPlayer = activePlayer; - this.otherPlayer = passivePlayer; - } - else { - this.mainPlayer = passivePlayer; - this.otherPlayer = activePlayer; - } - } - public void update(Double amount) { - Double result = mainPlayer.getAccount() + amount; - mainPlayer.setAccount(result); + Double result = goFishPlayer.getAccount() + amount; + goFishPlayer.setAccount(result); } public void dealHands () { - deck.deal(5, mainPlayer); - deck.deal(5, otherPlayer); + deck.deal(5, goFishPlayer); + deck.deal(5, computer); } @@ -111,7 +174,7 @@ public String seeHand (GoFishPlayer player) { String hand = ""; for (Card c: player.getHand() ) { - hand += c.getCardValue() + " of " + c.getSuit() + " ==== "; + hand += c.getCardValue() + " of " + c.getSuit() + "\n"; } return hand; From bad6a7b40ca41b546f3d07f8e0072b4b9fe6b1f5 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Sun, 16 Jun 2019 18:45:22 -0400 Subject: [PATCH 67/71] added method for change card value from in to string --- .../zipcoder/casino/gameTools/CardValue.java | 8 +- .../java/io/zipcoder/casino/games/GoFish.java | 114 +++++++++++------- .../zipcoder/casino/player/GoFishPlayer.java | 11 ++ 3 files changed, 86 insertions(+), 47 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/gameTools/CardValue.java b/src/main/java/io/zipcoder/casino/gameTools/CardValue.java index 9e402fd5d..b213308e6 100644 --- a/src/main/java/io/zipcoder/casino/gameTools/CardValue.java +++ b/src/main/java/io/zipcoder/casino/gameTools/CardValue.java @@ -10,10 +10,10 @@ public enum CardValue { EIGHT(8), NINE(9), TEN(10), - JACK(11), - QUEEN(12), - KING(13), - ACE(14); + JACK(10), + QUEEN(10), + KING(10), + ACE(11); private Integer cardValue; diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 6431c84cb..c4c938962 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -15,55 +15,84 @@ public class GoFish extends Games { private GoFishPlayer goFishPlayer; private GoFishPlayer computer = new GoFishPlayer(); private GoFishPlayer currentPlayer = new GoFishPlayer(); - + ArrayList hand = new ArrayList(); private boolean isPlaying = true; - - - private Deck deck = new Deck(); - public GoFish() {} public GoFish(GoFishPlayer player, Console console) { super(); this.goFishPlayer = player; this.console = console; - } + public void runGame () { - console.println("Hey " + goFishPlayer.getName() + "! \nWelcome to GO FISH GAME"); - //String userInput = console.getStringInput("Do you want to play?"); - //if (readyToPlay(userInput)) { + console.println("Hey " + goFishPlayer.getName() + "! \nWelcome to GO FISH GAME\n"); dealHands(); currentPlayer = goFishPlayer; - while (deck.getDeck().size() > 0) { - if (currentPlayer == goFishPlayer) { playerTurn(); } else { compTurn(); } + checkForFour(currentPlayer); + } + getWinner(); + } + public void checkForFour (GoFishPlayer player) { + hand = player.getHand(); + String valueString; + Integer value; + int [] cardCount = new int[15]; + for (Card card : hand + ) { + valueString = card.getCardValue().name(); + value = cardValueToIntValue(valueString); + cardCount[value]++; + if (cardCount[value] == 4) { + console.println(player.getName() + " got 4 of the kind\n"); + removeFour(cardCount[value], hand); + player.setHand(hand); + updateScore(player); + } + } + } - - //} + public void removeFour (Integer value, ArrayList hand) { + for (Card card : hand + ) { + if (card.getCardValue().getCardIntegerValue() == value) { + hand.remove(card); + } } - } + public void getWinner() { + if (goFishPlayer.getScore() > computer.getScore()) { + console.println(goFishPlayer.getName() + "is the winner!\n Congratulations!"); + } + if (goFishPlayer.getScore() < computer.getScore()) { + console.println("Sorry " + goFishPlayer.getName() + "! You lost this game\n Would you like to play again?"); + } + else { + console.println("DRAW!\n Hey "+ goFishPlayer.getName() + "! Would you like to play again?"); - public void setCurrentPlayer(GoFishPlayer player) { + } + } + public void updateScore(GoFishPlayer player) { + player.setScore(player.getScore() + 1); + console.println("You score is " + player.getScore()); } public void playerTurn() { - console.println(seeHand(goFishPlayer)); - - console.println(seeHand(computer) + "comphand!"); + console.println( goFishPlayer.getName() + " your turn now! Your score is " + goFishPlayer.getScore() + "\n"); + console.println(seeHand(goFishPlayer)); String input = searchFor(); ArrayList temp = checkHand(input, computer); @@ -80,10 +109,12 @@ public void playerTurn() { } deck.dealSingleCard(goFishPlayer); + currentPlayer = computer; } public void compTurn() { + console.println("computers turn"); Integer compValueInt = compPickValue(); String compValueString = getCardValue(compValueInt); console.println("Computer picking " + compValueString); @@ -93,9 +124,11 @@ public void compTurn() { removeFromHand(temp, goFishPlayer); addToHand(temp, computer); - console.println("Comp got card/s from you"); - console.getStringInput(""); - console.println("your hand" + seeHand(goFishPlayer)); + console.println("Comp got this card/s from you"); + for (Card card: temp + ) { + console.println(card.getCardValue() + " of " + card.getSuit() + "\n"); + } compValueInt = compPickValue(); compValueString = getCardValue(compValueInt); @@ -127,14 +160,6 @@ public String getCardValue (Integer input) { return result; } - public void checkForFour () {} - - - - - - - public ArrayList checkHand (String value, GoFishPlayer player){ ArrayList cards = new ArrayList(0); @@ -180,19 +205,29 @@ public String seeHand (GoFishPlayer player) { } - public boolean readyToPlay(String userInput){ - if (userInput.equalsIgnoreCase("yes")) { - return true; - } - else { - return false;} - } public String searchFor() { String userInput = console.getStringInput("What are you looking for?"); return userInput.toUpperCase(); } + public Integer cardValueToIntValue (String string) { + if (string.equals("TWO")) {return 2;} + else if (string.equals("THREE")) {return 3;} + else if (string.equals("FOUR")) {return 4;} + else if (string.equals("FIVE")) {return 5;} + else if (string.equals("SIX")) {return 6;} + else if (string.equals("SEVEN")) {return 7;} + else if (string.equals("EIGHT")) {return 8;} + else if (string.equals("NINE")) {return 9;} + else if (string.equals("TEN")) {return 10;} + else if (string.equals("JACK")) {return 11;} + else if (string.equals("QUEEN")) {return 12;} + else if (string.equals("KING")) {return 13;} + else if (string.equals("ACE")) {return 14;} + else return null; + } + @Override void nextTurn() { @@ -211,11 +246,4 @@ public void display(String output) { super.display(output); } - public Card check (Integer query) { - return null; - }; - - public Card goFishAction () { - return null; - } } diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index b30700946..04c9c128c 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -8,11 +8,22 @@ public class GoFishPlayer extends CardGamePlayer { + Integer score; + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + public GoFishPlayer() {} public GoFishPlayer(Player player) { super(player); + score = 0; } public void endturn() {}; From 66195b1c86bf38bfcbcb8ed3acfbb14704fbe813 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Sun, 16 Jun 2019 23:23:57 -0400 Subject: [PATCH 68/71] sunday night --- .../java/io/zipcoder/casino/games/GoFish.java | 115 +++++++++--- .../casino/player/CardGamePlayer.java | 31 ++- .../zipcoder/casino/player/GoFishPlayer.java | 11 +- .../io/zipcoder/casino/games/GoFishTest.java | 177 +++++++++++++++--- 4 files changed, 278 insertions(+), 56 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index c4c938962..97461baf1 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -13,11 +13,14 @@ public class GoFish extends Games { Console console; private GoFishPlayer goFishPlayer; - private GoFishPlayer computer = new GoFishPlayer(); - private GoFishPlayer currentPlayer = new GoFishPlayer(); - ArrayList hand = new ArrayList(); +// private GoFishPlayer computer = new GoFishPlayer(); + private Player test = new Player("Computer"); + GoFishPlayer computer = new GoFishPlayer(test); + private GoFishPlayer currentPlayer; + private ArrayList hand = new ArrayList(); private boolean isPlaying = true; private Deck deck = new Deck(); + Integer computerScore = 0; public GoFish() {} @@ -25,6 +28,7 @@ public GoFish(GoFishPlayer player, Console console) { super(); this.goFishPlayer = player; this.console = console; + } public void runGame () { @@ -38,12 +42,11 @@ public void runGame () { else { compTurn(); } - checkForFour(currentPlayer); } getWinner(); } - public void checkForFour (GoFishPlayer player) { + public Boolean checkForFour (GoFishPlayer player) { hand = player.getHand(); String valueString; Integer value; @@ -54,28 +57,40 @@ public void checkForFour (GoFishPlayer player) { value = cardValueToIntValue(valueString); cardCount[value]++; if (cardCount[value] == 4) { - console.println(player.getName() + " got 4 of the kind\n"); - removeFour(cardCount[value], hand); - player.setHand(hand); - updateScore(player); + return true; } } + return false; + } + + + public boolean checkProperPick (String userInput, GoFishPlayer player) { + for (Card card: player.getHand() + ) { + if (card.getCardValue().name().equals(userInput)) { + return true; + } + } + return false; } - public void removeFour (Integer value, ArrayList hand) { + public void removeFour (String stringValue, ArrayList hand) { + ArrayList cardsToRemove = new ArrayList(); for (Card card : hand ) { - if (card.getCardValue().getCardIntegerValue() == value) { - hand.remove(card); + if (card.getCardValue().name().equals(stringValue)) { + cardsToRemove.add(card); } } + hand.removeAll(cardsToRemove); + } public void getWinner() { - if (goFishPlayer.getScore() > computer.getScore()) { + if (goFishPlayer.getScore() > computerScore) { console.println(goFishPlayer.getName() + "is the winner!\n Congratulations!"); } - if (goFishPlayer.getScore() < computer.getScore()) { + if (goFishPlayer.getScore() < computerScore) { console.println("Sorry " + goFishPlayer.getName() + "! You lost this game\n Would you like to play again?"); } else { @@ -90,26 +105,47 @@ public void updateScore(GoFishPlayer player) { } public void playerTurn() { + hand = goFishPlayer.getHand(); + console.println( goFishPlayer.getName() + " your turn now! Your score is " + goFishPlayer.getScore() + "\n"); - console.println(seeHand(goFishPlayer)); + console.println(seeHand(hand)); String input = searchFor(); + while (!checkProperPick(input, goFishPlayer)) { + console.println("no such card in your hand, impossible move, try again"); + input = searchFor(); + } ArrayList temp = checkHand(input, computer); - while (!temp.isEmpty()) { + while (!temp.isEmpty()) { removeFromHand(temp, computer); addToHand(temp, goFishPlayer); console.println("You got card/s from computer"); + console.println(seeHand(temp)); console.getStringInput(""); - console.println("your hand: \n" + seeHand(goFishPlayer)); + + if (checkForFour(goFishPlayer)) { + console.println( goFishPlayer.getName()+ ", look at this!!! Boomoooooooom! 4 of the kind\n"); + removeFour(input, hand); + goFishPlayer.setHand(hand); + updateScore(goFishPlayer); + } + + console.println("your hand: \n" + seeHandByPlayer(goFishPlayer)); input = searchFor(); temp = checkHand(input, computer); } - deck.dealSingleCard(goFishPlayer); + goFishAction(goFishPlayer); + if (checkForFour(goFishPlayer)) { + console.println( goFishPlayer.getName()+ ", look at this!!! Boomoooooooom! 4 of the kind\n"); + removeFour(input, hand); + goFishPlayer.setHand(hand); + updateScore(goFishPlayer); + } currentPlayer = computer; } @@ -117,17 +153,25 @@ public void compTurn() { console.println("computers turn"); Integer compValueInt = compPickValue(); String compValueString = getCardValue(compValueInt); + + while (!checkProperPick(compValueString,computer)) { + compValueInt = compPickValue(); + compValueString = getCardValue(compValueInt); + } + console.println("Computer picking " + compValueString); ArrayList temp = checkHand(compValueString, goFishPlayer); while (!temp.isEmpty()) { - removeFromHand(temp, goFishPlayer); addToHand(temp, computer); console.println("Comp got this card/s from you"); - for (Card card: temp - ) { - console.println(card.getCardValue() + " of " + card.getSuit() + "\n"); + console.println(seeHand(temp)); + if (checkForFour(goFishPlayer)) { + console.println( "Boomoooooooom! 4 of the kind for COMPUTERMAN\n"); + removeFour(compValueString, hand); + computer.setHand(hand); + computerScore++; } compValueInt = compPickValue(); @@ -135,12 +179,17 @@ public void compTurn() { temp = checkHand(compValueString, goFishPlayer); } - deck.dealSingleCard(computer); + console.getStringInput(""); + goFishAction(computer); + if (checkForFour(goFishPlayer)) { + console.println( "Boomoooooooom! 4 of the kind for COMPUTERMAN\n"); + removeFour(compValueString, hand); + computer.setHand(hand); + computerScore++; + } currentPlayer = goFishPlayer; } - - public Integer compPickValue () { Random random = new Random(); Integer value = random.nextInt(13); @@ -194,15 +243,22 @@ public void dealHands () { deck.deal(5, computer); } + public String seeHand(ArrayList hand) { + String result = ""; + for (Card c: hand + ) { + result += c.getCardValue() + " of " + c.getSuit() + "\n"; + } + return result; + } - public String seeHand (GoFishPlayer player) { + public String seeHandByPlayer(GoFishPlayer player) { String hand = ""; for (Card c: player.getHand() ) { hand += c.getCardValue() + " of " + c.getSuit() + "\n"; } return hand; - } @@ -227,6 +283,11 @@ public Integer cardValueToIntValue (String string) { else if (string.equals("ACE")) {return 14;} else return null; } + public void goFishAction(GoFishPlayer player) { + console.println("no such cand in the hand!\nYOU GO FISH!"); + deck.dealSingleCard(player); + + } @Override diff --git a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java index e6b3b7928..3b06118b4 100644 --- a/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java +++ b/src/main/java/io/zipcoder/casino/player/CardGamePlayer.java @@ -9,14 +9,36 @@ public class CardGamePlayer { private Player player; private ArrayList hand; + private Integer score; + private String name; - public CardGamePlayer (Player player) { + + public Player getPlayer() { + return player; + } + + public void setPlayer(Player player) { this.player = player; + } + + + public Integer getScore() { + return score; + } + public void setScore(Integer score) { + this.score = score; } - public ArrayList getHand() { + + public CardGamePlayer (Player player) { + this.player = player; + } + public CardGamePlayer () { + + } + public ArrayList getHand() { return hand; } @@ -26,7 +48,10 @@ public void setHand(ArrayList hand) { public void endturn() {}; - public CardGamePlayer(){}; + public CardGamePlayer(String name, Integer score) { + this.name = name; + this.score = score; + } public String getName() { return player.getName(); diff --git a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java index 04c9c128c..721f69560 100644 --- a/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java +++ b/src/main/java/io/zipcoder/casino/player/GoFishPlayer.java @@ -7,9 +7,16 @@ import java.util.ArrayList; public class GoFishPlayer extends CardGamePlayer { - + String name; Integer score; + public GoFishPlayer(String name, Integer score) { + this.name = name; + this.score = score; + } + + public GoFishPlayer() {} + public Integer getScore() { return score; } @@ -19,8 +26,6 @@ public void setScore(Integer score) { } - public GoFishPlayer() {} - public GoFishPlayer(Player player) { super(player); score = 0; diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index 0af643a27..eadad3bd8 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -1,60 +1,191 @@ package io.zipcoder.casino.games; +import io.zipcoder.casino.gameTools.Card; +import io.zipcoder.casino.gameTools.CardValue; +import io.zipcoder.casino.gameTools.Suit; +import io.zipcoder.casino.player.GoFishPlayer; +import io.zipcoder.casino.player.Player; +import io.zipcoder.casino.utilities.Console; import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; + public class GoFishTest { - //GoFish goFish = new GoFish(); + Console console = new Console(System.in, System.out); + Player player = new Player("Aaaaa"); + GoFishPlayer goFishPlayer = new GoFishPlayer(player); + GoFish goFish = new GoFish(goFishPlayer,console); - @Test - public void nextTurn() { - } @Test - public void endGame() { + public void createOtherPlayersTest() { + GoFish goFish = new GoFish(); + Integer expected = 2; + //Integer actual = goFish.createOtherPlayers(expected).size(); + //Assert.assertEquals(expected,actual); } @Test - public void getResults() { + public void runGoFishGameStart() { + } @Test - public void display() { + public void removeFourTest() { + GoFish goFish = new GoFish(); + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.ACE, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + goFish.removeFour("ACE",hand); + Integer expected = 0; + Integer actual = hand.size(); + Assert.assertEquals(expected,actual); } @Test - public void check() { + public void removeFourTest1() { + GoFish goFish = new GoFish(); + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.ACE, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + + goFish.removeFour("ACE",hand); + Integer expected = 1; + Integer actual = hand.size(); + Assert.assertEquals(expected,actual); } @Test - public void goFish() { + public void removeFourTest2() { + GoFish goFish = new GoFish(); + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.ACE, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + + goFish.removeFour("ACE",hand); + Assert.assertTrue(hand.get(0).equals(card5)); } + @Test - public void getCurrentBet() { + public void checkProperPickTest() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.ACE, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + goFishPlayer.setHand(hand); + Assert.assertTrue(goFish.checkProperPick("TWO",goFishPlayer)); } - @Test - public void setCurrentBet() { + public void checkProperPickTest1() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.ACE, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + goFishPlayer.setHand(hand); + Assert.assertFalse(goFish.checkProperPick("SIX",goFishPlayer)); + } + @Test (expected = NullPointerException.class) + public void checkProperPickTest2() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.ACE, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + goFishPlayer.setHand(hand); + goFish.checkProperPick("SIX",new GoFishPlayer()); } @Test - public void inputNumPlayers() { - + public void checkForFourTest() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.ACE, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + goFishPlayer.setHand(hand); + goFish.checkForFour(goFishPlayer); + Integer expected = 1; + Integer actual = goFishPlayer.getHand().size(); + Assert.assertTrue(goFish.checkForFour(goFishPlayer)); } - @Test - public void createOtherPlayersTest() { - GoFish goFish = new GoFish(); - Integer expected = 2; - //Integer actual = goFish.createOtherPlayers(expected).size(); - //Assert.assertEquals(expected,actual); + public void checkForFourTest1() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.KING, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + goFishPlayer.setHand(hand); + goFish.checkForFour(goFishPlayer); + Integer expected = 1; + Integer actual = goFishPlayer.getHand().size(); + Assert.assertFalse(goFish.checkForFour(goFishPlayer)); } - @Test - public void runGoFishGameStart() { + public void RunGame() { + goFish.runGame(); + } + } -} \ No newline at end of file + From 5b43db2f440a26336e648d817a3288d21e3fc174 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Mon, 17 Jun 2019 13:05:30 -0400 Subject: [PATCH 69/71] monday --- .../java/io/zipcoder/casino/games/GoFish.java | 90 +++++++++++-------- .../io/zipcoder/casino/games/GoFishTest.java | 10 +++ 2 files changed, 63 insertions(+), 37 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 97461baf1..ae1ce6a03 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -19,6 +19,8 @@ public class GoFish extends Games { private GoFishPlayer currentPlayer; private ArrayList hand = new ArrayList(); private boolean isPlaying = true; + private boolean breakTheGame = false; + private Deck deck = new Deck(); Integer computerScore = 0; @@ -33,17 +35,31 @@ public GoFish(GoFishPlayer player, Console console) { public void runGame () { console.println("Hey " + goFishPlayer.getName() + "! \nWelcome to GO FISH GAME\n"); + while (isPlaying) { dealHands(); currentPlayer = goFishPlayer; while (deck.getDeck().size() > 0) { if (currentPlayer == goFishPlayer) { playerTurn(); - } - else { + } else { compTurn(); } - } + } getWinner(); + String choice = console.getStringInput("would you like to play again?"); + isPlaying = playAgain(choice); + } + + } + + public boolean playAgain(String choice) { + + if (choice.equalsIgnoreCase("yes")) { + return true; + } + else { + return false; + } } public Boolean checkForFour (GoFishPlayer player) { @@ -112,41 +128,43 @@ public void playerTurn() { console.println(seeHand(hand)); String input = searchFor(); - while (!checkProperPick(input, goFishPlayer)) { - console.println("no such card in your hand, impossible move, try again"); - input = searchFor(); - } - ArrayList temp = checkHand(input, computer); + if (!breakTheGame) { + while (!checkProperPick(input, goFishPlayer)) { + console.println("no such card in your hand, impossible move, try again"); + input = searchFor(); + } + ArrayList temp = checkHand(input, computer); + + while (!temp.isEmpty()) { + removeFromHand(temp, computer); + addToHand(temp, goFishPlayer); + console.println("You got card/s from computer"); + console.println(seeHand(temp)); + console.getStringInput(""); + + if (checkForFour(goFishPlayer)) { + console.println(goFishPlayer.getName() + ", look at this!!! Boomoooooooom! 4 of the kind\n"); + removeFour(input, hand); + goFishPlayer.setHand(hand); + updateScore(goFishPlayer); + } - while (!temp.isEmpty()) { - removeFromHand(temp, computer); - addToHand(temp, goFishPlayer); - console.println("You got card/s from computer"); - console.println(seeHand(temp)); - console.getStringInput(""); + console.println("your hand: \n" + seeHandByPlayer(goFishPlayer)); + + input = searchFor(); + temp = checkHand(input, computer); + + } + goFishAction(goFishPlayer); if (checkForFour(goFishPlayer)) { - console.println( goFishPlayer.getName()+ ", look at this!!! Boomoooooooom! 4 of the kind\n"); + console.println(goFishPlayer.getName() + ", look at this!!! Boomoooooooom! 4 of the kind\n"); removeFour(input, hand); goFishPlayer.setHand(hand); updateScore(goFishPlayer); } - - console.println("your hand: \n" + seeHandByPlayer(goFishPlayer)); - - input = searchFor(); - temp = checkHand(input, computer); - + currentPlayer = computer; } - goFishAction(goFishPlayer); - - if (checkForFour(goFishPlayer)) { - console.println( goFishPlayer.getName()+ ", look at this!!! Boomoooooooom! 4 of the kind\n"); - removeFour(input, hand); - goFishPlayer.setHand(hand); - updateScore(goFishPlayer); - } - currentPlayer = computer; } public void compTurn() { @@ -264,6 +282,10 @@ public String seeHandByPlayer(GoFishPlayer player) { public String searchFor() { String userInput = console.getStringInput("What are you looking for?"); + if (userInput.equalsIgnoreCase("exit")) { + console.println("Good bye!"); + breakTheGame = true; + } return userInput.toUpperCase(); } @@ -284,9 +306,8 @@ public Integer cardValueToIntValue (String string) { else return null; } public void goFishAction(GoFishPlayer player) { - console.println("no such cand in the hand!\nYOU GO FISH!"); + console.println("no such card in the hand!\nYOU GO FISH!"); deck.dealSingleCard(player); - } @@ -302,9 +323,4 @@ boolean getResults() { return false; } - @Override - public void display(String output) { - super.display(output); - } - } diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index eadad3bd8..b0138716f 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -187,5 +187,15 @@ public void RunGame() { } + @Test + public void playAgainTest() { + String choice = "YES"; + Assert.assertTrue(goFish.playAgain(choice)); + } + @Test + public void playAgainTest1() { + String choice = "no"; + Assert.assertFalse(goFish.playAgain(choice)); } +} From aad884deaff138f31582a0609f81ec783cf5b9f1 Mon Sep 17 00:00:00 2001 From: alilinykh Date: Mon, 17 Jun 2019 15:08:11 -0400 Subject: [PATCH 70/71] 315 --- .../java/io/zipcoder/casino/games/GoFish.java | 5 -- .../io/zipcoder/casino/games/GoFishTest.java | 84 ++++++++++++++----- 2 files changed, 64 insertions(+), 25 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index ae1ce6a03..75967c271 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -251,11 +251,6 @@ public void addToHand (ArrayList cards, GoFishPlayer player) { player.setHand(temp); } - public void update(Double amount) { - Double result = goFishPlayer.getAccount() + amount; - goFishPlayer.setAccount(result); - } - public void dealHands () { deck.deal(5, goFishPlayer); deck.deal(5, computer); diff --git a/src/test/io/zipcoder/casino/games/GoFishTest.java b/src/test/io/zipcoder/casino/games/GoFishTest.java index b0138716f..ea366b26c 100644 --- a/src/test/io/zipcoder/casino/games/GoFishTest.java +++ b/src/test/io/zipcoder/casino/games/GoFishTest.java @@ -18,21 +18,6 @@ public class GoFishTest { GoFish goFish = new GoFish(goFishPlayer,console); - - - @Test - public void createOtherPlayersTest() { - GoFish goFish = new GoFish(); - Integer expected = 2; - //Integer actual = goFish.createOtherPlayers(expected).size(); - //Assert.assertEquals(expected,actual); - } - - @Test - public void runGoFishGameStart() { - - } - @Test public void removeFourTest() { GoFish goFish = new GoFish(); @@ -181,11 +166,6 @@ public void checkForFourTest1() { Integer actual = goFishPlayer.getHand().size(); Assert.assertFalse(goFish.checkForFour(goFishPlayer)); } - @Test - public void RunGame() { - goFish.runGame(); - } - @Test public void playAgainTest() { @@ -197,5 +177,69 @@ public void playAgainTest1() { String choice = "no"; Assert.assertFalse(goFish.playAgain(choice)); } + + @Test + public void removeFromHandTest() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.KING, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + ArrayList cardsRemove = new ArrayList(); + cardsRemove.add(card1); + goFishPlayer.setHand(hand); + goFish.removeFromHand(cardsRemove,goFishPlayer); + Integer expected = 4; + Integer actual = goFishPlayer.getHand().size(); + Assert.assertEquals(expected,actual); + } + @Test + public void removeFromHandTest1() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.KING, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + ArrayList cardsRemove = new ArrayList(); + cardsRemove.addAll(hand); + goFishPlayer.setHand(hand); + goFish.removeFromHand(cardsRemove,goFishPlayer); + Assert.assertTrue(goFishPlayer.getHand().isEmpty()); + } + + @Test + public void addToHandTest() { + ArrayList hand = new ArrayList(4); + Card card1 = new Card(CardValue.KING, Suit.CLUBS); + Card card2 = new Card(CardValue.ACE, Suit.CLUBS); + Card card3 = new Card(CardValue.ACE, Suit.CLUBS); + Card card4 = new Card(CardValue.ACE, Suit.CLUBS); + Card card5 = new Card(CardValue.TWO, Suit.CLUBS); + hand.add(card1); + hand.add(card2); + hand.add(card3); + hand.add(card4); + hand.add(card5); + ArrayList cardsToAdd = new ArrayList(); + cardsToAdd.add(card1); + goFishPlayer.setHand(hand); + goFish.addToHand(cardsToAdd,goFishPlayer); + Integer expected = 6; + Integer actual = goFishPlayer.getHand().size(); + Assert.assertEquals(expected,actual); + } + } From 235a2609d29ebed16b93bdcf9811be67dab99c8d Mon Sep 17 00:00:00 2001 From: alilinykh Date: Wed, 19 Jun 2019 14:27:12 -0400 Subject: [PATCH 71/71] some stuff --- src/main/java/io/zipcoder/casino/games/GoFish.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/io/zipcoder/casino/games/GoFish.java b/src/main/java/io/zipcoder/casino/games/GoFish.java index 75967c271..59104080b 100644 --- a/src/main/java/io/zipcoder/casino/games/GoFish.java +++ b/src/main/java/io/zipcoder/casino/games/GoFish.java @@ -122,9 +122,7 @@ public void updateScore(GoFishPlayer player) { public void playerTurn() { hand = goFishPlayer.getHand(); - console.println( goFishPlayer.getName() + " your turn now! Your score is " + goFishPlayer.getScore() + "\n"); - console.println(seeHand(hand)); String input = searchFor(); @@ -191,7 +189,6 @@ public void compTurn() { computer.setHand(hand); computerScore++; } - compValueInt = compPickValue(); compValueString = getCardValue(compValueInt); temp = checkHand(compValueString, goFishPlayer); @@ -305,7 +302,6 @@ public void goFishAction(GoFishPlayer player) { deck.dealSingleCard(player); } - @Override void nextTurn() { }