Friday Lab 3/24

bin/.gitignore

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 /.DS_Store
-=======
->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
 /controller/
 /model/
 /view/

src/model/Die.java

@@ -6,18 +6,20 @@ public class Die {
  * Die will probably have to go in each individual turn, so that it can pull charity status
  * from the player currently playing
  */
-	public int rollDice(Boolean c) {
+	public int rollOneDice()
+	{
 		Random rand = new Random();
-		if (c) {
-			int face = 1+rand.nextInt(12);
-			return face;
-			/* There needs to be something that takes charity - 1 from the player after rolling
-			 * Or maybe just a simple "if charity > 0 then charity - 1 after every turn
-			 */
-		}
-		else {
-			int face = 1+rand.nextInt(6);
-			return face;
-		}
+		int face = 1+rand.nextInt(6);
+		return face;
 	}
+
+	public int rollTwoDice()
+	{
+		Random rand = new Random();
+		int face = 1+rand.nextInt(12);
+		return face;
+	}
+
+
+
 }

src/model/FinacialStatement.java → src/model/FinancialStatement.java

@@ -1,6 +1,6 @@
 package model;
 
-public class FinacialStatement
+public class FinancialStatement
 {
 	private double salary;
 	private double interest;

src/model/MarketCard.java

@@ -6,6 +6,7 @@ public class MarketCard extends Card
 	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)
 	{

src/model/Player.java

@@ -2,6 +2,6 @@ package model;
 
 public class Player
 {
-	private FinacialStatement _fs;
+	private FinancialStatement _fs;
 
 }

src/model/SmallDealStack.java

@@ -124,18 +124,8 @@ public class SmallDealStack extends CardStack
 							  SD21, SD22, SD23, SD24, SD25, SD26, SD27, SD28, SD29, SD30, 
 							  SD31, SD32, SD33, SD34, SD35, SD36, SD37, SD38};
 		super.randomizeCards(sdArray);
-		}
+
 	}
 
 }
 
-
-
-
-
-
-
-
-
-
-