All kinds of good stuff

bin/.gitignore

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

src/controller/Cashflow.java

@@ -20,10 +20,6 @@ public class Cashflow
 
 	}
 
-
-
-
-
 	public void go()
 	{
 		// Joe
@@ -73,8 +69,8 @@ public class Cashflow
 	private static void testGamePlay()
 	{
 		Player p = new Player();
-		p.getFinancialStatement().getProfession().getName();
-		//GameBoard g = new GameBoard();
+		System.out.println(p.getFinancialStatement().getProfession().getName());
+		GameBoard g = new GameBoard();
 
 	}
 

src/model/CharityTile.java

@@ -8,4 +8,17 @@ public class CharityTile extends Tile
 		super(type, boardIndex);
 
 	}
+
+	@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
+	}
+
 }

src/model/ChildTile.java

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

src/model/DealTile.java

@@ -1,5 +1,7 @@
 package model;
 
+import java.util.Scanner;
+
 public class DealTile extends Tile
 {
 	private static SmallDealStack _smallDealStack;
@@ -14,12 +16,28 @@ public class DealTile extends Tile
 	}
 
 	@Override
-	public void getLandedOn()
+	public void getLandedOn(Player p)
 	{
 		// TODO
+		// For now, using a scanner to interact with user until GUI is ready:
 		// Ask user to decide big/small deal:
+		Scanner s = new Scanner(System.in);
+		System.out.println("You landed on a deal tile. Enter 0 for small deal or 1 for big deal");
+		String input = s.next();
+
 		// Pick card from big/small deal stack:
+		Card c;
+		if(input.equals("1"))
+		{
+			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 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:
@@ -43,6 +61,4 @@ public class DealTile extends Tile
 
 	}
 
-
-
 }

src/model/DoodadTile.java

@@ -2,8 +2,22 @@ package model;
 
 public class DoodadTile extends Tile
 {
+	private static DoodadStack _doodadStack;
+
+
 	public DoodadTile(String name, int boardIndex)
 	{
 		super(name, boardIndex);
+		_doodadStack = new DoodadStack();
+	}
+
+	@Override
+	public void getLandedOn(Player p)
+	{
+		// Pop next card
+		// Get cash out from card
+		// Check if player has enough money to pay in full
+		// If yes: Take cash from player
+		// Otherwise set players cash balance to 0
 	}
 }

src/model/FinancialStatement.java

@@ -103,6 +103,8 @@ public class FinancialStatement
 		_totalExpenses = _expenses;
 		_monthlyCashFlow = _totalIncome - _totalExpenses;
 		_hasWon = _passiveIncome > _totalExpenses;
+
+		// TODO add method to update display if its currently being displayed
 	}
 
 	private int getPassiveIncome()

src/model/GameBoard.java

@@ -46,10 +46,11 @@ public class GameBoard
 		}
 		currentNode.getData().addPlayers(p);
 		p.setLocation(currentNode.getData().getBoardIndex());
+		currentNode.getData().getLandedOn(p);
 		return passedPaydays;
 	}
 
-	public void getProfessions()
+	public Professions getProfessions()
 	{
 		return _profs;
 	}

src/model/Player.java

@@ -4,20 +4,23 @@ public class Player
 {
 	private FinancialStatement _fs; 
 	private int _charityCount; //charity counter
-	private int _downsizeCount; //downsize counter
+	private int _downsizeCount; //down size counter
 	private int _location;
 	private boolean _hasWon;
 
-	public Player() { 
-
+	public Player()
+	{
+		Professions p = new Professions();
+		_fs = new FinancialStatement(p.getProfession());
 		_charityCount = 0;
 		_downsizeCount = 0;
 		_location = 0;
 		_hasWon = false;
 	}
 
 
-	public boolean hasWon() {
+	public boolean hasWon()
+	{
 		return _hasWon;
 	}
 
@@ -26,16 +29,19 @@ public class Player
 		return _fs;
 	}
 
-	public boolean donateCharity() {
+	public boolean donateCharity()
+	{
 		//
 		return false;
 	}
 
-	public void setLocation(int i) {
+	public void setLocation(int i)
+	{
 		_location = i;
 	}
 
-	public int getLocation() {
+	public int getLocation()
+	{
 		return this._location;
 	}
 

src/model/Professions.java

@@ -36,19 +36,15 @@ public class Professions
 	private static Profession Mechanic = new Profession("Mechanic", 2000, 400, 300, 0, 100, 100, 400, 0, 0, 100,
 			700, 31000, 0, 3000, 3000);
 
-	private static Profession Janitor = new Profession("Janitor", 1600, 300, 200, 0, 100, 100, 300, 0, 0, 100,
+	private static final Profession Janitor = new Profession("Janitor", 1600, 300, 200, 0, 100, 100, 300, 0, 0, 100,
 			600, 20000, 0, 4000, 3000);
 
 	private static Profession[] profs = {Nurse, Teacher, TruckDriver, Secretary, Engineer, BusinessManager, 
 	                      AirlinePilot, Lawyer, PoliceOfficer, Doctor, Mechanic, Janitor};	
 
 	public Profession playerProf;
 
-	public Professions()
-	{
-
-	}
-
+	public Professions() {}
 
 	public Profession getProfession()
 	{

src/model/Tile.java

@@ -24,7 +24,7 @@ public class Tile
 		return _name;
 	}
 
-	public void getLandedOn()
+	public void getLandedOn(Player p)
 	{
 
 	}