Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git Conflicts: src/model/MarketStack.java woah
joh13010 · Mar 24, 2017 · cb3f002 · cb3f002
2 parents ce184a7 + 41b18a4
commit cb3f002
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 89 deletions.
diff --git a/src/model/BigDealStack.java b/src/model/BigDealStack.java
@@ -1,5 +1,9 @@
 package model;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Stack;
+
 public class BigDealStack extends CardStack
 {
 	private static DealCard BD1= new DealCard("Limited Partner Wanted",
@@ -110,14 +114,19 @@ public class BigDealStack extends CardStack
 	private static DealCard BD36 = new DealCard("House for Sale - 3Br/2Ba", 
 								"Skilled Tradesman kept this 3/2 house in excellent condition, so it commands top-dollar rent in older neighborhood",
 								325000, 18000, 307000, 900);
-
+	private Stack<DealCard> _bigDealStack;		
 	public BigDealStack()
 	{
 		DealCard[] bdCardArray = {BD1, BD2, BD3, BD4, BD5, BD6, BD7, BD8, BD9, BD10, 
 								  BD11, BD12, BD13, BD14, BD15, BD16, BD17, BD18, BD19, BD20,
 								  BD21, BD22, BD23, BD24, BD25, BD26, BD27, BD28, BD29, BD30,
 								  BD31, BD32, BD33, BD34, BD35, BD36};
 		super.randomizeCards(bdCardArray);
+		List<DealCard> list = Arrays.asList(bdCardArray);
+		Stack<DealCard> BDCardStack = new Stack<DealCard>();
+		BDCardStack.addAll(list);
+
+		_bigDealStack = BDCardStack; 
 	}
 
 

diff --git a/src/model/DoodadStack.java b/src/model/DoodadStack.java
@@ -50,6 +50,8 @@ public class DoodadStack extends CardStack
 	private static DoodadCard D42 = new DoodadCard("Season Tickets", 1500);
 
 	// Constructor just calls makes this stack a randomized stack with Doodad cards
+	private Stack<DoodadCard> _doodadStack;
+
 	public DoodadStack()
 	{
 		DoodadCard[] cardArray = {D01, D02, D03, D04, D05, D06, D07, D08, D09, D10,
@@ -58,6 +60,12 @@ public DoodadStack()
 								  D31, D32, D33, D34, D35, D36, D37, D38, D39, D40, D41, D42};
 
 		super.randomizeCards(cardArray);
+		List<DoodadCard> list = Arrays.asList(cardArray);
+		Stack<DoodadCard> DoodadCardStack = new Stack<DoodadCard>();
+		DoodadCardStack.addAll(list);
+
+		_doodadStack = DoodadCardStack; 
+
 	}
 
 

diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
@@ -7,7 +7,7 @@ public class FinancialStatement
 	private double[] realEstate;
 	private String career;
 	private double expenses;
-	private double assets;
+	public static double assets; //sorry i had to make this change to use w/ cards if i messed something up just change it im sorry!!
 	private double liabilities;
 	private double income;
 

diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
@@ -20,6 +20,4 @@ public GameBoard()
 		_tiles.addTiles(t1, t2, t3, t4);
 	}
 
-
-
 }
diff --git a/src/model/MarketCard.java b/src/model/MarketCard.java
@@ -4,16 +4,14 @@ public class MarketCard extends Card
 {
 	private String _description;
 	private String _type;
-	private boolean _affectAll;
 	private int _value;
 	private String _addit;
 
-	public MarketCard(String title, String description, String type, boolean affectAll, int value, String addit)
+	public MarketCard(String title, String description, String type, int value, String addit)
 	{
 		super(title);
 		_description = description;
 		_type = type;
-		_affectAll = affectAll;
 		_value = value;
 		_addit = addit; //additional info
 	}
@@ -28,10 +26,6 @@ public String getType()
 		return _type;
 	}
 
-	public boolean doesAffectAll()
-	{
-		return _affectAll;
-	}
 
 	public int getValue()
 	{
@@ -41,6 +35,9 @@ public String getAddit()
 	{
 		return _addit;
 	}
+	public void display(){
+		//display cards in a pretty gui
+	}
 
 
 }
diff --git a/src/model/MarketStack.java b/src/model/MarketStack.java
diff --git a/src/model/SmallDealStack.java b/src/model/SmallDealStack.java
@@ -1,5 +1,9 @@
 package model;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Stack;
+
 public class SmallDealStack extends CardStack
 {
 	private static DealCard SD01 = new DealCard("",
@@ -116,16 +120,22 @@ public class SmallDealStack extends CardStack
 	private static DealCard SD38 = new DealCard("",
 									"",
 									, , , );
+	private Stack<DealCard> _bigDealStack;		
 
 	public SmallDealStack()
 	{
 		DealCard[] sdArray = {SD01, SD02, SD03, SD04, SD05, SD06, SD07, SD08, SD09, SD10, 
-							  SD11, SD12, SD13, SD14, SD15, SD16, SD17, SD18, SD19, SD20, 
-							  SD21, SD22, SD23, SD24, SD25, SD26, SD27, SD28, SD29, SD30, 
-							  SD31, SD32, SD33, SD34, SD35, SD36, SD37, SD38};
+				  SD11, SD12, SD13, SD14, SD15, SD16, SD17, SD18, SD19, SD20, 
+				  SD21, SD22, SD23, SD24, SD25, SD26, SD27, SD28, SD29, SD30, 
+				  SD31, SD32, SD33, SD34, SD35, SD36, SD37, SD38};
 		super.randomizeCards(sdArray);
-
+		List<DealCard> list = Arrays.asList(sdCardArray);
+		Stack<DealCard> SDCardStack = new Stack<DealCard>();
+		SDCardStack.addAll(list);
+
+		_bigDealStack = SDCardStack; 
 	}
+
 
 }