From 0a2ab8853a243c64f79a3f49b59f6900544e172e Mon Sep 17 00:00:00 2001
From: Joe Hill <hillj1895@yahoo.com>
Date: Thu, 30 Mar 2017 12:22:27 -0400
Subject: [PATCH] sup

---
 bin/controller/Cashflow.class | Bin 1708 -> 1780 bytes
 src/controller/Cashflow.java  |  58 ++++++++++++++++++++++++----------
 src/model/DealTile.java       |  10 ++++--
 src/model/GameBoard.java      |  12 +++----
 4 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 79d608d743c49e8efd5aa0d1b21960e0d35aa471..c10ba025e212599cfb8c30f6c05f96c73fe98296 100644
GIT binary patch
delta 1023
zcmbVKO;giQ6g@AgO&U|dN)e=BMX(gD6(|Ul59LDy%7>PZ7C{LRJH^t}HaLUhOgC;_
zU{<(u<w7^QD2&XgYghgP|AHHr3f`n0#I2K=_wK##-1E*odGDM*ozmBXkDma9u(~b%
zsFc9qmQe|b!J(@;eNf4+<%|m68%bykwoFRdGBF+*wWwndlezh1I<00I_$L1XgEOit
ztB)p>%#5;<QUzRKC|g&aD8ZDHP6UUuSuHE#qOr%v@?JE`aNrW%*cADTiR#&8IuZ8I
z320()ZD?z1Dmai#45>=WBA4KU(_AjgxPkzKkWlq#@~LWR7<C|s76I27%8!w5<#csJ
zMl0F~rETgAMvPUlcH=Sg)LloHfX;s#EEO`k5jNhk26qUJBKjD(Zm&dU-H>q;0|w*5
zq7OqdhH=Xn;=EP28Kk0O(>Mtu7?UxMi1CbTSPEfM#uOrCo30hdlyC=80e2bBSYne}
zaGJ)~=~Pun?~G}WkTFZCw1_z}cx*GLdox-lqpq1+e2B@2W5M{%RU2)5r{T7BFuM`4
zjds$spnnC}_E7Pjb`Ga#m1qYlz~d~+D3Xg9%Bm=1s5ZWzsAqnI+1>ebgl0HN^?uq-
zF0r|Qnw`U6CLe!{F8~2u$M{5)<1}H;TR7@u=8Gwjg{ajellI|_yXtq*@R_orJiB!g
zwy5$&ZBmKLVLr?v1#5?mKH$|peDPiQ$4OUn58wL+Egsu)-v?aXM<`yqhmKwJxOxld
zZ}t>0_yr>cj8ay>L;=&!Ip(Q(efX^ecg+%*h~`U}yaoDS(!Un9lF7grM0yKOMBu_C
zjWUH^iiZ(}f>}JoJk}AzHpM$wwB}#zgPodQ;vN-1tuL^I`{Y0wI`DuZj%a*XrijPt
bQEmOGX1ec$?Eo$TKE?u#0cuvL$YJFVrP9GP

delta 995
zcma)4OHUI~6#nka;0)swu(TGDVvC?Hh@*f7setl+6h(_b!3P6OYPGMlqY1j`#y>zN
znz(?(g>mCX7sW`Tu3h*O-1r0Bur%PAfk2HLGnsSGJ@>oc`OZ0a+wsmJf7|)=89)aX
z*W_QbBHRqlRAxm_s{M)hpsppOhPM1jh6@hM)F?QCS_Uz$8_~p5oq-Po$I4NMdJ$fR
zs)yPWO-*X)xEfu}8+uB?DfrBB&L=c5c+6eS<CD>dGa{P)MjN?AI<DX>0_Gd8vCWTW
z1?6aAa0enKq&6%ZoRQGVz;zRuAF6^2xM=?1!jcQ^3Ket7^z*)&P6m0emH{odA|r&$
z3c3+CV|-)5j~)fR2s21VCTi2lxQc!e*BGkpjERgoMXC%s)itVQz>*_otxz&8VTi#o
z{y1;=vYBjFU$L~fFrr`-W7HN3GE@YDkwXQPOVD!hJn=7>wajg9^PQ6pyTOxMc3N9X
zQa`zPhG5yGwkm^RM!_uRNMj;Dn@FeioZaww5%Ua{hiw_k<uW-5cg$yOj*p?)3<_PW
z%v=)23TyxZ%4ozJTX4lTaXivegr|q^eT#Oluox0P;N%wkF}Ls$r#BIFo-5*fi?@ij
zuLu><MY|%d6w&vbXWqKkyWjWm&Orhb)o>~1U)I9^(!M8&JSxbxK_OcW$$E5f!wC<4
zHRvOMgkIV*>hS<Rq-gXn$X`bjD(S{3M6w$g#{{hsULu0Y32LGPYq*XZ;0V@*De`zC
z4B#et0`!Ae>L7ND2pkZ0;1uCvOl?w$CTji^8VVshmqL5cUxj1#It^=DN6GJ_)jE@!
zi@5!2_xE94G6?{^KM}(v9MV3Am6Eq^GHc>wEwYZi5acbyV$Ow4+-?0rVb1Q;5j)Rl
N3734J=bnwa{|9Z&y=wpf

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index ab4cab2..79090e1 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -16,26 +16,13 @@ public static void main(String[] args)
 		/*
 		 * Just testing stuff in here for now. Main method will call the go() method when game is built
 		 */
-		BigDealStack ms = new BigDealStack();
-		int initialSize = ms.getSize();
-		for(int i=0; i<initialSize; i++)
-		{
-			int num = i+1;
-			System.out.println(num + ": " + (ms.get(i).getTitle())); //Always going to need this cast when getting description unfortunately
-		}
 		
-		
-		System.out.println("Just popped: " + ms.pop().getTitle());
-		
-		for(int i=0; i<initialSize; i++)
-		{
-			int num = i+1;
-			System.out.println(num + ": " + (ms.get(i).getTitle())); //Always going to need this cast when getting description unfortunately
-		}
+		testCards();
 		
 		
 	}
-	
+
+
 	public void go()
 	{
 		// Joe
@@ -82,5 +69,42 @@ public boolean isWinner()
 		}
 	}
 	
-	
+	public static void testCards()
+	{
+		BigDealStack ms = new BigDealStack();
+		int initialSize = ms.getSize();
+		for(int i=0; i<initialSize; i++)
+		{
+			int num = i+1;
+			System.out.println(num + ": " + (ms.get(i).getTitle())); //Always going to need this cast when getting description unfortunately
+		}
+		
+		
+		System.out.println("Just popped: " + ms.pop().getTitle());
+		
+		for(int i=0; i<initialSize; i++)
+		{
+			int num = i+1;
+			System.out.println(num + ": " + (ms.get(i).getTitle())); //Always going to need this cast when getting description unfortunately
+		}
+		
+		
+	}
+
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/model/DealTile.java b/src/model/DealTile.java
index d99ee2c..d02d25d 100644
--- a/src/model/DealTile.java
+++ b/src/model/DealTile.java
@@ -29,11 +29,15 @@ public void buyIncomeProperty(Player p, DealCard d)
 	{
 		FinancialStatement f = p.getFinancialStatement();
 		
-		f.increaseCashBalance(-d.getDownPayment());					// Watch out for negatives
-		f.increasePassiveIncome(d.getCashFlowChange());
-		
 		OwnedRealEstate newProperty = new OwnedRealEstate(d.getTitle(), d.getCost(), d.getDownPayment());
 		f.addProperty(newProperty);
+		
+		// Add functionality in this ^^ to do this:
+		
+		//f.increaseCashBalance(-d.getDownPayment());					// Watch out for negatives
+		//f.increasePassiveIncome(d.getCashFlowChange());
+		
+		
 	}
 	
 	public void updateStockPrice(DealCard d)
diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
index 23026f9..3cc6b86 100644
--- a/src/model/GameBoard.java
+++ b/src/model/GameBoard.java
@@ -22,28 +22,28 @@ public GameBoard()
 	}
 	
 	
-	// TODO This method will move the player and return true if they passed a payday along the way.
+	// TODO This method will move the player and returns the number of paydays they passed along the way.
 	// It also removes the player from the _players ArrayList of their initial tile and adds them to the 
-	// arraylist of the tile they land on
-	public boolean movePlayer(Player p, int distance)
+	// arraylist of the tile they land on.
+	public int movePlayer(Player p, int distance)
 	{
 		int currentLocation = p.getLocation();
 		Node currentNode = _tiles.get(currentLocation);
 		Tile currentTile = _tiles.elementAt(currentLocation);
 		currentTile.removePlayer(p);
-		boolean passedPayday = false;
+		int passedPaydays = 0;
 		for(int i=0; i<distance; i++)
 		{
 			Node nextNode = currentNode.getNext();
 			if(nextNode.getData().getName().equals("Payday"))
 			{
-				passedPayday = true;
+				passedPaydays++;
 			}
 			currentNode = nextNode;
 		}
 		currentNode.getData().addPlayer(p);
 		p.setLocation(currentNode.getData().getBoardIndex());
-		return passedPayday;
+		return passedPaydays;
 	}