From cc4e2b30b2e13917fbfa7582678b385eff7d491a Mon Sep 17 00:00:00 2001
From: Joe Hill <hillj1895@yahoo.com>
Date: Fri, 24 Mar 2017 12:29:19 -0400
Subject: [PATCH] Friday Lab 3/24

---
 bin/.gitignore                                |   3 --
 bin/controller/Cashflow.class                 | Bin 1334 -> 1334 bytes
 bin/model/Profession.class                    | Bin 2597 -> 2597 bytes
 bin/view/Window.class                         | Bin 253 -> 253 bytes
 src/model/Die.java                            |  26 ++++++++++--------
 ...Statement.java => FinancialStatement.java} |   2 +-
 src/model/MarketCard.java                     |   1 +
 src/model/Player.java                         |   2 +-
 src/model/SmallDealStack.java                 |  12 +-------
 9 files changed, 18 insertions(+), 28 deletions(-)
 rename src/model/{FinacialStatement.java => FinancialStatement.java} (96%)

diff --git a/bin/.gitignore b/bin/.gitignore
index f168c3b..66905d0 100644
--- a/bin/.gitignore
+++ b/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/
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 3c071d601ed958a4988af39014afa843d2e1e5c5..37ff42fd6a419eff73e89640ccb1fd665407f971 100644
GIT binary patch
delta 17
ZcmdnSwT+A8)W2Q(7#J8#Hgf2(0subx1?d0)

delta 17
ZcmdnSwT+A8)W2Q(7#J9gHgf2(0subn1?K<&

diff --git a/bin/model/Profession.class b/bin/model/Profession.class
index 8206775f8dfd9f979a18b9da8b87f2568dd1faa1..8fdeb619cfbf0611443cdf9dd2e107bdaf0a3a90 100644
GIT binary patch
delta 17
ZcmZ1~vQ&iQ)W2Q(7#J8#Hgd>v0RTPe1<wEg

delta 17
ZcmZ1~vQ&iQ)W2Q(7#J9gHgd>v0RTPU1<e2e

diff --git a/bin/view/Window.class b/bin/view/Window.class
index fe71bb585cb9090b491f256af3681c5534b0e673..c68be936dff58fb320e6e1a871331e9afe1c4f25 100644
GIT binary patch
delta 16
Ycmey%_?MC6)W2Q(7#J8#CUSfQ06@+M2LJ#7

delta 16
Ycmey%_?MC6)W2Q(7#J9gCUSfQ06@kE1poj5

diff --git a/src/model/Die.java b/src/model/Die.java
index 77ce069..9b45df8 100644
--- a/src/model/Die.java
+++ b/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;
+	}
+	
+	
+	
 }
diff --git a/src/model/FinacialStatement.java b/src/model/FinancialStatement.java
similarity index 96%
rename from src/model/FinacialStatement.java
rename to src/model/FinancialStatement.java
index 592dd4b..1895073 100644
--- a/src/model/FinacialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -1,6 +1,6 @@
 package model;
 
-public class FinacialStatement
+public class FinancialStatement
 {
 	private double salary;
 	private double interest;
diff --git a/src/model/MarketCard.java b/src/model/MarketCard.java
index 0a30173..c156b8b 100644
--- a/src/model/MarketCard.java
+++ b/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)
 	{
diff --git a/src/model/Player.java b/src/model/Player.java
index 90f8447..1ff34f5 100644
--- a/src/model/Player.java
+++ b/src/model/Player.java
@@ -2,6 +2,6 @@
 
 public class Player
 {
-	private FinacialStatement _fs;
+	private FinancialStatement _fs;
 	
 }
diff --git a/src/model/SmallDealStack.java b/src/model/SmallDealStack.java
index 00a8cd6..2c3460f 100644
--- a/src/model/SmallDealStack.java
+++ b/src/model/SmallDealStack.java
@@ -124,18 +124,8 @@ public SmallDealStack()
 							  SD21, SD22, SD23, SD24, SD25, SD26, SD27, SD28, SD29, SD30, 
 							  SD31, SD32, SD33, SD34, SD35, SD36, SD37, SD38};
 		super.randomizeCards(sdArray);
-		}
+
 	}
 	
 }
 
-
-
-
-
-
-
-
-
-
-