Merge branch 'master' of nsatinover/ZCW-OOP-Casino into master

pom.xml

@@ -7,6 +7,18 @@
     <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>7</source>
+                    <target>7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <dependency>

src/main/java/io/zipcoder/casino/Card.java

@@ -6,6 +6,8 @@ public class Card {
     private int value;
     private String name;
 
-
+    public void setVisibility(boolean visibility){
+        isVisible = visibility;
+    }
 
 }

src/main/java/io/zipcoder/casino/CardGame.java

@@ -2,8 +2,7 @@ package io.zipcoder.casino;
 
 import java.util.HashMap;
 
-public class CardGame {
-    private boolean isFaceUp; // Deal() will change IF card is visible
+public abstract class CardGame {
     private int tablePot;
     private int minBet;
     private int maxBet;
@@ -17,12 +16,18 @@ public class CardGame {
         this.maxBet = maxBet;
     }
 
-    public void Deal(){
-        //faceUp/ faceDown
-    }
+    //use hand size to determine dealing
+    public abstract void Deal();
 
     public void Shuffle(){
 
     }
 
+    public void faceDown(Card card){
+        card.setVisibility(false);
+    }
+
+    public void faceUp(Card card){
+        card.setVisibility(true);
+    }
 }

src/main/java/io/zipcoder/casino/CardPlayer.java

@@ -1,13 +1,9 @@
 package io.zipcoder.casino;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 public class CardPlayer {
     private Player player;
-    /*
-    private HashMap<Player, Card[]> hand = new HashMap<Player, Card[]>();
-    private ArrayList<Card> cardhand = new ArrayList<Card>();
-    private ArrayList<Card> discard = new ArrayList<Card>()
-    */
+    private ArrayList<Card> hand = new ArrayList<>();
+    private ArrayList<Card> discard = new ArrayList<>();
 }

src/main/java/io/zipcoder/casino/Console.java

@@ -3,19 +3,18 @@ package io.zipcoder.casino;
 public class Console {
     private Game[] games;
 
-    Console(){
-        Yahtzee yahtzee = new Yahtzee();
-        Stud stud = new Stud;
-        War war = new War;
-        games = new Game[yahtzee, stud, war];
-    }
-
+    Console(){}
 
     public void createAccount(){
 
     }
 
     public void chooseGame(String gameName){
-
+        /*
+            ask the user for min max bet at the table
+            ask the user which game they would like to play
+            create a new game with min and max set based
+            on user input
+         */
     }
 }

src/main/java/io/zipcoder/casino/Deck.java

@@ -4,5 +4,5 @@ import java.util.ArrayList;
 import java.util.Collections;
 
 public class Deck {
-    ArrayList<Card> deck = new ArrayList<Card>();
+    ArrayList<Card> cards = new ArrayList<Card>();
 }

src/main/java/io/zipcoder/casino/Dice.java

@@ -3,7 +3,6 @@ package io.zipcoder.casino;
 public class Dice {
     private int sides;
     private int value;
-    private ScoreSheet scoreSheet;
 
     public void Roll(){
 

src/main/java/io/zipcoder/casino/DiceGame.java

@@ -1,8 +1,8 @@
 package io.zipcoder.casino;
 
-public class DiceGame {
+public abstract class DiceGame {
     private int amoutdice;
-    int numberOfRolls;
+    private int numberOfRolls;
     private Player[] players;
-    private Player playersTrun;
+    private Player playersTurn;
 }

src/main/java/io/zipcoder/casino/DicePlayer.java

@@ -4,5 +4,6 @@ import java.util.HashMap;
 
 public class DicePlayer {
     private Player player;
-    HashMap<Player, Dice[]> tableDice = new HashMap<Player, Dice[]>();
+    Dice[] cup = new Dice[5];
+    ScoreSheet scoreSheet = new ScoreSheet();
 }

src/main/java/io/zipcoder/casino/Gamble.java

@@ -1,7 +1,7 @@
 package io.zipcoder.casino;
 
 public interface Gamble {
-    public void Bet(int betAmount);
-    public int Payout(int payoutAmount);
-    public void Ante(int anteAmount);
+     void Bet(int betAmount);
+     int Payout(int payoutAmount);
+     void Ante(int anteAmount);
 }

src/main/java/io/zipcoder/casino/Game.java

@@ -1,7 +1,7 @@
 package io.zipcoder.casino;
 
 public interface Game {
-    public void Play();
-    public void Quit();
-    public void StartRound();
+     void Quit();
+     void StartGame();
+     void StartRound();
 }

src/main/java/io/zipcoder/casino/ScoreSheet.java

@@ -1,25 +1,32 @@
+//Lauren
+
 package io.zipcoder.casino;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class ScoreSheet {
-    private int score;
+    private Map<String, Integer> scores = new HashMap<>();
 
-    ScoreSheet(){
-        this.score = 0;
-    }
+    ScoreSheet(){}
 
     public int getScore() {
-        return score;
+        return 0;
     }
 
     public void setScore(int score) {
-        this.score = score;
+
     }
 
     public void printScore(){
-        System.out.println(score);
+
     }
 
     public void setRow(String setRow){
 
     }
+
+    public void calculateScore(String row, int value){
+
+    }
 }

src/main/java/io/zipcoder/casino/Stud.java

@@ -5,6 +5,10 @@ public class Stud extends CardGame implements Gamble, Game {
         super(minBet, maxBet);
     }
 
+    public void Deal() {
+
+    }
+
 
     public void determineWinner(){
 
@@ -33,11 +37,12 @@ public class Stud extends CardGame implements Gamble, Game {
     /**
      * Below 3 Implemented from Game
      */
-    public void Play() {
+
+    public void Quit() {
 
     }
 
-    public void Quit() {
+    public void StartGame() {
 
     }
 

src/main/java/io/zipcoder/casino/War.java

@@ -1,13 +1,23 @@
 package io.zipcoder.casino;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 public class War extends CardGame implements Gamble, Game {
 
+    private ArrayList<Card> tableCards = new ArrayList<Card>();
+
     War(int minBet, int maxBet) {
         super(minBet, maxBet);
     }
 
+    public void Deal() {
+
+    }
+
+    /**
+     * Specific to war methods
+     */
     public void playCard(){
 
     }
@@ -22,7 +32,6 @@ public class War extends CardGame implements Gamble, Game {
 
     /**
      * Below 3 Implemented from Gamble
-     * @param betAmount
      */
     public void Bet(int betAmount) {
 
@@ -39,11 +48,12 @@ public class War extends CardGame implements Gamble, Game {
     /**
      * Below 3 Implemented from Game
      */
-    public void Play() {
+
+    public void Quit() {
 
     }
 
-    public void Quit() {
+    public void StartGame() {
 
     }
 

src/main/java/io/zipcoder/casino/Yahtzee.java

@@ -4,7 +4,7 @@ public class Yahtzee extends DiceGame implements Game{
     private Dice[] cup;
 
 
-    public void compareScore(Player player1, Player player2){
+    public void compareScore(DicePlayer player1, DicePlayer player2){
 
     }
 
@@ -15,14 +15,15 @@ public class Yahtzee extends DiceGame implements Game{
     public void stopRoll(){
 
     }
+
     /**
      * implemented from 'Game'
      */
-    public void Play() {
+    public void Quit() {
 
     }
 
-    public void Quit() {
+    public void StartGame() {
 
     }