Merge branch 'master' of demetrm/Casino into working

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

@@ -7,6 +7,9 @@ import io.zipcoder.casino.CardGame.Suit;
 
 import java.util.Stack;
 
+import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.lastStack;
+import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.unCover;
+
 public class Foundation {
 
     public static Stack<Card> clubStack = new Stack<>();
@@ -71,6 +74,7 @@ public class Foundation {
                 spadeStack.push(tempStackCard.pop());
             }
         }
+        if (lastStack.size() > 0) unCover(lastStack);
     }
 
     public static Boolean allFoundsFull() {

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

@@ -84,6 +84,13 @@ public class Solitaire extends CardGame {
         for(Tableau tab : arrayTabs) tab.stack.peek().setCovered(false);
     }
 
+    public void refillDeck(){
+        if (solitaireDeck.deckOfCards.size()<1){
+            while(wastePile.iterator().hasNext())
+                solitaireDeck.deckOfCards.push(wastePile.pop());
+        }
+    }
+
     public void drawCard(){
         wastePile.push(solitaireDeck.draw());
     }
@@ -146,6 +153,10 @@ public class Solitaire extends CardGame {
         if(wastePile.size()>0) System.out.println("\n\nDraw pile: " + wastePile.peek().toString2());
     }
 
+    public static void unCover(Stack<Card> lastStack){
+        if (lastStack.size() > 0 && lastStack.peek().isCovered()) lastStack.peek().setCovered(false);
+    }
+
     //you've got a temp stack. so when you pull a card, show it. if it doesn't go, put it back.
     //fix empty stack exceptions
     //draw shouldn't reprint every time. only print top of wastePile
@@ -191,6 +202,7 @@ public class Solitaire extends CardGame {
                         print();
                         break;
                 }
+                if (solitaireDeck.deckOfCards.size()<1) refillDeck();
             }
     }
 

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

@@ -6,6 +6,7 @@ import java.util.Stack;
 
 import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.lastStack;
 import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.tempStack;
+import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.unCover;
 
 public class Tableau {
     //consider making an undo method.
@@ -55,8 +56,4 @@ public class Tableau {
             if (c.getFace().getPrimaryValue() == 13) return true; //primVal of 13 is KING
         } return false;
     }
-
-    private void unCover(Stack<Card> lastStack){
-        if (size() > 0 && lastStack.peek().isCovered()) lastStack.peek().setCovered(false);
-    }
 }