From 8f7a4a72738b748bc8c4509602f1d04cd1c0b5c3 Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@67.221.65.41>
Date: Fri, 7 Apr 2017 11:43:18 -0400
Subject: [PATCH] tilessss

---
 bin/model/CharityTile.class        | Bin 879 -> 833 bytes
 bin/model/ChildTile.class          | Bin 621 -> 651 bytes
 bin/model/DoodadTile.class         | Bin 1047 -> 1090 bytes
 bin/model/FinancialStatement.class | Bin 4557 -> 4635 bytes
 src/model/CharityTile.java         |   5 +----
 src/model/ChildTile.java           |   1 +
 src/model/DoodadTile.java          |   2 ++
 src/model/FinancialStatement.java  |   6 +++++-
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
index d52244e9b809f4950740fec9adb142c48a94a0a1..ef1cf0258729324c4afb881c3d241a5d122c9431 100644
GIT binary patch
delta 200
zcmaFQc94zh)W2Q(7#J9g7)&>EU1l^1$uCLF@ytuk&rM~s-#HTmW^pm7GwAU!=rbrX
zG6-kpB^RY87N<HV7H2pm<|O7Nr%pCt+FD(}z{<b`G)P^08-vJ91|@AEEyb3wjX@5`
zPy*p?3~KEn4BFY{ecKpxHv*M1GjIV(AqEy8DagRiAPgi$7}OY~8MuKWVi4mPco=wr
bJfOi01`LJ_j6j!ybTX;|nZ`gS6N3o=NSi1a

delta 247
zcmX@e_MVOF)W2Q(7#J9g7%Vq(U1kh+PAtxFO3X>jOHSotP-oELVbEoeWn>UYPb~>Z
zEH2J0OZCi4&d*I{v)?%r1ZII$8S()28#6NS6{nUU8NkTEqT!+$Hd&BqYkfTfI|CEY
z9zE@C3?efbG_`@W6kEbJ200)@352&XsI^0A?RF6cz3lXD3<ev4I+z)_fTR=y8;}$R
znj*>|$RNfb%OK961*CNu<QTYtGGY+Z8F(0Yfjpo+3?>Yw42%qBKsGZ2BeyP)Z4P8J
HF<1Zq)o3u;

diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class
index 1c2f52b6d80bd140725df2a83ee1ef4dfbf265a3..58a4266b7d5cd4ef9daff4c14db69b9f24e806ca 100644
GIT binary patch
delta 130
zcmaFM(#^_s>ff$?3=9lL4C))XN*RT@7^E2#c^H%!<QW;*N()jFOHwD-GcFGEW?*Ds
z0;=QJ-o_xZjX?@RDQpA^F)?rfNj?T<Fv-rq4`d56a07W_5G@Qm47@-dP&0!vg9^|f
MMg~<NkBLDI09?cofB*mh

delta 99
zcmeBXeapgi>ff$?3=9lL3@RJBN*O0lVqEO)z`)4B1Qg@Y-o_xZjX`Q7kj=!v1tht^
n;(QG33<3<?K)x769Rm*oFOUb+!JxpP2-MBUpakSGF(?B7tzis1

diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
index aab4fc1727033edc9b58fc4325f7203cef8a09c2..a960f1ae3bee2a2efe554026b6e753cb3dcdf40c 100644
GIT binary patch
delta 222
zcmbQvafpNK)W2Q(7#J9g7+g1URWS*3F_<#g@i5pkh%hp+l@_EVmZVN@VY<b6jDeYf
z38*e<ayqkWy`uIu20ako#$ckgg+V8!eH()%gm1f?K><l-5rYtj$A^&L2sDM6K^#bG
zF>nD%AqHLsVFn2X5e78|F$OE3j3bce!XU{I#30QO#UR6w$e;`qVF1d4UBDoz!XO3Y
e0v*HP094G#-~?o|F);mRaFGG>oPj(h1{VN%`zJ#H

delta 162
zcmX@aF`a|!)W2Q(7#J9g7@Rh8RWVJT&UA}&9Ro816HqK<auu^GqtxUD%pzsW86>s0
zG3ae$Fwxq=ptFd98^q(=#$dS-sF0aK97rlLZ~#dm23`hX1_=fc1~mpT1}mV9Es*EU
sAjJ^Opa^6!07b!uGe`o(Kp+ID!j6HF!5+wFVPLWq1+pE0Y$gUr0LAkdu>b%7

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index b527dce92127679951eddfe19e01aa8236cfc3df..883bcda6406f7bdb2f79a44694813391dc3af421 100644
GIT binary patch
delta 140
zcmX@BJX?k9)W2Q(7#J9g7(Q;~dd0!dm!4V@l3$XT<C&M7pPRb*6NeHbqrhZQuIr53
zCcouc!N|CI8g~;jkR!=o2qe4t+kvF8KopS76L<h5{RJ!4EEpIWw1KAT18GJe&8oG9
bp=S+{!Nf2fNV0(i&rIGZD9ZjGEcyWe=BFqq

delta 79
zcmbQOa#oq^)W2Q(7#J9g7(Q&|dd0Dsl~aL{k$<up*LBA2lmBt8U}W07oV$q`$kF02
e1d?<3+kvEtKopRy7kB_969g++85o!t-U9$~yc=x*

diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java
index 35d4f34..4d85163 100644
--- a/src/model/CharityTile.java
+++ b/src/model/CharityTile.java
@@ -13,14 +13,11 @@ public class CharityTile extends Tile
 	public void getLandedOn(Player p)
 	{
 		
-		// TODO
-		// Ask players if they want to donate to charity (returns boolean)
 		
 		if (p.donateCharity())
 		{
 			p.setCharityCount(p.getCharityCount() + 3);
-			p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() 
-					- (p.getFinancialStatement().getPassiveIncome()*.10));
+			p.getFinancialStatement().increaseCashBalance((int) -((p.getFinancialStatement().getTotalIncome()*.1)));
 		}
 		else
 		{
diff --git a/src/model/ChildTile.java b/src/model/ChildTile.java
index bdc42fa..c9bdbf5 100644
--- a/src/model/ChildTile.java
+++ b/src/model/ChildTile.java
@@ -12,6 +12,7 @@ public class ChildTile extends Tile
 	public void getLandedOn(Player p)
 	{
 		p.getFinancialStatement().addChild();
+		p.getFinancialStatement().update();
 		
 	}
 	
diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java
index 89ac791..5190806 100644
--- a/src/model/DoodadTile.java
+++ b/src/model/DoodadTile.java
@@ -20,10 +20,12 @@ public class DoodadTile extends Tile
 		if (p.getFinancialStatement().getCashBalance() > amount)
 			{
 				p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() - amount);
+				p.getFinancialStatement().update();
 			}
 		else if(p.getFinancialStatement().getCashBalance() < amount)
 			{
 				p.getFinancialStatement().setCashBalance(0);
+				p.getFinancialStatement().update();
 			}
 		// Pop next card
 		// Get cash out from card
diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index 0b8ece4..cbd79a0 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -91,7 +91,7 @@ public class FinancialStatement
 		update();
 	}
 	
-	private void update()
+	public void update()
 	{
 		_income = _salary + _REcashFlow;
 		_expenses = _taxes + _homeMortgagePayment + _schoolLoanPayment + _carLoanPayment + _creditCardPayment + _otherExpenses + (_perChildExpense * _numChildren);
@@ -199,6 +199,10 @@ public class FinancialStatement
 	{
 		return _profession;
 	}
+	public int getTotalIncome()
+	{
+		return _totalIncome;
+	}
 }