From aa7fb944ceffb86333d9101619b6790d8d82a870 Mon Sep 17 00:00:00 2001
From: Joe <Joe@localhost>
Date: Fri, 3 Mar 2017 17:42:22 -0500
Subject: [PATCH] Okay so I made a lot of commits today so heres a small
 summary:

-Changed the card classes a little.
-Added some card stack classes with randomize functionality.
-Added some empty classes like Player, Financial Statement, GameBoard
and Tile.
-Added some empty methods in the Cashflow class with some mediocre
pseudocode.
---
 bin/controller/Cashflow.class    | Bin 1102 -> 1340 bytes
 src/controller/Cashflow.java     |  35 ++++++++++++++++++++++++++++++-
 src/model/DealCard.java          |   2 --
 src/model/FinacialStatement.java |   6 ++++++
 src/model/GameBoard.java         |   8 +++++++
 src/model/Player.java            |   7 +++++++
 src/model/Tile.java              |   6 ++++++
 7 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 src/model/FinacialStatement.java
 create mode 100644 src/model/GameBoard.java
 create mode 100644 src/model/Player.java
 create mode 100644 src/model/Tile.java

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 0c0513698444633e9aaeec129fd05ccdc6cb92cc..bf36558152ab881448e4d626a6a50d6de2641929 100644
GIT binary patch
literal 1340
zcmah}TTc@~7(LT2-BK2Taur2UR9bHJf`C*&0YS7}w1$N6fJ0fz!nWHiTMRz?M||>G
zABvI07$1G{AE9TqRk<am$<EAoJKuNaOn)4G`3hhVX&nK9#*CBqT*tOeH!&r5w>E9(
zjSfwqep~Lzge~*g#Nzt4nehZdYwM15Hv}3|IcLMP6SFdBPAXGUAiP$v<-Y0e3e>Gu
z{7b%t&d^$hQFKNBxTbhcdor`5ybrCs<&6sjWASAHZHmPs2%^qF4Gh*xS$T7zm|Hj9
zS90ApStjLVq`fR%OPwo5&D*jF(VRMGB%)|JY2^i4VymftqoqC9%4d`DWgV@Yt31}c
zbazb8?=FHC)TvLqflIh7pl9i^-m(WaJ6DY>=+trb1YPO<UC+!JxQ6SDa*AZGxeRGJ
zi6!E(v}?*-QpXK}*3->Q7A<?jbR)Qhn2zp~rTumd#L>f6_M}}j7dKfxHWxoTR0Lh<
zQxx{Ah_n9qau^ALz-Xt6ykp=l?(s5Yp<w2D$^GZ0oT*ajHmNweZ(s<+oVnl>1TMtl
z6&a|z=CBVq%5j2~If4-+4Lrmc6G-i}xtnpVf@e9rswP%A%?^ROFk#@4$_RT-`2r)D
z#I%kn>e){?Nwk3{iUYl%xVKqYlWvwuX*@>><RhnCmDZ0*ffA}wI<=%-7J!%&5EjSH
z7jpu&zFy{Kp`yk>)*+C369SR6Q*<-tjHR?&`{$Vrs8*>GR^WpSB7iD{xC=l>*k7v=
z;i@r$?||Q0o)TOI*Q%ZaT=?jR)$<$jjUhB}uR<AsC>ps|qY2HlsO0Y~R>gJp5G^YQ
zXiN2$aB(a+{sDJ8wAVx0Cv+U5Yo%HHjGG7OjSiG>n<0bWFjB%O4<(G3@c3O&bX<P_
z>!*SbLcw2Q&mdfwV6}vcqLsfkjB`JOcE7E`GBnS#j16M~Pci2=Hi~C>&bjL_j1+f4
z=5}MAI}HnrtwG=jQ5`Kp3@~BwFB!dbs#(QpBKnRI!M_Wi2!W;lC*C<X@dYsgc=;QS
C<{JF~

delta 577
zcmYk3O-~b16o#KWQ##XODy3Qr(y3Le{XnVKN|j1c5fQ~zjR`v^(o}?ksf~$l*tj-n
z#)Vr~ZpFpah%v^MaiPD!|KSQfQ#Neg^ZmZ(p8Li6Wm-S?K7R!&-0fNA-kW4NVlzaz
zxAXY^sA9Cewc6Y$-E%wZ&2FRXK3cbk5eeXkO@gBeqa~HKmraG9FDykE<Cwv?BKE|6
z?v^&(%~q-L;#s%ZwwWO1wN*x?z1J!g&T!J;g!e%u^iyQLA1YgRI1{Mn6p8%uf%$G{
zZL?J?JTNIJw3&>B!=%kw&UtCAX2vMloach)YUAmPB7Jb{dAGA_QRb4(G*$1dR-ACS
zVlzWkVRp9~19FS2)D336KiZf+N6!1JJ@vYJb{jNQa1lX64pkDX#10kvm^<QVSb{-0
zz+pjqzd>wNq6mi=kxVfBosdw$;x4h3KJn#ApTo0y{XJzT^l&=#k>oDUN+R@$<9$xY
z^ZqtP>6!XQ*{9-D^ttR)d!;KU_3q#AKwlr|rw9BN=0G({Tr`vNOLf`dmPEl`m3?il
yaa|&lIc_j7n?>aoH(8LEj8K*C1>sDRV^O?Rh}+UUjJ8MIAg0umOe{%C<IaBo*kDxv

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index 6ee73c9..08160b7 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -5,10 +5,18 @@ import model.*;
 
 public class Cashflow
 {
+
+	
+	private GameBoard _board;
+	private Player[] _players;
+	private CardStack[] _cards;
+	
 	public static void main(String[] args)
 	{
+		/*
+		 * Just testing stuff in here for now. Main method will call the go() method when game is built
+		 */
 		MarketStack ms = new MarketStack();
-		
 		int initialSize = ms.getSize();
 		for(int i=0; i<initialSize; i++)
 		{
@@ -16,4 +24,29 @@ public class Cashflow
 			System.out.println(num + ": " + ((MarketCard) ms.pop()).getDescription()); //Always going to need this cast when getting description unfortunately
 		}
 	}
+	
+	public void go()
+	{
+		// Joe
+		// Initialize game board
+		// Initialize GUI
+		// Initialize players (pick professions)
+		// Initialize cards
+		
+		
+		/*
+		 * Start game:
+		 * calls play function that has a
+		 * while loop that repeats until either a player wins or
+		 * someone elects to quit
+		 */
+
+	}
+	
+	public void play()
+	{
+		
+	}
+	
+	
 }
diff --git a/src/model/DealCard.java b/src/model/DealCard.java
index 1ab7efc..fa027ec 100644
--- a/src/model/DealCard.java
+++ b/src/model/DealCard.java
@@ -8,8 +8,6 @@ public class DealCard extends Card
 	private int _mortgage;
 	private int _cashFlowChange;
 	
-	
-	
 	public DealCard(String title, String description, int cost, int downPayment, int mortgage, int cashFlowChange)
 	{
 		super(title);
diff --git a/src/model/FinacialStatement.java b/src/model/FinacialStatement.java
new file mode 100644
index 0000000..f34997c
--- /dev/null
+++ b/src/model/FinacialStatement.java
@@ -0,0 +1,6 @@
+package model;
+
+public class FinacialStatement
+{
+	
+}
diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
new file mode 100644
index 0000000..85eade4
--- /dev/null
+++ b/src/model/GameBoard.java
@@ -0,0 +1,8 @@
+package model;
+
+public class GameBoard
+{
+	private Tile[] _gameTiles;
+	
+	// This class should have an array of tiles that goes back to the beginning when it eaches the end
+}
diff --git a/src/model/Player.java b/src/model/Player.java
new file mode 100644
index 0000000..90f8447
--- /dev/null
+++ b/src/model/Player.java
@@ -0,0 +1,7 @@
+package model;
+
+public class Player
+{
+	private FinacialStatement _fs;
+	
+}
diff --git a/src/model/Tile.java b/src/model/Tile.java
new file mode 100644
index 0000000..9f4d5d9
--- /dev/null
+++ b/src/model/Tile.java
@@ -0,0 +1,6 @@
+package model;
+
+public class Tile
+{
+	
+}