sup

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
+		}
+
+
+	}
+
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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)

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;
 	}