Merge branch 'master' of https://github.uconn.edu/joh13010/2102-Group…

…-Project-Spring-2017.git

bin/.gitignore

@@ -1 +1,4 @@
+/.DS_Store
 /controller/
+/model/
+/view/

src/model/CardStack.java

@@ -1,6 +1,7 @@
 package model;
 
 import java.util.ArrayList;
+
 import java.util.LinkedList;
 import java.util.Random;
 import java.util.Stack;

src/model/CharityTile.java

@@ -12,13 +12,21 @@ public class CharityTile extends Tile
 	@Override
 	public void getLandedOn(Player p)
 	{
+
 		// TODO
 		// Ask players if they want to donate to charity (returns boolean)
-		// If true:
-		// 		Set players charity coutner to 3
-		//		Take money from them (check board for deets)
-		// else:
-		// 		Nothin
+
+		if (p.donateCharity())
+		{
+			p.setCharityCount(p.getCharityCount() + 3);
+			p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() 
+					- (p.getFinancialStatement().getPassiveIncome()*.10));
+		}
+		else
+		{
+			//you're an asshole
+		}
+
 	}
 
 }

src/model/ChildTile.java

@@ -11,7 +11,8 @@ public class ChildTile extends Tile
 	@Override
 	public void getLandedOn(Player p)
 	{
-		// Increment child counter using addChild() method in financial statement
+		p.getFinancialStatement().addChild();
+
 	}
 
 }

src/model/DealTile.java

@@ -29,15 +29,16 @@ public class DealTile extends Tile
 		Card c;
 		if(input.equals("1"))
 		{
-			c = _smallDealStack.pickCard()
+			c = _smallDealStack.pickCard();
 		}
 		else 
 		{
 			c = _smallDealStack.pickCard();
 		}
 
 		// If stock, update price, then ask user if they want to buy and ask everyone if they want to sell:
-		if(c.getTitle().equals(anObject))
+		//if(c.getTitle().equals(anObject))
+
 		// If property, ask user if they want to do it (and check if they can afford the down payment):
 		// If yes, call ButIncomeProperty method:
 		// Else, do nothing:

src/model/DoodadTile.java

@@ -3,7 +3,8 @@ package model;
 public class DoodadTile extends Tile
 {
 	private static DoodadStack _doodadStack;
-
+	private DoodadCard card;
+	private int amount;
 
 	public DoodadTile(String name, int boardIndex)
 	{
@@ -14,6 +15,16 @@ public class DoodadTile extends Tile
 	@Override
 	public void getLandedOn(Player p)
 	{
+		card = (DoodadCard) _doodadStack.pop();
+		amount = card.getValue();
+		if (p.getFinancialStatement().getCashBalance() > amount)
+			{
+				p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() - amount);
+			}
+		else if(p.getFinancialStatement().getCashBalance() < amount)
+			{
+				p.getFinancialStatement().setCashBalance(0);
+			}
 		// Pop next card
 		// Get cash out from card
 		// Check if player has enough money to pay in full

src/model/FinancialStatement.java

@@ -107,7 +107,7 @@ public class FinancialStatement
 		// TODO add method to update display if its currently being displayed
 	}
 
-	private int getPassiveIncome()
+	int getPassiveIncome()
 	{
 		int passiveInc = 0;
 		for(OwnedRealEstate re : _realEstate)
@@ -184,6 +184,11 @@ public class FinancialStatement
 		return _cashBalance;
 	}
 
+	public void setCashBalance(double d)
+	{
+		_cashBalance = (int) d;
+	}
+
 	public void increaseCashBalance(int cashIncrease)
 	{
 		this._cashBalance =+ cashIncrease;

src/model/Player.java

@@ -3,6 +3,7 @@ package model;
 public class Player
 {
 	private FinancialStatement _fs; 
+	private boolean _donate;
 	private int _charityCount; //charity counter
 	private int _downsizeCount; //down size counter
 	private int _location;
@@ -31,8 +32,11 @@ public class Player
 
 	public boolean donateCharity()
 	{
-		//
-		return false;
+		return _donate;
+	}
+	public void setCharity(boolean charityq)
+	{
+		_donate = charityq;
 	}
 
 	public void setLocation(int i)
@@ -51,7 +55,11 @@ public class Player
 		return _charityCount;
 	}
 
-
+	public void setCharityCount(int charityCount)
+	{
+		_charityCount = charityCount;
+	}
+
 	public void decrementCharityCount()
 	{
 		_charityCount--;