tilessss

joh13010 · Apr 7, 2017 · 8f7a4a7 · 8f7a4a7
1 parent f97939a
commit 8f7a4a7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 5 deletions.
diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class
diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
diff --git 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
@@ -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
@@ -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
@@ -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;
+	}
 }