Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
fdd8e41
created all classes and interfaces for Casino
Feb 22, 2019
a409837
implemented all Interface methods so code compiles
Feb 22, 2019
1409695
Merge pull request #1 from caraeppes/master
caraeppes Feb 22, 2019
41c2070
created packages and cards and a BJ test case
Feb 23, 2019
0f8c42b
Merge pull request #2 from DelendaJ/master
caraeppes Feb 23, 2019
2787adc
wrote method stubs
Feb 23, 2019
d8d3879
created drawCard method and deck
Feb 23, 2019
dfecf76
neela changes
Feb 23, 2019
a1dd401
Merge branch 'master' of https://github.com/NeelaMukherjee/Maven.Casino
Feb 23, 2019
acc7bf3
Merge branch 'master' into pr/3
Feb 23, 2019
596849e
imported plaeyr package to yahtzee
Feb 23, 2019
9d35fad
Merge pull request #5 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 23, 2019
a27d21e
wrote tests for Yahtzee Constructor, getAllDice, and getScoreForCategory
caraeppes Feb 23, 2019
21e2dde
added more tests for scoring
caraeppes Feb 23, 2019
3b220a0
added some score methods
caraeppes Feb 23, 2019
c6582a3
created tests for methods that check if Dice have straight, yahtzees,…
caraeppes Feb 23, 2019
ec421ce
wrote tests for several score methods
caraeppes Feb 23, 2019
bd7b9b1
wrote code for all test cases to pass
caraeppes Feb 23, 2019
5d721ab
added stub methods for Go Fish and Go Fish Player
Feb 23, 2019
bb05e03
Merge pull request #6 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 23, 2019
dff2b4d
started tests for yahtzeePlayer
caraeppes Feb 23, 2019
64873b8
Merge pull request #7 from caraeppes/master
caraeppes Feb 23, 2019
2bedeb9
wrote tests for Yahtzee Player's methods
caraeppes Feb 24, 2019
6f963ee
moved markScoreCard method from YahtzeePlayer to Yahtzee. completed …
caraeppes Feb 24, 2019
ccef48d
edited some methods while working on the console and user interaction
caraeppes Feb 24, 2019
d523534
writing tests for consoles display
caraeppes Feb 24, 2019
93a5b01
Merge pull request #8 from caraeppes/master
caraeppes Feb 24, 2019
0d804d6
did some test cases and added some card methods
Feb 24, 2019
b6671ed
changed hand class
Feb 24, 2019
444c7a9
changed hand class location
Feb 24, 2019
091ce25
swiched location of gofish and gofishplayer
Feb 24, 2019
2436e1d
added tests for all methods that will be used to display score card
caraeppes Feb 24, 2019
5d76f25
class location change
Feb 24, 2019
61979c6
added imports
Feb 24, 2019
abea4c0
added imports
Feb 24, 2019
f77edfe
added imports
Feb 24, 2019
c6ff236
Merge pull request #4 from DelendaJ/master
NeelaMukherjee Feb 24, 2019
9df1e73
writing methods to pass all toString tests
caraeppes Feb 24, 2019
d99f7ee
Merge pull request #9 from caraeppes/master
caraeppes Feb 24, 2019
03ae588
Go Fish and Player changes
Feb 24, 2019
c317bc8
Merge pull request #10 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 24, 2019
1eda4d0
worked on play method in yahtzee. game is almost completely function…
caraeppes Feb 24, 2019
715e3c5
Merge pull request #11 from caraeppes/master
caraeppes Feb 24, 2019
cd2b053
wrote tests and mmethods for scoring methods
caraeppes Feb 24, 2019
442c0fc
yahtzee is fully functional
caraeppes Feb 24, 2019
1d30620
added the fourOfAKind method check method
Feb 24, 2019
f9ae35b
Merge pull request #12 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 24, 2019
656cdd6
handled errors from invalid user input
caraeppes Feb 24, 2019
c4796e5
Merge pull request #13 from caraeppes/master
caraeppes Feb 24, 2019
70af351
Initial craps changes with methods for betting
Feb 24, 2019
747b0b9
Merge pull request #14 from JimCoates/master
JimCoates Feb 24, 2019
da3af9c
added ability to have multiple decks
Feb 24, 2019
83eb43a
Merge branch 'master' into master
DelendaJ Feb 24, 2019
f5dc945
Merge pull request #15 from DelendaJ/master
caraeppes Feb 24, 2019
754f30d
added hand methods
Feb 24, 2019
6e267e7
Merge pull request #16 from DelendaJ/DelendaCasino
NeelaMukherjee Feb 25, 2019
5e7037d
added run method to Casino and allowed user to choose game
caraeppes Feb 25, 2019
53d79c8
Merge pull request #17 from caraeppes/master
caraeppes Feb 25, 2019
50b3ed7
adjusted Casino run method
caraeppes Feb 25, 2019
732202b
small changes to finetune things
caraeppes Feb 25, 2019
b0af5aa
Merge pull request #18 from caraeppes/master
caraeppes Feb 25, 2019
5f549cf
yahtze updates
caraeppes Feb 25, 2019
704be76
Merge pull request #19 from caraeppes/master
caraeppes Feb 25, 2019
2f86842
fixed mege conflicts
Feb 25, 2019
ede9cc1
Merge pull request #20 from kylecarter2020/master
caraeppes Feb 25, 2019
a570bbb
added cards to remove from hand
Feb 25, 2019
94ef136
Merge pull request #21 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 25, 2019
34e2157
changes to craps and craps player
Feb 25, 2019
76e1d6a
Merge pull request #22 from JimCoates/master
JimCoates Feb 25, 2019
cae9992
fixed casino and yahtzee so project compiles
caraeppes Feb 25, 2019
31284c8
Merge pull request #23 from caraeppes/master
caraeppes Feb 25, 2019
c8febd6
added abiltiy to print string values of cards
Feb 25, 2019
e4ca9e9
Merge pull request #24 from kylecarter2020/master
NeelaMukherjee Feb 25, 2019
135cbbc
Started GoFishPlayerTests
caraeppes Feb 25, 2019
08723bc
Merge pull request #25 from caraeppes/master
caraeppes Feb 25, 2019
f941463
GoFish Player methods added
Feb 25, 2019
f7963dc
working on GoFish Tests
caraeppes Feb 25, 2019
d5e2dca
Merge pull request #26 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 25, 2019
07b39ef
Merge pull request #27 from caraeppes/master
caraeppes Feb 25, 2019
533c0d5
changed tests so code will compile
caraeppes Feb 25, 2019
3d017ba
Merge pull request #28 from caraeppes/master
caraeppes Feb 25, 2019
7107ec9
updated hand and added more hand tests
Feb 25, 2019
c986a83
Merge pull request #29 from DelendaJ/DelendaCasino
NeelaMukherjee Feb 25, 2019
09cad04
GoFishPlayerTests are passing
caraeppes Feb 25, 2019
0e9fc91
Started with the play method
Feb 25, 2019
ad9cc54
Merge pull request #30 from caraeppes/master
caraeppes Feb 25, 2019
e12a7e9
Merge pull request #31 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 25, 2019
6d09c64
refactored hand class and hand tests
Feb 25, 2019
f9bcd5b
Merge pull request #32 from DelendaJ/DelendaCasino
NeelaMukherjee Feb 25, 2019
b45f35e
updated tests
caraeppes Feb 25, 2019
a32b92d
first draft of Go Fish
Feb 25, 2019
26decfe
Merge pull request #33 from caraeppes/master
caraeppes Feb 25, 2019
0ef4721
Merge pull request #34 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 25, 2019
fa41714
Hand Class changed
Feb 25, 2019
5730887
Hand and Go Fish
Feb 25, 2019
6f16af3
Merge pull request #35 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 25, 2019
95e6433
Go Fish
Feb 25, 2019
138b9b9
Merge pull request #36 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 25, 2019
ad12ea3
created blackjackplayer tests and methods
Feb 25, 2019
21baa7b
Merge pull request #37 from DelendaJ/DelendaCasino
kylecarter2020 Feb 25, 2019
5b7041a
adjusted go fish to support more user interaction
caraeppes Feb 26, 2019
dc858ff
Merge pull request #38 from caraeppes/master
caraeppes Feb 26, 2019
fe56abd
broke play down into smaller methods
caraeppes Feb 26, 2019
803f217
Merge pull request #39 from caraeppes/master
caraeppes Feb 26, 2019
fc3ddb1
Craps tests and craps actions
Feb 26, 2019
f15e533
Merge pull request #40 from JimCoates/master
JimCoates Feb 26, 2019
c59595b
adjusted call to blackjack constructor
caraeppes Feb 26, 2019
1f2424f
Merge pull request #41 from caraeppes/master
caraeppes Feb 26, 2019
d4d3c03
created blackjack constructor
Feb 26, 2019
a185d97
Merge pull request #42 from DelendaJ/DelendaCasino
caraeppes Feb 26, 2019
a375b31
fixed blackjack test
Feb 26, 2019
6f698cd
fixed blackjack test
Feb 26, 2019
6c6d642
fixed failing blackjack test
DelendaJ Feb 26, 2019
c7d133d
Merge branch 'master' into master
DelendaJ Feb 26, 2019
3aa02c8
Merge pull request #43 from DelendaJ/master
caraeppes Feb 26, 2019
2586fcb
resolved merge conflict
Feb 26, 2019
cf6b2ce
added play method to blackjack constructor
Feb 26, 2019
db8c86b
Merge pull request #44 from DelendaJ/DelendaCasino
caraeppes Feb 26, 2019
4b39473
added stub for blacksjack unit test
Feb 26, 2019
5af0106
deleted original blackjack test
Feb 26, 2019
18361e6
added some go fish tests
caraeppes Feb 26, 2019
c429f18
Go Fish
Feb 26, 2019
1b6d404
Merge pull request #45 from caraeppes/master
caraeppes Feb 26, 2019
ebf7343
Merge pull request #46 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 26, 2019
a3fa607
fixed error in tests
caraeppes Feb 26, 2019
daa9f31
Merge pull request #47 from caraeppes/master
caraeppes Feb 26, 2019
81797ba
added walkaway and end of game methods
caraeppes Feb 26, 2019
1eaffb8
Merge pull request #48 from caraeppes/master
caraeppes Feb 26, 2019
41ce0a5
added tests
caraeppes Feb 26, 2019
e7eadc0
More tests, hardway
Feb 26, 2019
296158f
Merge pull request #49 from caraeppes/master
caraeppes Feb 26, 2019
bab0317
Merge pull request #50 from JimCoates/master
JimCoates Feb 26, 2019
f876456
added new Blackjack enum, added functions to blackjack
Feb 26, 2019
d2238d1
Merge branch 'master' into master
DelendaJ Feb 26, 2019
11e2a90
Merge pull request #51 from DelendaJ/master
NeelaMukherjee Feb 26, 2019
c1cbbf4
updated tests
caraeppes Feb 26, 2019
4ffdc9b
Merge pull request #52 from caraeppes/master
caraeppes Feb 26, 2019
9a65f42
go Fish tests
Feb 26, 2019
cc21ca5
Merge pull request #53 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 26, 2019
26f0f0e
go fist test
Feb 26, 2019
4e85565
Merge pull request #54 from NeelaMukherjee/pr/3
NeelaMukherjee Feb 26, 2019
da1a57e
go fish tests
Feb 27, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
24 changes: 24 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@
<groupId>io.zipcoder</groupId>
<artifactId>casino</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>6</source>
<target>6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>

</build>




<dependencies>
<dependency>
Expand Down
Binary file added src/.DS_Store
Binary file not shown.
Binary file added src/main/.DS_Store
Binary file not shown.
Binary file added src/main/java/.DS_Store
Binary file not shown.
Binary file added src/main/java/io/.DS_Store
Binary file not shown.
Binary file added src/main/java/io/zipcoder/.DS_Store
Binary file not shown.
121 changes: 121 additions & 0 deletions src/main/java/io/zipcoder/casino/CardGame/BlackJack/Blackjack.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
package io.zipcoder.casino.CardGame.BlackJack;

import io.zipcoder.casino.CardGame.CardGame;
import io.zipcoder.casino.CardGame.Cards.Deck;
import io.zipcoder.casino.GamblingGame;
import io.zipcoder.casino.Player;
import io.zipcoder.casino.utilities.Console;

public class Blackjack extends CardGame implements GamblingGame {
private double pot;
private BlackjackPlayer blackjackPlayer;
private BlackjackPlayer dealer;
private Player player;
private Deck deck;
private double bet;
private int playerCardTotal;
private int dealerCardTotal;
private Console console = Console.getInstance();


public Blackjack(Player player) {
this.blackjackPlayer = new BlackjackPlayer(player);
this.pot = 0;
this.player = new Player("Dealer", 0);
this.dealer = new BlackjackPlayer(this.player);
this.deck = new Deck(10);
this.deck.shuffle();
}

public void takeBet(double amount) {
pot += amount;
}

public double payout() {

return this.pot * 2;


}


public double push(){
return 0;
}

public void play() {
setBet(console.getDoubleInput("How much money do you want to lose? "));

while (!validateBet()){
setBet(console.getDoubleInput("Whoa there, scammer! You can't bet what you don't have! "));

}

blackjackPlayer.bet(getBet());
takeBet(getBet());

blackjackPlayer.setHand(deck.deal(2));
dealer.setHand(deck.deal(2));

console.println(blackjackPlayer.getHand().toString());

console.println("Your cards total " + blackjackPlayer.sumOfHand().toString());

if (blackjackPlayer.sumOfHand() == 21){
console.println("Congrats, cheater! You win!");
blackjackPlayer.collect(payout());
this.pot = 0;
play();
}

else if (blackjackPlayer.sumOfHand() > 21){
console.println("You lose!");
this.pot = 0;
play();
}

else {
int choice = console.getIntegerInput(menu());

}








}

public boolean validateBet(){
boolean result = false;
if (this.bet < this.blackjackPlayer.getBlackjackPlayerWallet()) {
result = true;

}

return result;
}

public void walkAway() {

}

public double getPot(){
return pot;
}

public void setBet(double bet) {
this.bet = bet;
}

public double getBet() {
return this.bet;
}

public String menu() {
return "**Enter 1 to Hit\n**Enter 2 to Stand \n**Enter 3 to Double Down\n**Enter 4 to Split\n**Enter 5 to Walk away\n\nMake a Move! ";

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package io.zipcoder.casino.CardGame.BlackJack;

public enum BlackjackActions {

HIT(1),
STAND(2),
DOUBLEDOWN(3),
SPLIT(4),
WALKAWAY(5);

int actionValue;

BlackjackActions (int actionValue) {
this.actionValue = actionValue;
}


public int getActionValue() {
return actionValue;
}


}

Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package io.zipcoder.casino.CardGame.BlackJack;

import io.zipcoder.casino.CardGame.Cards.Card;
import io.zipcoder.casino.CardGame.Cards.Deck;
import io.zipcoder.casino.CardGame.Hand;
import io.zipcoder.casino.GamblingPlayer;
import io.zipcoder.casino.Player;

import java.util.ArrayList;

public class BlackjackPlayer implements GamblingPlayer {
private Hand hand;
private Player player;
private double wallet;

public BlackjackPlayer(Player player) {
this.player = player;
this.wallet = player.getWallet();

}

public double getBlackjackPlayerWallet() {
return this.wallet;

}

public void bet(double amount) {
this.wallet -= amount;

}

public void collect(double amount) {
this.wallet += amount;
}

public void hit(Deck deck) {
this.hand.drawCard(deck);
}

public void stand() {
}

public void doubleDown() {
}

public void split() {
}

public Integer sumOfHand() {
int sum = 0;
ArrayList<Card> cardsInHand = hand.showMyCards();
for (Card c : cardsInHand) {
sum += c.getFace().getValue();
}

return sum;
}

public Hand getHand() {
return this.hand;
}

public void setHand(ArrayList<Card> cards) {
this.hand = new Hand(cards);
}

public int numberOfCardsInHand() {
return this.hand.getSize();
}
}
13 changes: 13 additions & 0 deletions src/main/java/io/zipcoder/casino/CardGame/CardGame.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package io.zipcoder.casino.CardGame;

import io.zipcoder.casino.CardGame.Cards.Deck;
import io.zipcoder.casino.Game;
import io.zipcoder.casino.Player;

public abstract class CardGame implements Game {
private Player player;
private Player dealer;
private Deck deck;


}
32 changes: 32 additions & 0 deletions src/main/java/io/zipcoder/casino/CardGame/Cards/Card.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package io.zipcoder.casino.CardGame.Cards;

public class Card {
private Face face;
private Suit suit;


public Card (Face face, Suit suit) {
this.face = face;
this.suit = suit;



}

public Face getFace() {
return face;
}


public Suit getSuit() {
return suit;
}

public String getCardFaceValue(){
return face.getFaceValue();
}

public char getCardSuitValue(){
return suit.getSuitIcon();
}
}
64 changes: 64 additions & 0 deletions src/main/java/io/zipcoder/casino/CardGame/Cards/Deck.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@



package io.zipcoder.casino.CardGame.Cards;


import java.util.ArrayList;
import java.util.Collections;

public class Deck {
public ArrayList<Card> deck = new ArrayList<>();

public Deck(int numberOfDecks) {
for (int i = 0; i < numberOfDecks; i++) {
createDeck();
}


}

public Card getCard(int cardIndex){
return deck.get(cardIndex);

}
public void shuffle() {
Collections.shuffle(deck);

}

public void removeCardFromDeck(int cardIndex) {
deck.remove(cardIndex);
}

public int deckSize() {
return deck.size();
}

public ArrayList<Card> deal (int numberOfCards) {
ArrayList<Card> requestedCards = new ArrayList<Card>();
for (int i = 0; i < numberOfCards; i++ ) {
requestedCards.add(deck.get(i));
deck.remove(i);
}

return requestedCards;

}

private void createDeck() {
for (Suit s : Suit.values()) {
for (Face f : Face.values()) {
deck.add(new Card(f, s));


}
}
}

public String toString() {
return deck.toString();
}
}


37 changes: 37 additions & 0 deletions src/main/java/io/zipcoder/casino/CardGame/Cards/Face.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package io.zipcoder.casino.CardGame.Cards;

public enum Face {

ACE("A",1),
TWO("2",2),
THREE("3",3),
FOUR("4",4),
FIVE("5",5),
SIX("6", 6),
SEVEN("7",7),
EIGHT("8",8),
NINE("9",9),
TEN("10", 10),
JACK("J", 10),
QUEEN("Q", 10),
KING("K", 10);

String faceValue;
int value;

private Face(String f, int v){
this.faceValue = f;
this.value = v;
}

public String getFaceValue(){
return faceValue;
}

public int getValue(){
return this.value;
}
}



Loading