From 6df164952bb750630ddb5924bfc21df9757dbb11 Mon Sep 17 00:00:00 2001
From: Joe <Joe@localhost>
Date: Fri, 3 Mar 2017 13:24:04 -0500
Subject: [PATCH] More doodad changes

---
 bin/controller/Cashflow.class | Bin 1157 -> 1087 bytes
 src/controller/Cashflow.java  |   4 ++--
 src/model/DoodadStack.java    |  26 ++++++++++----------------
 src/model/MarketCard.java     |  10 ++++++++++
 src/model/Market_Cards.java   |   2 +-
 5 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 src/model/MarketCard.java

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 7665aef46dca2bb2f859772cf4a2420f27d83a42..7dce6a220275a33cfda53d3033ce4b8874ef8392 100644
GIT binary patch
delta 492
zcmY+9O-~b16o#KWGdja%)JYptKnAN;X{|DT)K(Zl1^hr*m^3WdIY}o?O`)WWCa`fM
zKY+|HaOGBA3`P>!yEHC!;U7Vd-Ke?A$$Q_Ad)~V{bm-_WN1r|eHJ11Ek14wyC(X`I
ztT4-!r6EQbvl&%*&!d-7(2X|QL34X6iPv4uFrKceVmP5F{G%rQ&PIFwMW@?}`<f!>
zZO;9lA2?htP)gsalH+s9<rtIccQxi!6vj+Z<5P9H!qxP+5l(vqF4wp&r8aw;ij(Ea
z%6hLAcY}qf-wHK1xn)yR=)bH>okqH2l<GdyE;BR~PSR@*mTT@XXEUqF51My+!BeT7
zh#E)owY$>hoALA2A(k|Q#RI&xeR3<+jQp%Q_m;r7p4F`n6b|s$PFo*2yU)d3IpeZe
zrZR2_%D9~ozBZLV{^r-$_wtU3mN|hfQ{&)rLQalT6z~WIFOX+g)Y_lD%Pew_`*L-p
p@VtmhEDd2FU`VLOLqVp5OFR-}@mRdW7)Ru6Jf*4<SQ5(M$!{F6V50y4

delta 561
zcmZ9J&vOfL7{))}&6?eAm+T}Ht!OBTHc`4%rJ6`->sKo%IrU~ob|R!rCbnj{xbO#<
zb#!rZci0-8VH`NP_zN8TBjvTsP`BrO-{<|l&+~jgn9l~RFWc|l1Jm4mZhd=Vw)~(G
zcz5nA(#2AJt=sfF?xNRk#?7k5Fj<3risXMIoBfO^j9>fh$G##_EG-RifKh{k3g@2p
z&~rQ9ddqD*dJy<)HitMYtnNmj$kgL;yBm(FWVN6e`iCC$+v}}`jdrK$_btXK8jSCJ
zFlN}4I2!g;!OU~aW*5i9mn!SH3av6~k>{k%6sN+^syaK&X`3=La=+K@DfaBJDlTWK
z8dMb4Uzav#sf87-P|kDC<~%ip8FU-*af<~m7%WO^f1J20B3q*D`<{5cC~974-*0_F
z7iF-#g|oUzsy-2sju@&X=3X<E({GpcH{`a+uV(bO9NA<dH5qZ@H)}fLj1&=b5%W(I
zDmU`#$Jg*<V((pt-DF6T#bI9X5@`nGPmPapiOW)%BJzsNBs?lCa}|vgGt>noWOtlv
Xf^@D6cMxrxjDe%nq%7Q!md46Y-phEw

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index b02f9e7..0ad2aaa 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -9,11 +9,11 @@ public static void main(String[] args)
 	{
 		DoodadStack ds = new DoodadStack();
 		
-		int initialSize = ds.getStack().getSize();
+		int initialSize = ds.getSize();
 		for(int i=0; i<initialSize; i++)
 		{
 			int num = i+1;
-			System.out.println(num + ": " + ds.getStack().pop().getTitle());
+			System.out.println(num + ": " + ds.pop().getTitle());
 		}
 		
 	}
diff --git a/src/model/DoodadStack.java b/src/model/DoodadStack.java
index 8bdb568..59317d2 100644
--- a/src/model/DoodadStack.java
+++ b/src/model/DoodadStack.java
@@ -2,15 +2,13 @@
 
 import java.util.*;
 
-public class DoodadStack
+public class DoodadStack extends CardStack
 {
-	private CardStack _doodadCardStack;
-	
 	private static DoodadCard D01 = new DoodadCard("New Tennis Racket", 200);
 	private static DoodadCard D02 = new DoodadCard("Food Processor",200);
 	private static DoodadCard D03 = new DoodadCard("Birthday Party for You Child", 500); //if you have a child 
 	private static DoodadCard D04 = new DoodadCard("Next-Gen Game Console", 600);
-	private static DoodadCard D05 = new DoodadCard("First DoodadCard for Child (Take out a loan if you must)", 5000); //if you have a child 
+	private static DoodadCard D05 = new DoodadCard("First Car for Child (Take out a loan if you must)", 5000); //if you have a child 
 	private static DoodadCard D06 = new DoodadCard("Jet Ski (Take out a loan if you must)", 3000);
 	private static DoodadCard D07 = new DoodadCard("New Tailored Suit", 1000);
 	private static DoodadCard D08 = new DoodadCard("New Rims for Your DoodadCard (Take outa  loan if you must)", 2000);
@@ -51,17 +49,17 @@ public class DoodadStack
 	private static DoodadCard D41 = new DoodadCard("Remodel Kitchen (Take out a loan if you must)", 7500);
 	private static DoodadCard D42 = new DoodadCard("Season Tickets", 1500);
 	
-	
+	// Constructor just calls makes this stack a randomized stack with Doodad cards
 	public DoodadStack()
 	{
-		_doodadCardStack = randomizeStack();
+		randomizeStack();
 	}
 
 
-	
-	private CardStack randomizeStack()
+	// Randomizes the stack with the member variable cards
+	private void randomizeStack()
 	{
-		CardStack cardStack = new CardStack();
+		//CardStack cardStack = new CardStack();
 		ArrayList<DoodadCard> cardList = new ArrayList<DoodadCard>();
 		Random r = new Random();
 		DoodadCard[] cardArray = {D01, D02, D03, D04, D05, D06, D07, D08, D09, D10,
@@ -75,19 +73,15 @@ private CardStack randomizeStack()
 			cardList.add(c);
 		}
 		
+		// Pushes a card at a random index in the card list
 		int initialLength = cardList.size();
 		for(int i=0; i < initialLength; i++)
 		{
-			cardStack.push(cardList.remove(r.nextInt(cardList.size())));
+			this.push(cardList.remove(r.nextInt(cardList.size())));
 		}
-		return cardStack;
 		
 	}
-	
-	public CardStack getStack()
-	{
-		return _doodadCardStack;
-	}
+
 
 	
 
diff --git a/src/model/MarketCard.java b/src/model/MarketCard.java
new file mode 100644
index 0000000..90a9b1b
--- /dev/null
+++ b/src/model/MarketCard.java
@@ -0,0 +1,10 @@
+package model;
+
+public class MarketCard extends Card
+{
+	public MarketCard(String title, int value) {
+		super(title, value);
+		// TODO Auto-generated constructor stub
+	}
+
+}
diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java
index f79d3db..82b22ba 100644
--- a/src/model/Market_Cards.java
+++ b/src/model/Market_Cards.java
@@ -3,7 +3,7 @@
  * hi im very forgetful so my code is usually full of comments when its not finished sorry
  * 
  */
-public class Market_Cards extends Card {
+public class MarketCardStack extends Card {
 
 	public Market_Cards(String title, String type, Boolean effect, int value, int value2, int value3, int value4) {
 		super(title, type, effect, value, value2, value3, value4);